http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.sqlpp
index 30e6b22..afd9634 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.sqlpp
@@ -25,7 +25,7 @@ use test;
 
 create type test.DBLPType as
  closed {
-  id : int64,
+  id : bigint,
   dblpid : string,
   title : string,
   authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.sqlpp
index 30e6b22..afd9634 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.sqlpp
@@ -25,7 +25,7 @@ use test;
 
 create type test.DBLPType as
  closed {
-  id : int64,
+  id : bigint,
   dblpid : string,
   title : string,
   authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.1.ddl.sqlpp
index b73d2df..27c84a5 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.1.ddl.sqlpp
@@ -25,14 +25,14 @@ use tpch;
 
 create type tpch.OrderType as
 {
-  o_orderkey : int64,
-  o_custkey : int64,
+  o_orderkey : bigint,
+  o_custkey : bigint,
   o_orderstatus : string,
   o_totalprice : double,
   o_orderdate : string,
   o_orderpriority : string,
   o_clerk : string,
-  o_shippriority : int64,
+  o_shippriority : bigint,
   o_comment : string
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.1.ddl.sqlpp
index e7a62cd..aa3ff43 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.1.ddl.sqlpp
@@ -25,14 +25,14 @@ use tpch;
 
 create type tpch.OrderType as
  closed {
-  o_orderkey : int64,
-  o_custkey : int64,
+  o_orderkey : bigint,
+  o_custkey : bigint,
   o_orderstatus : string,
   o_totalprice : double,
   o_orderdate : string,
   o_orderpriority : string,
   o_clerk : string,
-  o_shippriority : int64,
+  o_shippriority : bigint,
   o_comment : string
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey-open/orders-index-custkey-open.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey-open/orders-index-custkey-open.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey-open/orders-index-custkey-open.1.ddl.sqlpp
index 9e0cd10..147e000 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey-open/orders-index-custkey-open.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey-open/orders-index-custkey-open.1.ddl.sqlpp
@@ -25,14 +25,14 @@ use tpch;
 
 create type tpch.OrderType as
 {
-  o_orderkey : int64,
-  o_custkey : int64,
+  o_orderkey : bigint,
+  o_custkey : bigint,
   o_orderstatus : string,
   o_totalprice : double,
   o_orderdate : string,
   o_orderpriority : string,
   o_clerk : string,
-  o_shippriority : int64,
+  o_shippriority : bigint,
   o_comment : string
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey/orders-index-custkey.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey/orders-index-custkey.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey/orders-index-custkey.1.ddl.sqlpp
index e7a62cd..aa3ff43 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey/orders-index-custkey.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey/orders-index-custkey.1.ddl.sqlpp
@@ -25,14 +25,14 @@ use tpch;
 
 create type tpch.OrderType as
  closed {
-  o_orderkey : int64,
-  o_custkey : int64,
+  o_orderkey : bigint,
+  o_custkey : bigint,
   o_orderstatus : string,
   o_totalprice : double,
   o_orderdate : string,
   o_orderpriority : string,
   o_clerk : string,
-  o_shippriority : int64,
+  o_shippriority : bigint,
   o_comment : string
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/range-search-open/range-search-open.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/range-search-open/range-search-open.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/range-search-open/range-search-open.1.ddl.sqlpp
index ce63b62..6b99589 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/range-search-open/range-search-open.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/range-search-open/range-search-open.1.ddl.sqlpp
@@ -25,10 +25,10 @@ use test;
 
 create type test.LineItemType as
 {
-  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/index-selection/range-search/range-search.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/range-search/range-search.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/range-search/range-search.1.ddl.sqlpp
index d2c232b..616d56c 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/range-search/range-search.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/range-search/range-search.1.ddl.sqlpp
@@ -25,10 +25,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/index-selection/rtree-secondary-index-circular-query/rtree-secondary-index-circular-query.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/rtree-secondary-index-circular-query/rtree-secondary-index-circular-query.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/rtree-secondary-index-circular-query/rtree-secondary-index-circular-query.1.ddl.sqlpp
index 8acd45e..afcf123 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/rtree-secondary-index-circular-query/rtree-secondary-index-circular-query.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/rtree-secondary-index-circular-query/rtree-secondary-index-circular-query.1.ddl.sqlpp
@@ -25,7 +25,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/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.1.ddl.sqlpp
index 49fda09..5ecf5ef 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.1.ddl.sqlpp
@@ -25,7 +25,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/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.1.ddl.sqlpp
index a7f3838..a02545c 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.1.ddl.sqlpp
@@ -25,7 +25,7 @@ use test;
 
 create type test.MyRecord as
 {
-  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/index-selection/rtree-secondary-index/rtree-secondary-index.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/rtree-secondary-index/rtree-secondary-index.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/rtree-secondary-index/rtree-secondary-index.1.ddl.sqlpp
index 8acd45e..afcf123 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/rtree-secondary-index/rtree-secondary-index.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/rtree-secondary-index/rtree-secondary-index.1.ddl.sqlpp
@@ -25,7 +25,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/inverted-index-join-noeqjoin/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.sqlpp
index 2241b83..2b34f4b 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.sqlpp
@@ -32,21 +32,21 @@ use test;
 
 create type test.AddressType as
 {
-  number : int64,
+  number : bigint,
   street : string,
   city : string
 }
 
 create type test.CustomerType as
 {
-  cid : int64,
+  cid : bigint,
   name : string,
-  age : int64?,
+  age : bigint?,
   address : AddressType?,
   interests : [string],
   children : [{
           name : string,
-          age : int64?
+          age : bigint?
       }
 ]
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance/ngram-edit-distance.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance/ngram-edit-distance.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance/ngram-edit-distance.1.ddl.sqlpp
index ee4e407..129f35f 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance/ngram-edit-distance.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance/ngram-edit-distance.1.ddl.sqlpp
@@ -31,21 +31,21 @@ use test;
 
 create type test.AddressType as
 {
-  number : int64,
+  number : bigint,
   street : string,
   city : string
 }
 
 create type test.CustomerType as
 {
-  cid : int64,
+  cid : bigint,
   name : string,
-  age : int64?,
+  age : bigint?,
   address : AddressType?,
   interests : [string],
   children : [{
           name : string,
-          age : int64?
+          age : bigint?
       }
 ]
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.sqlpp
index 58471c8..48f950c 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.sqlpp
@@ -32,7 +32,7 @@ use test;
 
 create type test.DBLPType as
  closed {
-  id : int64,
+  id : bigint,
   dblpid : string,
   title : string,
   authors : string,
@@ -41,7 +41,7 @@ create type test.DBLPType as
 
 create type test.CSXType as
  closed {
-  id : int64,
+  id : bigint,
   csxid : string,
   title : string,
   authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard/ngram-jaccard.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard/ngram-jaccard.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard/ngram-jaccard.1.ddl.sqlpp
index 1e472bf..91ce1d3 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard/ngram-jaccard.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard/ngram-jaccard.1.ddl.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.DBLPType as
  closed {
-  id : int64,
+  id : bigint,
   dblpid : string,
   title : string,
   authors : string,
@@ -40,7 +40,7 @@ create type test.DBLPType as
 
 create type test.CSXType as
  closed {
-  id : int64,
+  id : bigint,
   csxid : string,
   title : string,
   authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance-inline/olist-edit-distance-inline.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance-inline/olist-edit-distance-inline.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance-inline/olist-edit-distance-inline.1.ddl.sqlpp
index d188743..6e42781 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance-inline/olist-edit-distance-inline.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance-inline/olist-edit-distance-inline.1.ddl.sqlpp
@@ -32,21 +32,21 @@ use test;
 
 create type test.AddressType as
 {
-  number : int32,
+  number : integer,
   street : string,
   city : string
 }
 
 create type test.CustomerType as
 {
-  cid : int32,
+  cid : integer,
   name : string,
-  age : int32?,
+  age : integer?,
   address : AddressType?,
   interests : [string],
   children : [{
           name : string,
-          age : int32?
+          age : integer?
       }
 ]
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance/olist-edit-distance.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance/olist-edit-distance.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance/olist-edit-distance.1.ddl.sqlpp
index a7109ed..168bb53 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance/olist-edit-distance.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance/olist-edit-distance.1.ddl.sqlpp
@@ -31,21 +31,21 @@ use test;
 
 create type test.AddressType as
 {
-  number : int32,
+  number : integer,
   street : string,
   city : string
 }
 
 create type test.CustomerType as
 {
-  cid : int32,
+  cid : integer,
   name : string,
-  age : int32?,
+  age : integer?,
   address : AddressType?,
   interests : [string],
   children : [{
           name : string,
-          age : int32?
+          age : integer?
       }
 ]
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-jaccard-inline/olist-jaccard-inline.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-jaccard-inline/olist-jaccard-inline.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-jaccard-inline/olist-jaccard-inline.1.ddl.sqlpp
index c50750c..15746e8 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-jaccard-inline/olist-jaccard-inline.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-jaccard-inline/olist-jaccard-inline.1.ddl.sqlpp
@@ -32,21 +32,21 @@ use test;
 
 create type test.AddressType as
  closed {
-  number : int32,
+  number : integer,
   street : string,
   city : string
 }
 
 create type test.CustomerType as
  closed {
-  cid : int32,
+  cid : integer,
   name : string,
-  age : int32?,
+  age : integer?,
   address : AddressType?,
   interests : [string],
   children : [{
           name : string,
-          age : int32?
+          age : integer?
       }
 ]
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-jaccard/olist-jaccard.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-jaccard/olist-jaccard.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-jaccard/olist-jaccard.1.ddl.sqlpp
index fb165dd..3da5e06 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-jaccard/olist-jaccard.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-jaccard/olist-jaccard.1.ddl.sqlpp
@@ -31,21 +31,21 @@ use test;
 
 create type test.AddressType as
  closed {
-  number : int32,
+  number : integer,
   street : string,
   city : string
 }
 
 create type test.CustomerType as
  closed {
-  cid : int32,
+  cid : integer,
   name : string,
-  age : int32?,
+  age : integer?,
   address : AddressType?,
   interests : [string],
   children : [{
           name : string,
-          age : int32?
+          age : integer?
       }
 ]
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard-inline/ulist-jaccard-inline.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard-inline/ulist-jaccard-inline.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard-inline/ulist-jaccard-inline.1.ddl.sqlpp
index a204569..e6d0ab2 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard-inline/ulist-jaccard-inline.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard-inline/ulist-jaccard-inline.1.ddl.sqlpp
@@ -32,21 +32,21 @@ use test;
 
 create type test.AddressType as
  closed {
-  number : int32,
+  number : integer,
   street : string,
   city : string
 }
 
 create type test.CustomerType as
  closed {
-  cid : int32,
+  cid : integer,
   name : string,
-  age : int32?,
+  age : integer?,
   address : AddressType?,
   interests : {{string}},
   children : [{
           name : string,
-          age : int32?
+          age : integer?
       }
 ]
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard/ulist-jaccard.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard/ulist-jaccard.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard/ulist-jaccard.1.ddl.sqlpp
index 575588b..e49d136 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard/ulist-jaccard.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard/ulist-jaccard.1.ddl.sqlpp
@@ -31,21 +31,21 @@ use test;
 
 create type test.AddressType as
  closed {
-  number : int32,
+  number : integer,
   street : string,
   city : string
 }
 
 create type test.CustomerType as
  closed {
-  cid : int32,
+  cid : integer,
   name : string,
-  age : int32?,
+  age : integer?,
   address : AddressType?,
   interests : {{string}},
   children : [{
           name : string,
-          age : int32?
+          age : integer?
       }
 ]
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/word-jaccard-inline/word-jaccard-inline.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/word-jaccard-inline/word-jaccard-inline.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/word-jaccard-inline/word-jaccard-inline.1.ddl.sqlpp
index cc9809e..8599c64 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/word-jaccard-inline/word-jaccard-inline.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/word-jaccard-inline/word-jaccard-inline.1.ddl.sqlpp
@@ -32,7 +32,7 @@ use test;
 
 create type test.DBLPType as
  closed {
-  id : int32,
+  id : integer,
   dblpid : string,
   title : string,
   authors : string,
@@ -41,7 +41,7 @@ create type test.DBLPType as
 
 create type test.CSXType as
  closed {
-  id : int32,
+  id : integer,
   csxid : string,
   title : string,
   authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/word-jaccard/word-jaccard.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/word-jaccard/word-jaccard.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/word-jaccard/word-jaccard.1.ddl.sqlpp
index 67e61d2..c81d84a 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/word-jaccard/word-jaccard.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/word-jaccard/word-jaccard.1.ddl.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.DBLPType as
  closed {
-  id : int64,
+  id : bigint,
   dblpid : string,
   title : string,
   authors : string,
@@ -40,7 +40,7 @@ create type test.DBLPType as
 
 create type test.CSXType as
  closed {
-  id : int64,
+  id : bigint,
   csxid : string,
   title : string,
   authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.sqlpp
index bf2685d..9c05c66 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.sqlpp
@@ -31,21 +31,21 @@ use test;
 
 create type test.AddressType as
 {
-  number : int64,
+  number : bigint,
   street : string,
   city : string
 }
 
 create type test.CustomerType as
 {
-  cid : int64,
+  cid : bigint,
   name : string,
-  age : int64?,
+  age : bigint?,
   address : AddressType?,
   interests : [string],
   children : [{
           name : string,
-          age : int64?
+          age : bigint?
       }
 ]
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ngram-edit-distance/ngram-edit-distance.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ngram-edit-distance/ngram-edit-distance.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ngram-edit-distance/ngram-edit-distance.1.ddl.sqlpp
index 875fb79..cc86bb1 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ngram-edit-distance/ngram-edit-distance.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ngram-edit-distance/ngram-edit-distance.1.ddl.sqlpp
@@ -30,21 +30,21 @@ use test;
 
 create type test.AddressType as
 {
-  number : int64,
+  number : bigint,
   street : string,
   city : string
 }
 
 create type test.CustomerType as
 {
-  cid : int64,
+  cid : bigint,
   name : string,
-  age : int64?,
+  age : bigint?,
   address : AddressType?,
   interests : [string],
   children : [{
           name : string,
-          age : int64?
+          age : bigint?
       }
 ]
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.sqlpp
index 7145e0d..f43e4c2 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.DBLPType as
  closed {
-  id : int64,
+  id : bigint,
   dblpid : string,
   title : string,
   authors : string,
@@ -40,7 +40,7 @@ create type test.DBLPType as
 
 create type test.CSXType as
  closed {
-  id : int64,
+  id : bigint,
   csxid : string,
   title : string,
   authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ngram-jaccard/ngram-jaccard.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ngram-jaccard/ngram-jaccard.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ngram-jaccard/ngram-jaccard.1.ddl.sqlpp
index b418d74..de7a9ee 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ngram-jaccard/ngram-jaccard.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ngram-jaccard/ngram-jaccard.1.ddl.sqlpp
@@ -30,7 +30,7 @@ use test;
 
 create type test.DBLPType as
  closed {
-  id : int64,
+  id : bigint,
   dblpid : string,
   title : string,
   authors : string,
@@ -39,7 +39,7 @@ create type test.DBLPType as
 
 create type test.CSXType as
  closed {
-  id : int64,
+  id : bigint,
   csxid : string,
   title : string,
   authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/olist-edit-distance-inline/olist-edit-distance-inline.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/olist-edit-distance-inline/olist-edit-distance-inline.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/olist-edit-distance-inline/olist-edit-distance-inline.1.ddl.sqlpp
index 2ffe27b..426f1a2 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/olist-edit-distance-inline/olist-edit-distance-inline.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/olist-edit-distance-inline/olist-edit-distance-inline.1.ddl.sqlpp
@@ -31,21 +31,21 @@ use test;
 
 create type test.AddressType as
 {
-  number : int64,
+  number : bigint,
   street : string,
   city : string
 }
 
 create type test.CustomerType as
 {
-  cid : int64,
+  cid : bigint,
   name : string,
-  age : int64?,
+  age : bigint?,
   address : AddressType?,
   interests : [string],
   children : [{
           name : string,
-          age : int64?
+          age : bigint?
       }
 ]
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/olist-edit-distance/olist-edit-distance.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/olist-edit-distance/olist-edit-distance.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/olist-edit-distance/olist-edit-distance.1.ddl.sqlpp
index 31c9766..3e486b2 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/olist-edit-distance/olist-edit-distance.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/olist-edit-distance/olist-edit-distance.1.ddl.sqlpp
@@ -30,21 +30,21 @@ use test;
 
 create type test.AddressType as
 {
-  number : int64,
+  number : bigint,
   street : string,
   city : string
 }
 
 create type test.CustomerType as
 {
-  cid : int64,
+  cid : bigint,
   name : string,
-  age : int64?,
+  age : bigint?,
   address : AddressType?,
   interests : [string],
   children : [{
           name : string,
-          age : int64?
+          age : bigint?
       }
 ]
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/olist-jaccard-inline/olist-jaccard-inline.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/olist-jaccard-inline/olist-jaccard-inline.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/olist-jaccard-inline/olist-jaccard-inline.1.ddl.sqlpp
index 133aac7..1e90145 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/olist-jaccard-inline/olist-jaccard-inline.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/olist-jaccard-inline/olist-jaccard-inline.1.ddl.sqlpp
@@ -31,21 +31,21 @@ use test;
 
 create type test.AddressType as
  closed {
-  number : int64,
+  number : bigint,
   street : string,
   city : string
 }
 
 create type test.CustomerType as
  closed {
-  cid : int64,
+  cid : bigint,
   name : string,
-  age : int64?,
+  age : bigint?,
   address : AddressType?,
   interests : [string],
   children : [{
           name : string,
-          age : int64?
+          age : bigint?
       }
 ]
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/olist-jaccard/olist-jaccard.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/olist-jaccard/olist-jaccard.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/olist-jaccard/olist-jaccard.1.ddl.sqlpp
index 6f2aac0..c3eb159 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/olist-jaccard/olist-jaccard.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/olist-jaccard/olist-jaccard.1.ddl.sqlpp
@@ -30,21 +30,21 @@ use test;
 
 create type test.AddressType as
  closed {
-  number : int64,
+  number : bigint,
   street : string,
   city : string
 }
 
 create type test.CustomerType as
  closed {
-  cid : int64,
+  cid : bigint,
   name : string,
-  age : int64?,
+  age : bigint?,
   address : AddressType?,
   interests : [string],
   children : [{
           name : string,
-          age : int64?
+          age : bigint?
       }
 ]
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ulist-jaccard-inline/ulist-jaccard-inline.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ulist-jaccard-inline/ulist-jaccard-inline.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ulist-jaccard-inline/ulist-jaccard-inline.1.ddl.sqlpp
index ff5c472..4939a11 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ulist-jaccard-inline/ulist-jaccard-inline.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ulist-jaccard-inline/ulist-jaccard-inline.1.ddl.sqlpp
@@ -31,21 +31,21 @@ use test;
 
 create type test.AddressType as
  closed {
-  number : int64,
+  number : bigint,
   street : string,
   city : string
 }
 
 create type test.CustomerType as
  closed {
-  cid : int64,
+  cid : bigint,
   name : string,
-  age : int64?,
+  age : bigint?,
   address : AddressType?,
   interests : {{string}},
   children : [{
           name : string,
-          age : int64?
+          age : bigint?
       }
 ]
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ulist-jaccard/ulist-jaccard.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ulist-jaccard/ulist-jaccard.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ulist-jaccard/ulist-jaccard.1.ddl.sqlpp
index aa9cbc7..a82a5a5 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ulist-jaccard/ulist-jaccard.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ulist-jaccard/ulist-jaccard.1.ddl.sqlpp
@@ -30,21 +30,21 @@ use test;
 
 create type test.AddressType as
  closed {
-  number : int64,
+  number : bigint,
   street : string,
   city : string
 }
 
 create type test.CustomerType as
  closed {
-  cid : int64,
+  cid : bigint,
   name : string,
-  age : int64?,
+  age : bigint?,
   address : AddressType?,
   interests : {{string}},
   children : [{
           name : string,
-          age : int64?
+          age : bigint?
       }
 ]
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/word-jaccard-inline/word-jaccard-inline.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/word-jaccard-inline/word-jaccard-inline.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/word-jaccard-inline/word-jaccard-inline.1.ddl.sqlpp
index 33350da..3d0722b 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/word-jaccard-inline/word-jaccard-inline.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/word-jaccard-inline/word-jaccard-inline.1.ddl.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.DBLPType as
  closed {
-  id : int64,
+  id : bigint,
   dblpid : string,
   title : string,
   authors : string,
@@ -40,7 +40,7 @@ create type test.DBLPType as
 
 create type test.CSXType as
  closed {
-  id : int64,
+  id : bigint,
   csxid : string,
   title : string,
   authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/word-jaccard/word-jaccard.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/word-jaccard/word-jaccard.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/word-jaccard/word-jaccard.1.ddl.sqlpp
index e8b6b86..038c626 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/word-jaccard/word-jaccard.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/word-jaccard/word-jaccard.1.ddl.sqlpp
@@ -30,7 +30,7 @@ use test;
 
 create type test.DBLPType as
  closed {
-  id : int64,
+  id : bigint,
   dblpid : string,
   title : string,
   authors : string,
@@ -39,7 +39,7 @@ create type test.DBLPType as
 
 create type test.CSXType as
  closed {
-  id : int64,
+  id : bigint,
   csxid : string,
   title : string,
   authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/loj-01-core/loj-01.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/loj-01-core/loj-01.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/loj-01-core/loj-01.1.ddl.sqlpp
index 55cb79a..76aa46b 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/loj-01-core/loj-01.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/loj-01-core/loj-01.1.ddl.sqlpp
@@ -25,7 +25,7 @@ use test;
 
 create type test.DBLPType as
  closed {
-  id : int64,
+  id : bigint,
   dblpid : string,
   title : string,
   authors : string,
@@ -34,7 +34,7 @@ create type test.DBLPType as
 
 create type test.CSXType as
  closed {
-  id : int64,
+  id : bigint,
   csxid : string,
   title : string,
   authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/loj-01-sugar/loj-01.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/loj-01-sugar/loj-01.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/loj-01-sugar/loj-01.1.ddl.sqlpp
index 55cb79a..76aa46b 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/loj-01-sugar/loj-01.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/loj-01-sugar/loj-01.1.ddl.sqlpp
@@ -25,7 +25,7 @@ use test;
 
 create type test.DBLPType as
  closed {
-  id : int64,
+  id : bigint,
   dblpid : string,
   title : string,
   authors : string,
@@ -34,7 +34,7 @@ create type test.DBLPType as
 
 create type test.CSXType as
  closed {
-  id : int64,
+  id : bigint,
   csxid : string,
   title : string,
   authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue285-2/query_issue285-2.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue285-2/query_issue285-2.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue285-2/query_issue285-2.1.ddl.sqlpp
index 8a1e435..e0ee5db 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue285-2/query_issue285-2.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue285-2/query_issue285-2.1.ddl.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.DBLPType as
  closed {
-  id : int64,
+  id : bigint,
   dblpid : string,
   title : string,
   authors : string,
@@ -40,7 +40,7 @@ create type test.DBLPType as
 
 create type test.CSXType as
  closed {
-  id : int64,
+  id : bigint,
   csxid : string,
   title : string,
   authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue285/query_issue285.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue285/query_issue285.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue285/query_issue285.1.ddl.sqlpp
index 7387fa6..6d6edb8 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue285/query_issue285.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue285/query_issue285.1.ddl.sqlpp
@@ -35,7 +35,7 @@ use test;
 
 create type test.DBLPType as
  closed {
-  id : int64,
+  id : bigint,
   dblpid : string,
   title : string,
   authors : string,
@@ -44,7 +44,7 @@ create type test.DBLPType as
 
 create type test.CSXType as
  closed {
-  id : int64,
+  id : bigint,
   csxid : string,
   title : string,
   authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue658/query_issue658.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue658/query_issue658.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue658/query_issue658.1.ddl.sqlpp
index 74addf7..0970fd8 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue658/query_issue658.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue658/query_issue658.1.ddl.sqlpp
@@ -29,7 +29,7 @@ use test;
 
 create type test.DBLPType as
  closed {
-  id : int64,
+  id : bigint,
   dblpid : string,
   title : string,
   authors : string,
@@ -38,7 +38,7 @@ create type test.DBLPType as
 
 create type test.CSXType as
  closed {
-  id : int64,
+  id : bigint,
   csxid : string,
   title : string,
   authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue849-2/query_issue849-2.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue849-2/query_issue849-2.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue849-2/query_issue849-2.1.ddl.sqlpp
index 02d50b6..2a0ed77 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue849-2/query_issue849-2.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue849-2/query_issue849-2.1.ddl.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.sType as
  closed {
-  b : int64
+  b : bigint
 }
 
 create  dataset s(sType) primary key b;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue849/query_issue849.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue849/query_issue849.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue849/query_issue849.1.ddl.sqlpp
index 02d50b6..2a0ed77 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue849/query_issue849.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue849/query_issue849.1.ddl.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.sType as
  closed {
-  b : int64
+  b : bigint
 }
 
 create  dataset s(sType) primary key b;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/listify_03/listify_03.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/listify_03/listify_03.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/listify_03/listify_03.3.query.sqlpp
index 5e73b39..8a0f6dc 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/listify_03/listify_03.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/listify_03/listify_03.3.query.sqlpp
@@ -25,10 +25,10 @@
 use test;
 
 
-select element coll_min(y)
+select element array_min(y)
 from  [1,2] as x
 with  y as (
-      select element coll_min(i)
+      select element array_min(i)
       from  [[1,2,3],[10,20,30],[-2,-5,0]] as i
   )
 ;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/query-ASTERIXDB-159-2/query-ASTERIXDB-159-2.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/query-ASTERIXDB-159-2/query-ASTERIXDB-159-2.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/query-ASTERIXDB-159-2/query-ASTERIXDB-159-2.1.ddl.sqlpp
index 78ce34a..bbe6fc1 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/query-ASTERIXDB-159-2/query-ASTERIXDB-159-2.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/query-ASTERIXDB-159-2/query-ASTERIXDB-159-2.1.ddl.sqlpp
@@ -24,7 +24,7 @@ use TinySocial;
 
 create type TinySocial.FacebookUserType as
  open {
-  id : int64
+  id : bigint
 }
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/query-ASTERIXDB-159-2/query-ASTERIXDB-159-2.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/query-ASTERIXDB-159-2/query-ASTERIXDB-159-2.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/query-ASTERIXDB-159-2/query-ASTERIXDB-159-2.3.query.sqlpp
index 0954239..04614b4 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/query-ASTERIXDB-159-2/query-ASTERIXDB-159-2.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/query-ASTERIXDB-159-2/query-ASTERIXDB-159-2.3.query.sqlpp
@@ -22,6 +22,6 @@ USE TinySocial;
 SELECT fu1.id id1, fu2.id id2
 FROM FacebookUsers fu1
 JOIN FacebookUsers fu2
-ON COLL_COUNT(RANGE(fu1.id, fu2.id))<5
+ON ARRAY_COUNT(RANGE(fu1.id, fu2.id))<5
 ORDER BY fu1.id, fu2.id
 LIMIT 5;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/query-ASTERIXDB-159-3/query-ASTERIXDB-159-3.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/query-ASTERIXDB-159-3/query-ASTERIXDB-159-3.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/query-ASTERIXDB-159-3/query-ASTERIXDB-159-3.1.ddl.sqlpp
index 78ce34a..bbe6fc1 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/query-ASTERIXDB-159-3/query-ASTERIXDB-159-3.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/query-ASTERIXDB-159-3/query-ASTERIXDB-159-3.1.ddl.sqlpp
@@ -24,7 +24,7 @@ use TinySocial;
 
 create type TinySocial.FacebookUserType as
  open {
-  id : int64
+  id : bigint
 }
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/query-ASTERIXDB-159-3/query-ASTERIXDB-159-3.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/query-ASTERIXDB-159-3/query-ASTERIXDB-159-3.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/query-ASTERIXDB-159-3/query-ASTERIXDB-159-3.3.query.sqlpp
index a932f2a..ea6ceca 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/query-ASTERIXDB-159-3/query-ASTERIXDB-159-3.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/query-ASTERIXDB-159-3/query-ASTERIXDB-159-3.3.query.sqlpp
@@ -22,6 +22,6 @@ USE TinySocial;
 SELECT fu1.id id1, fu2.id id2
 FROM FacebookUsers fu1
 LEFT OUTER JOIN FacebookUsers fu2
-ON COLL_COUNT(RANGE(fu1.id, fu2.id))>2 AND COLL_COUNT(RANGE(fu1.id, fu2.id))<5
+ON ARRAY_COUNT(RANGE(fu1.id, fu2.id))>2 AND ARRAY_COUNT(RANGE(fu1.id, 
fu2.id))<5
 ORDER BY fu1.id DESC, fu2.id DESC
 LIMIT 5;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_01/csv_01.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_01/csv_01.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_01/csv_01.1.ddl.sqlpp
index 5eaf942..ccc5483 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_01/csv_01.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_01/csv_01.1.ddl.sqlpp
@@ -31,7 +31,7 @@ use temp;
 
 create type temp.test as
  closed {
-  id : int64,
+  id : bigint,
   float : float?,
   double : double?,
   date : string?,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_02/csv_02.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_02/csv_02.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_02/csv_02.1.ddl.sqlpp
index c7ae973..aa2fc7b 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_02/csv_02.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_02/csv_02.1.ddl.sqlpp
@@ -31,7 +31,7 @@ use temp;
 
 create type temp.test as
  closed {
-  id : int64,
+  id : bigint,
   float : float?,
   double : double?,
   date : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_03/csv_03.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_03/csv_03.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_03/csv_03.1.ddl.sqlpp
index 2fb7c4e..235027f 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_03/csv_03.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_03/csv_03.1.ddl.sqlpp
@@ -31,7 +31,7 @@ use temp;
 
 create type temp.test as
  closed {
-  id : int64,
+  id : bigint,
   float : float,
   floatq : float?,
   double : double,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_04/csv_04.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_04/csv_04.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_04/csv_04.1.ddl.sqlpp
index 80ee8dd..2728e3a 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_04/csv_04.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_04/csv_04.1.ddl.sqlpp
@@ -33,7 +33,7 @@ use temp;
 
 create type temp.test as
  closed {
-  id : int64,
+  id : bigint,
   float : float,
   stringa : string,
   stringb : string?

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_05/csv_05.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_05/csv_05.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_05/csv_05.1.ddl.sqlpp
index ebd6df9..6c07027 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_05/csv_05.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_05/csv_05.1.ddl.sqlpp
@@ -31,7 +31,7 @@ use temp;
 
 create type temp.test as
  closed {
-  id : int32,
+  id : integer,
   float : float,
   stringa : string,
   stringb : string?

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_06/csv_06.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_06/csv_06.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_06/csv_06.1.ddl.sqlpp
index ed50c14..dd2f7c3 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_06/csv_06.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_06/csv_06.1.ddl.sqlpp
@@ -32,7 +32,7 @@ use temp;
 
 create type temp.test as
  closed {
-  id : int32,
+  id : integer,
   float : float,
   stringa : string,
   stringb : string?

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_07/csv_07.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_07/csv_07.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_07/csv_07.1.ddl.sqlpp
index 21e292f..25441aa 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_07/csv_07.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_07/csv_07.1.ddl.sqlpp
@@ -32,7 +32,7 @@ use temp;
 
 create type temp.test as
  closed {
-  id : int32,
+  id : integer,
   float : float,
   stringa : string,
   stringb : string?

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_08_header_cr/csv_08.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_08_header_cr/csv_08.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_08_header_cr/csv_08.1.ddl.sqlpp
index 5eaf942..ccc5483 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_08_header_cr/csv_08.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_08_header_cr/csv_08.1.ddl.sqlpp
@@ -31,7 +31,7 @@ use temp;
 
 create type temp.test as
  closed {
-  id : int64,
+  id : bigint,
   float : float?,
   double : double?,
   date : string?,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_08_header_crlf/csv_08.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_08_header_crlf/csv_08.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_08_header_crlf/csv_08.1.ddl.sqlpp
index 5eaf942..ccc5483 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_08_header_crlf/csv_08.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_08_header_crlf/csv_08.1.ddl.sqlpp
@@ -31,7 +31,7 @@ use temp;
 
 create type temp.test as
  closed {
-  id : int64,
+  id : bigint,
   float : float?,
   double : double?,
   date : string?,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_08_header_lf/csv_08.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_08_header_lf/csv_08.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_08_header_lf/csv_08.1.ddl.sqlpp
index 5eaf942..ccc5483 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_08_header_lf/csv_08.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_08_header_lf/csv_08.1.ddl.sqlpp
@@ -31,7 +31,7 @@ use temp;
 
 create type temp.test as
  closed {
-  id : int64,
+  id : bigint,
   float : float?,
   double : double?,
   date : string?,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/duplicate-key-error/duplicate-key-error.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/duplicate-key-error/duplicate-key-error.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/duplicate-key-error/duplicate-key-error.1.ddl.sqlpp
index eff464c..0263605 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/duplicate-key-error/duplicate-key-error.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/duplicate-key-error/duplicate-key-error.1.ddl.sqlpp
@@ -30,7 +30,7 @@ use test;
 
 create type test.Schema as
  closed {
-  id : int32
+  id : integer
 }
 
 create  dataset mydataset(Schema) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue14_query/issue14_query.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue14_query/issue14_query.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue14_query/issue14_query.1.ddl.sqlpp
index bab627f..009a861 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue14_query/issue14_query.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue14_query/issue14_query.1.ddl.sqlpp
@@ -30,8 +30,8 @@ use test;
 
 create type test.Schema as
  closed {
-  id : int32,
-  age : int32,
+  id : integer,
+  age : integer,
   name : string
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue289_query/issue289_query.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue289_query/issue289_query.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue289_query/issue289_query.1.ddl.sqlpp
index 2b6dd4c..fc8e6f5 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue289_query/issue289_query.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue289_query/issue289_query.1.ddl.sqlpp
@@ -30,19 +30,19 @@ use test;
 
 create type test.AddressType as
 {
-  number : int64,
+  number : bigint,
   street : string,
   city : string
 }
 
 create type test.CustomerType as
  closed {
-  cid : int64,
+  cid : bigint,
   name : string,
-  age : int64?,
+  age : bigint?,
   address : AddressType?,
   lastorder : {
-      oid : int64,
+      oid : bigint,
       total : float
   }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue289_query/issue289_query.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue289_query/issue289_query.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue289_query/issue289_query.3.query.sqlpp
index 087f7f6..d1abb50 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue289_query/issue289_query.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue289_query/issue289_query.3.query.sqlpp
@@ -25,7 +25,7 @@
 use test;
 
 
-select element test.coll_count((
+select element test.array_count((
     select element l
     from  Customers as l
 ));

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue315_query/issue315_query.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue315_query/issue315_query.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue315_query/issue315_query.1.ddl.sqlpp
index b109d5a..19a2090 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue315_query/issue315_query.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue315_query/issue315_query.1.ddl.sqlpp
@@ -30,8 +30,8 @@ use test;
 
 create type test.Schema as
  closed {
-  id : int32,
-  age : int32,
+  id : integer,
+  age : integer,
   name : string
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue610_adm_token_end_collection/issue610_adm_token_end_collection.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue610_adm_token_end_collection/issue610_adm_token_end_collection.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue610_adm_token_end_collection/issue610_adm_token_end_collection.1.ddl.sqlpp
index 6a0ceea..a30c89b 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue610_adm_token_end_collection/issue610_adm_token_end_collection.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue610_adm_token_end_collection/issue610_adm_token_end_collection.1.ddl.sqlpp
@@ -30,9 +30,9 @@ use foo;
 
 create type foo.bartype as
 {
-  id : int32,
+  id : integer,
   nest_rec : {
-      id : int32
+      id : integer
   }
 
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue650_query/issue650_query.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue650_query/issue650_query.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue650_query/issue650_query.1.ddl.sqlpp
index 4c31b1e..2f6f7da 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue650_query/issue650_query.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue650_query/issue650_query.1.ddl.sqlpp
@@ -30,9 +30,9 @@ use fuzzyjoin;
 
 create type fuzzyjoin.UserType as
 {
-  uid : int32,
+  uid : integer,
   name : string,
-  lottery_numbers : [int32],
+  lottery_numbers : [integer],
   interests : {{string}}
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/type_promotion_0/type_promotion_0.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/type_promotion_0/type_promotion_0.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/type_promotion_0/type_promotion_0.1.ddl.sqlpp
index 2680cf8..0c3c160 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/type_promotion_0/type_promotion_0.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/type_promotion_0/type_promotion_0.1.ddl.sqlpp
@@ -25,21 +25,21 @@ use TestDataverse;
 
 create type TestDataverse.TestType as
 {
-  id : int64,
-  int8 : int8,
-  int16 : int16,
-  int32 : int32,
-  int64 : int64,
+  id : bigint,
+  int8 : tinyint,
+  int16 : smallint,
+  int32 : integer,
+  int64 : bigint,
   float : float,
   double : double,
-  int8_u : {{int8}}?,
-  int8_o : [int8]?,
-  int16_u : {{int16}}?,
-  int16_o : [int16]?,
-  int32_u : {{int32}}?,
-  int32_o : [int32]?,
-  int64_u : {{int64}}?,
-  int64_o : [int64]?,
+  int8_u : {{tinyint}}?,
+  int8_o : [tinyint]?,
+  int16_u : {{smallint}}?,
+  int16_o : [smallint]?,
+  int32_u : {{integer}}?,
+  int32_o : [integer]?,
+  int64_u : {{bigint}}?,
+  int64_o : [bigint]?,
   float_u : {{float}}?,
   float_o : [float]?,
   double_u : {{double}}?,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/materialization/assign-reuse/assign-reuse.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/materialization/assign-reuse/assign-reuse.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/materialization/assign-reuse/assign-reuse.1.ddl.sqlpp
index 157b151..072724d 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/materialization/assign-reuse/assign-reuse.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/materialization/assign-reuse/assign-reuse.1.ddl.sqlpp
@@ -32,11 +32,11 @@ create type TinySocial.EmploymentType as
 
 create type TinySocial.FacebookUserType as
  closed {
-  id : int64,
+  id : bigint,
   alias : string,
   name : string,
   `user-since` : datetime,
-  `friend-ids` : {{int64}},
+  `friend-ids` : {{bigint}},
   employment : [EmploymentType]
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/materialization/assign-reuse/assign-reuse.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/materialization/assign-reuse/assign-reuse.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/materialization/assign-reuse/assign-reuse.3.query.sqlpp
index 48a2456..d71964b 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/materialization/assign-reuse/assign-reuse.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/materialization/assign-reuse/assign-reuse.3.query.sqlpp
@@ -23,12 +23,12 @@ use TinySocial;
 with  lonelyusers as (
       select element d
       from  FacebookUsers as d
-      where (TinySocial.coll_count(d.`friend-ids`) < 2)
+      where (TinySocial.array_count(d.`friend-ids`) < 2)
   ),
       lonelyusers2 as (
       select element d
       from  FacebookUsers as d
-      where (TinySocial.coll_count(d.`friend-ids`) < 2)
+      where (TinySocial.array_count(d.`friend-ids`) < 2)
   )
 select element 
{'user1':{'id':l1.id,'name':l1.name},'user2':{'id':l2.id,'name':l2.name}}
 from  lonelyusers as l1,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/flushtest/flushtest.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/flushtest/flushtest.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/flushtest/flushtest.1.ddl.sqlpp
index 04894ab..162525b 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/flushtest/flushtest.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/flushtest/flushtest.1.ddl.sqlpp
@@ -32,13 +32,13 @@ create type DMLTest.EmploymentType as
 
 create type DMLTest.FacebookUserType as
  closed {
-  id : int64,
-  `id-copy` : int64,
+  id : bigint,
+  `id-copy` : bigint,
   alias : string,
   name : string,
   `user-since` : datetime,
   `user-since-copy` : datetime,
-  `friend-ids` : {{int64}},
+  `friend-ids` : {{bigint}},
   employment : [EmploymentType]
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/groupby-orderby-count/groupby-orderby-count.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/groupby-orderby-count/groupby-orderby-count.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/groupby-orderby-count/groupby-orderby-count.1.ddl.sqlpp
index b2c4d5c..e4977a5 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/groupby-orderby-count/groupby-orderby-count.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/groupby-orderby-count/groupby-orderby-count.1.ddl.sqlpp
@@ -25,8 +25,8 @@ use twitter;
 
 create type twitter.Tweet as
 {
-  id : int64,
-  tweetid : int64,
+  id : bigint,
+  tweetid : bigint,
   loc : point,
   time : datetime,
   text : string

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/groupby-orderby-count/groupby-orderby-count.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/groupby-orderby-count/groupby-orderby-count.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/groupby-orderby-count/groupby-orderby-count.3.query.sqlpp
index ea20ddf..85b78af 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/groupby-orderby-count/groupby-orderby-count.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/groupby-orderby-count/groupby-orderby-count.3.query.sqlpp
@@ -20,9 +20,9 @@
 use twitter;
 
 
-select element {'word':tok,'count':twitter.coll_count(token)}
+select element {'word':tok,'count':twitter.array_count(token)}
 from  TwitterData as t,
       twitter.`word-tokens`(t.text) as token
 group by token as tok
-order by twitter.coll_count(token) desc,tok
+order by twitter.array_count(token) desc,tok
 ;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/nested-loop-join_01/nested-loop-join_01.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/nested-loop-join_01/nested-loop-join_01.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/nested-loop-join_01/nested-loop-join_01.1.ddl.sqlpp
index 61e3ffb..b721378 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/nested-loop-join_01/nested-loop-join_01.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/nested-loop-join_01/nested-loop-join_01.1.ddl.sqlpp
@@ -25,17 +25,17 @@ use test;
 
 create type test.UserType as
 {
-  uid : int64,
+  uid : bigint,
   name : string,
-  lottery_numbers : [int64],
+  lottery_numbers : [bigint],
   interests : {{string}}
 }
 
 create type test.VisitorType as
 {
-  vid : int64,
+  vid : bigint,
   name : string,
-  lottery_numbers : [int64],
+  lottery_numbers : [bigint],
   interests : {{string}}
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/prefix-search/prefix-search.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/prefix-search/prefix-search.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/prefix-search/prefix-search.1.ddl.sqlpp
index 84fd241..32ae2c7 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/prefix-search/prefix-search.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/prefix-search/prefix-search.1.ddl.sqlpp
@@ -31,10 +31,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/misc/query-ASTERIXDB-1577/query-ASTERIXDB-1577.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-1577/query-ASTERIXDB-1577.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-1577/query-ASTERIXDB-1577.1.ddl.sqlpp
index 5b1d0dd..aab8e91 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-1577/query-ASTERIXDB-1577.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-1577/query-ASTERIXDB-1577.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 samptable1(samptabletype) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-971/query-ASTERIXDB-971.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-971/query-ASTERIXDB-971.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-971/query-ASTERIXDB-971.1.ddl.sqlpp
index 82f182e..edec216 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-971/query-ASTERIXDB-971.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-971/query-ASTERIXDB-971.1.ddl.sqlpp
@@ -22,7 +22,7 @@ create dataverse test;
 use test;
 
 create type account as open
-{ id: int32, sum:int32 }
+{ id: integer, sum:integer }
 
 create dataset Accounts(account) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/stable_sort/stable_sort.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/stable_sort/stable_sort.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/stable_sort/stable_sort.1.ddl.sqlpp
index c2815bf..7d457d5 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/stable_sort/stable_sort.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/stable_sort/stable_sort.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/misc/string_eq_01/string_eq_01.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/string_eq_01/string_eq_01.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/string_eq_01/string_eq_01.1.ddl.sqlpp
index 69246b9..6e08aab 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/string_eq_01/string_eq_01.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/string_eq_01/string_eq_01.1.ddl.sqlpp
@@ -32,11 +32,11 @@ create type TinySocial.EmploymentType as
 
 create type TinySocial.FacebookUserType as
  closed {
-  id : int64,
+  id : bigint,
   alias : string,
   name : string,
   `user-since` : datetime,
-  `friend-ids` : {{int64}},
+  `friend-ids` : {{bigint}},
   employment : [EmploymentType]
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/compact-dataset-and-its-indexes/compact-dataset-and-its-indexes.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/compact-dataset-and-its-indexes/compact-dataset-and-its-indexes.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/compact-dataset-and-its-indexes/compact-dataset-and-its-indexes.1.ddl.sqlpp
index 6894c32..b86727d 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/compact-dataset-and-its-indexes/compact-dataset-and-its-indexes.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/compact-dataset-and-its-indexes/compact-dataset-and-its-indexes.1.ddl.sqlpp
@@ -32,11 +32,11 @@ use test;
 
 create type test.LineItemTypetmp 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/nested-index-dml/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/nested-index-dml/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/nested-index-dml/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ddl.sqlpp
index 6260212..547a22a 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/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/nested-index-dml/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ddl.sqlpp
@@ -27,10 +27,10 @@ create type TinySocial.TwitterUserType as
 {
   `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 TinySocial.TweetMessageType as

Reply via email to