http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_03.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_03.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_03.ast
index 1a79f18..a3a67e3 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_03.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_03.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl MyRecord [
   closed RecordType {
-    id : int32,
+    id : integer,
     point : point,
     kwds : string,
     line1 : line,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-secondary-index-open.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-secondary-index-open.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-secondary-index-open.ast
index 373614f..415c1f4 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-secondary-index-open.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-secondary-index-open.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl MyRecord [
   open RecordType {
-    id : int32,
+    id : integer,
     point : point,
     kwds : string,
     line1 : line,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-secondary-index.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-secondary-index.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-secondary-index.ast
index 54a2eee..e5c689e 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-secondary-index.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-secondary-index.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl MyRecord [
   closed RecordType {
-    id : int32,
+    id : integer,
     point : point,
     kwds : string,
     line1 : line,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/scan-delete-all.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/scan-delete-all.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/scan-delete-all.ast
index ef75bcb..bbaa60b 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/scan-delete-all.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/scan-delete-all.ast
@@ -1,10 +1,10 @@
 DataverseUse tpch
 TypeDecl LineItemType [
   closed RecordType {
-    l_orderkey : int32,
-    l_partkey : int32,
-    l_suppkey : int32,
-    l_linenumber : int32,
+    l_orderkey : integer,
+    l_partkey : integer,
+    l_suppkey : integer,
+    l_linenumber : integer,
     l_quantity : double,
     l_extendedprice : double,
     l_discount : double,
@@ -21,9 +21,9 @@ TypeDecl LineItemType [
 ]
 TypeDecl LineIDType [
   closed RecordType {
-    l_orderkey : int32,
-    l_partkey : int32,
-    l_suppkey : int32
+    l_orderkey : integer,
+    l_partkey : integer,
+    l_suppkey : integer
   }
 ]
 DatasetDecl LineItems_q1(LineItemType) partitioned by [[l_orderkey]]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/scan-delete-rtree-secondary-index.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/scan-delete-rtree-secondary-index.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/scan-delete-rtree-secondary-index.ast
index ab52c9a..53ddc81 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/scan-delete-rtree-secondary-index.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/scan-delete-rtree-secondary-index.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl MyRecord [
   closed RecordType {
-    id : int32,
+    id : integer,
     point : point,
     kwds : string,
     line1 : line,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/scan-delete.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/scan-delete.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/scan-delete.ast
index ef75bcb..bbaa60b 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/scan-delete.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/scan-delete.ast
@@ -1,10 +1,10 @@
 DataverseUse tpch
 TypeDecl LineItemType [
   closed RecordType {
-    l_orderkey : int32,
-    l_partkey : int32,
-    l_suppkey : int32,
-    l_linenumber : int32,
+    l_orderkey : integer,
+    l_partkey : integer,
+    l_suppkey : integer,
+    l_linenumber : integer,
     l_quantity : double,
     l_extendedprice : double,
     l_discount : double,
@@ -21,9 +21,9 @@ TypeDecl LineItemType [
 ]
 TypeDecl LineIDType [
   closed RecordType {
-    l_orderkey : int32,
-    l_partkey : int32,
-    l_suppkey : int32
+    l_orderkey : integer,
+    l_partkey : integer,
+    l_suppkey : integer
   }
 ]
 DatasetDecl LineItems_q1(LineItemType) partitioned by [[l_orderkey]]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/scan-insert-secondary-index.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/scan-insert-secondary-index.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/scan-insert-secondary-index.ast
index ef75bcb..bbaa60b 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/scan-insert-secondary-index.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/scan-insert-secondary-index.ast
@@ -1,10 +1,10 @@
 DataverseUse tpch
 TypeDecl LineItemType [
   closed RecordType {
-    l_orderkey : int32,
-    l_partkey : int32,
-    l_suppkey : int32,
-    l_linenumber : int32,
+    l_orderkey : integer,
+    l_partkey : integer,
+    l_suppkey : integer,
+    l_linenumber : integer,
     l_quantity : double,
     l_extendedprice : double,
     l_discount : double,
@@ -21,9 +21,9 @@ TypeDecl LineItemType [
 ]
 TypeDecl LineIDType [
   closed RecordType {
-    l_orderkey : int32,
-    l_partkey : int32,
-    l_suppkey : int32
+    l_orderkey : integer,
+    l_partkey : integer,
+    l_suppkey : integer
   }
 ]
 DatasetDecl LineItems_q1(LineItemType) partitioned by [[l_orderkey]]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/scan-insert.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/scan-insert.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/scan-insert.ast
index ef75bcb..bbaa60b 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/scan-insert.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/scan-insert.ast
@@ -1,10 +1,10 @@
 DataverseUse tpch
 TypeDecl LineItemType [
   closed RecordType {
-    l_orderkey : int32,
-    l_partkey : int32,
-    l_suppkey : int32,
-    l_linenumber : int32,
+    l_orderkey : integer,
+    l_partkey : integer,
+    l_suppkey : integer,
+    l_linenumber : integer,
     l_quantity : double,
     l_extendedprice : double,
     l_discount : double,
@@ -21,9 +21,9 @@ TypeDecl LineItemType [
 ]
 TypeDecl LineIDType [
   closed RecordType {
-    l_orderkey : int32,
-    l_partkey : int32,
-    l_suppkey : int32
+    l_orderkey : integer,
+    l_partkey : integer,
+    l_suppkey : integer
   }
 ]
 DatasetDecl LineItems_q1(LineItemType) partitioned by [[l_orderkey]]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_01.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_01.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_01.ast
index 4148306..9f0b05a 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_01.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_01.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_02.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_02.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_02.ast
index e3c5cf3..bd009ea 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_02.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_02.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_03.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_03.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_03.ast
index 8e315b0..e00d123 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_03.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_03.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_04.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_04.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_04.ast
index 01927d0..8503fc0 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_04.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_04.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_05.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_05.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_05.ast
index cd42e5c..091ac0b 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_05.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_05.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_06.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_06.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_06.ast
index 22a703b..1fc15b9 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_06.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_06.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_07.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_07.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_07.ast
index 5c0f7a4..210c5f8 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_07.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_07.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_08.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_08.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_08.ast
index 400dc1d..dde6594 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_08.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_08.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_01.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_01.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_01.ast
index e87ab92..23e9f94 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_01.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_01.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_02.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_02.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_02.ast
index 6113114..3ea6c39 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_02.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_02.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_03.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_03.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_03.ast
index 14bb9fa..f3e6664 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_03.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_03.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_04.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_04.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_04.ast
index c3034c2..33896a8 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_04.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_04.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_05.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_05.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_05.ast
index f32115c..a2339f8 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_05.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_05.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_06.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_06.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_06.ast
index 071f279..64c9e36 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_06.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_06.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_07.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_07.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_07.ast
index 57a392a..c80aa6c 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_07.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_07.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_08.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_08.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_08.ast
index 325931d..8c146c9 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_08.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_08.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/fuzzyeq-to-edit-distance-check.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/fuzzyeq-to-edit-distance-check.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/fuzzyeq-to-edit-distance-check.ast
index c1b3382..41f2380 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/fuzzyeq-to-edit-distance-check.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/fuzzyeq-to-edit-distance-check.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/fuzzyeq-to-jaccard-check.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/fuzzyeq-to-jaccard-check.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/fuzzyeq-to-jaccard-check.ast
index 84c17f4..3c06584 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/fuzzyeq-to-jaccard-check.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/fuzzyeq-to-jaccard-check.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_01.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_01.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_01.ast
index 711a1dc..83f7572 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_01.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_01.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_02.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_02.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_02.ast
index 27ac1cb..9252d55 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_02.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_02.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_03.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_03.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_03.ast
index 7556b6f..c3f6a91 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_03.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_03.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_04.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_04.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_04.ast
index 0e8ce0c..ab9edef 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_04.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_04.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_05.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_05.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_05.ast
index 67702f3..60fccc6 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_05.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_05.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_06.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_06.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_06.ast
index 0b189e9..d4c181d 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_06.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_06.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_07.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_07.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_07.ast
index 8435543..6efb812 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_07.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_07.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_08.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_08.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_08.ast
index 8269193..ffdc437 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_08.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_08.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_01.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_01.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_01.ast
index d54ff7e..024623d 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_01.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_01.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_02.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_02.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_02.ast
index ab47111..433eae6 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_02.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_02.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_03.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_03.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_03.ast
index eca8a1b..97314fe 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_03.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_03.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_04.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_04.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_04.ast
index d12f24e..621a9f0 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_04.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_04.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_05.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_05.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_05.ast
index 9aaf423..4ea0e01 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_05.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_05.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_06.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_06.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_06.ast
index 63e0f28..e94c845 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_06.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_06.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_07.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_07.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_07.ast
index cad2e24..0741d5c 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_07.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_07.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_08.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_08.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_08.ast
index 44d5c59..5914745 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_08.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_08.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/dont-skip-primary-index-search-in-delete.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/dont-skip-primary-index-search-in-delete.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/dont-skip-primary-index-search-in-delete.ast
index e473596..bff53a7 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/dont-skip-primary-index-search-in-delete.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/dont-skip-primary-index-search-in-delete.ast
@@ -1,22 +1,22 @@
 DataverseUse test
 TypeDecl AddressType [
   closed RecordType {
-    number : int32,
+    number : integer,
     street : string,
     city : string
   }
 ]
 TypeDecl CustomerType [
   closed RecordType {
-    cid : int32,
+    cid : integer,
     name : string,
-    age : int32?,
+    age : integer?,
     address : AddressType?,
     interests : UnorderedList <string>
 ,
     children : OrderedList [          open RecordType {
             name : string,
-            age : int32?
+            age : integer?
           }
 ]
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-ngram-index-search-in-delete.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-ngram-index-search-in-delete.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-ngram-index-search-in-delete.ast
index ac9fc6b..dd3e724 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-ngram-index-search-in-delete.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-ngram-index-search-in-delete.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-ngram-index.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-ngram-index.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-ngram-index.ast
index 3b23ad3..4647d35 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-ngram-index.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-ngram-index.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-rtree-index-search-in-delete.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-rtree-index-search-in-delete.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-rtree-index-search-in-delete.ast
index ab52c9a..53ddc81 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-rtree-index-search-in-delete.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-rtree-index-search-in-delete.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl MyRecord [
   closed RecordType {
-    id : int32,
+    id : integer,
     point : point,
     kwds : string,
     line1 : line,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-rtree-secondary-index.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-rtree-secondary-index.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-rtree-secondary-index.ast
index 54a2eee..e5c689e 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-rtree-secondary-index.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-rtree-secondary-index.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl MyRecord [
   closed RecordType {
-    id : int32,
+    id : integer,
     point : point,
     kwds : string,
     line1 : line,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-secondary-btree-index-2.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-secondary-btree-index-2.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-secondary-btree-index-2.ast
index ccc8afc..4c8f681 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-secondary-btree-index-2.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-secondary-btree-index-2.ast
@@ -2,7 +2,7 @@ DataverseUse test
 WriteOutputTo asterix_nc1:rttest/btree-index_btree-secondary-57.adm
 TypeDecl TestType [
   open RecordType {
-    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/optimizerts/results_parser_sqlpp/skip-index/skip-secondary-btree-index-search-in-delete.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-secondary-btree-index-search-in-delete.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-secondary-btree-index-search-in-delete.ast
index ecf76bf..508003d 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-secondary-btree-index-search-in-delete.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-secondary-btree-index-search-in-delete.ast
@@ -1,22 +1,22 @@
 DataverseUse test
 TypeDecl AddressType [
   closed RecordType {
-    number : int32,
+    number : integer,
     street : string,
     city : string
   }
 ]
 TypeDecl CustomerType [
   closed RecordType {
-    cid : int32,
+    cid : integer,
     name : string,
-    age : int32,
+    age : integer,
     address : AddressType?,
     interests : UnorderedList <string>
 ,
     children : OrderedList [          open RecordType {
             name : string,
-            age : int32?
+            age : integer?
           }
 ]
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-secondary-btree-index.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-secondary-btree-index.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-secondary-btree-index.ast
index ccc8afc..4c8f681 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-secondary-btree-index.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-secondary-btree-index.ast
@@ -2,7 +2,7 @@ DataverseUse test
 WriteOutputTo asterix_nc1:rttest/btree-index_btree-secondary-57.adm
 TypeDecl TestType [
   open RecordType {
-    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/optimizerts/results_parser_sqlpp/skip-index/skip-word-index-search-in-delete.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-word-index-search-in-delete.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-word-index-search-in-delete.ast
index ac9fc6b..dd3e724 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-word-index-search-in-delete.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-word-index-search-in-delete.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-word-index.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-word-index.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-word-index.ast
index 1acf737..c76c66b 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-word-index.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-word-index.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/sort-cust.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/sort-cust.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/sort-cust.ast
index 0925bfd..8e0b8cc 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/sort-cust.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/sort-cust.ast
@@ -1,19 +1,19 @@
 DataverseUse custlimit
 TypeDecl AddressType [
   closed RecordType {
-    number : int32,
+    number : integer,
     street : string,
     city : string
   }
 ]
 TypeDecl CustomerType [
   closed RecordType {
-    cid : int32,
+    cid : integer,
     name : string,
-    age : int32?,
+    age : integer?,
     address : AddressType?,
     lastorder :       open RecordType {
-        oid : int32,
+        oid : integer,
         total : float
       }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization-above-join.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization-above-join.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization-above-join.ast
index b12ce2a..5c76658 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization-above-join.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization-above-join.ast
@@ -1,7 +1,7 @@
 DataverseUse fuzzyjoin
 TypeDecl DBLPType [
   open RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization.ast
index 8ab0020..6927f09 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization.ast
@@ -8,11 +8,11 @@ TypeDecl EmploymentType [
 ]
 TypeDecl FacebookUserType [
   closed RecordType {
-    id : int32,
+    id : integer,
     alias : string,
     name : string,
     user-since : datetime,
-    friend-ids : UnorderedList <int32>
+    friend-ids : UnorderedList <integer>
 ,
     employment : OrderedList [EmploymentType]
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/unnest_list_in_subplan.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/unnest_list_in_subplan.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/unnest_list_in_subplan.ast
index 9cdb149..8379b56 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/unnest_list_in_subplan.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/unnest_list_in_subplan.ast
@@ -1,7 +1,7 @@
 DataverseUse fuzzyjoin
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,
@@ -10,8 +10,8 @@ TypeDecl DBLPType [
 ]
 TypeDecl TOKENSRANKEDADMType [
   closed RecordType {
-    token : int32,
-    rank : int32
+    token : integer,
+    rank : integer
   }
 ]
 DatasetDecl DBLP(DBLPType) partitioned by [[id]]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/del-dataset.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/del-dataset.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/del-dataset.sqlpp
index 5b5416e..79f24b8 100644
--- 
a/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/del-dataset.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/del-dataset.sqlpp
@@ -24,19 +24,19 @@ use demo0927;
 
 create type demo0927.AddressType as
  closed {
-  number : int32,
+  number : integer,
   street : string,
   city : string
 }
 
 create type demo0927.CustomerType as
  closed {
-  cid : int32,
+  cid : integer,
   name : string,
-  age : int32?,
+  age : integer?,
   address : AddressType?,
   lastorder : {
-      oid : int32,
+      oid : integer,
       total : float
   }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/load-del-dataset.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/load-del-dataset.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/load-del-dataset.sqlpp
index 873a166..4fe2265 100644
--- 
a/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/load-del-dataset.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/load-del-dataset.sqlpp
@@ -24,19 +24,19 @@ use demo0927;
 
 create type demo0927.AddressType as
  closed {
-  number : int32,
+  number : integer,
   street : string,
   city : string
 }
 
 create type demo0927.CustomerType as
  closed {
-  cid : int32,
+  cid : integer,
   name : string,
-  age : int32?,
+  age : integer?,
   address : AddressType?,
   lastorder : {
-      oid : int32,
+      oid : integer,
       total : float
   }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/del-dataset.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/del-dataset.ast
 
b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/del-dataset.ast
index 37c89be..65f6458 100644
--- 
a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/del-dataset.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/del-dataset.ast
@@ -1,19 +1,19 @@
 DataverseUse demo0927
 TypeDecl AddressType [
   closed RecordType {
-    number : int32,
+    number : integer,
     street : string,
     city : string
   }
 ]
 TypeDecl CustomerType [
   closed RecordType {
-    cid : int32,
+    cid : integer,
     name : string,
-    age : int32?,
+    age : integer?,
     address : AddressType?,
     lastorder :       open RecordType {
-        oid : int32,
+        oid : integer,
         total : float
       }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/load-del-dataset.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/load-del-dataset.ast
 
b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/load-del-dataset.ast
index 37c89be..65f6458 100644
--- 
a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/load-del-dataset.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/load-del-dataset.ast
@@ -1,19 +1,19 @@
 DataverseUse demo0927
 TypeDecl AddressType [
   closed RecordType {
-    number : int32,
+    number : integer,
     street : string,
     city : string
   }
 ]
 TypeDecl CustomerType [
   closed RecordType {
-    cid : int32,
+    cid : integer,
     name : string,
-    age : int32?,
+    age : integer?,
     address : AddressType?,
     lastorder :       open RecordType {
-        oid : int32,
+        oid : integer,
         total : float
       }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/utf-8.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/utf-8.ast
 
b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/utf-8.ast
index 50d1e0b..8a1b335 100644
--- 
a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/utf-8.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/utf-8.ast
@@ -1,8 +1,8 @@
 Query:
-FunctionCall null.string_to_codepoint@1[
+FunctionCall null.string-to-codepoint@1[
   LiteralExpr [STRING] [äöß]
 ]
 Query:
-FunctionCall null.string_to_codepoint@1[
+FunctionCall null.string-to-codepoint@1[
   LiteralExpr [STRING] [迎]
 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null/agg_null.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null/agg_null.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null/agg_null.3.query.sqlpp
index 1a53508..eef6201 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null/agg_null.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null/agg_null.3.query.sqlpp
@@ -22,4 +22,4 @@
 * Date         : Feb 7th 2014
 */
 
-{'sql-count1':`coll_sql-count`([null]),'average1':`coll_sql-avg`([null]),'sql-sum1':`coll_sql-sum`([null]),'sql-min1':`coll_sql-min`([null]),'sql-max1':`coll_sql-max`([null]),'sql-count2':`coll_sql-count`({{null,null}}),'average2':`coll_sql-avg`({{null,null}}),'sql-sum2':`coll_sql-sum`({{null,null}}),'sql-min2':`coll_sql-min`({{null,null}}),'sql-max2':`coll_sql-max`({{null,null}})};
+{'sql-count1':`array_sql-count`([null]),'average1':`array_sql-avg`([null]),'sql-sum1':`array_sql-sum`([null]),'sql-min1':`array_sql-min`([null]),'sql-max1':`array_sql-max`([null]),'sql-count2':`array_sql-count`({{null,null}}),'average2':`array_sql-avg`({{null,null}}),'sql-sum2':`array_sql-sum`({{null,null}}),'sql-min2':`array_sql-min`({{null,null}}),'sql-max2':`array_sql-max`({{null,null}})};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec/agg_null_rec.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec/agg_null_rec.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec/agg_null_rec.1.ddl.sqlpp
index 496bbf9..d1f6370 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec/agg_null_rec.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec/agg_null_rec.1.ddl.sqlpp
@@ -30,7 +30,7 @@ use test;
 
 create type test.TestType as
 {
-  id : int64,
+  id : bigint,
   val : double
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec/agg_null_rec.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec/agg_null_rec.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec/agg_null_rec.3.query.sqlpp
index a56229e..7d20368 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec/agg_null_rec.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec/agg_null_rec.3.query.sqlpp
@@ -25,19 +25,19 @@
 use test;
 
 
-{'sql-count':test.`coll_sql-count`((
+{'sql-count':test.`array_sql-count`((
     select element t.valplus
     from  Test as t
-)),'average':test.`coll_sql-avg`((
+)),'average':test.`array_sql-avg`((
     select element t.valplus
     from  Test as t
-)),'sql-sum':test.`coll_sql-sum`((
+)),'sql-sum':test.`array_sql-sum`((
     select element t.valplus
     from  Test as t
-)),'sql-min':test.`coll_sql-min`((
+)),'sql-min':test.`array_sql-min`((
     select element t.valplus
     from  Test as t
-)),'sql-max':test.`coll_sql-max`((
+)),'sql-max':test.`array_sql-max`((
     select element t.valplus
     from  Test as t
 ))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec_1/agg_null_rec_1.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec_1/agg_null_rec_1.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec_1/agg_null_rec_1.1.ddl.sqlpp
index 496bbf9..d1f6370 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec_1/agg_null_rec_1.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec_1/agg_null_rec_1.1.ddl.sqlpp
@@ -30,7 +30,7 @@ use test;
 
 create type test.TestType as
 {
-  id : int64,
+  id : bigint,
   val : double
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec_1/agg_null_rec_1.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec_1/agg_null_rec_1.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec_1/agg_null_rec_1.3.query.sqlpp
index 1f901d8..b0c4f39 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec_1/agg_null_rec_1.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec_1/agg_null_rec_1.3.query.sqlpp
@@ -25,28 +25,28 @@
 use test;
 
 
-{'sql-count':test.`coll_sql-count`((
+{'sql-count':test.`array_sql-count`((
     select element t
     from  Test as t
-)),'average':test.`coll_sql-avg`((
+)),'average':test.`array_sql-avg`((
     select element i.val
     from  (
         select element t
         from  Test as t
     ) as i
-)),'sql-sum':test.`coll_sql-sum`((
+)),'sql-sum':test.`array_sql-sum`((
     select element i.val
     from  (
         select element t
         from  Test as t
     ) as i
-)),'sql-min':test.`coll_sql-min`((
+)),'sql-min':test.`array_sql-min`((
     select element i.valplus
     from  (
         select element t
         from  Test as t
     ) as i
-)),'sql-max':test.`coll_sql-max`((
+)),'sql-max':test.`array_sql-max`((
     select element i.valplus
     from  (
         select element t

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_number/agg_number.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_number/agg_number.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_number/agg_number.3.query.sqlpp
index 59d5dac..407f237 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_number/agg_number.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_number/agg_number.3.query.sqlpp
@@ -22,4 +22,4 @@
 * Date         : Feb 7th 2014
 */
 
-{'sql-count1':`coll_sql-count`([float('2.0'),double('3.0'),93847382783847382,1]),'average1':`coll_sql-avg`([float('2.0'),double('3.0'),93847382783847382,1]),'sql-sum1':`coll_sql-sum`([float('2.0'),double('3.0'),93847382783847382,1]),'sql-min1':`coll_sql-min`([float('2.0'),double('3.0'),93847382783847382,1]),'sql-max1':`coll_sql-max`([float('2.0'),double('3.0'),93847382783847382,1]),'sql-count2':`coll_sql-count`({{float('2.0'),double('3.0'),93847382783847382,1}}),'average2':`coll_sql-avg`({{float('2.0'),double('3.0'),93847382783847382,1}}),'sql-sum2':`coll_sql-sum`({{float('2.0'),double('3.0'),93847382783847382,1}}),'sql-min2':`coll_sql-min`({{float('2.0'),double('3.0'),93847382783847382,1}}),'sql-max2':`coll_sql-max`({{float('2.0'),double('3.0'),93847382783847382,1}})};
+{'sql-count1':`array_sql-count`([float('2.0'),double('3.0'),93847382783847382,1]),'average1':`array_sql-avg`([float('2.0'),double('3.0'),93847382783847382,1]),'sql-sum1':`array_sql-sum`([float('2.0'),double('3.0'),93847382783847382,1]),'sql-min1':`array_sql-min`([float('2.0'),double('3.0'),93847382783847382,1]),'sql-max1':`array_sql-max`([float('2.0'),double('3.0'),93847382783847382,1]),'sql-count2':`array_sql-count`({{float('2.0'),double('3.0'),93847382783847382,1}}),'average2':`array_sql-avg`({{float('2.0'),double('3.0'),93847382783847382,1}}),'sql-sum2':`array_sql-sum`({{float('2.0'),double('3.0'),93847382783847382,1}}),'sql-min2':`array_sql-min`({{float('2.0'),double('3.0'),93847382783847382,1}}),'sql-max2':`array_sql-max`({{float('2.0'),double('3.0'),93847382783847382,1}})};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_number_rec/agg_number_rec.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_number_rec/agg_number_rec.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_number_rec/agg_number_rec.1.ddl.sqlpp
index 75d83d0..141cac1 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_number_rec/agg_number_rec.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_number_rec/agg_number_rec.1.ddl.sqlpp
@@ -30,7 +30,7 @@ use test;
 
 create type test.TestType as
 {
-  id : int64,
+  id : bigint,
   val : double
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_number_rec/agg_number_rec.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_number_rec/agg_number_rec.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_number_rec/agg_number_rec.3.query.sqlpp
index 8276ee2..85fe388 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_number_rec/agg_number_rec.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_number_rec/agg_number_rec.3.query.sqlpp
@@ -25,19 +25,19 @@
 use test;
 
 
-{'sql-count':test.`coll_sql-count`((
+{'sql-count':test.`array_sql-count`((
     select element t.valplus
     from  Test as t
-)),'average':test.`coll_sql-avg`((
+)),'average':test.`array_sql-avg`((
     select element t.valplus
     from  Test as t
-)),'sql-sum':test.`coll_sql-sum`((
+)),'sql-sum':test.`array_sql-sum`((
     select element t.valplus
     from  Test as t
-)),'sql-min':test.`coll_sql-min`((
+)),'sql-min':test.`array_sql-min`((
     select element t.valplus
     from  Test as t
-)),'sql-max':test.`coll_sql-max`((
+)),'sql-max':test.`array_sql-max`((
     select element t.valplus
     from  Test as t
 ))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_double/avg_double.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_double/avg_double.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_double/avg_double.3.query.sqlpp
index 3d5e0f1..20f441e 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_double/avg_double.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_double/avg_double.3.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-select element `coll_sql-avg`((
+select element `array_sql-avg`((
     select element x
     from  [1.0,2.0,double('3.0')] as x
 ));

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_double_null/avg_double_null.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_double_null/avg_double_null.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_double_null/avg_double_null.1.ddl.sqlpp
index 99c3f77..70ff912 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_double_null/avg_double_null.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_double_null/avg_double_null.1.ddl.sqlpp
@@ -25,11 +25,11 @@ use test;
 
 create type test.NumericType as
 {
-  id : int32,
-  int8Field : int8?,
-  int16Field : int16?,
-  int32Field : int32?,
-  int64Field : int64?,
+  id : integer,
+  int8Field : tinyint?,
+  int16Field : smallint?,
+  int32Field : integer?,
+  int64Field : bigint?,
   floatField : float?,
   doubleField : double?
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_double_null/avg_double_null.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_double_null/avg_double_null.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_double_null/avg_double_null.3.query.sqlpp
index 50eab2a..6b96901 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_double_null/avg_double_null.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_double_null/avg_double_null.3.query.sqlpp
@@ -20,7 +20,7 @@
 use test;
 
 
-{'average':test.`coll_sql-avg`((
+{'average':test.`array_sql-avg`((
     select element x.doubleField
     from  Numeric as x
 ))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.1.ddl.sqlpp
index a226f6b..d61f2fc 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.1.ddl.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that coll_sql-avg aggregation correctly returns null 
for an empty stream,
+ * Description    : Tests that array_sql-avg aggregation correctly returns 
null for an empty stream,
  *                  without an aggregate combiner.
  * Success        : Yes
  */

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.2.update.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.2.update.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.2.update.sqlpp
index d5b1944..cfc4f9e 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.2.update.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.2.update.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that coll_sql-avg aggregation correctly returns null 
for an empty stream,
+ * Description    : Tests that array_sql-avg aggregation correctly returns 
null for an empty stream,
  *                  without an aggregate combiner.
  * Success        : Yes
  */

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.3.query.sqlpp
index 05871a3..afde53e 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.3.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that coll_sql-avg aggregation correctly returns null 
for an empty stream,
+ * Description    : Tests that array_sql-avg aggregation correctly returns 
null for an empty stream,
  *                  without an aggregate combiner.
  * Success        : Yes
  */
@@ -25,7 +25,7 @@
 use test;
 
 
-select element test.`coll_sql-avg`((
+select element test.`array_sql-avg`((
     select element x
     from  [1,2,3] as x
     where (x > 10)

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.1.ddl.sqlpp
index 15c64ec..6659c71 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.1.ddl.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that coll_sql-avg aggregation correctly returns null 
for an empty stream,
+ * Description    : Tests that array_sql-avg aggregation correctly returns 
null for an empty stream,
  *                  with an aggregate combiner.
  * Success        : Yes
  */
@@ -30,7 +30,7 @@ use test;
 
 create type test.TestType as
  closed {
-  id : int64,
+  id : bigint,
   val : double
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.2.update.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.2.update.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.2.update.sqlpp
index ca013ae..90dff6a 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.2.update.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.2.update.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that coll_sql-avg aggregation correctly returns null 
for an empty stream,
+ * Description    : Tests that array_sql-avg aggregation correctly returns 
null for an empty stream,
  *                  with an aggregate combiner.
  * Success        : Yes
  */

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.3.query.sqlpp
index f9b71b0..9f72341 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.3.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that coll_sql-avg aggregation correctly returns null 
for an empty stream,
+ * Description    : Tests that array_sql-avg aggregation correctly returns 
null for an empty stream,
  *                  with an aggregate combiner.
  * Success        : Yes
  */
@@ -25,7 +25,7 @@
 use test;
 
 
-select element test.`coll_sql-avg`((
+select element test.`array_sql-avg`((
     select element x.val
     from  Test as x
 ));

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_float/avg_float.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_float/avg_float.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_float/avg_float.3.query.sqlpp
index bcac49f..cd83470 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_float/avg_float.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_float/avg_float.3.query.sqlpp
@@ -20,7 +20,7 @@
 use test;
 
 
-select element test.`coll_sql-avg`((
+select element test.`array_sql-avg`((
     select element x
     from  [test.float('1'),test.float('2'),test.float('3')] as x
 ));

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_float_null/avg_float_nu.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_float_null/avg_float_nu.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_float_null/avg_float_nu.1.ddl.sqlpp
index 6ed581d..8d128d6 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_float_null/avg_float_nu.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_float_null/avg_float_nu.1.ddl.sqlpp
@@ -25,11 +25,11 @@ use test;
 
 create type test.NumericType as
 {
-  id : int64,
-  int8Field : int8?,
-  int16Field : int16?,
-  int32Field : int32?,
-  int64Field : int64?,
+  id : bigint,
+  int8Field : tinyint?,
+  int16Field : smallint?,
+  int32Field : integer?,
+  int64Field : bigint?,
   floatField : float?,
   doubleField : double?
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_float_null/avg_float_nu.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_float_null/avg_float_nu.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_float_null/avg_float_nu.3.query.sqlpp
index ef91677..b0c982e 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_float_null/avg_float_nu.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_float_null/avg_float_nu.3.query.sqlpp
@@ -20,7 +20,7 @@
 use test;
 
 
-{'average':test.`coll_sql-avg`((
+{'average':test.`array_sql-avg`((
     select element x.floatField
     from  Numeric as x
 ))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int16/avg_int16.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int16/avg_int16.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int16/avg_int16.3.query.sqlpp
index b839385..5e29f15 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int16/avg_int16.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int16/avg_int16.3.query.sqlpp
@@ -20,7 +20,7 @@
 use test;
 
 
-select element test.`coll_sql-avg`((
+select element test.`array_sql-avg`((
     select element x
-    from  [test.int16('1'),test.int16('2'),test.int16('3')] as x
+    from  [test.smallint('1'),test.smallint('2'),test.smallint('3')] as x
 ));

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int16_null/avg_int16_null.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int16_null/avg_int16_null.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int16_null/avg_int16_null.1.ddl.sqlpp
index 6ed581d..8d128d6 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int16_null/avg_int16_null.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int16_null/avg_int16_null.1.ddl.sqlpp
@@ -25,11 +25,11 @@ use test;
 
 create type test.NumericType as
 {
-  id : int64,
-  int8Field : int8?,
-  int16Field : int16?,
-  int32Field : int32?,
-  int64Field : int64?,
+  id : bigint,
+  int8Field : tinyint?,
+  int16Field : smallint?,
+  int32Field : integer?,
+  int64Field : bigint?,
   floatField : float?,
   doubleField : double?
 }

Reply via email to