asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From buyin...@apache.org
Subject asterixdb git commit: [DOC] Reorganize data model documentations.
Date Tue, 25 Jul 2017 18:48:26 GMT
Repository: asterixdb
Updated Branches:
  refs/heads/master bc229c048 -> d8192749d


[DOC] Reorganize data model documentations.

- user model changes: no
- storage format changes: no
- interface changes: no

Details:
- Re-organize data model documentations;
- Align results in the function doc with JSON;
- Fix a few minor issues in the function doc.

Change-Id: I6a2306747631c25d46c5246643abc1e147cf7c21
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1898
Sonar-Qube: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: Dmitry Lychagin <dmitry.lychagin@couchbase.com>
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
BAD: Jenkins <jenkins@fulliautomatix.ics.uci.edu>


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

Branch: refs/heads/master
Commit: d8192749dc18d974a49431d049c886bf09b3006a
Parents: bc229c0
Author: Yingyi Bu <yingyi@couchbase.com>
Authored: Mon Jul 24 23:46:39 2017 -0700
Committer: Yingyi Bu <buyingyi@gmail.com>
Committed: Tue Jul 25 11:42:02 2017 -0700

----------------------------------------------------------------------
 asterixdb/asterix-doc/pom.xml                   |   5 +-
 .../src/main/markdown/builtins/11_type.md       |   2 +-
 .../src/main/markdown/builtins/12_misc.md       |   2 +-
 .../main/markdown/builtins/13_conditional.md    |   2 +-
 .../main/markdown/builtins/1_numeric_common.md  |  14 +-
 .../main/markdown/builtins/9_aggregate_sql.md   |  11 +-
 .../markdown/datamodel/datamodel_composite.md   |  57 +++
 .../main/markdown/datamodel/datamodel_header.md |  55 +++
 .../markdown/datamodel/datamodel_incomplete.md  |  54 +++
 .../datamodel/datamodel_primitive_common.md     |  95 +++++
 .../datamodel/datamodel_primitive_delta.md      | 221 ++++++++++
 .../asterix-doc/src/site/markdown/datamodel.md  | 407 -------------------
 12 files changed, 501 insertions(+), 424 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d8192749/asterixdb/asterix-doc/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-doc/pom.xml b/asterixdb/asterix-doc/pom.xml
index a707434..57ed8f1 100644
--- a/asterixdb/asterix-doc/pom.xml
+++ b/asterixdb/asterix-doc/pom.xml
@@ -59,7 +59,10 @@
                   <filelist dir="${project.basedir}/src/main/markdown/builtins" files="0_toc.md,1_numeric_common.md,1_numeric_delta.md,2_string_common.md,2_string_delta.md,3_binary.md,4_spatial.md,5_similarity.md,6_tokenizing.md,7_temporal.md,7_allens.md,8_record.md,9_aggregate_sql.md,10_comparison.md,11_type.md,13_conditional.md,12_misc.md" />
                 </concat>
                 <concat destfile="${project.build.directory}/generated-site/markdown/aql/builtins.md">
-                  <filelist dir="${project.basedir}/src/main/markdown/builtins" files="0_toc.md,1_numeric.md,2_string.md,3_binary.md,4_spatial.md,5_similarity.md,6_tokenizing.md,7_temporal.md,7_allens.md,8_record.md,9_aggregate_aql.md,10_comparison.md,11_type.md,13_conditional.md,12_misc.md" />
+                  <filelist dir="${project.basedir}/src/main/markdown/builtins" files="0_toc.md,1_numeric_common.md,1_numeric_delta.md,2_string_common.md,2_string_delta.md,3_binary.md,4_spatial.md,5_similarity.md,6_tokenizing.md,7_temporal.md,7_allens.md,8_record.md,9_aggregate_sql.md,10_comparison.md,11_type.md,13_conditional.md,12_misc.md" />
+                </concat>
+                <concat destfile="${project.build.directory}/generated-site/markdown/datamodel.md">
+                  <filelist dir="${project.basedir}/src/main/markdown/datamodel" files="datamodel_header.md,datamodel_primitive_common.md,datamodel_primitive_delta.md,datamodel_incomplete.md,datamodel_composite.md" />
                 </concat>
                 <concat destfile="${project.build.directory}/generated-site/markdown/ansible.md">
                   <filelist dir="${project.basedir}/src/main/installation/" files="ansible_title.md,ansible.md" />

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d8192749/asterixdb/asterix-doc/src/main/markdown/builtins/11_type.md
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-doc/src/main/markdown/builtins/11_type.md b/asterixdb/asterix-doc/src/main/markdown/builtins/11_type.md
index 5cb22d4..a2b2555 100644
--- a/asterixdb/asterix-doc/src/main/markdown/builtins/11_type.md
+++ b/asterixdb/asterix-doc/src/main/markdown/builtins/11_type.md
@@ -17,7 +17,7 @@
  ! under the License.
  !-->
 
-## <a id="TypeFunctions">Type Functions</a> <font size="4"><a href="#toc">[Back to TOC]</a></font> ##
+## <a id="TypeFunctions">Type Functions</a> ##
 
 ### is_array (isarray) ###
  * Syntax:

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d8192749/asterixdb/asterix-doc/src/main/markdown/builtins/12_misc.md
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-doc/src/main/markdown/builtins/12_misc.md b/asterixdb/asterix-doc/src/main/markdown/builtins/12_misc.md
index b28443c..ac2a465 100644
--- a/asterixdb/asterix-doc/src/main/markdown/builtins/12_misc.md
+++ b/asterixdb/asterix-doc/src/main/markdown/builtins/12_misc.md
@@ -17,7 +17,7 @@
  ! under the License.
  !-->
 
-## <a id="MiscFunctions">Miscellaneous Functions</a> <font size="4"><a href="#toc">[Back to TOC]</a></font> ##
+## <a id="MiscFunctions">Miscellaneous Functions</a> ##
 
 ### uuid ###
  * Syntax:

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d8192749/asterixdb/asterix-doc/src/main/markdown/builtins/13_conditional.md
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-doc/src/main/markdown/builtins/13_conditional.md b/asterixdb/asterix-doc/src/main/markdown/builtins/13_conditional.md
index 04fa943..202f7e4 100644
--- a/asterixdb/asterix-doc/src/main/markdown/builtins/13_conditional.md
+++ b/asterixdb/asterix-doc/src/main/markdown/builtins/13_conditional.md
@@ -17,7 +17,7 @@
  ! under the License.
  !-->
 
