http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q11_important_stock/q11_important_stock.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q11_important_stock/q11_important_stock.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q11_important_stock/q11_important_stock.1.ddl.sqlpp
index 3e3f696..6cbdf11 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q11_important_stock/q11_important_stock.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q11_important_stock/q11_important_stock.1.ddl.sqlpp
@@ -25,11 +25,11 @@ use tpch;
 
 create type tpch.LineItemType as
  closed {
-  l_orderkey : int64,
-  l_partkey : int64,
-  l_suppkey : int64,
-  l_linenumber : int64,
-  l_quantity : int64,
+  l_orderkey : bigint,
+  l_partkey : bigint,
+  l_suppkey : bigint,
+  l_linenumber : bigint,
+  l_quantity : bigint,
   l_extendedprice : double,
   l_discount : double,
   l_tax : double,
@@ -45,23 +45,23 @@ create type tpch.LineItemType as
 
 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
 }
 
 create type tpch.CustomerType as
  closed {
-  c_custkey : int64,
+  c_custkey : bigint,
   c_name : string,
   c_address : string,
-  c_nationkey : int64,
+  c_nationkey : bigint,
   c_phone : string,
   c_acctbal : double,
   c_mktsegment : string,
@@ -70,10 +70,10 @@ create type tpch.CustomerType as
 
 create type tpch.SupplierType as
  closed {
-  s_suppkey : int64,
+  s_suppkey : bigint,
   s_name : string,
   s_address : string,
-  s_nationkey : int64,
+  s_nationkey : bigint,
   s_phone : string,
   s_acctbal : double,
   s_comment : string
@@ -81,27 +81,27 @@ create type tpch.SupplierType as
 
 create type tpch.NationType as
  closed {
-  n_nationkey : int64,
+  n_nationkey : bigint,
   n_name : string,
-  n_regionkey : int64,
+  n_regionkey : bigint,
   n_comment : string
 }
 
 create type tpch.RegionType as
  closed {
-  r_regionkey : int64,
+  r_regionkey : bigint,
   r_name : string,
   r_comment : string
 }
 
 create type tpch.PartType as
  closed {
-  p_partkey : int64,
+  p_partkey : bigint,
   p_name : string,
   p_mfgr : string,
   p_brand : string,
   p_type : string,
-  p_size : int64,
+  p_size : bigint,
   p_container : string,
   p_retailprice : double,
   p_comment : string
@@ -109,9 +109,9 @@ create type tpch.PartType as
 
 create type tpch.PartSuppType as
  closed {
-  ps_partkey : int64,
-  ps_suppkey : int64,
-  ps_availqty : int64,
+  ps_partkey : bigint,
+  ps_suppkey : bigint,
+  ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q12_shipping/q12_shipping.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q12_shipping/q12_shipping.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q12_shipping/q12_shipping.1.ddl.sqlpp
index 1871e19..0db8d36 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q12_shipping/q12_shipping.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q12_shipping/q12_shipping.1.ddl.sqlpp
@@ -25,11 +25,11 @@ use tpch;
 
 create type tpch.LineItemType as
  closed {
-  l_orderkey : int32,
-  l_partkey : int32,
-  l_suppkey : int32,
-  l_linenumber : int32,
-  l_quantity : int32,
+  l_orderkey : integer,
+  l_partkey : integer,
+  l_suppkey : integer,
+  l_linenumber : integer,
+  l_quantity : integer,
   l_extendedprice : double,
   l_discount : double,
   l_tax : double,
@@ -45,23 +45,23 @@ create type tpch.LineItemType as
 
 create type tpch.OrderType as
  closed {
-  o_orderkey : int32,
-  o_custkey : int32,
+  o_orderkey : integer,
+  o_custkey : integer,
   o_orderstatus : string,
   o_totalprice : double,
   o_orderdate : string,
   o_orderpriority : string,
   o_clerk : string,
-  o_shippriority : int32,
+  o_shippriority : integer,
   o_comment : string
 }
 
 create type tpch.CustomerType as
  closed {
-  c_custkey : int32,
+  c_custkey : integer,
   c_name : string,
   c_address : string,
-  c_nationkey : int32,
+  c_nationkey : integer,
   c_phone : string,
   c_acctbal : double,
   c_mktsegment : string,
@@ -70,10 +70,10 @@ create type tpch.CustomerType as
 
 create type tpch.SupplierType as
  closed {
-  s_suppkey : int32,
+  s_suppkey : integer,
   s_name : string,
   s_address : string,
-  s_nationkey : int32,
+  s_nationkey : integer,
   s_phone : string,
   s_acctbal : double,
   s_comment : string
@@ -81,27 +81,27 @@ create type tpch.SupplierType as
 
 create type tpch.NationType as
  closed {
-  n_nationkey : int32,
+  n_nationkey : integer,
   n_name : string,
-  n_regionkey : int32,
+  n_regionkey : integer,
   n_comment : string
 }
 
 create type tpch.RegionType as
  closed {
-  r_regionkey : int32,
+  r_regionkey : integer,
   r_name : string,
   r_comment : string
 }
 
 create type tpch.PartType as
  closed {
-  p_partkey : int32,
+  p_partkey : integer,
   p_name : string,
   p_mfgr : string,
   p_brand : string,
   p_type : string,
-  p_size : int32,
+  p_size : integer,
   p_container : string,
   p_retailprice : double,
   p_comment : string
@@ -109,9 +109,9 @@ create type tpch.PartType as
 
 create type tpch.PartSuppType as
  closed {
-  ps_partkey : int32,
-  ps_suppkey : int32,
-  ps_availqty : int32,
+  ps_partkey : integer,
+  ps_suppkey : integer,
+  ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q13_customer_distribution/q13_customer_distribution.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q13_customer_distribution/q13_customer_distribution.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q13_customer_distribution/q13_customer_distribution.1.ddl.sqlpp
index 3e3f696..6cbdf11 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q13_customer_distribution/q13_customer_distribution.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q13_customer_distribution/q13_customer_distribution.1.ddl.sqlpp
@@ -25,11 +25,11 @@ use tpch;
 
 create type tpch.LineItemType as
  closed {
-  l_orderkey : int64,
-  l_partkey : int64,
-  l_suppkey : int64,
-  l_linenumber : int64,
-  l_quantity : int64,
+  l_orderkey : bigint,
+  l_partkey : bigint,
+  l_suppkey : bigint,
+  l_linenumber : bigint,
+  l_quantity : bigint,
   l_extendedprice : double,
   l_discount : double,
   l_tax : double,
@@ -45,23 +45,23 @@ create type tpch.LineItemType as
 
 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
 }
 
 create type tpch.CustomerType as
  closed {
-  c_custkey : int64,
+  c_custkey : bigint,
   c_name : string,
   c_address : string,
-  c_nationkey : int64,
+  c_nationkey : bigint,
   c_phone : string,
   c_acctbal : double,
   c_mktsegment : string,
@@ -70,10 +70,10 @@ create type tpch.CustomerType as
 
 create type tpch.SupplierType as
  closed {
-  s_suppkey : int64,
+  s_suppkey : bigint,
   s_name : string,
   s_address : string,
-  s_nationkey : int64,
+  s_nationkey : bigint,
   s_phone : string,
   s_acctbal : double,
   s_comment : string
@@ -81,27 +81,27 @@ create type tpch.SupplierType as
 
 create type tpch.NationType as
  closed {
-  n_nationkey : int64,
+  n_nationkey : bigint,
   n_name : string,
-  n_regionkey : int64,
+  n_regionkey : bigint,
   n_comment : string
 }
 
 create type tpch.RegionType as
  closed {
-  r_regionkey : int64,
+  r_regionkey : bigint,
   r_name : string,
   r_comment : string
 }
 
 create type tpch.PartType as
  closed {
-  p_partkey : int64,
+  p_partkey : bigint,
   p_name : string,
   p_mfgr : string,
   p_brand : string,
   p_type : string,
-  p_size : int64,
+  p_size : bigint,
   p_container : string,
   p_retailprice : double,
   p_comment : string
@@ -109,9 +109,9 @@ create type tpch.PartType as
 
 create type tpch.PartSuppType as
  closed {
-  ps_partkey : int64,
-  ps_suppkey : int64,
-  ps_availqty : int64,
+  ps_partkey : bigint,
+  ps_suppkey : bigint,
+  ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q13_customer_distribution/q13_customer_distribution.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q13_customer_distribution/q13_customer_distribution.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q13_customer_distribution/q13_customer_distribution.3.query.sqlpp
index bd5f431..2664bd9 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q13_customer_distribution/q13_customer_distribution.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q13_customer_distribution/q13_customer_distribution.3.query.sqlpp
@@ -24,7 +24,7 @@ FROM  (
         SELECT c_custkey, sum(o_orderkey_count) AS c_count
         FROM  (
                 SELECT c_custkey,
-                       coll_count(
+                       array_count(
                            (
                             select element o_orderkey
                             from  Orders

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q14_promotion_effect/q14_promotion_effect.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q14_promotion_effect/q14_promotion_effect.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q14_promotion_effect/q14_promotion_effect.1.ddl.sqlpp
index 1871e19..0db8d36 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q14_promotion_effect/q14_promotion_effect.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q14_promotion_effect/q14_promotion_effect.1.ddl.sqlpp
@@ -25,11 +25,11 @@ use tpch;
 
 create type tpch.LineItemType as
  closed {
-  l_orderkey : int32,
-  l_partkey : int32,
-  l_suppkey : int32,
-  l_linenumber : int32,
-  l_quantity : int32,
+  l_orderkey : integer,
+  l_partkey : integer,
+  l_suppkey : integer,
+  l_linenumber : integer,
+  l_quantity : integer,
   l_extendedprice : double,
   l_discount : double,
   l_tax : double,
@@ -45,23 +45,23 @@ create type tpch.LineItemType as
 
 create type tpch.OrderType as
  closed {
-  o_orderkey : int32,
-  o_custkey : int32,
+  o_orderkey : integer,
+  o_custkey : integer,
   o_orderstatus : string,
   o_totalprice : double,
   o_orderdate : string,
   o_orderpriority : string,
   o_clerk : string,
-  o_shippriority : int32,
+  o_shippriority : integer,
   o_comment : string
 }
 
 create type tpch.CustomerType as
  closed {
-  c_custkey : int32,
+  c_custkey : integer,
   c_name : string,
   c_address : string,
-  c_nationkey : int32,
+  c_nationkey : integer,
   c_phone : string,
   c_acctbal : double,
   c_mktsegment : string,
@@ -70,10 +70,10 @@ create type tpch.CustomerType as
 
 create type tpch.SupplierType as
  closed {
-  s_suppkey : int32,
+  s_suppkey : integer,
   s_name : string,
   s_address : string,
-  s_nationkey : int32,
+  s_nationkey : integer,
   s_phone : string,
   s_acctbal : double,
   s_comment : string
@@ -81,27 +81,27 @@ create type tpch.SupplierType as
 
 create type tpch.NationType as
  closed {
-  n_nationkey : int32,
+  n_nationkey : integer,
   n_name : string,
-  n_regionkey : int32,
+  n_regionkey : integer,
   n_comment : string
 }
 
 create type tpch.RegionType as
  closed {
-  r_regionkey : int32,
+  r_regionkey : integer,
   r_name : string,
   r_comment : string
 }
 
 create type tpch.PartType as
  closed {
-  p_partkey : int32,
+  p_partkey : integer,
   p_name : string,
   p_mfgr : string,
   p_brand : string,
   p_type : string,
-  p_size : int32,
+  p_size : integer,
   p_container : string,
   p_retailprice : double,
   p_comment : string
@@ -109,9 +109,9 @@ create type tpch.PartType as
 
 create type tpch.PartSuppType as
  closed {
-  ps_partkey : int32,
-  ps_suppkey : int32,
-  ps_availqty : int32,
+  ps_partkey : integer,
+  ps_suppkey : integer,
+  ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q15_top_supplier/q15_top_supplier.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q15_top_supplier/q15_top_supplier.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q15_top_supplier/q15_top_supplier.1.ddl.sqlpp
index 3e3f696..6cbdf11 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q15_top_supplier/q15_top_supplier.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q15_top_supplier/q15_top_supplier.1.ddl.sqlpp
@@ -25,11 +25,11 @@ use tpch;
 
 create type tpch.LineItemType as
  closed {
-  l_orderkey : int64,
-  l_partkey : int64,
-  l_suppkey : int64,
-  l_linenumber : int64,
-  l_quantity : int64,
+  l_orderkey : bigint,
+  l_partkey : bigint,
+  l_suppkey : bigint,
+  l_linenumber : bigint,
+  l_quantity : bigint,
   l_extendedprice : double,
   l_discount : double,
   l_tax : double,
@@ -45,23 +45,23 @@ create type tpch.LineItemType as
 
 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
 }
 
 create type tpch.CustomerType as
  closed {
-  c_custkey : int64,
+  c_custkey : bigint,
   c_name : string,
   c_address : string,
-  c_nationkey : int64,
+  c_nationkey : bigint,
   c_phone : string,
   c_acctbal : double,
   c_mktsegment : string,
@@ -70,10 +70,10 @@ create type tpch.CustomerType as
 
 create type tpch.SupplierType as
  closed {
-  s_suppkey : int64,
+  s_suppkey : bigint,
   s_name : string,
   s_address : string,
-  s_nationkey : int64,
+  s_nationkey : bigint,
   s_phone : string,
   s_acctbal : double,
   s_comment : string
@@ -81,27 +81,27 @@ create type tpch.SupplierType as
 
 create type tpch.NationType as
  closed {
-  n_nationkey : int64,
+  n_nationkey : bigint,
   n_name : string,
-  n_regionkey : int64,
+  n_regionkey : bigint,
   n_comment : string
 }
 
 create type tpch.RegionType as
  closed {
-  r_regionkey : int64,
+  r_regionkey : bigint,
   r_name : string,
   r_comment : string
 }
 
 create type tpch.PartType as
  closed {
-  p_partkey : int64,
+  p_partkey : bigint,
   p_name : string,
   p_mfgr : string,
   p_brand : string,
   p_type : string,
-  p_size : int64,
+  p_size : bigint,
   p_container : string,
   p_retailprice : double,
   p_comment : string
@@ -109,9 +109,9 @@ create type tpch.PartType as
 
 create type tpch.PartSuppType as
  closed {
-  ps_partkey : int64,
-  ps_suppkey : int64,
-  ps_availqty : int64,
+  ps_partkey : bigint,
+  ps_suppkey : bigint,
+  ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q16_parts_supplier_relationship/q16_parts_supplier_relationship.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q16_parts_supplier_relationship/q16_parts_supplier_relationship.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q16_parts_supplier_relationship/q16_parts_supplier_relationship.1.ddl.sqlpp
index 3e3f696..6cbdf11 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q16_parts_supplier_relationship/q16_parts_supplier_relationship.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q16_parts_supplier_relationship/q16_parts_supplier_relationship.1.ddl.sqlpp
@@ -25,11 +25,11 @@ use tpch;
 
 create type tpch.LineItemType as
  closed {
-  l_orderkey : int64,
-  l_partkey : int64,
-  l_suppkey : int64,
-  l_linenumber : int64,
-  l_quantity : int64,
+  l_orderkey : bigint,
+  l_partkey : bigint,
+  l_suppkey : bigint,
+  l_linenumber : bigint,
+  l_quantity : bigint,
   l_extendedprice : double,
   l_discount : double,
   l_tax : double,
@@ -45,23 +45,23 @@ create type tpch.LineItemType as
 
 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
 }
 
 create type tpch.CustomerType as
  closed {
-  c_custkey : int64,
+  c_custkey : bigint,
   c_name : string,
   c_address : string,
-  c_nationkey : int64,
+  c_nationkey : bigint,
   c_phone : string,
   c_acctbal : double,
   c_mktsegment : string,
@@ -70,10 +70,10 @@ create type tpch.CustomerType as
 
 create type tpch.SupplierType as
  closed {
-  s_suppkey : int64,
+  s_suppkey : bigint,
   s_name : string,
   s_address : string,
-  s_nationkey : int64,
+  s_nationkey : bigint,
   s_phone : string,
   s_acctbal : double,
   s_comment : string
@@ -81,27 +81,27 @@ create type tpch.SupplierType as
 
 create type tpch.NationType as
  closed {
-  n_nationkey : int64,
+  n_nationkey : bigint,
   n_name : string,
-  n_regionkey : int64,
+  n_regionkey : bigint,
   n_comment : string
 }
 
 create type tpch.RegionType as
  closed {
-  r_regionkey : int64,
+  r_regionkey : bigint,
   r_name : string,
   r_comment : string
 }
 
 create type tpch.PartType as
  closed {
-  p_partkey : int64,
+  p_partkey : bigint,
   p_name : string,
   p_mfgr : string,
   p_brand : string,
   p_type : string,
-  p_size : int64,
+  p_size : bigint,
   p_container : string,
   p_retailprice : double,
   p_comment : string
@@ -109,9 +109,9 @@ create type tpch.PartType as
 
 create type tpch.PartSuppType as
  closed {
-  ps_partkey : int64,
-  ps_suppkey : int64,
-  ps_availqty : int64,
+  ps_partkey : bigint,
+  ps_suppkey : bigint,
+  ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q17_large_gby_variant/q17_large_gby_variant.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q17_large_gby_variant/q17_large_gby_variant.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q17_large_gby_variant/q17_large_gby_variant.1.ddl.sqlpp
index 3e3f696..6cbdf11 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q17_large_gby_variant/q17_large_gby_variant.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q17_large_gby_variant/q17_large_gby_variant.1.ddl.sqlpp
@@ -25,11 +25,11 @@ use tpch;
 
 create type tpch.LineItemType as
  closed {
-  l_orderkey : int64,
-  l_partkey : int64,
-  l_suppkey : int64,
-  l_linenumber : int64,
-  l_quantity : int64,
+  l_orderkey : bigint,
+  l_partkey : bigint,
+  l_suppkey : bigint,
+  l_linenumber : bigint,
+  l_quantity : bigint,
   l_extendedprice : double,
   l_discount : double,
   l_tax : double,
@@ -45,23 +45,23 @@ create type tpch.LineItemType as
 
 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
 }
 
 create type tpch.CustomerType as
  closed {
-  c_custkey : int64,
+  c_custkey : bigint,
   c_name : string,
   c_address : string,
-  c_nationkey : int64,
+  c_nationkey : bigint,
   c_phone : string,
   c_acctbal : double,
   c_mktsegment : string,
@@ -70,10 +70,10 @@ create type tpch.CustomerType as
 
 create type tpch.SupplierType as
  closed {
-  s_suppkey : int64,
+  s_suppkey : bigint,
   s_name : string,
   s_address : string,
-  s_nationkey : int64,
+  s_nationkey : bigint,
   s_phone : string,
   s_acctbal : double,
   s_comment : string
@@ -81,27 +81,27 @@ create type tpch.SupplierType as
 
 create type tpch.NationType as
  closed {
-  n_nationkey : int64,
+  n_nationkey : bigint,
   n_name : string,
-  n_regionkey : int64,
+  n_regionkey : bigint,
   n_comment : string
 }
 
 create type tpch.RegionType as
  closed {
-  r_regionkey : int64,
+  r_regionkey : bigint,
   r_name : string,
   r_comment : string
 }
 
 create type tpch.PartType as
  closed {
-  p_partkey : int64,
+  p_partkey : bigint,
   p_name : string,
   p_mfgr : string,
   p_brand : string,
   p_type : string,
-  p_size : int64,
+  p_size : bigint,
   p_container : string,
   p_retailprice : double,
   p_comment : string
@@ -109,9 +109,9 @@ create type tpch.PartType as
 
 create type tpch.PartSuppType as
  closed {
-  ps_partkey : int64,
-  ps_suppkey : int64,
-  ps_availqty : int64,
+  ps_partkey : bigint,
+  ps_suppkey : bigint,
+  ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.1.ddl.sqlpp
index 1871e19..0db8d36 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.1.ddl.sqlpp
@@ -25,11 +25,11 @@ use tpch;
 
 create type tpch.LineItemType as
  closed {
-  l_orderkey : int32,
-  l_partkey : int32,
-  l_suppkey : int32,
-  l_linenumber : int32,
-  l_quantity : int32,
+  l_orderkey : integer,
+  l_partkey : integer,
+  l_suppkey : integer,
+  l_linenumber : integer,
+  l_quantity : integer,
   l_extendedprice : double,
   l_discount : double,
   l_tax : double,
@@ -45,23 +45,23 @@ create type tpch.LineItemType as
 
 create type tpch.OrderType as
  closed {
-  o_orderkey : int32,
-  o_custkey : int32,
+  o_orderkey : integer,
+  o_custkey : integer,
   o_orderstatus : string,
   o_totalprice : double,
   o_orderdate : string,
   o_orderpriority : string,
   o_clerk : string,
-  o_shippriority : int32,
+  o_shippriority : integer,
   o_comment : string
 }
 
 create type tpch.CustomerType as
  closed {
-  c_custkey : int32,
+  c_custkey : integer,
   c_name : string,
   c_address : string,
-  c_nationkey : int32,
+  c_nationkey : integer,
   c_phone : string,
   c_acctbal : double,
   c_mktsegment : string,
@@ -70,10 +70,10 @@ create type tpch.CustomerType as
 
 create type tpch.SupplierType as
  closed {
-  s_suppkey : int32,
+  s_suppkey : integer,
   s_name : string,
   s_address : string,
-  s_nationkey : int32,
+  s_nationkey : integer,
   s_phone : string,
   s_acctbal : double,
   s_comment : string
@@ -81,27 +81,27 @@ create type tpch.SupplierType as
 
 create type tpch.NationType as
  closed {
-  n_nationkey : int32,
+  n_nationkey : integer,
   n_name : string,
-  n_regionkey : int32,
+  n_regionkey : integer,
   n_comment : string
 }
 
 create type tpch.RegionType as
  closed {
-  r_regionkey : int32,
+  r_regionkey : integer,
   r_name : string,
   r_comment : string
 }
 
 create type tpch.PartType as
  closed {
-  p_partkey : int32,
+  p_partkey : integer,
   p_name : string,
   p_mfgr : string,
   p_brand : string,
   p_type : string,
-  p_size : int32,
+  p_size : integer,
   p_container : string,
   p_retailprice : double,
   p_comment : string
@@ -109,9 +109,9 @@ create type tpch.PartType as
 
 create type tpch.PartSuppType as
  closed {
-  ps_partkey : int32,
-  ps_suppkey : int32,
-  ps_availqty : int32,
+  ps_partkey : integer,
+  ps_suppkey : integer,
+  ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q18_large_volume_customer/q18_large_volume_customer.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q18_large_volume_customer/q18_large_volume_customer.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q18_large_volume_customer/q18_large_volume_customer.1.ddl.sqlpp
index 3e3f696..6cbdf11 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q18_large_volume_customer/q18_large_volume_customer.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q18_large_volume_customer/q18_large_volume_customer.1.ddl.sqlpp
@@ -25,11 +25,11 @@ use tpch;
 
 create type tpch.LineItemType as
  closed {
-  l_orderkey : int64,
-  l_partkey : int64,
-  l_suppkey : int64,
-  l_linenumber : int64,
-  l_quantity : int64,
+  l_orderkey : bigint,
+  l_partkey : bigint,
+  l_suppkey : bigint,
+  l_linenumber : bigint,
+  l_quantity : bigint,
   l_extendedprice : double,
   l_discount : double,
   l_tax : double,
@@ -45,23 +45,23 @@ create type tpch.LineItemType as
 
 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
 }
 
 create type tpch.CustomerType as
  closed {
-  c_custkey : int64,
+  c_custkey : bigint,
   c_name : string,
   c_address : string,
-  c_nationkey : int64,
+  c_nationkey : bigint,
   c_phone : string,
   c_acctbal : double,
   c_mktsegment : string,
@@ -70,10 +70,10 @@ create type tpch.CustomerType as
 
 create type tpch.SupplierType as
  closed {
-  s_suppkey : int64,
+  s_suppkey : bigint,
   s_name : string,
   s_address : string,
-  s_nationkey : int64,
+  s_nationkey : bigint,
   s_phone : string,
   s_acctbal : double,
   s_comment : string
@@ -81,27 +81,27 @@ create type tpch.SupplierType as
 
 create type tpch.NationType as
  closed {
-  n_nationkey : int64,
+  n_nationkey : bigint,
   n_name : string,
-  n_regionkey : int64,
+  n_regionkey : bigint,
   n_comment : string
 }
 
 create type tpch.RegionType as
  closed {
-  r_regionkey : int64,
+  r_regionkey : bigint,
   r_name : string,
   r_comment : string
 }
 
 create type tpch.PartType as
  closed {
-  p_partkey : int64,
+  p_partkey : bigint,
   p_name : string,
   p_mfgr : string,
   p_brand : string,
   p_type : string,
-  p_size : int64,
+  p_size : bigint,
   p_container : string,
   p_retailprice : double,
   p_comment : string
@@ -109,9 +109,9 @@ create type tpch.PartType as
 
 create type tpch.PartSuppType as
  closed {
-  ps_partkey : int64,
-  ps_suppkey : int64,
-  ps_availqty : int64,
+  ps_partkey : bigint,
+  ps_suppkey : bigint,
+  ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q19_discounted_revenue/q19_discounted_revenue.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q19_discounted_revenue/q19_discounted_revenue.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q19_discounted_revenue/q19_discounted_revenue.1.ddl.sqlpp
index 1871e19..0db8d36 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q19_discounted_revenue/q19_discounted_revenue.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q19_discounted_revenue/q19_discounted_revenue.1.ddl.sqlpp
@@ -25,11 +25,11 @@ use tpch;
 
 create type tpch.LineItemType as
  closed {
-  l_orderkey : int32,
-  l_partkey : int32,
-  l_suppkey : int32,
-  l_linenumber : int32,
-  l_quantity : int32,
+  l_orderkey : integer,
+  l_partkey : integer,
+  l_suppkey : integer,
+  l_linenumber : integer,
+  l_quantity : integer,
   l_extendedprice : double,
   l_discount : double,
   l_tax : double,
@@ -45,23 +45,23 @@ create type tpch.LineItemType as
 
 create type tpch.OrderType as
  closed {
-  o_orderkey : int32,
-  o_custkey : int32,
+  o_orderkey : integer,
+  o_custkey : integer,
   o_orderstatus : string,
   o_totalprice : double,
   o_orderdate : string,
   o_orderpriority : string,
   o_clerk : string,
-  o_shippriority : int32,
+  o_shippriority : integer,
   o_comment : string
 }
 
 create type tpch.CustomerType as
  closed {
-  c_custkey : int32,
+  c_custkey : integer,
   c_name : string,
   c_address : string,
-  c_nationkey : int32,
+  c_nationkey : integer,
   c_phone : string,
   c_acctbal : double,
   c_mktsegment : string,
@@ -70,10 +70,10 @@ create type tpch.CustomerType as
 
 create type tpch.SupplierType as
  closed {
-  s_suppkey : int32,
+  s_suppkey : integer,
   s_name : string,
   s_address : string,
-  s_nationkey : int32,
+  s_nationkey : integer,
   s_phone : string,
   s_acctbal : double,
   s_comment : string
@@ -81,27 +81,27 @@ create type tpch.SupplierType as
 
 create type tpch.NationType as
  closed {
-  n_nationkey : int32,
+  n_nationkey : integer,
   n_name : string,
-  n_regionkey : int32,
+  n_regionkey : integer,
   n_comment : string
 }
 
 create type tpch.RegionType as
  closed {
-  r_regionkey : int32,
+  r_regionkey : integer,
   r_name : string,
   r_comment : string
 }
 
 create type tpch.PartType as
  closed {
-  p_partkey : int32,
+  p_partkey : integer,
   p_name : string,
   p_mfgr : string,
   p_brand : string,
   p_type : string,
-  p_size : int32,
+  p_size : integer,
   p_container : string,
   p_retailprice : double,
   p_comment : string
@@ -109,9 +109,9 @@ create type tpch.PartType as
 
 create type tpch.PartSuppType as
  closed {
-  ps_partkey : int32,
-  ps_suppkey : int32,
-  ps_availqty : int32,
+  ps_partkey : integer,
+  ps_suppkey : integer,
+  ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q20_potential_part_promotion/q20_potential_part_promotion.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q20_potential_part_promotion/q20_potential_part_promotion.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q20_potential_part_promotion/q20_potential_part_promotion.1.ddl.sqlpp
index 1871e19..0db8d36 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q20_potential_part_promotion/q20_potential_part_promotion.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q20_potential_part_promotion/q20_potential_part_promotion.1.ddl.sqlpp
@@ -25,11 +25,11 @@ use tpch;
 
 create type tpch.LineItemType as
  closed {
-  l_orderkey : int32,
-  l_partkey : int32,
-  l_suppkey : int32,
-  l_linenumber : int32,
-  l_quantity : int32,
+  l_orderkey : integer,
+  l_partkey : integer,
+  l_suppkey : integer,
+  l_linenumber : integer,
+  l_quantity : integer,
   l_extendedprice : double,
   l_discount : double,
   l_tax : double,
@@ -45,23 +45,23 @@ create type tpch.LineItemType as
 
 create type tpch.OrderType as
  closed {
-  o_orderkey : int32,
-  o_custkey : int32,
+  o_orderkey : integer,
+  o_custkey : integer,
   o_orderstatus : string,
   o_totalprice : double,
   o_orderdate : string,
   o_orderpriority : string,
   o_clerk : string,
-  o_shippriority : int32,
+  o_shippriority : integer,
   o_comment : string
 }
 
 create type tpch.CustomerType as
  closed {
-  c_custkey : int32,
+  c_custkey : integer,
   c_name : string,
   c_address : string,
-  c_nationkey : int32,
+  c_nationkey : integer,
   c_phone : string,
   c_acctbal : double,
   c_mktsegment : string,
@@ -70,10 +70,10 @@ create type tpch.CustomerType as
 
 create type tpch.SupplierType as
  closed {
-  s_suppkey : int32,
+  s_suppkey : integer,
   s_name : string,
   s_address : string,
-  s_nationkey : int32,
+  s_nationkey : integer,
   s_phone : string,
   s_acctbal : double,
   s_comment : string
@@ -81,27 +81,27 @@ create type tpch.SupplierType as
 
 create type tpch.NationType as
  closed {
-  n_nationkey : int32,
+  n_nationkey : integer,
   n_name : string,
-  n_regionkey : int32,
+  n_regionkey : integer,
   n_comment : string
 }
 
 create type tpch.RegionType as
  closed {
-  r_regionkey : int32,
+  r_regionkey : integer,
   r_name : string,
   r_comment : string
 }
 
 create type tpch.PartType as
  closed {
-  p_partkey : int32,
+  p_partkey : integer,
   p_name : string,
   p_mfgr : string,
   p_brand : string,
   p_type : string,
-  p_size : int32,
+  p_size : integer,
   p_container : string,
   p_retailprice : double,
   p_comment : string
@@ -109,9 +109,9 @@ create type tpch.PartType as
 
 create type tpch.PartSuppType as
  closed {
-  ps_partkey : int32,
-  ps_suppkey : int32,
-  ps_availqty : int32,
+  ps_partkey : integer,
+  ps_suppkey : integer,
+  ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.1.ddl.sqlpp
index 3e3f696..6cbdf11 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.1.ddl.sqlpp
@@ -25,11 +25,11 @@ use tpch;
 
 create type tpch.LineItemType as
  closed {
-  l_orderkey : int64,
-  l_partkey : int64,
-  l_suppkey : int64,
-  l_linenumber : int64,
-  l_quantity : int64,
+  l_orderkey : bigint,
+  l_partkey : bigint,
+  l_suppkey : bigint,
+  l_linenumber : bigint,
+  l_quantity : bigint,
   l_extendedprice : double,
   l_discount : double,
   l_tax : double,
@@ -45,23 +45,23 @@ create type tpch.LineItemType as
 
 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
 }
 
 create type tpch.CustomerType as
  closed {
-  c_custkey : int64,
+  c_custkey : bigint,
   c_name : string,
   c_address : string,
-  c_nationkey : int64,
+  c_nationkey : bigint,
   c_phone : string,
   c_acctbal : double,
   c_mktsegment : string,
@@ -70,10 +70,10 @@ create type tpch.CustomerType as
 
 create type tpch.SupplierType as
  closed {
-  s_suppkey : int64,
+  s_suppkey : bigint,
   s_name : string,
   s_address : string,
-  s_nationkey : int64,
+  s_nationkey : bigint,
   s_phone : string,
   s_acctbal : double,
   s_comment : string
@@ -81,27 +81,27 @@ create type tpch.SupplierType as
 
 create type tpch.NationType as
  closed {
-  n_nationkey : int64,
+  n_nationkey : bigint,
   n_name : string,
-  n_regionkey : int64,
+  n_regionkey : bigint,
   n_comment : string
 }
 
 create type tpch.RegionType as
  closed {
-  r_regionkey : int64,
+  r_regionkey : bigint,
   r_name : string,
   r_comment : string
 }
 
 create type tpch.PartType as
  closed {
-  p_partkey : int64,
+  p_partkey : bigint,
   p_name : string,
   p_mfgr : string,
   p_brand : string,
   p_type : string,
-  p_size : int64,
+  p_size : bigint,
   p_container : string,
   p_retailprice : double,
   p_comment : string
@@ -109,9 +109,9 @@ create type tpch.PartType as
 
 create type tpch.PartSuppType as
  closed {
-  ps_partkey : int64,
-  ps_suppkey : int64,
-  ps_availqty : int64,
+  ps_partkey : bigint,
+  ps_suppkey : bigint,
+  ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q22_global_sales_opportunity/q22_global_sales_opportunity.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q22_global_sales_opportunity/q22_global_sales_opportunity.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q22_global_sales_opportunity/q22_global_sales_opportunity.1.ddl.sqlpp
index 1871e19..0db8d36 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q22_global_sales_opportunity/q22_global_sales_opportunity.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q22_global_sales_opportunity/q22_global_sales_opportunity.1.ddl.sqlpp
@@ -25,11 +25,11 @@ use tpch;
 
 create type tpch.LineItemType as
  closed {
-  l_orderkey : int32,
-  l_partkey : int32,
-  l_suppkey : int32,
-  l_linenumber : int32,
-  l_quantity : int32,
+  l_orderkey : integer,
+  l_partkey : integer,
+  l_suppkey : integer,
+  l_linenumber : integer,
+  l_quantity : integer,
   l_extendedprice : double,
   l_discount : double,
   l_tax : double,
@@ -45,23 +45,23 @@ create type tpch.LineItemType as
 
 create type tpch.OrderType as
  closed {
-  o_orderkey : int32,
-  o_custkey : int32,
+  o_orderkey : integer,
+  o_custkey : integer,
   o_orderstatus : string,
   o_totalprice : double,
   o_orderdate : string,
   o_orderpriority : string,
   o_clerk : string,
-  o_shippriority : int32,
+  o_shippriority : integer,
   o_comment : string
 }
 
 create type tpch.CustomerType as
  closed {
-  c_custkey : int32,
+  c_custkey : integer,
   c_name : string,
   c_address : string,
-  c_nationkey : int32,
+  c_nationkey : integer,
   c_phone : string,
   c_acctbal : double,
   c_mktsegment : string,
@@ -70,10 +70,10 @@ create type tpch.CustomerType as
 
 create type tpch.SupplierType as
  closed {
-  s_suppkey : int32,
+  s_suppkey : integer,
   s_name : string,
   s_address : string,
-  s_nationkey : int32,
+  s_nationkey : integer,
   s_phone : string,
   s_acctbal : double,
   s_comment : string
@@ -81,27 +81,27 @@ create type tpch.SupplierType as
 
 create type tpch.NationType as
  closed {
-  n_nationkey : int32,
+  n_nationkey : integer,
   n_name : string,
-  n_regionkey : int32,
+  n_regionkey : integer,
   n_comment : string
 }
 
 create type tpch.RegionType as
  closed {
-  r_regionkey : int32,
+  r_regionkey : integer,
   r_name : string,
   r_comment : string
 }
 
 create type tpch.PartType as
  closed {
-  p_partkey : int32,
+  p_partkey : integer,
   p_name : string,
   p_mfgr : string,
   p_brand : string,
   p_type : string,
-  p_size : int32,
+  p_size : integer,
   p_container : string,
   p_retailprice : double,
   p_comment : string
@@ -109,9 +109,9 @@ create type tpch.PartType as
 
 create type tpch.PartSuppType as
  closed {
-  ps_partkey : int32,
-  ps_suppkey : int32,
-  ps_availqty : int32,
+  ps_partkey : integer,
+  ps_suppkey : integer,
+  ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue562/query-issue562.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue562/query-issue562.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue562/query-issue562.1.ddl.sqlpp
index dc1e7e8..98ee9a2 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue562/query-issue562.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue562/query-issue562.1.ddl.sqlpp
@@ -31,11 +31,11 @@ use tpch;
 
 create type tpch.LineItemType as
  closed {
-  l_orderkey : int32,
-  l_partkey : int32,
-  l_suppkey : int32,
-  l_linenumber : int32,
-  l_quantity : int32,
+  l_orderkey : integer,
+  l_partkey : integer,
+  l_suppkey : integer,
+  l_linenumber : integer,
+  l_quantity : integer,
   l_extendedprice : double,
   l_discount : double,
   l_tax : double,
@@ -51,23 +51,23 @@ create type tpch.LineItemType as
 
 create type tpch.OrderType as
  closed {
-  o_orderkey : int32,
-  o_custkey : int32,
+  o_orderkey : integer,
+  o_custkey : integer,
   o_orderstatus : string,
   o_totalprice : double,
   o_orderdate : string,
   o_orderpriority : string,
   o_clerk : string,
-  o_shippriority : int32,
+  o_shippriority : integer,
   o_comment : string
 }
 
 create type tpch.CustomerType as
  closed {
-  c_custkey : int32,
+  c_custkey : integer,
   c_name : string,
   c_address : string,
-  c_nationkey : int32,
+  c_nationkey : integer,
   c_phone : string,
   c_acctbal : double,
   c_mktsegment : string,
@@ -76,10 +76,10 @@ create type tpch.CustomerType as
 
 create type tpch.SupplierType as
  closed {
-  s_suppkey : int32,
+  s_suppkey : integer,
   s_name : string,
   s_address : string,
-  s_nationkey : int32,
+  s_nationkey : integer,
   s_phone : string,
   s_acctbal : double,
   s_comment : string
@@ -87,27 +87,27 @@ create type tpch.SupplierType as
 
 create type tpch.NationType as
  closed {
-  n_nationkey : int32,
+  n_nationkey : integer,
   n_name : string,
-  n_regionkey : int32,
+  n_regionkey : integer,
   n_comment : string
 }
 
 create type tpch.RegionType as
  closed {
-  r_regionkey : int32,
+  r_regionkey : integer,
   r_name : string,
   r_comment : string
 }
 
 create type tpch.PartType as
  closed {
-  p_partkey : int32,
+  p_partkey : integer,
   p_name : string,
   p_mfgr : string,
   p_brand : string,
   p_type : string,
-  p_size : int32,
+  p_size : integer,
   p_container : string,
   p_retailprice : double,
   p_comment : string
@@ -115,9 +115,9 @@ create type tpch.PartType as
 
 create type tpch.PartSuppType as
  closed {
-  ps_partkey : int32,
-  ps_suppkey : int32,
-  ps_availqty : int32,
+  ps_partkey : integer,
+  ps_suppkey : integer,
+  ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue562/query-issue562.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue562/query-issue562.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue562/query-issue562.3.query.sqlpp
index afd3db5..7f7787e 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue562/query-issue562.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue562/query-issue562.3.query.sqlpp
@@ -37,7 +37,7 @@ WITH q22_customer_tmp AS
 
 SELECT cntrycode, count(ct) AS numcust, sum(c_acctbal) AS totacctbal
 FROM  q22_customer_tmp as ct
-WHERE coll_count((
+WHERE array_count((
                 SELECT ELEMENT Orders
                 FROM  Orders
                 WHERE c_custkey = o_custkey

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue601/query-issue601.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue601/query-issue601.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue601/query-issue601.1.ddl.sqlpp
index 09db56b..b4d7fb4 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue601/query-issue601.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue601/query-issue601.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/tpch-sql-sugar/query-issue638/query-issue638.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue638/query-issue638.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue638/query-issue638.1.ddl.sqlpp
index 88957d2..84121b9 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue638/query-issue638.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue638/query-issue638.1.ddl.sqlpp
@@ -31,11 +31,11 @@ use tpch;
 
 create type tpch.LineItemType as
  closed {
-  l_orderkey : int32,
-  l_partkey : int32,
-  l_suppkey : int32,
-  l_linenumber : int32,
-  l_quantity : int32,
+  l_orderkey : integer,
+  l_partkey : integer,
+  l_suppkey : integer,
+  l_linenumber : integer,
+  l_quantity : integer,
   l_extendedprice : double,
   l_discount : double,
   l_tax : double,
@@ -51,23 +51,23 @@ create type tpch.LineItemType as
 
 create type tpch.OrderType as
  closed {
-  o_orderkey : int32,
-  o_custkey : int32,
+  o_orderkey : integer,
+  o_custkey : integer,
   o_orderstatus : string,
   o_totalprice : double,
   o_orderdate : string,
   o_orderpriority : string,
   o_clerk : string,
-  o_shippriority : int32,
+  o_shippriority : integer,
   o_comment : string
 }
 
 create type tpch.CustomerType as
  closed {
-  c_custkey : int32,
+  c_custkey : integer,
   c_name : string,
   c_address : string,
-  c_nationkey : int32,
+  c_nationkey : integer,
   c_phone : string,
   c_acctbal : double,
   c_mktsegment : string,
@@ -76,10 +76,10 @@ create type tpch.CustomerType as
 
 create type tpch.SupplierType as
  closed {
-  s_suppkey : int32,
+  s_suppkey : integer,
   s_name : string,
   s_address : string,
-  s_nationkey : int32,
+  s_nationkey : integer,
   s_phone : string,
   s_acctbal : double,
   s_comment : string
@@ -87,27 +87,27 @@ create type tpch.SupplierType as
 
 create type tpch.NationType as
  closed {
-  n_nationkey : int32,
+  n_nationkey : integer,
   n_name : string,
-  n_regionkey : int32,
+  n_regionkey : integer,
   n_comment : string
 }
 
 create type tpch.RegionType as
  closed {
-  r_regionkey : int32,
+  r_regionkey : integer,
   r_name : string,
   r_comment : string
 }
 
 create type tpch.PartType as
  closed {
-  p_partkey : int32,
+  p_partkey : integer,
   p_name : string,
   p_mfgr : string,
   p_brand : string,
   p_type : string,
-  p_size : int32,
+  p_size : integer,
   p_container : string,
   p_retailprice : double,
   p_comment : string
@@ -115,9 +115,9 @@ create type tpch.PartType as
 
 create type tpch.PartSuppType as
  closed {
-  ps_partkey : int32,
-  ps_suppkey : int32,
-  ps_availqty : int32,
+  ps_partkey : integer,
+  ps_suppkey : integer,
+  ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue785-2/query-issue785-2.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue785-2/query-issue785-2.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue785-2/query-issue785-2.1.ddl.sqlpp
index d0fc321..65152ef 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue785-2/query-issue785-2.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue785-2/query-issue785-2.1.ddl.sqlpp
@@ -31,23 +31,23 @@ 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
 }
 
 create type tpch.CustomerType as
  closed {
-  c_custkey : int64,
+  c_custkey : bigint,
   c_name : string,
   c_address : string,
-  c_nationkey : int64,
+  c_nationkey : bigint,
   c_phone : string,
   c_acctbal : double,
   c_mktsegment : string,
@@ -56,10 +56,10 @@ create type tpch.CustomerType as
 
 create type tpch.SupplierType as
  closed {
-  s_suppkey : int64,
+  s_suppkey : bigint,
   s_name : string,
   s_address : string,
-  s_nationkey : int64,
+  s_nationkey : bigint,
   s_phone : string,
   s_acctbal : double,
   s_comment : string
@@ -67,15 +67,15 @@ create type tpch.SupplierType as
 
 create type tpch.NationType as
  closed {
-  n_nationkey : int64,
+  n_nationkey : bigint,
   n_name : string,
-  n_regionkey : int64,
+  n_regionkey : bigint,
   n_comment : string
 }
 
 create type tpch.RegionType as
  closed {
-  r_regionkey : int64,
+  r_regionkey : bigint,
   r_name : string,
   r_comment : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue785/query-issue785.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue785/query-issue785.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue785/query-issue785.1.ddl.sqlpp
index d0fc321..65152ef 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue785/query-issue785.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue785/query-issue785.1.ddl.sqlpp
@@ -31,23 +31,23 @@ 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
 }
 
 create type tpch.CustomerType as
  closed {
-  c_custkey : int64,
+  c_custkey : bigint,
   c_name : string,
   c_address : string,
-  c_nationkey : int64,
+  c_nationkey : bigint,
   c_phone : string,
   c_acctbal : double,
   c_mktsegment : string,
@@ -56,10 +56,10 @@ create type tpch.CustomerType as
 
 create type tpch.SupplierType as
  closed {
-  s_suppkey : int64,
+  s_suppkey : bigint,
   s_name : string,
   s_address : string,
-  s_nationkey : int64,
+  s_nationkey : bigint,
   s_phone : string,
   s_acctbal : double,
   s_comment : string
@@ -67,15 +67,15 @@ create type tpch.SupplierType as
 
 create type tpch.NationType as
  closed {
-  n_nationkey : int64,
+  n_nationkey : bigint,
   n_name : string,
-  n_regionkey : int64,
+  n_regionkey : bigint,
   n_comment : string
 }
 
 create type tpch.RegionType as
  closed {
-  r_regionkey : int64,
+  r_regionkey : bigint,
   r_name : string,
   r_comment : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue786/query-issue786.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue786/query-issue786.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue786/query-issue786.1.ddl.sqlpp
index 8c900c7..2f927dd 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue786/query-issue786.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue786/query-issue786.1.ddl.sqlpp
@@ -31,23 +31,23 @@ use tpch;
 
 create type tpch.OrderType as
  closed {
-  o_orderkey : int32,
-  o_custkey : int32,
+  o_orderkey : integer,
+  o_custkey : integer,
   o_orderstatus : string,
   o_totalprice : double,
   o_orderdate : string,
   o_orderpriority : string,
   o_clerk : string,
-  o_shippriority : int32,
+  o_shippriority : integer,
   o_comment : string
 }
 
 create type tpch.CustomerType as
  closed {
-  c_custkey : int32,
+  c_custkey : integer,
   c_name : string,
   c_address : string,
-  c_nationkey : int32,
+  c_nationkey : integer,
   c_phone : string,
   c_acctbal : double,
   c_mktsegment : string,
@@ -56,10 +56,10 @@ create type tpch.CustomerType as
 
 create type tpch.SupplierType as
  closed {
-  s_suppkey : int32,
+  s_suppkey : integer,
   s_name : string,
   s_address : string,
-  s_nationkey : int32,
+  s_nationkey : integer,
   s_phone : string,
   s_acctbal : double,
   s_comment : string
@@ -67,15 +67,15 @@ create type tpch.SupplierType as
 
 create type tpch.NationType as
  closed {
-  n_nationkey : int32,
+  n_nationkey : integer,
   n_name : string,
-  n_regionkey : int32,
+  n_regionkey : integer,
   n_comment : string
 }
 
 create type tpch.RegionType as
  closed {
-  r_regionkey : int32,
+  r_regionkey : integer,
   r_name : string,
   r_comment : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810-2/query-issue810-2.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810-2/query-issue810-2.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810-2/query-issue810-2.1.ddl.sqlpp
index f44a9c0..b2a395f 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810-2/query-issue810-2.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810-2/query-issue810-2.1.ddl.sqlpp
@@ -31,10 +31,10 @@ use tpch;
 
 create type tpch.LineItemType as
  closed {
-  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,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810-2/query-issue810-2.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810-2/query-issue810-2.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810-2/query-issue810-2.3.query.sqlpp
index e361e74..55b1107 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810-2/query-issue810-2.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810-2/query-issue810-2.3.query.sqlpp
@@ -28,7 +28,7 @@ use tpch;
 
 SELECT l_returnflag,
        l_linestatus,
-       coll_count(cheaps) AS count_cheaps,
+       array_count(cheaps) AS count_cheaps,
        total_charges AS total_charges
 FROM  LineItem as l
 WHERE l_shipdate <= '1998-09-02'

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810-3/query-issue810-3.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810-3/query-issue810-3.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810-3/query-issue810-3.1.ddl.sqlpp
index f44a9c0..b2a395f 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810-3/query-issue810-3.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810-3/query-issue810-3.1.ddl.sqlpp
@@ -31,10 +31,10 @@ use tpch;
 
 create type tpch.LineItemType as
  closed {
-  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,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810-3/query-issue810-3.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810-3/query-issue810-3.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810-3/query-issue810-3.3.query.sqlpp
index d8c9222..15af738 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810-3/query-issue810-3.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810-3/query-issue810-3.3.query.sqlpp
@@ -28,8 +28,8 @@ USE tpch;
 
 SELECT  l_returnflag,
         l_linestatus,
-        coll_count(cheaps) AS count_cheaps,
-        coll_avg(expensives) AS avg_expensive_discounts,
+        array_count(cheaps) AS count_cheaps,
+        array_avg(expensives) AS avg_expensive_discounts,
         sum_disc_prices AS sum_disc_prices,
         total_charges AS total_charges
 FROM  LineItem AS l

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810/query-issue810.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810/query-issue810.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810/query-issue810.1.ddl.sqlpp
index f44a9c0..b2a395f 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810/query-issue810.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810/query-issue810.1.ddl.sqlpp
@@ -31,10 +31,10 @@ use tpch;
 
 create type tpch.LineItemType as
  closed {
-  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,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810/query-issue810.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810/query-issue810.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810/query-issue810.3.query.sqlpp
index cf9582a..d35c4b8 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810/query-issue810.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810/query-issue810.3.query.sqlpp
@@ -28,8 +28,8 @@ USE tpch;
 
 SELECT l_returnflag,
        l_linestatus,
-       coll_count(cheap) AS count_cheaps,
-       coll_count(expensive) AS count_expensives
+       array_count(cheap) AS count_cheaps,
+       array_count(expensive) AS count_expensives
 FROM LineItem AS l
 WHERE l_shipdate <= '1998-09-02'
 /* +hash */

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/distinct_by/distinct_by.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/distinct_by/distinct_by.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/distinct_by/distinct_by.1.ddl.sqlpp
index 4d4bd1c..d50dd81 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/distinct_by/distinct_by.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/distinct_by/distinct_by.1.ddl.sqlpp
@@ -25,10 +25,10 @@ use tpch;
 
 create type tpch.LineItemType as
  closed {
-  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,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/group_no_agg/group_no_agg.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/group_no_agg/group_no_agg.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/group_no_agg/group_no_agg.1.ddl.sqlpp
index fbf62ab..3cbe494 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/group_no_agg/group_no_agg.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/group_no_agg/group_no_agg.1.ddl.sqlpp
@@ -25,7 +25,7 @@ use tpch;
 
 create type tpch.RegionType as
  closed {
-  r_regionkey : int32,
+  r_regionkey : integer,
   r_name : string,
   r_comment : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/nest_aggregate/nest_aggregate.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/nest_aggregate/nest_aggregate.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/nest_aggregate/nest_aggregate.1.ddl.sqlpp
index 52678df..089efc3 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/nest_aggregate/nest_aggregate.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/nest_aggregate/nest_aggregate.1.ddl.sqlpp
@@ -31,23 +31,23 @@ 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
 }
 
 create type tpch.CustomerType as
  closed {
-  c_custkey : int64,
+  c_custkey : bigint,
   c_name : string,
   c_address : string,
-  c_nationkey : int64,
+  c_nationkey : bigint,
   c_phone : string,
   c_acctbal : double,
   c_mktsegment : string,
@@ -56,10 +56,10 @@ create type tpch.CustomerType as
 
 create type tpch.SupplierType as
  closed {
-  s_suppkey : int64,
+  s_suppkey : bigint,
   s_name : string,
   s_address : string,
-  s_nationkey : int64,
+  s_nationkey : bigint,
   s_phone : string,
   s_acctbal : double,
   s_comment : string
@@ -67,15 +67,15 @@ create type tpch.SupplierType as
 
 create type tpch.NationType as
  closed {
-  n_nationkey : int64,
+  n_nationkey : bigint,
   n_name : string,
-  n_regionkey : int64,
+  n_regionkey : bigint,
   n_comment : string
 }
 
 create type tpch.RegionType as
  closed {
-  r_regionkey : int64,
+  r_regionkey : bigint,
   r_name : string,
   r_comment : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/nest_aggregate2/nest_aggregate2.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/nest_aggregate2/nest_aggregate2.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/nest_aggregate2/nest_aggregate2.1.ddl.sqlpp
index 52678df..089efc3 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/nest_aggregate2/nest_aggregate2.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/nest_aggregate2/nest_aggregate2.1.ddl.sqlpp
@@ -31,23 +31,23 @@ 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
 }
 
 create type tpch.CustomerType as
  closed {
-  c_custkey : int64,
+  c_custkey : bigint,
   c_name : string,
   c_address : string,
-  c_nationkey : int64,
+  c_nationkey : bigint,
   c_phone : string,
   c_acctbal : double,
   c_mktsegment : string,
@@ -56,10 +56,10 @@ create type tpch.CustomerType as
 
 create type tpch.SupplierType as
  closed {
-  s_suppkey : int64,
+  s_suppkey : bigint,
   s_name : string,
   s_address : string,
-  s_nationkey : int64,
+  s_nationkey : bigint,
   s_phone : string,
   s_acctbal : double,
   s_comment : string
@@ -67,15 +67,15 @@ create type tpch.SupplierType as
 
 create type tpch.NationType as
  closed {
-  n_nationkey : int64,
+  n_nationkey : bigint,
   n_name : string,
-  n_regionkey : int64,
+  n_regionkey : bigint,
   n_comment : string
 }
 
 create type tpch.RegionType as
  closed {
-  r_regionkey : int64,
+  r_regionkey : bigint,
   r_name : string,
   r_comment : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
index 211ef99..92698ab 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
@@ -25,10 +25,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/tpch-sql/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp
index 3e3f696..6cbdf11 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp
@@ -25,11 +25,11 @@ use tpch;
 
 create type tpch.LineItemType as
  closed {
-  l_orderkey : int64,
-  l_partkey : int64,
-  l_suppkey : int64,
-  l_linenumber : int64,
-  l_quantity : int64,
+  l_orderkey : bigint,
+  l_partkey : bigint,
+  l_suppkey : bigint,
+  l_linenumber : bigint,
+  l_quantity : bigint,
   l_extendedprice : double,
   l_discount : double,
   l_tax : double,
@@ -45,23 +45,23 @@ create type tpch.LineItemType as
 
 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
 }
 
 create type tpch.CustomerType as
  closed {
-  c_custkey : int64,
+  c_custkey : bigint,
   c_name : string,
   c_address : string,
-  c_nationkey : int64,
+  c_nationkey : bigint,
   c_phone : string,
   c_acctbal : double,
   c_mktsegment : string,
@@ -70,10 +70,10 @@ create type tpch.CustomerType as
 
 create type tpch.SupplierType as
  closed {
-  s_suppkey : int64,
+  s_suppkey : bigint,
   s_name : string,
   s_address : string,
-  s_nationkey : int64,
+  s_nationkey : bigint,
   s_phone : string,
   s_acctbal : double,
   s_comment : string
@@ -81,27 +81,27 @@ create type tpch.SupplierType as
 
 create type tpch.NationType as
  closed {
-  n_nationkey : int64,
+  n_nationkey : bigint,
   n_name : string,
-  n_regionkey : int64,
+  n_regionkey : bigint,
   n_comment : string
 }
 
 create type tpch.RegionType as
  closed {
-  r_regionkey : int64,
+  r_regionkey : bigint,
   r_name : string,
   r_comment : string
 }
 
 create type tpch.PartType as
  closed {
-  p_partkey : int64,
+  p_partkey : bigint,
   p_name : string,
   p_mfgr : string,
   p_brand : string,
   p_type : string,
-  p_size : int64,
+  p_size : bigint,
   p_container : string,
   p_retailprice : double,
   p_comment : string
@@ -109,9 +109,9 @@ create type tpch.PartType as
 
 create type tpch.PartSuppType as
  closed {
-  ps_partkey : int64,
-  ps_suppkey : int64,
-  ps_availqty : int64,
+  ps_partkey : bigint,
+  ps_suppkey : bigint,
+  ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp
index 3e3f696..6cbdf11 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp
@@ -25,11 +25,11 @@ use tpch;
 
 create type tpch.LineItemType as
  closed {
-  l_orderkey : int64,
-  l_partkey : int64,
-  l_suppkey : int64,
-  l_linenumber : int64,
-  l_quantity : int64,
+  l_orderkey : bigint,
+  l_partkey : bigint,
+  l_suppkey : bigint,
+  l_linenumber : bigint,
+  l_quantity : bigint,
   l_extendedprice : double,
   l_discount : double,
   l_tax : double,
@@ -45,23 +45,23 @@ create type tpch.LineItemType as
 
 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
 }
 
 create type tpch.CustomerType as
  closed {
-  c_custkey : int64,
+  c_custkey : bigint,
   c_name : string,
   c_address : string,
-  c_nationkey : int64,
+  c_nationkey : bigint,
   c_phone : string,
   c_acctbal : double,
   c_mktsegment : string,
@@ -70,10 +70,10 @@ create type tpch.CustomerType as
 
 create type tpch.SupplierType as
  closed {
-  s_suppkey : int64,
+  s_suppkey : bigint,
   s_name : string,
   s_address : string,
-  s_nationkey : int64,
+  s_nationkey : bigint,
   s_phone : string,
   s_acctbal : double,
   s_comment : string
@@ -81,27 +81,27 @@ create type tpch.SupplierType as
 
 create type tpch.NationType as
  closed {
-  n_nationkey : int64,
+  n_nationkey : bigint,
   n_name : string,
-  n_regionkey : int64,
+  n_regionkey : bigint,
   n_comment : string
 }
 
 create type tpch.RegionType as
  closed {
-  r_regionkey : int64,
+  r_regionkey : bigint,
   r_name : string,
   r_comment : string
 }
 
 create type tpch.PartType as
  closed {
-  p_partkey : int64,
+  p_partkey : bigint,
   p_name : string,
   p_mfgr : string,
   p_brand : string,
   p_type : string,
-  p_size : int64,
+  p_size : bigint,
   p_container : string,
   p_retailprice : double,
   p_comment : string
@@ -109,9 +109,9 @@ create type tpch.PartType as
 
 create type tpch.PartSuppType as
  closed {
-  ps_partkey : int64,
-  ps_suppkey : int64,
-  ps_availqty : int64,
+  ps_partkey : bigint,
+  ps_suppkey : bigint,
+  ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q04_order_priority/q04_order_priority.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q04_order_priority/q04_order_priority.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q04_order_priority/q04_order_priority.1.ddl.sqlpp
index 3e3f696..6cbdf11 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q04_order_priority/q04_order_priority.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q04_order_priority/q04_order_priority.1.ddl.sqlpp
@@ -25,11 +25,11 @@ use tpch;
 
 create type tpch.LineItemType as
  closed {
-  l_orderkey : int64,
-  l_partkey : int64,
-  l_suppkey : int64,
-  l_linenumber : int64,
-  l_quantity : int64,
+  l_orderkey : bigint,
+  l_partkey : bigint,
+  l_suppkey : bigint,
+  l_linenumber : bigint,
+  l_quantity : bigint,
   l_extendedprice : double,
   l_discount : double,
   l_tax : double,
@@ -45,23 +45,23 @@ create type tpch.LineItemType as
 
 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
 }
 
 create type tpch.CustomerType as
  closed {
-  c_custkey : int64,
+  c_custkey : bigint,
   c_name : string,
   c_address : string,
-  c_nationkey : int64,
+  c_nationkey : bigint,
   c_phone : string,
   c_acctbal : double,
   c_mktsegment : string,
@@ -70,10 +70,10 @@ create type tpch.CustomerType as
 
 create type tpch.SupplierType as
  closed {
-  s_suppkey : int64,
+  s_suppkey : bigint,
   s_name : string,
   s_address : string,
-  s_nationkey : int64,
+  s_nationkey : bigint,
   s_phone : string,
   s_acctbal : double,
   s_comment : string
@@ -81,27 +81,27 @@ create type tpch.SupplierType as
 
 create type tpch.NationType as
  closed {
-  n_nationkey : int64,
+  n_nationkey : bigint,
   n_name : string,
-  n_regionkey : int64,
+  n_regionkey : bigint,
   n_comment : string
 }
 
 create type tpch.RegionType as
  closed {
-  r_regionkey : int64,
+  r_regionkey : bigint,
   r_name : string,
   r_comment : string
 }
 
 create type tpch.PartType as
  closed {
-  p_partkey : int64,
+  p_partkey : bigint,
   p_name : string,
   p_mfgr : string,
   p_brand : string,
   p_type : string,
-  p_size : int64,
+  p_size : bigint,
   p_container : string,
   p_retailprice : double,
   p_comment : string
@@ -109,9 +109,9 @@ create type tpch.PartType as
 
 create type tpch.PartSuppType as
  closed {
-  ps_partkey : int64,
-  ps_suppkey : int64,
-  ps_availqty : int64,
+  ps_partkey : bigint,
+  ps_suppkey : bigint,
+  ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp
index 1871e19..0db8d36 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp
@@ -25,11 +25,11 @@ use tpch;
 
 create type tpch.LineItemType as
  closed {
-  l_orderkey : int32,
-  l_partkey : int32,
-  l_suppkey : int32,
-  l_linenumber : int32,
-  l_quantity : int32,
+  l_orderkey : integer,
+  l_partkey : integer,
+  l_suppkey : integer,
+  l_linenumber : integer,
+  l_quantity : integer,
   l_extendedprice : double,
   l_discount : double,
   l_tax : double,
@@ -45,23 +45,23 @@ create type tpch.LineItemType as
 
 create type tpch.OrderType as
  closed {
-  o_orderkey : int32,
-  o_custkey : int32,
+  o_orderkey : integer,
+  o_custkey : integer,
   o_orderstatus : string,
   o_totalprice : double,
   o_orderdate : string,
   o_orderpriority : string,
   o_clerk : string,
-  o_shippriority : int32,
+  o_shippriority : integer,
   o_comment : string
 }
 
 create type tpch.CustomerType as
  closed {
-  c_custkey : int32,
+  c_custkey : integer,
   c_name : string,
   c_address : string,
-  c_nationkey : int32,
+  c_nationkey : integer,
   c_phone : string,
   c_acctbal : double,
   c_mktsegment : string,
@@ -70,10 +70,10 @@ create type tpch.CustomerType as
 
 create type tpch.SupplierType as
  closed {
-  s_suppkey : int32,
+  s_suppkey : integer,
   s_name : string,
   s_address : string,
-  s_nationkey : int32,
+  s_nationkey : integer,
   s_phone : string,
   s_acctbal : double,
   s_comment : string
@@ -81,27 +81,27 @@ create type tpch.SupplierType as
 
 create type tpch.NationType as
  closed {
-  n_nationkey : int32,
+  n_nationkey : integer,
   n_name : string,
-  n_regionkey : int32,
+  n_regionkey : integer,
   n_comment : string
 }
 
 create type tpch.RegionType as
  closed {
-  r_regionkey : int32,
+  r_regionkey : integer,
   r_name : string,
   r_comment : string
 }
 
 create type tpch.PartType as
  closed {
-  p_partkey : int32,
+  p_partkey : integer,
   p_name : string,
   p_mfgr : string,
   p_brand : string,
   p_type : string,
-  p_size : int32,
+  p_size : integer,
   p_container : string,
   p_retailprice : double,
   p_comment : string
@@ -109,9 +109,9 @@ create type tpch.PartType as
 
 create type tpch.PartSuppType as
  closed {
-  ps_partkey : int32,
-  ps_suppkey : int32,
-  ps_availqty : int32,
+  ps_partkey : integer,
+  ps_suppkey : integer,
+  ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp
index 1871e19..0db8d36 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp
@@ -25,11 +25,11 @@ use tpch;
 
 create type tpch.LineItemType as
  closed {
-  l_orderkey : int32,
-  l_partkey : int32,
-  l_suppkey : int32,
-  l_linenumber : int32,
-  l_quantity : int32,
+  l_orderkey : integer,
+  l_partkey : integer,
+  l_suppkey : integer,
+  l_linenumber : integer,
+  l_quantity : integer,
   l_extendedprice : double,
   l_discount : double,
   l_tax : double,
@@ -45,23 +45,23 @@ create type tpch.LineItemType as
 
 create type tpch.OrderType as
  closed {
-  o_orderkey : int32,
-  o_custkey : int32,
+  o_orderkey : integer,
+  o_custkey : integer,
   o_orderstatus : string,
   o_totalprice : double,
   o_orderdate : string,
   o_orderpriority : string,
   o_clerk : string,
-  o_shippriority : int32,
+  o_shippriority : integer,
   o_comment : string
 }
 
 create type tpch.CustomerType as
  closed {
-  c_custkey : int32,
+  c_custkey : integer,
   c_name : string,
   c_address : string,
-  c_nationkey : int32,
+  c_nationkey : integer,
   c_phone : string,
   c_acctbal : double,
   c_mktsegment : string,
@@ -70,10 +70,10 @@ create type tpch.CustomerType as
 
 create type tpch.SupplierType as
  closed {
-  s_suppkey : int32,
+  s_suppkey : integer,
   s_name : string,
   s_address : string,
-  s_nationkey : int32,
+  s_nationkey : integer,
   s_phone : string,
   s_acctbal : double,
   s_comment : string
@@ -81,27 +81,27 @@ create type tpch.SupplierType as
 
 create type tpch.NationType as
  closed {
-  n_nationkey : int32,
+  n_nationkey : integer,
   n_name : string,
-  n_regionkey : int32,
+  n_regionkey : integer,
   n_comment : string
 }
 
 create type tpch.RegionType as
  closed {
-  r_regionkey : int32,
+  r_regionkey : integer,
   r_name : string,
   r_comment : string
 }
 
 create type tpch.PartType as
  closed {
-  p_partkey : int32,
+  p_partkey : integer,
   p_name : string,
   p_mfgr : string,
   p_brand : string,
   p_type : string,
-  p_size : int32,
+  p_size : integer,
   p_container : string,
   p_retailprice : double,
   p_comment : string
@@ -109,9 +109,9 @@ create type tpch.PartType as
 
 create type tpch.PartSuppType as
  closed {
-  ps_partkey : int32,
-  ps_suppkey : int32,
-  ps_availqty : int32,
+  ps_partkey : integer,
+  ps_suppkey : integer,
+  ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
 }

Reply via email to