http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.3.query.sqlpp
index feaa109..a932841 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.3.query.sqlpp
@@ -26,6 +26,6 @@ with  keywords as 'Allergies',
       region as test.polygon('\n\t33.80503407287759,-126.41235263538363 
\n\t44.9090773200516,-126.41235263538363 
\n\t44.9090773200516,-87.65258701038363 
\n\t33.80503407287759,-87.65258701038363')
 where (test.`spatial-intersect`(t.loc,region) and (t.time > 
test.datetime('2011-05-15T00:00:00Z')) and (t.time < 
test.datetime('2011-05-16T23:59:59Z')) and test.contains(t.text,keywords))
 group by test.`spatial-cell`(t.loc,test.`create-point`(24.5,-125.5),3.0,3.0) 
as c
-with  num as test.coll_count(t)
+with  num as test.array_count(t)
 order by num
 ;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/cell-aggregation/cell-aggregation.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/cell-aggregation/cell-aggregation.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/cell-aggregation/cell-aggregation.1.ddl.sqlpp
index 4586aa2..9461ef8 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/cell-aggregation/cell-aggregation.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/cell-aggregation/cell-aggregation.1.ddl.sqlpp
@@ -25,7 +25,7 @@ use test;
 
 create type test.MyRecord as
 {
-  id : int64,
+  id : bigint,
   loc : point
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/cell-aggregation/cell-aggregation.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/cell-aggregation/cell-aggregation.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/cell-aggregation/cell-aggregation.3.query.sqlpp
index 7d7cfc8..08fdec5 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/cell-aggregation/cell-aggregation.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/cell-aggregation/cell-aggregation.3.query.sqlpp
@@ -24,7 +24,7 @@ with  grid as (
       select element {'cell':c,'count':num}
       from  MyData as o
       group by test.`spatial-cell`(o.loc,test.`create-point`(0.0,0.0),5.0,5.0) 
as c
-      with  num as test.coll_count(o)
+      with  num as test.array_count(o)
       order by num
   )
 select element g

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/circle-intersect-circle/circle-intersect-circle.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/circle-intersect-circle/circle-intersect-circle.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/circle-intersect-circle/circle-intersect-circle.1.ddl.sqlpp
index f2a4f4a..5869e6d 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/circle-intersect-circle/circle-intersect-circle.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/circle-intersect-circle/circle-intersect-circle.1.ddl.sqlpp
@@ -25,7 +25,7 @@ use test;
 
 create type test.MyRecord as
 {
-  id : int64,
+  id : bigint,
   point : point,
   kwds : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/create-rtree-index/create-rtree-index.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/create-rtree-index/create-rtree-index.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/create-rtree-index/create-rtree-index.1.ddl.sqlpp
index f5c25e2..01f8f6e 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/create-rtree-index/create-rtree-index.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/create-rtree-index/create-rtree-index.1.ddl.sqlpp
@@ -29,7 +29,7 @@ use test;
 
 create type test.SpatialType as
 {
-  id : int64,
+  id : bigint,
   point : point,
   line1 : line,
   poly1 : polygon,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/distance-between-points/distance-between-points.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/distance-between-points/distance-between-points.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/distance-between-points/distance-between-points.1.ddl.sqlpp
index f2a4f4a..5869e6d 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/distance-between-points/distance-between-points.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/distance-between-points/distance-between-points.1.ddl.sqlpp
@@ -25,7 +25,7 @@ use test;
 
 create type test.MyRecord as
 {
-  id : int64,
+  id : bigint,
   point : point,
   kwds : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/line-intersect-circle/line-intersect-circle.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/line-intersect-circle/line-intersect-circle.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/line-intersect-circle/line-intersect-circle.1.ddl.sqlpp
index f2a4f4a..5869e6d 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/line-intersect-circle/line-intersect-circle.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/line-intersect-circle/line-intersect-circle.1.ddl.sqlpp
@@ -25,7 +25,7 @@ use test;
 
 create type test.MyRecord as
 {
-  id : int64,
+  id : bigint,
   point : point,
   kwds : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/line-intersect-line/line-intersect-line.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/line-intersect-line/line-intersect-line.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/line-intersect-line/line-intersect-line.1.ddl.sqlpp
index f2a4f4a..5869e6d 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/line-intersect-line/line-intersect-line.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/line-intersect-line/line-intersect-line.1.ddl.sqlpp
@@ -25,7 +25,7 @@ use test;
 
 create type test.MyRecord as
 {
-  id : int64,
+  id : bigint,
   point : point,
   kwds : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/line-intersect-polygon/line-intersect-polygon.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/line-intersect-polygon/line-intersect-polygon.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/line-intersect-polygon/line-intersect-polygon.1.ddl.sqlpp
index f2a4f4a..5869e6d 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/line-intersect-polygon/line-intersect-polygon.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/line-intersect-polygon/line-intersect-polygon.1.ddl.sqlpp
@@ -25,7 +25,7 @@ use test;
 
 create type test.MyRecord as
 {
-  id : int64,
+  id : bigint,
   point : point,
   kwds : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/line-intersect-rectangle/line-intersect-rectangle.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/line-intersect-rectangle/line-intersect-rectangle.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/line-intersect-rectangle/line-intersect-rectangle.1.ddl.sqlpp
index f2a4f4a..5869e6d 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/line-intersect-rectangle/line-intersect-rectangle.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/line-intersect-rectangle/line-intersect-rectangle.1.ddl.sqlpp
@@ -25,7 +25,7 @@ use test;
 
 create type test.MyRecord as
 {
-  id : int64,
+  id : bigint,
   point : point,
   kwds : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-equals-point/point-equals-point.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-equals-point/point-equals-point.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-equals-point/point-equals-point.1.ddl.sqlpp
index f2a4f4a..5869e6d 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-equals-point/point-equals-point.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-equals-point/point-equals-point.1.ddl.sqlpp
@@ -25,7 +25,7 @@ use test;
 
 create type test.MyRecord as
 {
-  id : int64,
+  id : bigint,
   point : point,
   kwds : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-in-circle/point-in-circle.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-in-circle/point-in-circle.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-in-circle/point-in-circle.1.ddl.sqlpp
index f2a4f4a..5869e6d 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-in-circle/point-in-circle.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-in-circle/point-in-circle.1.ddl.sqlpp
@@ -25,7 +25,7 @@ use test;
 
 create type test.MyRecord as
 {
-  id : int64,
+  id : bigint,
   point : point,
   kwds : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-in-polygon/point-in-polygon.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-in-polygon/point-in-polygon.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-in-polygon/point-in-polygon.1.ddl.sqlpp
index f2a4f4a..5869e6d 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-in-polygon/point-in-polygon.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-in-polygon/point-in-polygon.1.ddl.sqlpp
@@ -25,7 +25,7 @@ use test;
 
 create type test.MyRecord as
 {
-  id : int64,
+  id : bigint,
   point : point,
   kwds : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-in-rectangle/point-in-rectangle.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-in-rectangle/point-in-rectangle.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-in-rectangle/point-in-rectangle.1.ddl.sqlpp
index f2a4f4a..5869e6d 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-in-rectangle/point-in-rectangle.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-in-rectangle/point-in-rectangle.1.ddl.sqlpp
@@ -25,7 +25,7 @@ use test;
 
 create type test.MyRecord as
 {
-  id : int64,
+  id : bigint,
   point : point,
   kwds : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-on-line/point-on-line.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-on-line/point-on-line.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-on-line/point-on-line.1.ddl.sqlpp
index f2a4f4a..5869e6d 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-on-line/point-on-line.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-on-line/point-on-line.1.ddl.sqlpp
@@ -25,7 +25,7 @@ use test;
 
 create type test.MyRecord as
 {
-  id : int64,
+  id : bigint,
   point : point,
   kwds : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/polygon-intersect-circle/polygon-intersect-circle.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/polygon-intersect-circle/polygon-intersect-circle.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/polygon-intersect-circle/polygon-intersect-circle.1.ddl.sqlpp
index f2a4f4a..5869e6d 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/polygon-intersect-circle/polygon-intersect-circle.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/polygon-intersect-circle/polygon-intersect-circle.1.ddl.sqlpp
@@ -25,7 +25,7 @@ use test;
 
 create type test.MyRecord as
 {
-  id : int64,
+  id : bigint,
   point : point,
   kwds : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/polygon-intersect-polygon/polygon-intersect-polygon.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/polygon-intersect-polygon/polygon-intersect-polygon.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/polygon-intersect-polygon/polygon-intersect-polygon.1.ddl.sqlpp
index f2a4f4a..5869e6d 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/polygon-intersect-polygon/polygon-intersect-polygon.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/polygon-intersect-polygon/polygon-intersect-polygon.1.ddl.sqlpp
@@ -25,7 +25,7 @@ use test;
 
 create type test.MyRecord as
 {
-  id : int64,
+  id : bigint,
   point : point,
   kwds : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.1.ddl.sqlpp
index f2a4f4a..5869e6d 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.1.ddl.sqlpp
@@ -25,7 +25,7 @@ use test;
 
 create type test.MyRecord as
 {
-  id : int64,
+  id : bigint,
   point : point,
   kwds : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/rectangle-intersect-circle/rectangle-intersect-circle.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/rectangle-intersect-circle/rectangle-intersect-circle.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/rectangle-intersect-circle/rectangle-intersect-circle.1.ddl.sqlpp
index f2a4f4a..5869e6d 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/rectangle-intersect-circle/rectangle-intersect-circle.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/rectangle-intersect-circle/rectangle-intersect-circle.1.ddl.sqlpp
@@ -25,7 +25,7 @@ use test;
 
 create type test.MyRecord as
 {
-  id : int64,
+  id : bigint,
   point : point,
   kwds : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.1.ddl.sqlpp
index f2a4f4a..5869e6d 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.1.ddl.sqlpp
@@ -25,7 +25,7 @@ use test;
 
 create type test.MyRecord as
 {
-  id : int64,
+  id : bigint,
   point : point,
   kwds : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/spatial-area/spatial-area.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/spatial-area/spatial-area.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/spatial-area/spatial-area.1.ddl.sqlpp
index 3ca78b0..2ce79a1 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/spatial-area/spatial-area.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/spatial-area/spatial-area.1.ddl.sqlpp
@@ -25,7 +25,7 @@ use test;
 
 create type test.MyRecord as
 {
-  id : int32,
+  id : integer,
   point : point,
   kwds : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/cpttostr01/cpttostr01.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/cpttostr01/cpttostr01.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/cpttostr01/cpttostr01.1.ddl.sqlpp
index 68476ad..3c5922a 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/cpttostr01/cpttostr01.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/cpttostr01/cpttostr01.1.ddl.sqlpp
@@ -32,8 +32,8 @@ use test;
 
 create type test.TestType as
 {
-  id : int32,
-  cpt : [int32]
+  id : integer,
+  cpt : [integer]
 }
 
 create  dataset testds(TestType) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/matches05/matches05.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/matches05/matches05.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/matches05/matches05.1.ddl.sqlpp
index b625a87..9b21a8d 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/matches05/matches05.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/matches05/matches05.1.ddl.sqlpp
@@ -34,7 +34,7 @@ create type test.TestType1 as
 {
   fname : string,
   lname : string,
-  id : int64
+  id : bigint
 }
 
 create  dataset testds1(TestType1) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/strconcat01/strconcat01.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/strconcat01/strconcat01.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/strconcat01/strconcat01.1.ddl.sqlpp
index 215c8ca..ec476f9 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/strconcat01/strconcat01.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/strconcat01/strconcat01.1.ddl.sqlpp
@@ -32,7 +32,7 @@ use test;
 
 create type test.TestType as
 {
-  id : int32,
+  id : integer,
   fname : string,
   lname : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/aggregate_join/aggregate_join.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/aggregate_join/aggregate_join.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/aggregate_join/aggregate_join.1.ddl.sqlpp
index 07c39e3..590bb29 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/aggregate_join/aggregate_join.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/aggregate_join/aggregate_join.1.ddl.sqlpp
@@ -25,7 +25,7 @@ drop dataset samptable if exists;
 drop type samptabletype if exists;
 
 create type samptabletype as closed {
-  id: int8
+  id: tinyint
 };
 
 create dataset samptable(samptabletype) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/aggregate_join_external/aggregate_join_external.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/aggregate_join_external/aggregate_join_external.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/aggregate_join_external/aggregate_join_external.1.ddl.sqlpp
index e77519e..ecd4d11 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/aggregate_join_external/aggregate_join_external.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/aggregate_join_external/aggregate_join_external.1.ddl.sqlpp
@@ -23,22 +23,22 @@ USE test;
 
 
 CREATE TYPE OrderType AS CLOSED {
-  o_orderkey: int32,
-  o_custkey: int32,
+  o_orderkey: integer,
+  o_custkey: integer,
   o_orderstatus: string,
   o_totalprice: double,
   o_orderdate: string,
   o_orderpriority: string,
   o_clerk: string,
-  o_shippriority: int32,
+  o_shippriority: integer,
   o_comment: string
 }
 
 CREATE TYPE CustomerType AS CLOSED {
-  c_custkey: int32,
+  c_custkey: integer,
   c_name: string,
   c_address: string,
-  c_nationkey: int32,
+  c_nationkey: integer,
   c_phone: string,
   c_acctbal: double,
   c_mktsegment: string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/decorrelate_with_unique_id/decorrelate_with_unique_id.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/decorrelate_with_unique_id/decorrelate_with_unique_id.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/decorrelate_with_unique_id/decorrelate_with_unique_id.1.ddl.sqlpp
index e77519e..ecd4d11 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/decorrelate_with_unique_id/decorrelate_with_unique_id.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/decorrelate_with_unique_id/decorrelate_with_unique_id.1.ddl.sqlpp
@@ -23,22 +23,22 @@ USE test;
 
 
 CREATE TYPE OrderType AS CLOSED {
-  o_orderkey: int32,
-  o_custkey: int32,
+  o_orderkey: integer,
+  o_custkey: integer,
   o_orderstatus: string,
   o_totalprice: double,
   o_orderdate: string,
   o_orderpriority: string,
   o_clerk: string,
-  o_shippriority: int32,
+  o_shippriority: integer,
   o_comment: string
 }
 
 CREATE TYPE CustomerType AS CLOSED {
-  c_custkey: int32,
+  c_custkey: integer,
   c_name: string,
   c_address: string,
-  c_nationkey: int32,
+  c_nationkey: integer,
   c_phone: string,
   c_acctbal: double,
   c_mktsegment: string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/decorrelate_with_unique_id_2/decorrelate_with_unique_id_2.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/decorrelate_with_unique_id_2/decorrelate_with_unique_id_2.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/decorrelate_with_unique_id_2/decorrelate_with_unique_id_2.1.ddl.sqlpp
index 96c1839..653fbbd 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/decorrelate_with_unique_id_2/decorrelate_with_unique_id_2.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/decorrelate_with_unique_id_2/decorrelate_with_unique_id_2.1.ddl.sqlpp
@@ -27,22 +27,22 @@ create type test.TwitterUserType as
  closed {
   `screen-name` : string,
   lang : string,
-  `friends-count` : int64,
-  `statuses-count` : int64,
+  `friends-count` : bigint,
+  `statuses-count` : bigint,
   name : string,
-  `followers-count` : int64
+  `followers-count` : bigint
 }
 
 create type test.TweetMessageType as
  closed {
-  tweetid : int64,
+  tweetid : bigint,
   user : TwitterUserType,
   `sender-location` : point,
   `send-time` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string,
-  countA : int64,
-  countB : int64
+  countA : bigint,
+  countB : bigint
 }
 
 create external  dataset TweetMessages(TweetMessageType) using 
`hdfs`((`hdfs`=`hdfs://127.0.0.1:31888`),(`path`=`/asterix/tw_for_indexleftouterjoin.adm`),(`input-format`=`text-input-format`),(`format`=`adm`));

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/decorrelate_with_unique_id_2/decorrelate_with_unique_id_2.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/decorrelate_with_unique_id_2/decorrelate_with_unique_id_2.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/decorrelate_with_unique_id_2/decorrelate_with_unique_id_2.3.query.sqlpp
index 7a520a3..5d18ddb 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/decorrelate_with_unique_id_2/decorrelate_with_unique_id_2.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/decorrelate_with_unique_id_2/decorrelate_with_unique_id_2.3.query.sqlpp
@@ -34,6 +34,6 @@ select element {
             order by t2.tweetid
         )}
 from  TweetMessages as t1
-where (t1.tweetid < test.int64('10'))
+where (t1.tweetid < test.bigint('10'))
 order by t1.tweetid
 ;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/exists/exists.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/exists/exists.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/exists/exists.1.ddl.sqlpp
index 6460a1a..5df5c73 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/exists/exists.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/exists/exists.1.ddl.sqlpp
@@ -23,22 +23,22 @@ USE test;
 
 
 CREATE TYPE OrderType AS CLOSED {
-  o_orderkey: int32,
-  o_custkey: int32,
+  o_orderkey: integer,
+  o_custkey: integer,
   o_orderstatus: string,
   o_totalprice: double,
   o_orderdate: string,
   o_orderpriority: string,
   o_clerk: string,
-  o_shippriority: int32,
+  o_shippriority: integer,
   o_comment: string
 }
 
 CREATE TYPE CustomerType AS CLOSED {
-  c_custkey: int32,
+  c_custkey: integer,
   c_name: string,
   c_address: string,
-  c_nationkey: int32,
+  c_nationkey: integer,
   c_phone: string,
   c_acctbal: double,
   c_mktsegment: string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/gby_inline/gby_inline.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/gby_inline/gby_inline.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/gby_inline/gby_inline.1.ddl.sqlpp
index e77519e..ecd4d11 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/gby_inline/gby_inline.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/gby_inline/gby_inline.1.ddl.sqlpp
@@ -23,22 +23,22 @@ USE test;
 
 
 CREATE TYPE OrderType AS CLOSED {
-  o_orderkey: int32,
-  o_custkey: int32,
+  o_orderkey: integer,
+  o_custkey: integer,
   o_orderstatus: string,
   o_totalprice: double,
   o_orderdate: string,
   o_orderpriority: string,
   o_clerk: string,
-  o_shippriority: int32,
+  o_shippriority: integer,
   o_comment: string
 }
 
 CREATE TYPE CustomerType AS CLOSED {
-  c_custkey: int32,
+  c_custkey: integer,
   c_name: string,
   c_address: string,
-  c_nationkey: int32,
+  c_nationkey: integer,
   c_phone: string,
   c_acctbal: double,
   c_mktsegment: string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/in/in.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/in/in.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/in/in.1.ddl.sqlpp
index e77519e..ecd4d11 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/in/in.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/in/in.1.ddl.sqlpp
@@ -23,22 +23,22 @@ USE test;
 
 
 CREATE TYPE OrderType AS CLOSED {
-  o_orderkey: int32,
-  o_custkey: int32,
+  o_orderkey: integer,
+  o_custkey: integer,
   o_orderstatus: string,
   o_totalprice: double,
   o_orderdate: string,
   o_orderpriority: string,
   o_clerk: string,
-  o_shippriority: int32,
+  o_shippriority: integer,
   o_comment: string
 }
 
 CREATE TYPE CustomerType AS CLOSED {
-  c_custkey: int32,
+  c_custkey: integer,
   c_name: string,
   c_address: string,
-  c_nationkey: int32,
+  c_nationkey: integer,
   c_phone: string,
   c_acctbal: double,
   c_mktsegment: string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/in_correlated/in_correlated.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/in_correlated/in_correlated.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/in_correlated/in_correlated.1.ddl.sqlpp
index e77519e..ecd4d11 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/in_correlated/in_correlated.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/in_correlated/in_correlated.1.ddl.sqlpp
@@ -23,22 +23,22 @@ USE test;
 
 
 CREATE TYPE OrderType AS CLOSED {
-  o_orderkey: int32,
-  o_custkey: int32,
+  o_orderkey: integer,
+  o_custkey: integer,
   o_orderstatus: string,
   o_totalprice: double,
   o_orderdate: string,
   o_orderpriority: string,
   o_clerk: string,
-  o_shippriority: int32,
+  o_shippriority: integer,
   o_comment: string
 }
 
 CREATE TYPE CustomerType AS CLOSED {
-  c_custkey: int32,
+  c_custkey: integer,
   c_name: string,
   c_address: string,
-  c_nationkey: int32,
+  c_nationkey: integer,
   c_phone: string,
   c_acctbal: double,
   c_mktsegment: string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/not_exists/not_exists.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/not_exists/not_exists.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/not_exists/not_exists.1.ddl.sqlpp
index 6460a1a..5df5c73 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/not_exists/not_exists.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/not_exists/not_exists.1.ddl.sqlpp
@@ -23,22 +23,22 @@ USE test;
 
 
 CREATE TYPE OrderType AS CLOSED {
-  o_orderkey: int32,
-  o_custkey: int32,
+  o_orderkey: integer,
+  o_custkey: integer,
   o_orderstatus: string,
   o_totalprice: double,
   o_orderdate: string,
   o_orderpriority: string,
   o_clerk: string,
-  o_shippriority: int32,
+  o_shippriority: integer,
   o_comment: string
 }
 
 CREATE TYPE CustomerType AS CLOSED {
-  c_custkey: int32,
+  c_custkey: integer,
   c_name: string,
   c_address: string,
-  c_nationkey: int32,
+  c_nationkey: integer,
   c_phone: string,
   c_acctbal: double,
   c_mktsegment: string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/not_in/not_in.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/not_in/not_in.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/not_in/not_in.1.ddl.sqlpp
index e77519e..ecd4d11 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/not_in/not_in.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/not_in/not_in.1.ddl.sqlpp
@@ -23,22 +23,22 @@ USE test;
 
 
 CREATE TYPE OrderType AS CLOSED {
-  o_orderkey: int32,
-  o_custkey: int32,
+  o_orderkey: integer,
+  o_custkey: integer,
   o_orderstatus: string,
   o_totalprice: double,
   o_orderdate: string,
   o_orderpriority: string,
   o_clerk: string,
-  o_shippriority: int32,
+  o_shippriority: integer,
   o_comment: string
 }
 
 CREATE TYPE CustomerType AS CLOSED {
-  c_custkey: int32,
+  c_custkey: integer,
   c_name: string,
   c_address: string,
-  c_nationkey: int32,
+  c_nationkey: integer,
   c_phone: string,
   c_acctbal: double,
   c_mktsegment: string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1168/query-ASTERIXDB-1168.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1168/query-ASTERIXDB-1168.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1168/query-ASTERIXDB-1168.1.ddl.sqlpp
index c2c0dc6..36c0cc7 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1168/query-ASTERIXDB-1168.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1168/query-ASTERIXDB-1168.1.ddl.sqlpp
@@ -22,6 +22,6 @@ create dataverse test;
 use test;
 
 create type TType as closed
-{ id: int64, content: string }
+{ id: bigint, content: string }
 
 create dataset TData (TType) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1571-2/query-ASTERIXDB-1571-2.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1571-2/query-ASTERIXDB-1571-2.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1571-2/query-ASTERIXDB-1571-2.1.ddl.sqlpp
index 07c39e3..590bb29 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1571-2/query-ASTERIXDB-1571-2.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1571-2/query-ASTERIXDB-1571-2.1.ddl.sqlpp
@@ -25,7 +25,7 @@ drop dataset samptable if exists;
 drop type samptabletype if exists;
 
 create type samptabletype as closed {
-  id: int8
+  id: tinyint
 };
 
 create dataset samptable(samptabletype) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1571-3/query-ASTERIXDB-1571-3.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1571-3/query-ASTERIXDB-1571-3.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1571-3/query-ASTERIXDB-1571-3.1.ddl.sqlpp
index 07c39e3..590bb29 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1571-3/query-ASTERIXDB-1571-3.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1571-3/query-ASTERIXDB-1571-3.1.ddl.sqlpp
@@ -25,7 +25,7 @@ drop dataset samptable if exists;
 drop type samptabletype if exists;
 
 create type samptabletype as closed {
-  id: int8
+  id: tinyint
 };
 
 create dataset samptable(samptabletype) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1571-4/query-ASTERIXDB-1571-4.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1571-4/query-ASTERIXDB-1571-4.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1571-4/query-ASTERIXDB-1571-4.1.ddl.sqlpp
index 07c39e3..590bb29 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1571-4/query-ASTERIXDB-1571-4.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1571-4/query-ASTERIXDB-1571-4.1.ddl.sqlpp
@@ -25,7 +25,7 @@ drop dataset samptable if exists;
 drop type samptabletype if exists;
 
 create type samptabletype as closed {
-  id: int8
+  id: tinyint
 };
 
 create dataset samptable(samptabletype) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1571/query-ASTERIXDB-1571.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1571/query-ASTERIXDB-1571.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1571/query-ASTERIXDB-1571.1.ddl.sqlpp
index 07c39e3..590bb29 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1571/query-ASTERIXDB-1571.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1571/query-ASTERIXDB-1571.1.ddl.sqlpp
@@ -25,7 +25,7 @@ drop dataset samptable if exists;
 drop type samptabletype if exists;
 
 create type samptabletype as closed {
-  id: int8
+  id: tinyint
 };
 
 create dataset samptable(samptabletype) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1572/query-ASTERIXDB-1572.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1572/query-ASTERIXDB-1572.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1572/query-ASTERIXDB-1572.1.ddl.sqlpp
index 18e3e80..41ac8bc 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1572/query-ASTERIXDB-1572.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1572/query-ASTERIXDB-1572.1.ddl.sqlpp
@@ -25,7 +25,7 @@ drop dataset samptable if exists;
 drop type samptabletype if exists;
 
 create type samptabletype as closed {
-  id: int64
+  id: bigint
 };
 
 create dataset samptable(samptabletype) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1574-2/query-ASTERIXDB-1574-2.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1574-2/query-ASTERIXDB-1574-2.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1574-2/query-ASTERIXDB-1574-2.1.ddl.sqlpp
index 07c39e3..590bb29 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1574-2/query-ASTERIXDB-1574-2.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1574-2/query-ASTERIXDB-1574-2.1.ddl.sqlpp
@@ -25,7 +25,7 @@ drop dataset samptable if exists;
 drop type samptabletype if exists;
 
 create type samptabletype as closed {
-  id: int8
+  id: tinyint
 };
 
 create dataset samptable(samptabletype) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1574-3/query-ASTERIXDB-1574-3.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1574-3/query-ASTERIXDB-1574-3.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1574-3/query-ASTERIXDB-1574-3.1.ddl.sqlpp
index 07c39e3..590bb29 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1574-3/query-ASTERIXDB-1574-3.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1574-3/query-ASTERIXDB-1574-3.1.ddl.sqlpp
@@ -25,7 +25,7 @@ drop dataset samptable if exists;
 drop type samptabletype if exists;
 
 create type samptabletype as closed {
-  id: int8
+  id: tinyint
 };
 
 create dataset samptable(samptabletype) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1574/query-ASTERIXDB-1574.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1574/query-ASTERIXDB-1574.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1574/query-ASTERIXDB-1574.1.ddl.sqlpp
index 07c39e3..590bb29 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1574/query-ASTERIXDB-1574.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1574/query-ASTERIXDB-1574.1.ddl.sqlpp
@@ -25,7 +25,7 @@ drop dataset samptable if exists;
 drop type samptabletype if exists;
 
 create type samptabletype as closed {
-  id: int8
+  id: tinyint
 };
 
 create dataset samptable(samptabletype) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1597/query-ASTERIXDB-1597.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1597/query-ASTERIXDB-1597.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1597/query-ASTERIXDB-1597.1.ddl.sqlpp
index 07c39e3..590bb29 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1597/query-ASTERIXDB-1597.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1597/query-ASTERIXDB-1597.1.ddl.sqlpp
@@ -25,7 +25,7 @@ drop dataset samptable if exists;
 drop type samptabletype if exists;
 
 create type samptabletype as closed {
-  id: int8
+  id: tinyint
 };
 
 create dataset samptable(samptabletype) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division/relational_division.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division/relational_division.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division/relational_division.1.ddl.sqlpp
index 6ae5f32..0db6e12 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division/relational_division.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division/relational_division.1.ddl.sqlpp
@@ -23,22 +23,22 @@ USE test;
 
 
 CREATE TYPE OrderType AS CLOSED {
-  o_orderkey: int32,
-  o_custkey: int32,
+  o_orderkey: integer,
+  o_custkey: integer,
   o_orderstatus: string,
   o_totalprice: double,
   o_orderdate: string,
   o_orderpriority: string,
   o_clerk: string,
-  o_shippriority: int32,
+  o_shippriority: integer,
   o_comment: string
 }
 
 CREATE TYPE CustomerType AS CLOSED {
-  c_custkey: int32,
+  c_custkey: integer,
   c_name: string,
   c_address: string,
-  c_nationkey: int32,
+  c_nationkey: integer,
   c_phone: string,
   c_acctbal: double,
   c_mktsegment: string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division2/relational_division2.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division2/relational_division2.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division2/relational_division2.1.ddl.sqlpp
index 6ae5f32..0db6e12 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division2/relational_division2.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division2/relational_division2.1.ddl.sqlpp
@@ -23,22 +23,22 @@ USE test;
 
 
 CREATE TYPE OrderType AS CLOSED {
-  o_orderkey: int32,
-  o_custkey: int32,
+  o_orderkey: integer,
+  o_custkey: integer,
   o_orderstatus: string,
   o_totalprice: double,
   o_orderdate: string,
   o_orderpriority: string,
   o_clerk: string,
-  o_shippriority: int32,
+  o_shippriority: integer,
   o_comment: string
 }
 
 CREATE TYPE CustomerType AS CLOSED {
-  c_custkey: int32,
+  c_custkey: integer,
   c_name: string,
   c_address: string,
-  c_nationkey: int32,
+  c_nationkey: integer,
   c_phone: string,
   c_acctbal: double,
   c_mktsegment: string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division2/relational_division2.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division2/relational_division2.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division2/relational_division2.3.query.sqlpp
index 45f924a..80470ea 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division2/relational_division2.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division2/relational_division2.3.query.sqlpp
@@ -22,7 +22,7 @@ USE test;
 /** Finds customers whose orders have all possible priorities.*/
 
 WITH priorities AS
-COLL_COUNT((
+ARRAY_COUNT((
   SELECT DISTINCT o.o_orderpriority FROM Orders o
 ))
 ,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division3/relational_division3.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division3/relational_division3.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division3/relational_division3.1.ddl.sqlpp
index 6ae5f32..0db6e12 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division3/relational_division3.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division3/relational_division3.1.ddl.sqlpp
@@ -23,22 +23,22 @@ USE test;
 
 
 CREATE TYPE OrderType AS CLOSED {
-  o_orderkey: int32,
-  o_custkey: int32,
+  o_orderkey: integer,
+  o_custkey: integer,
   o_orderstatus: string,
   o_totalprice: double,
   o_orderdate: string,
   o_orderpriority: string,
   o_clerk: string,
-  o_shippriority: int32,
+  o_shippriority: integer,
   o_comment: string
 }
 
 CREATE TYPE CustomerType AS CLOSED {
-  c_custkey: int32,
+  c_custkey: integer,
   c_name: string,
   c_address: string,
-  c_nationkey: int32,
+  c_nationkey: integer,
   c_phone: string,
   c_acctbal: double,
   c_mktsegment: string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ddl.sqlpp
index e42f0c6..1b1484b 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ddl.sqlpp
@@ -31,11 +31,11 @@ use test;
 
 create type test.LineItemType as
  closed {
-  l_orderkey : int64,
-  l_partkey : int64,
-  l_suppkey : int64,
-  l_linenumber : int64,
-  l_quantity : int64,
+  l_orderkey : bigint,
+  l_partkey : bigint,
+  l_suppkey : bigint,
+  l_linenumber : bigint,
+  l_quantity : bigint,
   l_extendedprice : double,
   l_discount : double,
   l_tax : double,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.1.ddl.sqlpp
index d2178a7..a4eb713 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.1.ddl.sqlpp
@@ -31,11 +31,11 @@ use test;
 
 create type test.LineItemType as
  closed {
-  l_orderkey : int64,
-  l_partkey : int64,
-  l_suppkey : int64,
-  l_linenumber : int64,
-  l_quantity : int64,
+  l_orderkey : bigint,
+  l_partkey : bigint,
+  l_suppkey : bigint,
+  l_linenumber : bigint,
+  l_quantity : bigint,
   l_extendedprice : double,
   l_discount : double,
   l_tax : double,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.1.ddl.sqlpp
index b007f7a..eb52258 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.1.ddl.sqlpp
@@ -42,7 +42,7 @@ create type test.Person as
 
 create type test.TestType as
 {
-  id : int32,
+  id : integer,
   name : string,
   locn : point,
   zip : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-index/drop-index.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-index/drop-index.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-index/drop-index.1.ddl.sqlpp
index 934cdc3..33feb8a 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-index/drop-index.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-index/drop-index.1.ddl.sqlpp
@@ -31,19 +31,19 @@ use test;
 
 create type test.Schema as
  closed {
-  unique1 : int64,
-  unique2 : int64,
-  two : int64,
-  four : int64,
-  ten : int64,
-  twenty : int64,
-  onePercent : int64,
-  tenPercent : int64,
-  twentyPercent : int64,
-  fiftyPercent : int64,
-  unique3 : int64,
-  evenOnePercent : int64,
-  oddOnePercent : int64,
+  unique1 : bigint,
+  unique2 : bigint,
+  two : bigint,
+  four : bigint,
+  ten : bigint,
+  twenty : bigint,
+  onePercent : bigint,
+  tenPercent : bigint,
+  twentyPercent : bigint,
+  fiftyPercent : bigint,
+  unique3 : bigint,
+  evenOnePercent : bigint,
+  oddOnePercent : bigint,
   stringu1 : string,
   stringu2 : string,
   string4 : string

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.1.ddl.sqlpp
index 256a01c..ef45232 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.1.ddl.sqlpp
@@ -30,10 +30,10 @@ use test;
 
 create type test.LineItemType as
  closed {
-  l_orderkey : int64,
-  l_partkey : int64,
-  l_suppkey : int64,
-  l_linenumber : int64,
+  l_orderkey : bigint,
+  l_partkey : bigint,
+  l_suppkey : bigint,
+  l_linenumber : bigint,
   l_quantity : double,
   l_extendedprice : double,
   l_discount : double,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.1.ddl.sqlpp
index 4d276ba..4532f3c 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.1.ddl.sqlpp
@@ -28,10 +28,10 @@ create  dataverse test;
 
 create type test.Emp as
  closed {
-  id : int64,
+  id : bigint,
   fname : string,
   lname : string,
-  age : int64,
+  age : bigint,
   dept : string
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.1.ddl.sqlpp
index 99c0994..46fcd68 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.1.ddl.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.myDataType as
 {
-  id : int64
+  id : bigint
 }
 
 create temporary dataset myData(myDataType) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
index 3db5983..d14c703 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
@@ -30,10 +30,10 @@ use tpch;
 
 create type tpch.LineItemType as
  closed {
-  l_orderkey : int64,
-  l_partkey : int64,
-  l_suppkey : int64,
-  l_linenumber : int64,
+  l_orderkey : bigint,
+  l_partkey : bigint,
+  l_suppkey : bigint,
+  l_linenumber : bigint,
   l_quantity : double,
   l_extendedprice : double,
   l_discount : double,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.sqlpp
index 1d4cc5b..68232c4 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.sqlpp
@@ -27,28 +27,28 @@ use tpch;
 
 set `import-private-functions` `true`;
 
-select element 
{'l_returnflag':l_returnflag,'l_linestatus':l_linestatus,'sum_qty':tpch.coll_sum((
+select element 
{'l_returnflag':l_returnflag,'l_linestatus':l_linestatus,'sum_qty':tpch.array_sum((
         select element i.l_quantity
         from  l as i
-    )),'sum_base_price':tpch.coll_sum((
+    )),'sum_base_price':tpch.array_sum((
         select element i.l_extendedprice
         from  l as i
-    )),'sum_disc_price':tpch.coll_sum((
+    )),'sum_disc_price':tpch.array_sum((
         select element (i.l_extendedprice * (1 - i.l_discount))
         from  l as i
-    )),'sum_charge':tpch.coll_sum((
+    )),'sum_charge':tpch.array_sum((
         select element (i.l_extendedprice * (1 - i.l_discount) * (1 + i.l_tax))
         from  l as i
-    )),'ave_qty':tpch.coll_avg((
+    )),'ave_qty':tpch.array_avg((
         select element i.l_quantity
         from  l as i
-    )),'ave_price':tpch.coll_avg((
+    )),'ave_price':tpch.array_avg((
         select element i.l_extendedprice
         from  l as i
-    )),'ave_disc':tpch.coll_avg((
+    )),'ave_disc':tpch.array_avg((
         select element i.l_discount
         from  l as i
-    )),'count_order':tpch.coll_count(l)}
+    )),'count_order':tpch.array_count(l)}
 from  LineItem as l
 where (l.l_shipdate <= '1998-09-02')
 /* +hash */

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.sqlpp
index 807276b..6fe3764 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.sqlpp
@@ -30,7 +30,7 @@ use test;
 
 create type test.MyRecord as
  closed {
-  id : int64,
+  id : bigint,
   point : point,
   kwds : string,
   line1 : line,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.1.ddl.sqlpp
index 4dfb789..88b957e 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.1.ddl.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.MyRecord as
  closed {
-  id : int64,
+  id : bigint,
   point : point,
   kwds : string,
   line1 : line,
@@ -44,7 +44,7 @@ create type test.MyRecord as
 
 create type test.MyMiniRecord as
  closed {
-  id : int64,
+  id : bigint,
   point : point
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.ddl.sqlpp
index ba96966..e41796b 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.ddl.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.MyRecord as
  closed {
-  id : int64,
+  id : bigint,
   point : point,
   kwds : string,
   line1 : line,
@@ -44,7 +44,7 @@ create type test.MyRecord as
 
 create type test.MyMiniRecord as
  closed {
-  id : int64,
+  id : bigint,
   point : point
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.1.ddl.sqlpp
index f0abe6e..41c192c 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.1.ddl.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.MyRecord as
  closed {
-  id : int64,
+  id : bigint,
   point : point,
   kwds : string,
   line1 : line,
@@ -44,7 +44,7 @@ create type test.MyRecord as
 
 create type test.MyMiniRecord as
  closed {
-  id : int64,
+  id : bigint,
   point : point
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/accessors/accessors.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/accessors/accessors.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/accessors/accessors.3.query.sqlpp
index 832533e..1e2c817 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/accessors/accessors.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/accessors/accessors.3.query.sqlpp
@@ -20,4 +20,4 @@
 use test;
 
 
-{'year1':test.`get-year`(test.date('2010-10-30')),'year2':test.`get-year`(test.datetime('1987-11-19T23:49:23.938')),'year3':test.`get-year`(test.date('-1987-11-19')),'year4':test.`get-year`(test.date('09280329')),'year5':test.`get-year`(test.datetime('19371229T20030628')),'year6':test.`get-year`(test.string('-0003-01-09T23:12:12.39-07:00')),'year7':test.`get-year`(test.duration('P3Y73M632DT49H743M3948.94S')),'year8':test.`get-year`(test.`year-month-duration`('P8Y12M')),'year-null':test.`get-year`(null),'month1':test.`get-month`(test.date('2010-10-30')),'month2':test.`get-month`(test.datetime('1987-11-19T23:49:23.938')),'month3':test.`get-month`(test.date('-1987-11-19')),'month4':test.`get-month`(test.date('09280329')),'month5':test.`get-month`(test.datetime('19371229T20030628')),'month6':test.`get-month`(test.duration('P3Y73M632DT49H743M3948.94S')),'month7':test.`get-month`(test.`year-month-duration`('P8Y12M')),'month-null':test.`get-month`(null),'day1':test.`get-day`(test.date('201
 
0-10-30')),'day2':test.`get-day`(test.datetime('1987-11-19T23:49:23.938')),'day3':test.`get-day`(test.date('-1987-11-19')),'day4':test.`get-day`(test.date('09280329')),'day5':test.`get-day`(test.datetime('19371229T20030628')),'day6':test.`get-day`(test.duration('P3Y73M632DT49H743M3948.94S')),'day7':test.`get-day`(test.`day-time-duration`('P32DT49H743M3948.94S')),'day-null':test.`get-day`(null),'hour1':test.`get-hour`(test.datetime('1987-11-19T23:49:23.938')),'hour2':test.`get-hour`(test.datetime('19371229T20030628')),'hour3':test.`get-hour`(test.time('12:23:34.930+07:00')),'hour4':test.`get-hour`(test.duration('P3Y73M632DT49H743M3948.94S')),'hour5':test.`get-hour`(test.`day-time-duration`('P32DT49H743M3948.94S')),'hour-null':test.`get-hour`(null),'min1':test.`get-minute`(test.datetime('1987-11-19T23:49:23.938')),'min2':test.`get-minute`(test.datetime('19371229T20030628')),'min3':test.`get-minute`(test.time('12:23:34.930+07:00')),'min4':test.`get-minute`(test.duration('P3Y73M632DT49H
 
743M3948.94S')),'min5':test.`get-minute`(test.`day-time-duration`('P32DT49H743M3948.94S')),'min-null':test.`get-minute`(null),'second1':test.`get-second`(test.datetime('1987-11-19T23:49:23.938')),'second2':test.`get-second`(test.datetime('19371229T20030628')),'second3':test.`get-second`(test.time('12:23:34.930+07:00')),'second4':test.`get-second`(test.duration('P3Y73M632DT49H743M3948.94S')),'second5':test.`get-second`(test.`day-time-duration`('P32DT49H743M3948.94S')),'second-null':test.`get-second`(null),'ms1':test.`get-millisecond`(test.datetime('1987-11-19T23:49:23.938')),'ms2':test.`get-millisecond`(test.datetime('19371229T20030628')),'ms3':test.`get-millisecond`(test.time('12:23:34.930+07:00')),'ms4':test.`get-millisecond`(test.duration('P3Y73M632DT49H743M3948.94S')),'ms5':test.`get-millisecond`(test.`day-time-duration`('P32DT49H743M3948.94S')),'ms-null':test.`get-millisecond`(null)};
+{'year1':test.`get-year`(test.date('2010-10-30')),'year2':test.`get-year`(test.datetime('1987-11-19T23:49:23.938')),'year3':test.`get-year`(test.date('-1987-11-19')),'year4':test.`get-year`(test.date('09280329')),'year5':test.`get-year`(test.datetime('19371229T20030628')),'year6':test.`get-year`(test.string('-0003-01-09T23:12:12.39-07:00')),'year7':test.`get-year`(test.duration('P3Y73M632DT49H743M3948.94S')),'year8':test.`get-year`(test.`year_month_duration`('P8Y12M')),'year-null':test.`get-year`(null),'month1':test.`get-month`(test.date('2010-10-30')),'month2':test.`get-month`(test.datetime('1987-11-19T23:49:23.938')),'month3':test.`get-month`(test.date('-1987-11-19')),'month4':test.`get-month`(test.date('09280329')),'month5':test.`get-month`(test.datetime('19371229T20030628')),'month6':test.`get-month`(test.duration('P3Y73M632DT49H743M3948.94S')),'month7':test.`get-month`(test.`year_month_duration`('P8Y12M')),'month-null':test.`get-month`(null),'day1':test.`get-day`(test.date('201
 
0-10-30')),'day2':test.`get-day`(test.datetime('1987-11-19T23:49:23.938')),'day3':test.`get-day`(test.date('-1987-11-19')),'day4':test.`get-day`(test.date('09280329')),'day5':test.`get-day`(test.datetime('19371229T20030628')),'day6':test.`get-day`(test.duration('P3Y73M632DT49H743M3948.94S')),'day7':test.`get-day`(test.`day_time_duration`('P32DT49H743M3948.94S')),'day-null':test.`get-day`(null),'hour1':test.`get-hour`(test.datetime('1987-11-19T23:49:23.938')),'hour2':test.`get-hour`(test.datetime('19371229T20030628')),'hour3':test.`get-hour`(test.time('12:23:34.930+07:00')),'hour4':test.`get-hour`(test.duration('P3Y73M632DT49H743M3948.94S')),'hour5':test.`get-hour`(test.`day_time_duration`('P32DT49H743M3948.94S')),'hour-null':test.`get-hour`(null),'min1':test.`get-minute`(test.datetime('1987-11-19T23:49:23.938')),'min2':test.`get-minute`(test.datetime('19371229T20030628')),'min3':test.`get-minute`(test.time('12:23:34.930+07:00')),'min4':test.`get-minute`(test.duration('P3Y73M632DT49H
 
743M3948.94S')),'min5':test.`get-minute`(test.`day_time_duration`('P32DT49H743M3948.94S')),'min-null':test.`get-minute`(null),'second1':test.`get-second`(test.datetime('1987-11-19T23:49:23.938')),'second2':test.`get-second`(test.datetime('19371229T20030628')),'second3':test.`get-second`(test.time('12:23:34.930+07:00')),'second4':test.`get-second`(test.duration('P3Y73M632DT49H743M3948.94S')),'second5':test.`get-second`(test.`day_time_duration`('P32DT49H743M3948.94S')),'second-null':test.`get-second`(null),'ms1':test.`get-millisecond`(test.datetime('1987-11-19T23:49:23.938')),'ms2':test.`get-millisecond`(test.datetime('19371229T20030628')),'ms3':test.`get-millisecond`(test.time('12:23:34.930+07:00')),'ms4':test.`get-millisecond`(test.duration('P3Y73M632DT49H743M3948.94S')),'ms5':test.`get-millisecond`(test.`day_time_duration`('P32DT49H743M3948.94S')),'ms-null':test.`get-millisecond`(null)};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_max/agg_max.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_max/agg_max.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_max/agg_max.1.ddl.sqlpp
index 4f1cd7d..64e6570 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_max/agg_max.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_max/agg_max.1.ddl.sqlpp
@@ -25,12 +25,12 @@ use test;
 
 create type test.Schema as
  closed {
-  id : int32,
+  id : integer,
   time : time,
   date : date,
   datetime : datetime,
-  dtduration : `day-time-duration`,
-  ymduration : `year-month-duration`
+  dtduration : `day_time_duration`,
+  ymduration : `year_month_duration`
 }
 
 create  dataset tsdata(Schema) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_max/agg_max.2.update.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_max/agg_max.2.update.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_max/agg_max.2.update.sqlpp
index a5e1a69..d278635 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_max/agg_max.2.update.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_max/agg_max.2.update.sqlpp
@@ -21,8 +21,8 @@ use test;
 
 
 insert into tsdata
-select element 
{'id':1,'time':test.time('23:49:23.938'),'date':test.date('1904-01-06'),'datetime':test.datetime('2012-01-12T12:31:39'),'dtduration':test.`day-time-duration`('PT5M'),'ymduration':test.`year-month-duration`('P5M')};
+select element 
{'id':1,'time':test.time('23:49:23.938'),'date':test.date('1904-01-06'),'datetime':test.datetime('2012-01-12T12:31:39'),'dtduration':test.`day_time_duration`('PT5M'),'ymduration':test.`year_month_duration`('P5M')};
 insert into tsdata
-select element 
{'id':2,'time':test.time('12:37:10'),'date':test.date('2194-07-06'),'datetime':test.datetime('2013-01-12T12:31:39'),'dtduration':test.`day-time-duration`('PT5.329S'),'ymduration':test.`year-month-duration`('P1Y')};
+select element 
{'id':2,'time':test.time('12:37:10'),'date':test.date('2194-07-06'),'datetime':test.datetime('2013-01-12T12:31:39'),'dtduration':test.`day_time_duration`('PT5.329S'),'ymduration':test.`year_month_duration`('P1Y')};
 insert into tsdata
-select element 
{'id':3,'time':test.time('09:28:10.9'),'date':test.date('-1904-01-06'),'datetime':test.datetime('2012-01-12T18:31:39'),'dtduration':test.`day-time-duration`('P3DT2S'),'ymduration':test.`year-month-duration`('P29M')};
+select element 
{'id':3,'time':test.time('09:28:10.9'),'date':test.date('-1904-01-06'),'datetime':test.datetime('2012-01-12T18:31:39'),'dtduration':test.`day_time_duration`('P3DT2S'),'ymduration':test.`year_month_duration`('P29M')};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_max/agg_max.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_max/agg_max.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_max/agg_max.3.query.sqlpp
index b67806d..c41bc87 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_max/agg_max.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_max/agg_max.3.query.sqlpp
@@ -20,19 +20,19 @@
 use test;
 
 
-{'m0':test.coll_max((
+{'m0':test.array_max((
     select element i.time
     from  tsdata as i
-)),'m1':test.coll_max((
+)),'m1':test.array_max((
     select element i.date
     from  tsdata as i
-)),'m2':test.coll_max((
+)),'m2':test.array_max((
     select element i.datetime
     from  tsdata as i
-)),'m3':test.coll_max((
+)),'m3':test.array_max((
     select element i.dtduration
     from  tsdata as i
-)),'m4':test.coll_max((
+)),'m4':test.array_max((
     select element i.ymduration
     from  tsdata as i
 ))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_min/agg_min.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_min/agg_min.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_min/agg_min.1.ddl.sqlpp
index 4f1cd7d..64e6570 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_min/agg_min.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_min/agg_min.1.ddl.sqlpp
@@ -25,12 +25,12 @@ use test;
 
 create type test.Schema as
  closed {
-  id : int32,
+  id : integer,
   time : time,
   date : date,
   datetime : datetime,
-  dtduration : `day-time-duration`,
-  ymduration : `year-month-duration`
+  dtduration : `day_time_duration`,
+  ymduration : `year_month_duration`
 }
 
 create  dataset tsdata(Schema) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_min/agg_min.2.update.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_min/agg_min.2.update.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_min/agg_min.2.update.sqlpp
index a5e1a69..d278635 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_min/agg_min.2.update.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_min/agg_min.2.update.sqlpp
@@ -21,8 +21,8 @@ use test;
 
 
 insert into tsdata
-select element 
{'id':1,'time':test.time('23:49:23.938'),'date':test.date('1904-01-06'),'datetime':test.datetime('2012-01-12T12:31:39'),'dtduration':test.`day-time-duration`('PT5M'),'ymduration':test.`year-month-duration`('P5M')};
+select element 
{'id':1,'time':test.time('23:49:23.938'),'date':test.date('1904-01-06'),'datetime':test.datetime('2012-01-12T12:31:39'),'dtduration':test.`day_time_duration`('PT5M'),'ymduration':test.`year_month_duration`('P5M')};
 insert into tsdata
-select element 
{'id':2,'time':test.time('12:37:10'),'date':test.date('2194-07-06'),'datetime':test.datetime('2013-01-12T12:31:39'),'dtduration':test.`day-time-duration`('PT5.329S'),'ymduration':test.`year-month-duration`('P1Y')};
+select element 
{'id':2,'time':test.time('12:37:10'),'date':test.date('2194-07-06'),'datetime':test.datetime('2013-01-12T12:31:39'),'dtduration':test.`day_time_duration`('PT5.329S'),'ymduration':test.`year_month_duration`('P1Y')};
 insert into tsdata
-select element 
{'id':3,'time':test.time('09:28:10.9'),'date':test.date('-1904-01-06'),'datetime':test.datetime('2012-01-12T18:31:39'),'dtduration':test.`day-time-duration`('P3DT2S'),'ymduration':test.`year-month-duration`('P29M')};
+select element 
{'id':3,'time':test.time('09:28:10.9'),'date':test.date('-1904-01-06'),'datetime':test.datetime('2012-01-12T18:31:39'),'dtduration':test.`day_time_duration`('P3DT2S'),'ymduration':test.`year_month_duration`('P29M')};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_min/agg_min.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_min/agg_min.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_min/agg_min.3.query.sqlpp
index cfc6dd7..43c852f 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_min/agg_min.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_min/agg_min.3.query.sqlpp
@@ -20,19 +20,19 @@
 use test;
 
 
-{'m0':test.coll_min((
+{'m0':test.array_min((
     select element i.time
     from  tsdata as i
-)),'m1':test.coll_min((
+)),'m1':test.array_min((
     select element i.date
     from  tsdata as i
-)),'m2':test.coll_min((
+)),'m2':test.array_min((
     select element i.datetime
     from  tsdata as i
-)),'m3':test.coll_min((
+)),'m3':test.array_min((
     select element i.dtduration
     from  tsdata as i
-)),'m4':test.coll_min((
+)),'m4':test.array_min((
     select element i.ymduration
     from  tsdata as i
 ))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/duration_comps/duration_comps.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/duration_comps/duration_comps.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/duration_comps/duration_comps.3.query.sqlpp
index 6570a5c..7397cd1 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/duration_comps/duration_comps.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/duration_comps/duration_comps.3.query.sqlpp
@@ -22,4 +22,4 @@ use test;
 
 set `import-private-functions` `true`;
 
-{'yearMonthGreaterComp':test.`year-month-duration-greater-than`(test.duration('P13M'),test.duration('P1Y')),'dayTimeGreaterComp':test.`day-time-duration-greater-than`(test.duration('P1D'),test.duration('-P3D')),'yearMonthLessComp':test.`year-month-duration-less-than`(test.duration('P13M'),test.duration('P1Y')),'dayTimeLessComp':test.`day-time-duration-less-than`(test.duration('P1D'),test.duration('-P3D')),'equal1':test.`duration-equal`(test.duration('P1D'),test.duration('PT24H')),'equal2':test.`duration-equal`(test.duration('-P3D'),test.duration('PT24H')),'equal3':test.`duration-equal`(test.`duration-from-months`(test.`months-from-year-month-duration`(test.`get-year-month-duration`(test.duration('P1Y')))),test.duration('P1Y')),'equal4':test.`duration-equal`(test.`duration-from-ms`(test.`ms-from-day-time-duration`(test.`get-day-time-duration`(test.duration('-P3D')))),test.duration('-P3D'))};
+{'yearMonthGreaterComp':`year_month_duration_greater_than`(duration('P13M'),duration('P1Y')),'dayTimeGreaterComp':`day-time-duration-greater-than`(duration('P1D'),duration('-P3D')),'yearMonthLessComp':`year-month-duration-less-than`(duration('P13M'),duration('P1Y')),'dayTimeLessComp':`day-time-duration-less-than`(duration('P1D'),duration('-P3D')),'equal1':`duration_equal`(duration('P1D'),duration('PT24H')),'equal2':`duration_equal`(duration('-P3D'),duration('PT24H')),'equal3':`duration_equal`(`duration_from_months`(`months_from_year_month_duration`(`get_year_month_duration`(duration('P1Y')))),duration('P1Y')),'equal4':`duration_equal`(`duration_from_ms`(`ms_from_day_time_duration`(`get_day_time_duration`(duration('-P3D')))),duration('-P3D'))};

Reply via email to