-## <a id="ConditionalFunctions">Conditional Functions</a> <font size="4"><a href="#toc">[Back to TOC]</a></font> ##
+## <a id="ConditionalFunctions">Conditional Functions</a> ##
 
 ### if_null (ifnull) ###
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d8192749/asterixdb/asterix-doc/src/main/markdown/builtins/1_numeric_common.md
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-doc/src/main/markdown/builtins/1_numeric_common.md b/asterixdb/asterix-doc/src/main/markdown/builtins/1_numeric_common.md
index 9a4c080..c058d10 100644
--- a/asterixdb/asterix-doc/src/main/markdown/builtins/1_numeric_common.md
+++ b/asterixdb/asterix-doc/src/main/markdown/builtins/1_numeric_common.md
@@ -56,7 +56,7 @@
     * `missing` if the argument is a `missing` value,
     * `null` if the argument is a `null` value,
     * any other non-numeric input value will cause a type error,
-    * NaN for other legitimate numeric values.
+    * "NaN" for other legitimate numeric values.
 
  * Example:
 
@@ -65,7 +65,7 @@
 
  * The expected result is:
 
-        { "v1": 0.0, "v2": NaN, "v3": 1.5707963267948966, "v4": 1.0471975511965979, "v5": 2.0943951023931957 }
+        { "v1": 0.0, "v2": "NaN", "v3": 1.5707963267948966, "v4": 1.0471975511965979, "v5": 2.0943951023931957 }
 
 
 
@@ -83,7 +83,7 @@
     * `missing` if the argument is a `missing` value,
     * `null` if the argument is a `null` value,
     * any other non-numeric input value will cause a type error,
-    * NaN for other legitimate numeric values.
+    * "NaN" for other legitimate numeric values.
 
  * Example:
 
@@ -92,7 +92,7 @@
 
  * The expected result is:
 
-        { "v1": 1.5707963267948966, "v2": NaN, "v3": 0.0, "v4": 0.5235987755982989, "v5": -0.5235987755982989 }
+        { "v1": 1.5707963267948966, "v2": "NaN", "v3": 0.0, "v4": 0.5235987755982989, "v5": -0.5235987755982989 }
 
 
 ### atan ###
@@ -219,7 +219,7 @@
 
  * The expected result is:
 
-        { "v1": 2.718281828459045, "v2": 7.38905609893065, "v3": 1.0, "v4": 1.6487212707001282, "v5": Infinity }
+        { "v1": 2.718281828459045, "v2": 7.38905609893065, "v3": 1.0, "v4": 1.6487212707001282, "v5": "Infinity" }
 
 
 ### floor ###
@@ -274,7 +274,7 @@
 
  * The expected result is:
 
-        { "v1": 0.0, "v2": 0.6931471805599453, "v3": -Infinity, "v4": -0.6931471805599453, "v5": 6.907755278982137 }
+        { "v1": 0.0, "v2": 0.6931471805599453, "v3": "-Infinity", "v4": -0.6931471805599453, "v5": 6.907755278982137 }
 
 
 
@@ -298,7 +298,7 @@
 
  * The expected result is:
 
-        { "v1": 0.0, "v2": 0.3010299956639812, "v3": -Infinity, "v4": -0.3010299956639812, "v5": 3.0 }
+        { "v1": 0.0, "v2": 0.3010299956639812, "v3": "-Infinity", "v4": -0.3010299956639812, "v5": 3.0 }
 
 
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d8192749/asterixdb/asterix-doc/src/main/markdown/builtins/9_aggregate_sql.md
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-doc/src/main/markdown/builtins/9_aggregate_sql.md b/asterixdb/asterix-doc/src/main/markdown/builtins/9_aggregate_sql.md
index 62a35c3..90eb017 100644
--- a/asterixdb/asterix-doc/src/main/markdown/builtins/9_aggregate_sql.md
+++ b/asterixdb/asterix-doc/src/main/markdown/builtins/9_aggregate_sql.md
@@ -19,13 +19,12 @@
 
 ## <a id="AggregateFunctions">Aggregate Functions (Array Functions) </a> ##
 
-A high-level description of SQL++ aggregate functions can be found at <a href="manual.html#Aggregation_functions">here</a>.
-As SQL++ supports all legitimate SQL GROUP BY and Aggregation queries,
-<a href="manual.html#SQL-92_aggregation_functions">here</a> is a description of how standard SQL aggregation functions
-are supported.
-
 This section contains detailed descriptions of each SQL++ aggregate function (i.e., array function).
