asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From buyin...@apache.org
Subject asterixdb git commit: Revise the data model document.
Date Tue, 27 Sep 2016 15:52:41 GMT
Repository: asterixdb
Updated Branches:
  refs/heads/master fdcf055d3 -> ad5b22a27


Revise the data model document.

Change-Id: I9c51f4f14ce7c16c98ea67503488e69e19d9195d
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1206
Reviewed-by: Till Westmann <tillw@apache.org>
Sonar-Qube: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Tested-by: 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/ad5b22a2
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/ad5b22a2
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/ad5b22a2

Branch: refs/heads/master
Commit: ad5b22a271525c0a5c7a6690f5b4f59a5f6eddf6
Parents: fdcf055
Author: Yingyi Bu <yingyi@couchbase.com>
Authored: Mon Sep 26 23:26:14 2016 -0700
Committer: Yingyi Bu <buyingyi@gmail.com>
Committed: Tue Sep 27 08:52:12 2016 -0700

----------------------------------------------------------------------
 .../src/main/markdown/sqlpp/0_toc.md            |   1 -
 .../src/site/markdown/aql/datamodel.md          | 245 +++++++++++--------
 .../asterix-doc/src/site/markdown/index.md      |   2 +-
 asterixdb/asterix-doc/src/site/site.xml         |   2 +-
 4 files changed, 140 insertions(+), 110 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ad5b22a2/asterixdb/asterix-doc/src/main/markdown/sqlpp/0_toc.md
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-doc/src/main/markdown/sqlpp/0_toc.md b/asterixdb/asterix-doc/src/main/markdown/sqlpp/0_toc.md
index c9e2acf..cb75d76 100644
--- a/asterixdb/asterix-doc/src/main/markdown/sqlpp/0_toc.md
+++ b/asterixdb/asterix-doc/src/main/markdown/sqlpp/0_toc.md
@@ -53,7 +53,6 @@
       * [WITH clauses](#With_clauses)
       * [LET clauses](#Let_clauses)
       * [UNION ALL](#Union_all)
-      * [MISSING in query results](#Missing_in_query_results)
       * [SQL++ Vs. SQL-92](#Vs_SQL-92)
 * [4. DDL and DML statements](#DDL_and_DML_statements)
       * [Declarations](#Declarations)

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ad5b22a2/asterixdb/asterix-doc/src/site/markdown/aql/datamodel.md
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-doc/src/site/markdown/aql/datamodel.md b/asterixdb/asterix-doc/src/site/markdown/aql/datamodel.md
index 09d9177..5a5aced 100644
--- a/asterixdb/asterix-doc/src/site/markdown/aql/datamodel.md
+++ b/asterixdb/asterix-doc/src/site/markdown/aql/datamodel.md
@@ -17,15 +17,15 @@
  ! under the License.
  !-->
 
-# Asterix Data Model (ADM) #
+# The Asterix Data Model (ADM) #
 
 ## <a id="toc">Table of Contents</a> ##
 
 * [Primitive Types](#PrimitiveTypes)
     * [Boolean](#PrimitiveTypesBoolean)
-    * [Int8 / Int16 / Int32 / Int64](#PrimitiveTypesInt)
+    * [Tinyint / Smallint / Integer (Int) / Bigint](#PrimitiveTypesInt)
     * [Float](#PrimitiveTypesFloat)
-    * [Double](#PrimitiveTypesDouble)
+    * [Double (Double Precision)](#PrimitiveTypesDouble)
     * [String](#PrimitiveTypesString)
     * [Binary](#PrimitiveTypesBinary)
     * [Point](#PrimitiveTypesPoint)
@@ -35,27 +35,32 @@
     * [Polygon](#PrimitiveTypesPolygon)
     * [Date](#PrimitiveTypesDate)
     * [Time](#PrimitiveTypesTime)
-    * [Datetime](#PrimitiveTypesDateTime)
-    * [Duration/Year-month-duration/Day-time-duration](#PrimitiveTypesDuration)
+    * [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)
     * [Record](#DerivedTypesRecord)
-    * [OrderedList](#DerivedTypesOrderedList)
-    * [UnorderedList](#DerivedTypesUnorderedList)
+    * [Array](#DerivedTypesArray)
+    * [Multiset](#DerivedTypesMultiset)
 
-An instance of Asterix data model (ADM) can be a _*primitive type*_ (`int32`, `int64`, `string`,
`float`, `double`, `date`, `time`, `datetime`, etc. or `null`) or a _*derived type*_.
+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*_.
 
-## <a id="PrimitiveTypes">Primitive Types</a> <font size="4"><a href="#toc">[Back
to TOC]</a></font> ##
+The type names are case-insensitive, e.g., both `BIGINT` and `bigint` are acceptable.
 
-### <a id="PrimitiveTypesBoolean">Boolean</a><font size="4"><a href="#toc">[Back
to TOC]</a></font> ###
+## <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:
 
-        let $t := true
-        let $f := false
-        return { "true": $t, "false": $f }
+        { "true": true, "false": false };
 
 
  * The expected result is:
@@ -64,70 +69,61 @@ An instance of Asterix data model (ADM) can be a _*primitive type*_ (`int32`,
`i
 
 
 
-### <a id="PrimitiveTypesInt">Int8 / Int16 / Int32 / Int64</a> <font size="4"><a
href="#toc">[Back to TOC]</a></font> ###
+### <a id="PrimitiveTypesInt">Tinyint / Smallint / Integer (Int) / Bigint</a>
###
 Integer types using 8, 16, 32, or 64 bits. The ranges of these types are:
 
-- `int8`: -127 to 127
-- `int16`: -32767 to 32767
-- `int32`: -2147483647 to 2147483647
-- `int64`: -9223372036854775808 to 9223372036854775807
+- `tinyint`: -127 to 127
+- `smallint`: -32767 to 32767
+- `integer`: -2147483647 to 2147483647
+- `bigint`: -9223372036854775808 to 9223372036854775807
+
+`int` is an abbreviated alias for integer.
 
  * Example:
 
-        let $v8 := int8("125")
-        let $v16 := int16("32765")
-        let $v32 := 294967295
-        let $v64 := int64("1700000000000000000")
-        return { "int8": $v8, "int16": $v16, "int32": $v32, "int64": $v64}
+        { "tinyint": tiny("125"), "smallint": smallint("32765"), "integer": 294967295, "bigint":
bigint("1700000000000000000")};
 
 
  * The expected result is:
 
-        { "int8": 125i8, "int16": 32765i16, "int32": 294967295, "int64": 1700000000000000000i64
}
+        { "tinyint": 125, "smallint": 32765, "integer": 294967295, "bigint": 17000000 }
 
 
-### <a id="PrimitiveTypesFloat">Float</a> <font size="4"><a href="#toc">[Back
to TOC]</a></font> ###
-`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`.
+### <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:
 
-        let $v1 := float("NaN")
-        let $v2 := float("INF")
-        let $v3 := float("-INF")
-        let $v4 := float("-2013.5")
-        return { "v1": $v1, "v2": $v2, "v3": $v3, "v4": $v4 }
+        { "v1": float("NaN"), "v2": float("INF"), "v3": float("-INF"), "v4": float("-2013.5")
};
 
 
  * The expected result is:
 
-        { "v1": NaNf, "v2": Infinityf, "v3": -Infinityf, "v4": -2013.5f }
+        { "v1": NaN, "v2": Infinity, "v3": -Infinity, "v4": -2013.5 }
 
 
-### <a id="PrimitiveTypesDouble">Double</a> <font size="4"><a href="#toc">[Back
to TOC]</a></font> ###
-`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`.
+### <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:
 
-        let $v1 := double("NaN")
-        let $v2 := double("INF")
-        let $v3 := double("-INF")
-        let $v4 := double("-2013.593823748327284")
-        return { "v1": $v1, "v2": $v2, "v3": $v3, "v4": $v4 }
+        { "v1": double("NaN"), "v2": double("INF"), "v3": double("-INF"), "v4": "-2013.593823748327284"
};
 
 
  * The expected result is:
 
-        { "v1": NaNd, "v2": Infinityd, "v3": -Infinityd, "v4": -2013.5938237483274d }
+        { "v1": NaN, "v2": Infinity, "v3": -Infinity, "v4": -2013.5938237483274 }
 
+`Double precision` is an alias of `double`.
 
-### <a id="PrimitiveTypesString">String</a> <font size="4"><a href="#toc">[Back
to TOC]</a></font> ###
+### <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:
 
-        let $v1 := string("This is a string.")
-        let $v2 := string("\"This is a quoted string\"")
-        return { "v1": $v1, "v2": $v2 }
+        { "v1": string("This is a string."), "v2": string("\"This is a quoted string\"")
};
 
 
  * The expected result is:
@@ -135,34 +131,35 @@ Integer types using 8, 16, 32, or 64 bits. The ranges of these types
are:
         { "v1": "This is a string.", "v2": "\"This is a quoted string\"" }
 
 
-### <a id="PrimitiveTypesBinary">Binary</a> <font size="4"><a href="#toc">[Back
to TOC]</a></font> ###
+### <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:
 
-        let $hex1 := hex("ABCDEF0123456789")
-        let $hex2 := hex("abcdef0123456789")
-        let $base64_1 := base64("0123456789qwertyui+/")
-        let $base64_2 := base64('QXN0ZXJpeA==')
-        return { "hex1" : $hex1, "hex2": $hex2, "base64_1" : $base64_1, "base64_2" : $base64_2}
+        {
+          "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") }
+        {
+          "hex1": hex("ABCDEF0123456789"),
+          "hex2": hex("ABCDEF0123456789"),
+          "base64_1": hex("D35DB7E39EBBF3DAB07ABB72BA2FBF"),
+          "base64_2": hex("41737465726978")
+        }
 
 
-### <a id="PrimitiveTypesPoint">Point</a> <font size="4"><a href="#toc">[Back
to TOC]</a></font> ###
+### <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:
 
-        let $v1 := point("80.10d, -10E5")
-        let $v2 := point("5.10E-10d, -10E5")
-        return { "v1": $v1, "v2": $v2 }
+        { "v1": point("80.10d, -10E5"), "v2": point("5.10E-10d, -10E5") };
 
 
  * The expected result is:
@@ -170,14 +167,12 @@ The total length of the byte sequence can be up to 2,147,483,648.
         { "v1": point("80.1,-1000000.0"), "v2": point("5.1E-10,-1000000.0") }
 
 
-### <a id="PrimitiveTypesLine">Line</a> <font size="4"><a href="#toc">[Back
to TOC]</a></font> ###
+### <a id="PrimitiveTypesLine">Line</a> ###
 `line` consists of two points that represent the start and the end points of a line segment.
 
  * Example:
 
-        let $v1 := line("10.1234,11.1e-1 +10.2E-2,-11.22")
-        let $v2 := line("0.1234,-1.00e-10 +10.5E-2,-01.02")
-        return { "v1": $v1, "v2": $v2 }
+        { "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:
@@ -185,14 +180,12 @@ The total length of the byte sequence can be up to 2,147,483,648.
         { "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><font size="4"><a href="#toc">[Back
to TOC]</a></font> ###
+### <a id="PrimitiveTypesRectangle">Rectangle</a>###
 `rectangle` consists of two points that represent the _*bottom left*_ and _*upper right*_
corners of a rectangle.
 
  * Example:
 
-        let $v1 := rectangle("5.1,11.8 87.6,15.6548")
-        let $v2 := rectangle("0.1234,-1.00e-10 5.5487,0.48765")
-        return { "v1": $v1, "v2": $v2 }
+        { "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:
@@ -200,14 +193,12 @@ The total length of the byte sequence can be up to 2,147,483,648.
         { "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><font size="4"><a href="#toc">[Back
to TOC]</a></font> ###
+### <a id="PrimitiveTypesCircle">Circle</a> ###
 `circle` consists of one point that represents the center of the circle and a radius of type
`double`.
 
  * Example:
 
-        let $v1 := circle("10.1234,11.1e-1 +10.2E-2")
-        let $v2 := circle("0.1234,-1.00e-10 +10.5E-2")
-        return { "v1": $v1, "v2": $v2 }
+        { "v1": circle("10.1234,11.1e-1 +10.2E-2"), "v2": circle("0.1234,-1.00e-10 +10.5E-2")
};
 
 
  * The expected result is:
@@ -215,22 +206,26 @@ The total length of the byte sequence can be up to 2,147,483,648.
         { "v1": circle("10.1234,1.11 0.102"), "v2": circle("0.1234,-1.0E-10 0.105") }
 
 
-### <a id="PrimitiveTypesPolygon">Polygon</a><font size="4"><a href="#toc">[Back
to TOC]</a></font> ###
+### <a id="PrimitiveTypesPolygon">Polygon</a> ###
 `polygon` consists of _*n*_ points that represent the vertices of a _*simple closed*_ polygon.
 
  * Example:
 
-        let $v1 := polygon("-1.2,+1.3e2 -2.14E+5,2.15 -3.5e+2,03.6 -4.6E-3,+4.81")
-        let $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")
-        return { "v1": $v1, "v2": $v2 }
+        {
+          "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") }
+        {
+          "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><font size="4"><a href="#toc">[Back
to TOC]</a></font> ###
+### <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.
@@ -240,9 +235,7 @@ A date value can be represented in two formats, extended format and basic
format
 
  * Example:
 
-        let $v1 := date("2013-01-01")
-        let $v2 := date("-19700101")
-        return { "v1": $v1, "v2": $v2 }
+        { "v1": date("2013-01-01"), "v2": date("-19700101") };
 
 
  * The expected result is:
@@ -250,16 +243,14 @@ A date value can be represented in two formats, extended format and
basic format
         { "v1": date("2013-01-01"), "v2": date("-1970-01-01") }
 
 
-### <a id="PrimitiveTypesTime">Time</a><font size="4"><a href="#toc">[Back
to TOC]</a></font> ###
+### <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:
 
-        let $v1 := time("12:12:12.039Z")
-        let $v2 := time("000000000-0800")
-        return { "v1": $v1, "v2": $v2 }
+        { "v1": time("12:12:12.039Z"), "v2": time("000000000-0800") };
 
 
  * The expected result is:
@@ -267,7 +258,7 @@ Timezone field is optional for a time value. Timezone is represented as
`[+|-]hh
         { "v1": time("12:12:12.039Z"), "v2": time("08:00:00.000Z") }
 
 
-### <a id="PrimitiveTypesDateTime">Datetime</a><font size="4"><a href="#toc">[Back
to TOC]</a></font> ###
+### <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.
@@ -276,32 +267,33 @@ Millisecond field and timezone field are optional, as specified in the
`time` ty
 
  * Example:
 
-        let $v1 := datetime("2013-01-01T12:12:12.039Z")
-        let $v2 := datetime("-19700101T000000000-0800")
-        return { "v1": $v1, "v2": $v2 }
+        { "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><font
size="4"><a href="#toc">[Back to TOC]</a></font> ###
+### <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.
+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:
 
-        let $v1 := duration("P100Y12MT12M")
-        let $v2 := duration("-PT20.943S")
-        return { "v1": $v1, "v2": $v2 }
+        { "v1": duration("P100Y12MT12M"), "v2": duration("-PT20.943S") };
 
 
  * The expected result is:
@@ -309,38 +301,76 @@ Note that a canonical representation of the duration is always returned,
regardl
         { "v1": duration("P101YT12M"), "v2": duration("-PT20.943S") }
 
 
-### <a id="PrimitiveTypesInterval">Interval</a><font size="4"><a href="#toc">[Back
to TOC]</a></font> ###
+### <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:
 
-        let $v1 := interval(date("2013-01-01"), date("20130505"))
-        let $v2 := interval(time("00:01:01"), time("213901049+0800"))
-        let $v3 := interval(datetime("2013-01-01T00:01:01"), datetime("20130505T213901049+0800"))
-        return { "v1": $v1, "v2": $v2, "v3": $v3 }
+        {
+          "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"))
}
+        {
+          "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><font size="4"><a href="#toc">[Back
to TOC]</a></font> ###
+### <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:
 
-        let $v1 := uuid("5c848e5c-6b6a-498f-8452-8847a2957421")
-        return { "v1":$v1 }
+        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 a record.
+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 record 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 record.
 
-## <a id="DerivedTypes">Derived Types</a><font size="4"><a href="#toc">[Back
to TOC]</a></font> ##
+## <a id="DerivedTypes">Derived Types</a> ##
 
-### <a id="DerivedTypesRecord">Record</a><font size="4"><a href="#toc">[Back
to TOC]</a></font> ###
+### <a id="DerivedTypesRecord">Record</a>###
 A `record` contains a set of fields, where each field is described by its name and type.
A record type is either open or closed. Open records can contain fields that are not part
of the type definition, while closed records cannot. Syntactically, record constructors are
surrounded by curly braces "{...}".
 
 An example would be
@@ -349,8 +379,8 @@ An example would be
         { "id": 213508, "name": "Alice Bob" }
 
 
-### <a id="DerivedTypesOrderedList">OrderedList</a><font size="4"><a
href="#toc">[Back to TOC]</a></font> ###
-An `orderedList` is a sequence of values for which the order is determined by creation or
insertion. OrderedList constructors are denoted by brackets: "[...]".
+### <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
 
@@ -358,8 +388,9 @@ An example would be
         ["alice", 123, "bob", null]
 
 
-### <a id="DerivedTypesUnorderedList">UnorderedList</a><font size="4"><a
href="#toc">[Back to TOC]</a></font> ###
-An `unorderedList` is an unordered sequence of values, similar to bags in SQL. UnorderedList
constructors are denoted by two opening flower braces followed by data and two closing flower
braces, like "{{...}}".
+### <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
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ad5b22a2/asterixdb/asterix-doc/src/site/markdown/index.md
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-doc/src/site/markdown/index.md b/asterixdb/asterix-doc/src/site/markdown/index.md
index f117d93..bc7ca9c 100644
--- a/asterixdb/asterix-doc/src/site/markdown/index.md
+++ b/asterixdb/asterix-doc/src/site/markdown/index.md
@@ -26,7 +26,7 @@ warehousing and social data storage and analysis. AsterixDB has:
 
  * A semistructured NoSQL style data model (ADM) resulting from extending JSON
    with object database ideas
- * An expressive and declarative query language (AQL) that supports a broad
+ * Two expressive and declarative query languages (SQL++ and AQL) that support a broad
    range of queries and analysis over semistructured data
  * A parallel runtime query execution engine, Apache Hyracks, that has been
    scale-tested on up to 1000+ cores and 500+ disks

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ad5b22a2/asterixdb/asterix-doc/src/site/site.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-doc/src/site/site.xml b/asterixdb/asterix-doc/src/site/site.xml
index 7e6a5cf..6d7a733 100644
--- a/asterixdb/asterix-doc/src/site/site.xml
+++ b/asterixdb/asterix-doc/src/site/site.xml
@@ -97,7 +97,7 @@
     </menu>
 
     <menu name="Functions">
-      <item name="Functions" href="aql/functions.html"/>
+      <item name="Builtin Functions" href="aql/functions.html"/>
       <item name="AQL Allen's Relations Functions" href="aql/allens.html"/>
     </menu>
 


Mime
View raw message