asterixdb git commit: Use rsync instead of wget to distribute the benchmark source.

[imaxon]

Repository: asterixdb
Updated Branches:
  refs/heads/master e48c24e1f -> 692b8a890


Use rsync instead of wget to distribute the benchmark source.

Change-Id: I58d2553eb7866d6cc947f9a8f0443cb82fc654f6
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1511
Reviewed-by: Ian Maxon 
Sonar-Qube: Jenkins 
Tested-by: Jenkins 
Integration-Tests: Ian Maxon 


Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/692b8a89
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/692b8a89
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/692b8a89

Branch: refs/heads/master
Commit: 692b8a890d2159cc59d1287cdb716fb98bf69692
Parents: e48c24e
Author: Yingyi Bu 
Authored: Fri Feb 17 12:29:10 2017 -0800
Committer: Ian Maxon 
Committed: Fri Feb 17 13:20:16 2017 -0800

--
 .../src/main/resources/benchmarks/tpch/gen/compile.yml| 7 +++
 .../src/main/resources/benchmarks/tpch/gen/settings.yml   | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/asterixdb/blob/692b8a89/asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/gen/compile.yml
--
diff --git 
a/asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/gen/compile.yml
 
b/asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/gen/compile.yml
index a0aa8d3..6aca279 100644
--- 
a/asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/gen/compile.yml
+++ 
b/asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/gen/compile.yml
@@ -32,11 +32,10 @@
 path: "{{ generatorzip }}"
 state: absent
 
-- name: Download TPC-H data generator
-  get_url:
-url: "{{ tpch_url }}"
+- name: Upload TPC-H data generator
+  synchronize:
+src: "{{ tpch_path }}"
 dest: "{{ home_dir }}"
-force: yes
 
 - name: Unzip data generator
   shell: unzip "{{ generatorzip }}"

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/692b8a89/asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/gen/settings.yml
--
diff --git 
a/asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/gen/settings.yml
 
b/asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/gen/settings.yml
index 11ba53c..5a0a3ea 100644
--- 
a/asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/gen/settings.yml
+++ 
b/asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/gen/settings.yml
@@ -41,5 +41,5 @@ localgen: "{{ binary_dir }}/gen.sh"
 # The local data generation command.
 localgencmd: "gen.sh"
 
-# The url for the TPC-H benchmark.
-tpch_url: 
\ No newline at end of file
+# The path for the TPC-H benchmark source zip.
+tpch_path: 
\ No newline at end of file

asterixdb git commit: Added some info about open and close types to the data model doc. Change-Id: I1262090a2a568d935fd96e00db1da5cd836f25a5 Reviewed-on: https://asterix-gerrit.ics.uci.edu/1510 Tested

[buyingyi]

Repository: asterixdb
Updated Branches:
  refs/heads/master 34ee3335a -> e48c24e1f


Added some info about open and close types to the data model doc.
Change-Id: I1262090a2a568d935fd96e00db1da5cd836f25a5
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1510
Tested-by: Jenkins 
Integration-Tests: Jenkins 
Reviewed-by: Yingyi Bu 


Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/e48c24e1
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/e48c24e1
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/e48c24e1

Branch: refs/heads/master
Commit: e48c24e1fd1d2c3b179ae1a022d2cd98d4f2c2bd
Parents: 34ee333
Author: Mike Carey 
Authored: Thu Feb 16 18:06:52 2017 -0800
Committer: Yingyi Bu 
Committed: Fri Feb 17 09:01:57 2017 -0800

--
 .../asterix-doc/src/site/markdown/datamodel.md | 17 +
 1 file changed, 13 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e48c24e1/asterixdb/asterix-doc/src/site/markdown/datamodel.md
--
diff --git a/asterixdb/asterix-doc/src/site/markdown/datamodel.md 
b/asterixdb/asterix-doc/src/site/markdown/datamodel.md
index cba0d18..2c8a015 100644
--- a/asterixdb/asterix-doc/src/site/markdown/datamodel.md
+++ b/asterixdb/asterix-doc/src/site/markdown/datamodel.md
@@ -350,7 +350,7 @@ For example, a user might not be able to know the value of 
a field and let it be
 
 
 ### Missing ###
-`missing` represents a missing name-value pair in a object.
+`missing` represents a missing name-value pair in an object.
 If the referenced field does not exist, an empty result value is returned by 
the query.
 
 As neither the data model nor the system enforces homogeneity for datasets or 
collections,
@@ -371,13 +371,22 @@ Since a field with value `missing` means the field is 
absent, we get an empty ob
 ## Derived Types ##
 
 ### Object###
-A `object` contains a set of fields, where each field is described by its 
name and type. A object type is either open or closed. Open objects can contain 
fields that are not part of the type definition, while closed objects cannot. 
Syntactically, object constructors are surrounded by curly braces "{...}".
+An `object` contains a set of fields, where each field is described by its 
name and type. An object type may be defined as either open or closed. Open 
objects (instances of open object types) are permitted to contain fields that 
are not part of the type definition, while closed objects do not permit their 
instances to carry extra fields. An example type definition for an object is:
 
-An example would be
+create type SoldierType as open {
+name: string?,
+rank: string,
+serialno: int
+};
 
+Syntactically, object constructors are surrounded by curly braces "{...}".
+Some examples of legitimate instances of the above type include:
 
-{ "id": 213508, "name": "Alice Bob" }
+{ "name": "Joe Blow", "rank": "Sergeant", "serialno": 1234567 }
+{ "rank": "Private", "serialno": 9876543 }
+{ "name": "Sally Forth", "rank": "Major", "serialno": 2345678, 
"gender": "F" }
 
+The first instance has all of the type's prescribed content. The second 
instance is missing the name field, which is fine because it is optional (due 
to the ?). The third instance has an extra field; that is fine because the type 
definition specifies that it is open (which is also true by default, if open is 
not specified). To more tightly control object content, specifying closed 
instead of open in the type definition for SoldierType would have made the 
third example instance an invalid instance of the type.
 
 ### Array###
 An `array` is a container that holds a fixed number of values. Array 
constructors are denoted by brackets: "[...]".