-
+Note that as described in the SQL++ query reference documentation, standard
+SQL aggregate functions (e.g., `MIN`, `MAX`, `SUM`, `COUNT`, and `AVG`)
+are not real functions in SQL++ but just syntactic sugars over corresponding
+SQL++ builtin aggregate functions (e.g., `ARRAY_MIN`, `ARRAY_MAX`,
+`ARRAY_SUM`, `ARRAY_COUNT`, and `ARRAY_AVG`).
 
 ### array_count ###
  * Syntax:

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d8192749/asterixdb/asterix-doc/src/main/markdown/datamodel/datamodel_composite.md
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-doc/src/main/markdown/datamodel/datamodel_composite.md b/asterixdb/asterix-doc/src/main/markdown/datamodel/datamodel_composite.md
new file mode 100644
index 0000000..7ed4e34
--- /dev/null
+++ b/asterixdb/asterix-doc/src/main/markdown/datamodel/datamodel_composite.md
@@ -0,0 +1,57 @@
+<!--
+ ! Licensed to the Apache Software Foundation (ASF) under one
+ ! or more contributor license agreements.  See the NOTICE file
+ ! distributed with this work for additional information
+ ! regarding copyright ownership.  The ASF licenses this file
+ ! to you under the Apache License, Version 2.0 (the
+ ! "License"); you may not use this file except in compliance
+ ! with the License.  You may obtain a copy of the License at
+ !
+ !   http://www.apache.org/licenses/LICENSE-2.0
+ !
+ ! Unless required by applicable law or agreed to in writing,
+ ! software distributed under the License is distributed on an
+ ! "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ! KIND, either express or implied.  See the License for the
+ ! specific language governing permissions and limitations
+ ! under the License.
+ !-->
+
+
+## <a id="DerivedTypes">Derived Types</a> ##
+
+### <a id="DerivedTypesObject">Object</a>###
+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:
+
+        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:
+
+        { "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.
+
+### <a id="DerivedTypesArray">Array</a>###
+An `array` is a container that holds a fixed number of values. Array constructors are denoted by brackets: "[...]".
+
+An example would be
+
+
+        ["alice", 123, "bob", null]
+
+
+### <a id="DerivedTypesMultiset">Multiset</a>###
+A `multiset` is a generalization of the concept of a set that, unlike a set, allows multiple instances of the multiset's elements.
+ Multiset constructors are denoted by two opening curly braces followed by data and two closing curly braces, like "{{...}}".
+
+An example would be
+
+
+        {{"hello", 9328, "world", [1, 2, null]}}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d8192749/asterixdb/asterix-doc/src/main/markdown/datamodel/datamodel_header.md
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-doc/src/main/markdown/datamodel/datamodel_header.md b/asterixdb/asterix-doc/src/main/markdown/datamodel/datamodel_header.md
new file mode 100644
index 0000000..74bab7f
--- /dev/null
+++ b/asterixdb/asterix-doc/src/main/markdown/datamodel/datamodel_header.md
@@ -0,0 +1,55 @@
+<!--
+ ! Licensed to the Apache Software Foundation (ASF) under one
+ ! or more contributor license agreements.  See the NOTICE file
+ ! distributed with this work for additional information
+ ! regarding copyright ownership.  The ASF licenses this file
+ ! to you under the Apache License, Version 2.0 (the
+ ! "License"); you may not use this file except in compliance
+ ! with the License.  You may obtain a copy of the License at
+ !
+ !   http://www.apache.org/licenses/LICENSE-2.0
+ !
+ ! Unless required by applicable law or agreed to in writing,
+ ! software distributed under the License is distributed on an
+ ! "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ! KIND, either express or implied.  See the License for the
+ ! specific language governing permissions and limitations
+ ! under the License.
+ !-->
+
+# The Asterix Data Model (ADM) #
+
+## <a id="toc">Table of Contents</a> ##
+
+* [Primitive Types](#PrimitiveTypes)
+    * [Boolean](#PrimitiveTypesBoolean)
+    * [String](#PrimitiveTypesString)
+    * [Tinyint / Smallint / Integer (Int) / Bigint](#PrimitiveTypesInt)
+    * [Float](#PrimitiveTypesFloat)
+    * [Double (Double Precision)](#PrimitiveTypesDouble)
+    * [Binary](#PrimitiveTypesBinary)
+    * [Point](#PrimitiveTypesPoint)
+    * [Line](#PrimitiveTypesLine)
+    * [Rectangle](#PrimitiveTypesRectangle)
+    * [Circle](#PrimitiveTypesCircle)
+    * [Polygon](#PrimitiveTypesPolygon)
+    * [Date](#PrimitiveTypesDate)
+    * [Time](#PrimitiveTypesTime)
+    * [Datetime (Timestamp)](#PrimitiveTypesDateTime)
+    * [Duration/Year_month_duration/Day_time_duration](#PrimitiveTypesDuration)
+    * [Interval](#PrimitiveTypesInterval)
+    * [UUID](#PrimitiveTypesUUID)
+* [Incomplete Information Types] (#IncompleteInformationTypes)
+    * [Null](#IncompleteInformationTypesNull)
+    * [Missing](#IncompleteInformationTypesMissing)
+* [Derived Types](#DerivedTypes)
+    * [Object](#DerivedTypesObject)
+    * [Array](#DerivedTypesArray)
+    * [Multiset](#DerivedTypesMultiset)
+
+An instance of Asterix data model (ADM) can be a _*primitive type*_ (`boolean`,
+`tinyint`, `smallint`, `integer`, `bigint`, `string`, `float`, `double`, `date`,
+`time`, `datetime`, etc.), a _*special type*_ (`null` or `missing`), or a _*derived type*_.
+
+The type names are case-insensitive, e.g., both `BIGINT` and `bigint` are acceptable.
+

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d8192749/asterixdb/asterix-doc/src/main/markdown/datamodel/datamodel_incomplete.md
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-doc/src/main/markdown/datamodel/datamodel_incomplete.md b/asterixdb/asterix-doc/src/main/markdown/datamodel/datamodel_incomplete.md
new file mode 100644
index 0000000..da88ea0
--- /dev/null
+++ b/asterixdb/asterix-doc/src/main/markdown/datamodel/datamodel_incomplete.md
@@ -0,0 +1,54 @@
+<!--
+ ! Licensed to the Apache Software Foundation (ASF) under one
+ ! or more contributor license agreements.  See the NOTICE file
+ ! distributed with this work for additional information
+ ! regarding copyright ownership.  The ASF licenses this file
+ ! to you under the Apache License, Version 2.0 (the
+ ! "License"); you may not use this file except in compliance
+ ! with the License.  You may obtain a copy of the License at
+ !
+ !   http://www.apache.org/licenses/LICENSE-2.0
+ !
+ ! Unless required by applicable law or agreed to in writing,
+ ! software distributed under the License is distributed on an
+ ! "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ! KIND, either express or implied.  See the License for the
+ ! specific language governing permissions and limitations
+ ! under the License.
+ !-->
+
+## <a id="IncompleteInformationTypes">Incomplete Information Types</a>##
+
+### <a id="IncompleteInformationTypesNull">Null</a> ###
+`null` is a special value that is often used to represent an unknown value.
+For example, a user might not be able to know the value of a field and let it be `null`.
+
+ * Example:
+
+        { "field": null };
+
+
+ * The expected result is:
+
+        { "field": null }
+
+
+### <a id="IncompleteInformationTypesMissing">Missing</a> ###
+`missing` indicates that a name-value pair is missing from an object.
+If a missing name-value pair is accessed, an empty result value is returned by the query.
+
+As neither the data model nor the system enforces homogeneity for datasets or collections,
+items in a dataset or collection can be of heterogeneous types and
+so a field can be present in one object and `missing` in another.
+
+ * Example:
+
+        { "field": missing };
+
+
+ * The expected result is:
+
+        {  }
+
+Since a field with value `missing` means the field is absent, we get an empty object.
+

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d8192749/asterixdb/asterix-doc/src/main/markdown/datamodel/datamodel_primitive_common.md
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-doc/src/main/markdown/datamodel/datamodel_primitive_common.md b/asterixdb/asterix-doc/src/main/markdown/datamodel/datamodel_primitive_common.md
new file mode 100644
index 0000000..3a401b5
--- /dev/null
+++ b/asterixdb/asterix-doc/src/main/markdown/datamodel/datamodel_primitive_common.md
@@ -0,0 +1,95 @@
+<!--
+ ! Licensed to the Apache Software Foundation (ASF) under one
+ ! or more contributor license agreements.  See the NOTICE file
+ ! distributed with this work for additional information
+ ! regarding copyright ownership.  The ASF licenses this file
+ ! to you under the Apache License, Version 2.0 (the
+ ! "License"); you may not use this file except in compliance
+ ! with the License.  You may obtain a copy of the License at
+ !
+ !   http://www.apache.org/licenses/LICENSE-2.0
+ !
+ ! Unless required by applicable law or agreed to in writing,
+ ! software distributed under the License is distributed on an
+ ! "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ! KIND, either express or implied.  See the License for the
+ ! specific language governing permissions and limitations
+ ! under the License.
+ !-->
+
+## <a id="PrimitiveTypes">Primitive Types</a>##
+
+### <a id="PrimitiveTypesBoolean">Boolean</a> ###
+`boolean` data type can have one of the two values: _*true*_ or _*false*_.
+
+ * Example:
+
+        { "true": true, "false": false };
+
+
+ * The expected result is:
+
+        { "true": true, "false": false }
+
+
+### <a id="PrimitiveTypesString">String</a> ###
+`string` represents a sequence of characters. The total length of the sequence can be up to 2,147,483,648.
+
+ * Example:
+
+        { "v1": string("This is a string."), "v2": string("\"This is a quoted string\"") };
+
+
+ * The expected result is:
+
+        { "v1": "This is a string.", "v2": "\"This is a quoted string\"" }
+
+
+### <a id="PrimitiveTypesInt">Tinyint / Smallint / Integer (Int) / Bigint</a> ###
+Integer types using 8, 16, 32, or 64 bits. The ranges of these types are:
+
+- `tinyint`: -128 to 127
+- `smallint`: -32768 to 32767
+- `integer`: -2147483648 to 2147483647
+- `bigint`: -9223372036854775808 to 9223372036854775807
+
+`int` is an abbreviated alias for integer.
+
+ * Example:
+
+        { "tinyint": tiny("125"), "smallint": smallint("32765"), "integer": 294967295, "bigint": bigint("1700000000000000000")};
+
+
+ * The expected result is:
+
+        { "tinyint": 125, "smallint": 32765, "integer": 294967295, "bigint": 17000000 }
+
+### <a id="PrimitiveTypesFloat">Float</a> ###
+`float` represents approximate numeric data values using 4 bytes. The range of a float value can be
+from 2^(-149) to (2-2^(-23)·2^(127) for both positive and negative. Beyond these ranges will get `INF` or `-INF`.
+
+ * Example:
+
+        { "v1": float("NaN"), "v2": float("INF"), "v3": float("-INF"), "v4": float("-2013.5") };
+
+
+ * The expected result is:
+
+        { "v1": "NaN", "v2": "Infinity", "v3": "-Infinity", "v4": -2013.5 }
+
+
+### <a id="PrimitiveTypesDouble">Double (double precision)</a> ###
+`double` represents approximate numeric data values using 8 bytes. The range of a double value can be from (2^(-1022)) to (2-2^(-52))·2^(1023)
+for both positive and negative. Beyond these ranges will get `INF` or `-INF`.
+
+ * Example:
+
+        { "v1": double("NaN"), "v2": double("INF"), "v3": double("-INF"), "v4": "-2013.593823748327284" };
+
+
+ * The expected result is:
+
+        { "v1": "NaN", "v2": "Infinity", "v3": "-Infinity", "v4": -2013.5938237483274 }
+
+`Double precision` is an alias of `double`.
+

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d8192749/asterixdb/asterix-doc/src/main/markdown/datamodel/datamodel_primitive_delta.md
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-doc/src/main/markdown/datamodel/datamodel_primitive_delta.md b/asterixdb/asterix-doc/src/main/markdown/datamodel/datamodel_primitive_delta.md
new file mode 100644
index 0000000..13e3910
--- /dev/null
+++ b/asterixdb/asterix-doc/src/main/markdown/datamodel/datamodel_primitive_delta.md
@@ -0,0 +1,221 @@
+<!--
+ ! Licensed to the Apache Software Foundation (ASF) under one
+ ! or more contributor license agreements.  See the NOTICE file
+ ! distributed with this work for additional information
+ ! regarding copyright ownership.  The ASF licenses this file
+ ! to you under the Apache License, Version 2.0 (the
+ ! "License"); you may not use this file except in compliance
+ ! with the License.  You may obtain a copy of the License at
+ !
+ !   http://www.apache.org/licenses/LICENSE-2.0
+ !
+ ! Unless required by applicable law or agreed to in writing,
+ ! software distributed under the License is distributed on an
+ ! "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ! KIND, either express or implied.  See the License for the
+ ! specific language governing permissions and limitations
+ ! under the License.
+ !-->
+
+### <a id="PrimitiveTypesBinary">Binary</a> ###
+`binary` represents a sequence of bytes. It can be constructed from a `hex` or a `base64` string sequence.
+The total length of the byte sequence can be up to 2,147,483,648.
+
+ * Example:
+
+        {
+          "hex1" : hex("ABCDEF0123456789"),
+          "hex2": hex("abcdef0123456789"),
+          "base64_1" : base64("0123456789qwertyui+/"),
+          "base64_2" : base64('QXN0ZXJpeA==')
+        };
+
+ * The default output format is in `hex` format. Thus, the expected result is:
+
+        {
+          "hex1": hex("ABCDEF0123456789"),
+          "hex2": hex("ABCDEF0123456789"),
+          "base64_1": hex("D35DB7E39EBBF3DAB07ABB72BA2FBF"),
+          "base64_2": hex("41737465726978")
+        }
+
+
+### <a id="PrimitiveTypesPoint">Point</a> ###
+`point` is the fundamental two-dimensional building block for spatial types. It consists of two `double` coordinates x and y.
+
+ * Example:
+
+        { "v1": point("80.10d, -10E5"), "v2": point("5.10E-10d, -10E5") };
+
+
+ * The expected result is:
+
+        { "v1": point("80.1,-1000000.0"), "v2": point("5.1E-10,-1000000.0") }
+
+
+### <a id="PrimitiveTypesLine">Line</a> ###
+`line` consists of two points that represent the start and the end points of a line segment.
+
+ * Example:
+
+        { "v1": line("10.1234,11.1e-1 +10.2E-2,-11.22"), "v2": line("0.1234,-1.00e-10 +10.5E-2,-01.02") };
+
+
+ * The expected result is:
+
+        { "v1": line("10.1234,1.11 0.102,-11.22"), "v2": line("0.1234,-1.0E-10 0.105,-1.02") }
+
+
+### <a id="PrimitiveTypesRectangle">Rectangle</a>###
+`rectangle` consists of two points that represent the _*bottom left*_ and _*upper right*_ corners of a rectangle.
+
+ * Example:
+
+        { "v1": rectangle("5.1,11.8 87.6,15.6548"), "v2": rectangle("0.1234,-1.00e-10 5.5487,0.48765") };
+
+
+ * The expected result is:
+
+        { "v1": rectangle("5.1,11.8 87.6,15.6548"), "v2": rectangle("0.1234,-1.0E-10 5.5487,0.48765") }
+
+
+### <a id="PrimitiveTypesCircle">Circle</a> ###
+`circle` consists of one point that represents the center of the circle and a radius of type `double`.
+
+ * Example:
+
+        { "v1": circle("10.1234,11.1e-1 +10.2E-2"), "v2": circle("0.1234,-1.00e-10 +10.5E-2") };
+
+
+ * The expected result is:
+
+        { "v1": circle("10.1234,1.11 0.102"), "v2": circle("0.1234,-1.0E-10 0.105") }
+
+
+### <a id="PrimitiveTypesPolygon">Polygon</a> ###
+`polygon` consists of _*n*_ points that represent the vertices of a _*simple closed*_ polygon.
+
+ * Example:
+
+        {
+          "v1": polygon("-1.2,+1.3e2 -2.14E+5,2.15 -3.5e+2,03.6 -4.6E-3,+4.81"),
+          "v2": polygon("-1.0,+10.5e2 -02.15E+50,2.5 -1.0,+3.3e3 -2.50E+05,20.15 +3.5e+2,03.6 -4.60E-3,+4.75 -2,+1.0e2 -2.00E+5,20.10 30.5,03.25 -4.33E-3,+4.75")
+        };
+
+
+ * The expected result is:
+
+        {
+          "v1": polygon("-1.2,130.0 -214000.0,2.15 -350.0,3.6 -0.0046,4.81"),
+          "v2": polygon("-1.0,1050.0 -2.15E50,2.5 -1.0,3300.0 -250000.0,20.15 350.0,3.6 -0.0046,4.75 -2.0,100.0 -200000.0,20.1 30.5,3.25 -0.00433,4.75") }
+        }
+
+
+### <a id="PrimitiveTypesDate">Date</a> ###
+`date` represents a time point along the Gregorian calendar system specified by the year, month and day. ASTERIX supports the date from `-9999-01-01` to `9999-12-31`.
+
+A date value can be represented in two formats, extended format and basic format.
+
+ * Extended format is represented as `[-]yyyy-mm-dd` for `year-month-day`. Each field should be padded if there are less digits than the format specified.
+ * Basic format is in the format of `[-]yyyymmdd`.
+
+ * Example:
+
+        { "v1": date("2013-01-01"), "v2": date("-19700101") };
+
+
+ * The expected result is:
+
+        { "v1": date("2013-01-01"), "v2": date("-1970-01-01") }
+
+
+### <a id="PrimitiveTypesTime">Time</a> ###
+`time` type describes the time within the range of a day. It is represented by three fields: hour, minute and second. Millisecond field is optional as the fraction of the second field. Its extended format is as `hh:mm:ss[.mmm]` and the basic format is `hhmmss[mmm]`. The value domain is from `00:00:00.000` to `23:59:59.999`.
+
+Timezone field is optional for a time value. Timezone is represented as `[+|-]hh:mm` for extended format or `[+|-]hhmm` for basic format. Note that the sign designators cannot be omitted. `Z` can also be used to represent the UTC local time. If no timezone information is given, it is UTC by default.
+
+ * Example:
+
+        { "v1": time("12:12:12.039Z"), "v2": time("000000000-0800") };
+
+
+ * The expected result is:
+
+        { "v1": time("12:12:12.039Z"), "v2": time("08:00:00.000Z") }
+
+
+### <a id="PrimitiveTypesDateTime">Datetime (Timestamp)</a> ###
+A `datetime` value is a combination of an `date` and `time`, representing a fixed time point along the Gregorian calendar system. The value is among `-9999-01-01 00:00:00.000` and `9999-12-31 23:59:59.999`.
+
+A `datetime` value is represented as a combination of the representation of its `date` part and `time` part, separated by a separator `T`. Either extended or basic format can be used, and the two parts should be the same format.
+
+Millisecond field and timezone field are optional, as specified in the `time` type.
+
+ * Example:
+
+        { "v1": datetime("2013-01-01T12:12:12.039Z"), "v2": datetime("-19700101T000000000-0800") };
+
+
+ * The expected result is:
+
+        { "v1": datetime("2013-01-01T12:12:12.039Z"), "v2": datetime("-1970-01-01T08:00:00.000Z") }
+
+`timestamp` is an alias of `datetime`.
+
+### <a id="PrimitiveTypesDuration">Duration/Year_month_duration/Day_time_duration</a> ###
+`duration` represents a duration of time. A duration value is specified by integers on at least one of the following fields: year, month, day, hour, minute, second, and millisecond.
+
+A duration value is in the format of `[-]PnYnMnDTnHnMn.mmmS`. The millisecond part (as the fraction of the second field) is optional, and when no millisecond field is used, the decimal point should also be absent.
+
+Negative durations are also supported for the arithmetic operations between time instance types (`date`, `time` and `datetime`), and is used to roll the time back for the given duration. For example `date("2012-01-01") + duration("-P3D")` will return `date("2011-12-29")`.
+
+There are also two sub-duration types, namely `year_month_duration` and `day_time_duration`.
+`year_month_duration` represents only the years and months of a duration,
+while `day_time_duration` represents only the day to millisecond fields.
+Different from the `duration` type, both these two subtypes are totally ordered, so they can be used for comparison and
+index construction.
+
+Note that a canonical representation of the duration is always returned, regardless whether the duration is in the canonical representation or not from the user's input. More information about canonical representation can be found from [XPath dayTimeDuration Canonical Representation](http://www.w3.org/TR/xpath-functions/#canonical-dayTimeDuration) and [yearMonthDuration Canonical Representation](http://www.w3.org/TR/xpath-functions/#canonical-yearMonthDuration).
+
+ * Example:
+
+        { "v1": duration("P100Y12MT12M"), "v2": duration("-PT20.943S") };
+
+
+ * The expected result is:
+
+        { "v1": duration("P101YT12M"), "v2": duration("-PT20.943S") }
+
+
+### <a id="PrimitiveTypesInterval">Interval</a> ###
+`interval` represents inclusive-exclusive ranges of time. It is defined by two time point values with the same temporal type(`date`, `time` or `datetime`).
+
+ * Example:
+
+        {
+          "v1": interval(date("2013-01-01"), date("20130505")),
+          "v2": interval(time("00:01:01"), time("213901049+0800")),
+          "v3": interval(datetime("2013-01-01T00:01:01"), datetime("20130505T213901049+0800"))
+        };
+
+
+ * The expected result is:
+
+        {
+          "v1": interval(date("2013-01-01"), date("2013-05-05")),
+          "v2": interval(time("00:01:01.000Z"), time("13:39:01.049Z")),
+          "v3": interval(datetime("2013-01-01T00:01:01.000Z"), datetime("2013-05-05T13:39:01.049Z"))
+        }
+
+### <a id="PrimitiveTypesUUID">UUID</a> ###
+`uuid` represents a UUID value, which stands for Universally unique identifier. It is defined by a canonical format using hexadecimal text with inserted hyphen characters. (E.g.: 5a28ce1e-6a74-4201-9e8f-683256e5706f). This type is generally used to store auto-generated primary key values.
+
+ * Example:
+
+        return { "v1":uuid("5c848e5c-6b6a-498f-8452-8847a2957421") }
+
+
+ * The expected result is:
+
+        { "v1": uuid("5c848e5c-6b6a-498f-8452-8847a2957421") }
+

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d8192749/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
deleted file mode 100644
index 2c8a015..0000000
--- a/asterixdb/asterix-doc/src/site/markdown/datamodel.md
+++ /dev/null
@@ -1,407 +0,0 @@
-<!--
- ! Licensed to the Apache Software Foundation (ASF) under one
- ! or more contributor license agreements.  See the NOTICE file
- ! distributed with this work for additional information
- ! regarding copyright ownership.  The ASF licenses this file
- ! to you under the Apache License, Version 2.0 (the
- ! "License"); you may not use this file except in compliance
- ! with the License.  You may obtain a copy of the License at
- !
- !   http://www.apache.org/licenses/LICENSE-2.0
- !
- ! Unless required by applicable law or agreed to in writing,
- ! software distributed under the License is distributed on an
- ! "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ! KIND, either express or implied.  See the License for the
- ! specific language governing permissions and limitations
- ! under the License.
- !-->
-
-# The Asterix Data Model (ADM) #
-
-## <a id="toc">Table of Contents</a> ##
-
-* [Primitive Types](#PrimitiveTypes)
-    * [Boolean](#PrimitiveTypesBoolean)
-    * [Tinyint / Smallint / Integer (Int) / Bigint](#PrimitiveTypesInt)
-    * [Float](#PrimitiveTypesFloat)
-    * [Double (Double Precision)](#PrimitiveTypesDouble)
-    * [String](#PrimitiveTypesString)
-    * [Binary](#PrimitiveTypesBinary)
-    * [Point](#PrimitiveTypesPoint)
-    * [Line](#PrimitiveTypesLine)
-    * [Rectangle](#PrimitiveTypesRectangle)
-    * [Circle](#PrimitiveTypesCircle)
-    * [Polygon](#PrimitiveTypesPolygon)
-    * [Date](#PrimitiveTypesDate)
-    * [Time](#PrimitiveTypesTime)
-    * [Datetime (Timestamp)](#PrimitiveTypesDateTime)
-    * [Duration/Year_month_duration/Day_time_duration](#PrimitiveTypesDuration)
-    * [Interval](#PrimitiveTypesInterval)
-    * [UUID](#PrimitiveTypesUUID)
-* [Incomplete Information Types] (#IncompleteInformationTypesTypes)
-    * [Null](#IncompleteInformationTypesNull)
-    * [Missing](#IncompleteInformationTypesMissing)
-* [Derived Types](#DerivedTypes)
-    * [Object](#DerivedTypesObject)
-    * [Array](#DerivedTypesArray)
-    * [Multiset](#DerivedTypesMultiset)
-
-An instance of Asterix data model (ADM) can be a _*primitive type*_ (`boolean`,
-`tinyint`, `smallint`, `integer`, `bigint`, `string`, `float`, `double`, `date`,
-`time`, `datetime`, etc.), a _*special type*_ (`null` or `missing`), or a _*derived type*_.
-
-The type names are case-insensitive, e.g., both `BIGINT` and `bigint` are acceptable.
-
-## <a id="PrimitiveTypes">Primitive Types</a>##
-
-### <a id="PrimitiveTypesBoolean">Boolean</a> ###
-`boolean` data type can have one of the two values: _*true*_ or _*false*_.
-
- * Example:
-
-        { "true": true, "false": false };
-
-
- * The expected result is:
-
-        { "true": true, "false": false }
-
-
-
-### <a id="PrimitiveTypesInt">Tinyint / Smallint / Integer (Int) / Bigint</a> ###
-Integer types using 8, 16, 32, or 64 bits. The ranges of these types are:
-
-- `tinyint`: -127 to 127
-- `smallint`: -32767 to 32767
-- `integer`: -2147483647 to 2147483647
-- `bigint`: -9223372036854775808 to 9223372036854775807
-
-`int` is an abbreviated alias for integer.
-
- * Example:
-
-        { "tinyint": tiny("125"), "smallint": smallint("32765"), "integer": 294967295, "bigint": bigint("1700000000000000000")};
-
-
- * The expected result is:
-
-        { "tinyint": 125, "smallint": 32765, "integer": 294967295, "bigint": 17000000 }
-
-
-### <a id="PrimitiveTypesFloat">Float</a> ###
-`float` represents approximate numeric data values using 4 bytes. The range of a float value can be
-from 2^(-149) to (2-2^(-23)·2^(127) for both positive and negative. Beyond these ranges will get `INF` or `-INF`.
-
- * Example:
-
-        { "v1": float("NaN"), "v2": float("INF"), "v3": float("-INF"), "v4": float("-2013.5") };
-
-
- * The expected result is:
-
-        { "v1": NaN, "v2": Infinity, "v3": -Infinity, "v4": -2013.5 }
-
-
-### <a id="PrimitiveTypesDouble">Double (double precision)</a> ###
-`double` represents approximate numeric data values using 8 bytes. The range of a double value can be from (2^(-1022)) to (2-2^(-52))·2^(1023)
-for both positive and negative. Beyond these ranges will get `INF` or `-INF`.
-
- * Example:
-
-        { "v1": double("NaN"), "v2": double("INF"), "v3": double("-INF"), "v4": "-2013.593823748327284" };
-
-
- * The expected result is:
-
-        { "v1": NaN, "v2": Infinity, "v3": -Infinity, "v4": -2013.5938237483274 }
-
-`Double precision` is an alias of `double`.
-
-### <a id="PrimitiveTypesString">String</a> ###
-`string` represents a sequence of characters. The total length of the sequence can be up to 2,147,483,648.
-
- * Example:
-
-        { "v1": string("This is a string."), "v2": string("\"This is a quoted string\"") };
-
-
- * The expected result is:
-
-        { "v1": "This is a string.", "v2": "\"This is a quoted string\"" }
-
-
-### <a id="PrimitiveTypesBinary">Binary</a> ###
-`binary` represents a sequence of bytes. It can be constructed from a `hex` or a `base64` string sequence.
-The total length of the byte sequence can be up to 2,147,483,648.
-
- * Example:
-
-        {
-          "hex1" : hex("ABCDEF0123456789"),
-          "hex2": hex("abcdef0123456789"),
-          "base64_1" : base64("0123456789qwertyui+/"),
-          "base64_2" : base64('QXN0ZXJpeA==')
-        };
-
- * The default output format is in `hex` format. Thus, the expected result is:
-
-        {
-          "hex1": hex("ABCDEF0123456789"),
-          "hex2": hex("ABCDEF0123456789"),
-          "base64_1": hex("D35DB7E39EBBF3DAB07ABB72BA2FBF"),
-          "base64_2": hex("41737465726978")
-        }
-
-
-### <a id="PrimitiveTypesPoint">Point</a> ###
-`point` is the fundamental two-dimensional building block for spatial types. It consists of two `double` coordinates x and y.
-
- * Example:
-
-        { "v1": point("80.10d, -10E5"), "v2": point("5.10E-10d, -10E5") };
-
-
- * The expected result is:
-
-        { "v1": point("80.1,-1000000.0"), "v2": point("5.1E-10,-1000000.0") }
-
-
-### <a id="PrimitiveTypesLine">Line</a> ###
-`line` consists of two points that represent the start and the end points of a line segment.
-
- * Example:
-
-        { "v1": line("10.1234,11.1e-1 +10.2E-2,-11.22"), "v2": line("0.1234,-1.00e-10 +10.5E-2,-01.02") };
-
-
- * The expected result is:
-
-        { "v1": line("10.1234,1.11 0.102,-11.22"), "v2": line("0.1234,-1.0E-10 0.105,-1.02") }
-
-
-### <a id="PrimitiveTypesRectangle">Rectangle</a>###
-`rectangle` consists of two points that represent the _*bottom left*_ and _*upper right*_ corners of a rectangle.
-
- * Example:
-
-        { "v1": rectangle("5.1,11.8 87.6,15.6548"), "v2": rectangle("0.1234,-1.00e-10 5.5487,0.48765") };
-
-
- * The expected result is:
-
-        { "v1": rectangle("5.1,11.8 87.6,15.6548"), "v2": rectangle("0.1234,-1.0E-10 5.5487,0.48765") }
-
-
-### <a id="PrimitiveTypesCircle">Circle</a> ###
-`circle` consists of one point that represents the center of the circle and a radius of type `double`.
-
- * Example:
-
-        { "v1": circle("10.1234,11.1e-1 +10.2E-2"), "v2": circle("0.1234,-1.00e-10 +10.5E-2") };
-
-
- * The expected result is:
-
-        { "v1": circle("10.1234,1.11 0.102"), "v2": circle("0.1234,-1.0E-10 0.105") }
-
-
-### <a id="PrimitiveTypesPolygon">Polygon</a> ###
-`polygon` consists of _*n*_ points that represent the vertices of a _*simple closed*_ polygon.
-
- * Example:
-
-        {
-          "v1": polygon("-1.2,+1.3e2 -2.14E+5,2.15 -3.5e+2,03.6 -4.6E-3,+4.81"),
-          "v2": polygon("-1.0,+10.5e2 -02.15E+50,2.5 -1.0,+3.3e3 -2.50E+05,20.15 +3.5e+2,03.6 -4.60E-3,+4.75 -2,+1.0e2 -2.00E+5,20.10 30.5,03.25 -4.33E-3,+4.75")
-        };
-
-
- * The expected result is:
-
-        {
-          "v1": polygon("-1.2,130.0 -214000.0,2.15 -350.0,3.6 -0.0046,4.81"),
-          "v2": polygon("-1.0,1050.0 -2.15E50,2.5 -1.0,3300.0 -250000.0,20.15 350.0,3.6 -0.0046,4.75 -2.0,100.0 -200000.0,20.1 30.5,3.25 -0.00433,4.75") }
-        }
-
-
-### <a id="PrimitiveTypesDate">Date</a> ###
-`date` represents a time point along the Gregorian calendar system specified by the year, month and day. ASTERIX supports the date from `-9999-01-01` to `9999-12-31`.
-
-A date value can be represented in two formats, extended format and basic format.
-
- * Extended format is represented as `[-]yyyy-mm-dd` for `year-month-day`. Each field should be padded if there are less digits than the format specified.
- * Basic format is in the format of `[-]yyyymmdd`.
-
- * Example:
-
-        { "v1": date("2013-01-01"), "v2": date("-19700101") };
-
-
- * The expected result is:
-
-        { "v1": date("2013-01-01"), "v2": date("-1970-01-01") }
-
-
-### <a id="PrimitiveTypesTime">Time</a> ###
-`time` type describes the time within the range of a day. It is represented by three fields: hour, minute and second. Millisecond field is optional as the fraction of the second field. Its extended format is as `hh:mm:ss[.mmm]` and the basic format is `hhmmss[mmm]`. The value domain is from `00:00:00.000` to `23:59:59.999`.
-
-Timezone field is optional for a time value. Timezone is represented as `[+|-]hh:mm` for extended format or `[+|-]hhmm` for basic format. Note that the sign designators cannot be omitted. `Z` can also be used to represent the UTC local time. If no timezone information is given, it is UTC by default.
-
- * Example:
-
-        { "v1": time("12:12:12.039Z"), "v2": time("000000000-0800") };
-
-
- * The expected result is:
-
-        { "v1": time("12:12:12.039Z"), "v2": time("08:00:00.000Z") }
-
-
-### <a id="PrimitiveTypesDateTime">Datetime (Timestamp)</a> ###
-A `datetime` value is a combination of an `date` and `time`, representing a fixed time point along the Gregorian calendar system. The value is among `-9999-01-01 00:00:00.000` and `9999-12-31 23:59:59.999`.
-
-A `datetime` value is represented as a combination of the representation of its `date` part and `time` part, separated by a separator `T`. Either extended or basic format can be used, and the two parts should be the same format.
-
-Millisecond field and timezone field are optional, as specified in the `time` type.
-
- * Example:
-
-        { "v1": datetime("2013-01-01T12:12:12.039Z"), "v2": datetime("-19700101T000000000-0800") };
-
-
- * The expected result is:
-
-        { "v1": datetime("2013-01-01T12:12:12.039Z"), "v2": datetime("-1970-01-01T08:00:00.000Z") }
-
-`timestamp` is an alias of `datetime`.
-
-### <a id="PrimitiveTypesDuration">Duration/Year_month_duration/Day_time_duration</a> ###
-`duration` represents a duration of time. A duration value is specified by integers on at least one of the following fields: year, month, day, hour, minute, second, and millisecond.
-
-A duration value is in the format of `[-]PnYnMnDTnHnMn.mmmS`. The millisecond part (as the fraction of the second field) is optional, and when no millisecond field is used, the decimal point should also be absent.
-
-Negative durations are also supported for the arithmetic operations between time instance types (`date`, `time` and `datetime`), and is used to roll the time back for the given duration. For example `date("2012-01-01") + duration("-P3D")` will return `date("2011-12-29")`.
-
-There are also two sub-duration types, namely `year_month_duration` and `day_time_duration`.
-`year_month_duration` represents only the years and months of a duration,
-while `day_time_duration` represents only the day to millisecond fields.
-Different from the `duration` type, both these two subtypes are totally ordered, so they can be used for comparison and
-index construction.
-
-Note that a canonical representation of the duration is always returned, regardless whether the duration is in the canonical representation or not from the user's input. More information about canonical representation can be found from [XPath dayTimeDuration Canonical Representation](http://www.w3.org/TR/xpath-functions/#canonical-dayTimeDuration) and [yearMonthDuration Canonical Representation](http://www.w3.org/TR/xpath-functions/#canonical-yearMonthDuration).
-
- * Example:
-
-        { "v1": duration("P100Y12MT12M"), "v2": duration("-PT20.943S") };
-
-
- * The expected result is:
-
-        { "v1": duration("P101YT12M"), "v2": duration("-PT20.943S") }
-
-
-### <a id="PrimitiveTypesInterval">Interval</a> ###
-`interval` represents inclusive-exclusive ranges of time. It is defined by two time point values with the same temporal type(`date`, `time` or `datetime`).
-
- * Example:
-
-        {
-          "v1": interval(date("2013-01-01"), date("20130505")),
-          "v2": interval(time("00:01:01"), time("213901049+0800")),
-          "v3": interval(datetime("2013-01-01T00:01:01"), datetime("20130505T213901049+0800"))
-        };
-
-
- * The expected result is:
-
-        {
-          "v1": interval(date("2013-01-01"), date("2013-05-05")),
-          "v2": interval(time("00:01:01.000Z"), time("13:39:01.049Z")),
-          "v3": interval(datetime("2013-01-01T00:01:01.000Z"), datetime("2013-05-05T13:39:01.049Z"))
-        }
-
-### <a id="PrimitiveTypesUUID">UUID</a> ###
-`uuid` represents a UUID value, which stands for Universally unique identifier. It is defined by a canonical format using hexadecimal text with inserted hyphen characters. (E.g.: 5a28ce1e-6a74-4201-9e8f-683256e5706f). This type is generally used to store auto-generated primary key values.
-
- * Example:
-
-        return { "v1":uuid("5c848e5c-6b6a-498f-8452-8847a2957421") }
-
-
- * The expected result is:
-
-        { "v1": uuid("5c848e5c-6b6a-498f-8452-8847a2957421") }
-
-## <a id="IncompleteInformationTypes">Incomplete Information Types</a>##
-
-### <a id="IncompleteInformationTypesNull">Null</a> ###
-`null` is a special value that is often used to represent an unknown value.
-For example, a user might not be able to know the value of a field and let it be `null`.
-
- * Example:
-
-        { "field": null };
-
-
- * The expected result is:
-
-        { "field": null }
-
-
-### <a id="IncompleteInformationTypesMissing">Missing</a> ###
-`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,
-items in a dataset or collection can be of heterogeneous types and
-so a field can be present in one object and `missing` in another.
-
- * Example:
-
-        { "field": missing };
-
-
- * The expected result is:
-
-        {  }
-
-Since a field with value `missing` means the field is absent, we get an empty object.
-
-## <a id="DerivedTypes">Derived Types</a> ##
-
-### <a id="DerivedTypesObject">Object</a>###
-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:
-
-        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:
-
-        { "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.
-
-### <a id="DerivedTypesArray">Array</a>###
-An `array` is a container that holds a fixed number of values. Array constructors are denoted by brackets: "[...]".
-
-An example would be
-
-
-        ["alice", 123, "bob", null]
-
-
-### <a id="DerivedTypesMultiset">Multiset</a>###
-A `multiset` is a generalization of the concept of a set that, unlike a set, allows multiple instances of the multiset's elements.
- Multiset constructors are denoted by two opening curly braces followed by data and two closing curly braces, like "{{...}}".
-
-An example would be
-
-
-        {{"hello", 9328, "world", [1, 2, null]}}


Mime
View raw message