http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q18_large_volume_customer/q18_large_volume_customer.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q18_large_volume_customer/q18_large_volume_customer.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q18_large_volume_customer/q18_large_volume_customer.1.ddl.sqlpp
index c930359..56612a4 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q18_large_volume_customer/q18_large_volume_customer.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/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-with-index/q18_large_volume_customer/q18_large_volume_customer.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q18_large_volume_customer/q18_large_volume_customer.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q18_large_volume_customer/q18_large_volume_customer.3.query.sqlpp
index e0976a0..10ffa01 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q18_large_volume_customer/q18_large_volume_customer.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q18_large_volume_customer/q18_large_volume_customer.3.query.sqlpp
@@ -20,14 +20,14 @@
 use tpch;
 
 
-select element 
{'c_name':c_name,'c_custkey':c_custkey,'o_orderkey':o_orderkey,'o_orderdate':o_orderdate,'o_totalprice':o_totalprice,'sum_quantity':tpch.coll_sum((
+select element 
{'c_name':c_name,'c_custkey':c_custkey,'o_orderkey':o_orderkey,'o_orderdate':o_orderdate,'o_totalprice':o_totalprice,'sum_quantity':tpch.array_sum((
         select element j.l_quantity
         from  l as j
     ))}
 from  Customer as c,
       Orders as o,
       (
-    select element {'l_orderkey':l_orderkey,'t_sum_quantity':tpch.coll_sum((
+    select element {'l_orderkey':l_orderkey,'t_sum_quantity':tpch.array_sum((
             select element i.l_quantity
             from  l as i
         ))}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q19_discounted_revenue/q19_discounted_revenue.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q19_discounted_revenue/q19_discounted_revenue.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q19_discounted_revenue/q19_discounted_revenue.1.ddl.sqlpp
index cbeb640..4e176f4 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q19_discounted_revenue/q19_discounted_revenue.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/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-with-index/q19_discounted_revenue/q19_discounted_revenue.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q19_discounted_revenue/q19_discounted_revenue.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q19_discounted_revenue/q19_discounted_revenue.3.query.sqlpp
index 9057ccb..c6a2b67 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q19_discounted_revenue/q19_discounted_revenue.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q19_discounted_revenue/q19_discounted_revenue.3.query.sqlpp
@@ -22,7 +22,7 @@ use tpch;
 
 set `import-private-functions` `true`;
 
-select element coll_sum((
+select element array_sum((
     select element (l.l_extendedprice * (1 - l.l_discount))
     from  LineItem as l,
           Part as p

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q20_potential_part_promotion/q20_potential_part_promotion.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q20_potential_part_promotion/q20_potential_part_promotion.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q20_potential_part_promotion/q20_potential_part_promotion.1.ddl.sqlpp
index cbeb640..4e176f4 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q20_potential_part_promotion/q20_potential_part_promotion.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/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-with-index/q20_potential_part_promotion/q20_potential_part_promotion.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q20_potential_part_promotion/q20_potential_part_promotion.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q20_potential_part_promotion/q20_potential_part_promotion.3.query.sqlpp
index 82e38bf..bcc2099 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q20_potential_part_promotion/q20_potential_part_promotion.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q20_potential_part_promotion/q20_potential_part_promotion.3.query.sqlpp
@@ -24,7 +24,7 @@ select element {'s_name':t4.s_name,'s_address':t4.s_address}
 from  (
     select distinct element {'ps_suppkey':pst1.ps_suppkey}
     from  (
-        select element 
{'l_partkey':l_partkey,'l_suppkey':l_suppkey,'sum_quantity':(0.5 * 
tpch.coll_sum((
+        select element 
{'l_partkey':l_partkey,'l_suppkey':l_suppkey,'sum_quantity':(0.5 * 
tpch.array_sum((
                   select element i.l_quantity
                   from  l as i
               )))}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/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-with-index/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-with-index/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.1.ddl.sqlpp
index c930359..56612a4 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/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-with-index/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-with-index/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.query.sqlpp
index 3ccb9b8..50de6f3 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.query.sqlpp
@@ -22,10 +22,10 @@ use tpch;
 
 declare function tmp1() {
 (
-    select element {'l_orderkey':l_orderkey,'count_suppkey':coll_count((
+    select element {'l_orderkey':l_orderkey,'count_suppkey':array_count((
             select element i.l_suppkey
             from  l2 as i
-        )),'max_suppkey':tpch.coll_max((
+        )),'max_suppkey':tpch.array_max((
             select element i.l_suppkey
             from  l2 as i
         ))}
@@ -39,10 +39,10 @@ declare function tmp1() {
 };
 declare function tmp2() {
 (
-    select element {'l_orderkey':l_orderkey,'count_suppkey':coll_count((
+    select element {'l_orderkey':l_orderkey,'count_suppkey':array_count((
             select element i.l_suppkey
             from  l2 as i
-        )),'max_suppkey':tpch.coll_max((
+        )),'max_suppkey':tpch.array_max((
             select element i.l_suppkey
             from  l2 as i
         ))}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q22_global_sales_opportunity/q22_global_sales_opportunity.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q22_global_sales_opportunity/q22_global_sales_opportunity.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q22_global_sales_opportunity/q22_global_sales_opportunity.1.ddl.sqlpp
index cbeb640..4e176f4 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q22_global_sales_opportunity/q22_global_sales_opportunity.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/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-with-index/q22_global_sales_opportunity/q22_global_sales_opportunity.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q22_global_sales_opportunity/q22_global_sales_opportunity.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q22_global_sales_opportunity/q22_global_sales_opportunity.3.query.sqlpp
index 328c753..c64a54c 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q22_global_sales_opportunity/q22_global_sales_opportunity.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q22_global_sales_opportunity/q22_global_sales_opportunity.3.query.sqlpp
@@ -26,12 +26,12 @@ declare function q22_customer_tmp() {
     from  Customer as c
 )
 };
-with  avg as tpch.coll_avg((
+with  avg as tpch.array_avg((
       select element c.c_acctbal
       from  Customer as c
       where (c.c_acctbal > 0.0)
   ))
-select element 
{'cntrycode':cntrycode,'numcust':tpch.count(ct),'totacctbal':tpch.coll_sum((
+select element 
{'cntrycode':cntrycode,'numcust':tpch.count(ct),'totacctbal':tpch.array_sum((
         select element i.c_acctbal
         from  ct as i
     ))}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue562/query-issue562.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue562/query-issue562.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue562/query-issue562.1.ddl.sqlpp
index 6b385ee..e29de08 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue562/query-issue562.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/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-with-index/query-issue562/query-issue562.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue562/query-issue562.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue562/query-issue562.3.query.sqlpp
index eaac9ce..6983fa7 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue562/query-issue562.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue562/query-issue562.3.query.sqlpp
@@ -34,18 +34,18 @@ declare function q22_customer_tmp() {
     where ((phone_substr = '13') or (phone_substr = '31') or (phone_substr = 
'23') or (phone_substr = '29') or (phone_substr = '30') or (phone_substr = 
'18') or (phone_substr = '17'))
 )
 };
-with  avg as tpch.coll_avg((
+with  avg as tpch.array_avg((
       select element c.c_acctbal
       from  Customer as c
       with  phone_substr as tpch.substring(c.c_phone,1,2)
       where ((c.c_acctbal > 0.0) and ((phone_substr = '13') or (phone_substr = 
'31') or (phone_substr = '23') or (phone_substr = '29') or (phone_substr = 
'30') or (phone_substr = '18') or (phone_substr = '17')))
   ))
-select element 
{'cntrycode':cntrycode,'numcust':tpch.count(ct),'totacctbal':tpch.coll_sum((
+select element 
{'cntrycode':cntrycode,'numcust':tpch.count(ct),'totacctbal':tpch.array_sum((
         select element i.c_acctbal
         from  ct as i
     ))}
 from  tpch.q22_customer_tmp() as ct
-where (coll_count((
+where (array_count((
     select element o
     from  Orders as o
     where (ct.c_custkey = o.o_custkey)

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue601/query-issue601.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue601/query-issue601.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue601/query-issue601.1.ddl.sqlpp
index 955c076..8ef90ac 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue601/query-issue601.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/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-with-index/query-issue785-2/query-issue785-2.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue785-2/query-issue785-2.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue785-2/query-issue785-2.1.ddl.sqlpp
index 20bdd4a..c214fc2 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue785-2/query-issue785-2.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/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-with-index/query-issue785-2/query-issue785-2.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue785-2/query-issue785-2.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue785-2/query-issue785-2.3.query.sqlpp
index de434ef..60f347f 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue785-2/query-issue785-2.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue785-2/query-issue785-2.3.query.sqlpp
@@ -39,7 +39,7 @@ with  t as (
             Orders as orders
       where ((orders.o_custkey = customer.c_custkey) and (customer.c_nationkey 
= n.n_nationkey))
       group by orders.o_orderdate as orderdate,n.n_nationkey as nation_key
-      with  sum as tpch.coll_sum((
+      with  sum as tpch.array_sum((
             select element o.o_totalprice
             from  orders as o
         ))

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue785/query-issue785.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue785/query-issue785.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue785/query-issue785.1.ddl.sqlpp
index 20bdd4a..c214fc2 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue785/query-issue785.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/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-with-index/query-issue785/query-issue785.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue785/query-issue785.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue785/query-issue785.3.query.sqlpp
index c7761f3..c9fc37d 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue785/query-issue785.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue785/query-issue785.3.query.sqlpp
@@ -30,7 +30,7 @@ select element {'nation_key':nation_key,'sum_price':(
         select element {'orderdate':od,'sum_price':sum}
         from  x as i
         group by i.order_date as od
-        with  sum as tpch.coll_sum((
+        with  sum as tpch.array_sum((
               select element s.sum_price
               from  i as s
           ))
@@ -38,7 +38,7 @@ select element {'nation_key':nation_key,'sum_price':(
         limit 3
     )}
 from  (
-    select element 
{'nation_key':nation_key,'order_date':orderdate,'sum_price':tpch.coll_sum((
+    select element 
{'nation_key':nation_key,'order_date':orderdate,'sum_price':tpch.array_sum((
             select element o.o_totalprice
             from  orders as o
         ))}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue786/query-issue786.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue786/query-issue786.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue786/query-issue786.1.ddl.sqlpp
index bd1e72a..3d09e2a 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue786/query-issue786.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/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-with-index/query-issue786/query-issue786.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue786/query-issue786.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue786/query-issue786.3.query.sqlpp
index 37e3c92..c466ccc 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue786/query-issue786.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue786/query-issue786.3.query.sqlpp
@@ -32,7 +32,7 @@ select element 
{'nation_key':nation.n_nationkey,'name':nation.n_name,'aggregates
               Customer as customer
         where ((orders.o_custkey = customer.c_custkey) and 
(customer.c_nationkey = nation.n_nationkey))
         group by orders.o_orderdate as orderdate
-        with  sum as tpch.coll_sum((
+        with  sum as tpch.array_sum((
               select element o.o_totalprice
               from  orders as o
           ))

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue810-2/query-issue810-2.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue810-2/query-issue810-2.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue810-2/query-issue810-2.1.ddl.sqlpp
index b2789ac..b3e0cc5 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue810-2/query-issue810-2.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/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-with-index/query-issue810-2/query-issue810-2.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue810-2/query-issue810-2.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue810-2/query-issue810-2.3.query.sqlpp
index d75ea7b..7505cca 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue810-2/query-issue810-2.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue810-2/query-issue810-2.3.query.sqlpp
@@ -26,7 +26,7 @@
 use tpch;
 
 
-select element 
{'l_returnflag':l_returnflag,'l_linestatus':l_linestatus,'count_cheaps':coll_count(cheaps),'total_charges':tpch.coll_sum(charges)}
+select element 
{'l_returnflag':l_returnflag,'l_linestatus':l_linestatus,'count_cheaps':array_count(cheaps),'total_charges':tpch.array_sum(charges)}
 from  LineItem as l
 where (l.l_shipdate <= '1998-09-02')
 /* +hash */

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue810-3/query-issue810-3.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue810-3/query-issue810-3.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue810-3/query-issue810-3.1.ddl.sqlpp
index b2789ac..b3e0cc5 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue810-3/query-issue810-3.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/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-with-index/query-issue810-3/query-issue810-3.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue810-3/query-issue810-3.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue810-3/query-issue810-3.3.query.sqlpp
index f2656ee..e223001 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue810-3/query-issue810-3.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue810-3/query-issue810-3.3.query.sqlpp
@@ -26,7 +26,7 @@
 use tpch;
 
 
-select element 
{'l_returnflag':l_returnflag,'l_linestatus':l_linestatus,'count_cheaps':coll_count(cheaps),'avg_expensive_discounts':tpch.coll_avg(expensives),'sum_disc_prices':tpch.coll_sum(disc_prices),'total_charges':tpch.coll_sum(charges)}
+select element 
{'l_returnflag':l_returnflag,'l_linestatus':l_linestatus,'count_cheaps':array_count(cheaps),'avg_expensive_discounts':tpch.array_avg(expensives),'sum_disc_prices':tpch.array_sum(disc_prices),'total_charges':tpch.array_sum(charges)}
 from  LineItem as l
 where (l.l_shipdate <= '1998-09-02')
 /* +hash */

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue810/query-issue810.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue810/query-issue810.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue810/query-issue810.1.ddl.sqlpp
index b2789ac..b3e0cc5 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue810/query-issue810.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/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-with-index/query-issue810/query-issue810.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue810/query-issue810.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue810/query-issue810.3.query.sqlpp
index f4638f2..d2d3d86 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue810/query-issue810.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue810/query-issue810.3.query.sqlpp
@@ -26,7 +26,7 @@
 use tpch;
 
 
-select element 
{'l_returnflag':l_returnflag,'l_linestatus':l_linestatus,'count_cheaps':coll_count(cheap),'count_expensives':coll_count(expensive)}
+select element 
{'l_returnflag':l_returnflag,'l_linestatus':l_linestatus,'count_cheaps':array_count(cheap),'count_expensives':array_count(expensive)}
 from  LineItem as l
 where (l.l_shipdate <= '1998-09-02')
 /* +hash */

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue827-2/query-issue827-2.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue827-2/query-issue827-2.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue827-2/query-issue827-2.1.ddl.sqlpp
index 385d4c9..efec413 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue827-2/query-issue827-2.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue827-2/query-issue827-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-with-index/query-issue827-2/query-issue827-2.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue827-2/query-issue827-2.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue827-2/query-issue827-2.3.query.sqlpp
index aefe8a3..ed9e135 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue827-2/query-issue827-2.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue827-2/query-issue827-2.3.query.sqlpp
@@ -26,30 +26,30 @@
 use tpch;
 
 
-{'sum_qty_partial':tpch.coll_sum((
+{'sum_qty_partial':tpch.array_sum((
     select element i.l_quantity
     from  LineItem as i
     where (i.l_shipdate <= '1998-09-02')
-)),'sum_base_price':tpch.coll_sum((
+)),'sum_base_price':tpch.array_sum((
     select element i.l_extendedprice
     from  LineItem as i
-)),'sum_disc_price':tpch.coll_sum((
+)),'sum_disc_price':tpch.array_sum((
     select element (i.l_extendedprice * (1 - i.l_discount))
     from  LineItem as i
-)),'sum_charge':tpch.coll_sum((
+)),'sum_charge':tpch.array_sum((
     select element (i.l_extendedprice * (1 - i.l_discount) * (1 + i.l_tax))
     from  LineItem as i
-)),'ave_qty':tpch.coll_avg((
+)),'ave_qty':tpch.array_avg((
     select element i.l_quantity
     from  LineItem as i
     where (i.l_shipdate <= '1998-09-02')
-)),'ave_price':tpch.coll_avg((
+)),'ave_price':tpch.array_avg((
     select element i.l_extendedprice
     from  LineItem as i
-)),'ave_disc':tpch.coll_avg((
+)),'ave_disc':tpch.array_avg((
     select element i.l_discount
     from  LineItem as i
-)),'count_order':coll_count((
+)),'count_order':array_count((
     select element l
     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-with-index/query-issue827/query-issue827.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue827/query-issue827.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue827/query-issue827.1.ddl.sqlpp
index 385d4c9..efec413 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue827/query-issue827.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue827/query-issue827.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-with-index/query-issue827/query-issue827.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue827/query-issue827.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue827/query-issue827.3.query.sqlpp
index e735107..50ffb45 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue827/query-issue827.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue827/query-issue827.3.query.sqlpp
@@ -26,10 +26,10 @@
 use tpch;
 
 
-{'count_cheaps':coll_count((
+{'count_cheaps':array_count((
     select element l.l_quantity
     from  LineItem as l
-)),'count_expensives':tpch.coll_sum((
+)),'count_expensives':tpch.array_sum((
     select element e
     from  (
         select element l.l_extendedprice

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/distinct_by/distinct_by.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/distinct_by/distinct_by.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/distinct_by/distinct_by.1.ddl.sqlpp
index 4d4bd1c..d50dd81 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/distinct_by/distinct_by.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/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/group_no_agg/group_no_agg.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/group_no_agg/group_no_agg.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/group_no_agg/group_no_agg.1.ddl.sqlpp
index fbf62ab..3cbe494 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/group_no_agg/group_no_agg.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/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/nest_aggregate/nest_aggregate.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/nest_aggregate/nest_aggregate.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/nest_aggregate/nest_aggregate.1.ddl.sqlpp
index 52678df..089efc3 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/nest_aggregate/nest_aggregate.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/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/nest_aggregate/nest_aggregate.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/nest_aggregate/nest_aggregate.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/nest_aggregate/nest_aggregate.3.query.sqlpp
index 8efcb7f..7d42d94 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/nest_aggregate/nest_aggregate.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/nest_aggregate/nest_aggregate.3.query.sqlpp
@@ -32,7 +32,7 @@ select element 
{'nation_key':nation.n_nationkey,'name':nation.n_name,'aggregates
               Customer as customer
         where ((orders.o_custkey = customer.c_custkey) and 
(customer.c_nationkey = nation.n_nationkey))
         group by orders.o_orderdate as orderdate
-        with  sum as tpch.coll_sum((
+        with  sum as tpch.array_sum((
               select element o.o_totalprice
               from  orders as o
           ))

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/nest_aggregate2/nest_aggregate2.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/nest_aggregate2/nest_aggregate2.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/nest_aggregate2/nest_aggregate2.1.ddl.sqlpp
index 52678df..089efc3 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/nest_aggregate2/nest_aggregate2.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/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/nest_aggregate2/nest_aggregate2.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/nest_aggregate2/nest_aggregate2.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/nest_aggregate2/nest_aggregate2.3.query.sqlpp
index 1b70f0e..9e29c0e 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/nest_aggregate2/nest_aggregate2.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/nest_aggregate2/nest_aggregate2.3.query.sqlpp
@@ -32,7 +32,7 @@ select element 
{'nation_key':nation.n_nationkey,'name':nation.n_name,'aggregates
               Customer as customer
         where ((orders.o_custkey = customer.c_custkey) and 
(customer.c_nationkey = nation.n_nationkey))
         group by orders.o_orderdate as orderdate
-        with  sum as tpch.coll_sum((
+        with  sum as tpch.array_sum((
               select element o.o_totalprice
               from  orders as o
           ))

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/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/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
index 211ef99..9d41f77 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/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/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.sqlpp
index b6dd0c0..e83da05 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.sqlpp
@@ -22,28 +22,28 @@ use tpch;
 
 set `import-private-functions` `true`;
 
-select element 
{'l_returnflag':l_returnflag,'l_linestatus':l_linestatus,'sum_qty':COLL_SUM((
+select element 
{'l_returnflag':l_returnflag,'l_linestatus':l_linestatus,'sum_qty':ARRAY_SUM((
         select element i.l_quantity
         from  l as i
-    )),'sum_base_price':COLL_SUM((
+    )),'sum_base_price':ARRAY_SUM((
         select element i.l_extendedprice
         from  l as i
-    )),'sum_disc_price':COLL_SUM((
+    )),'sum_disc_price':ARRAY_SUM((
         select element (i.l_extendedprice * (1 - i.l_discount))
         from  l as i
-    )),'sum_charge':COLL_SUM((
+    )),'sum_charge':ARRAY_SUM((
         select element (i.l_extendedprice * (1 - i.l_discount) * (1 + i.l_tax))
         from  l as i
-    )),'ave_qty':COLL_AVG((
+    )),'ave_qty':ARRAY_AVG((
         select element i.l_quantity
         from  l as i
-    )),'ave_price':COLL_AVG((
+    )),'ave_price':ARRAY_AVG((
         select element i.l_extendedprice
         from  l as i
-    )),'ave_disc':COLL_AVG((
+    )),'ave_disc':ARRAY_AVG((
         select element i.l_discount
         from  l as i
-    )),'count_order':COLL_COUNT(l)}
+    )),'count_order':ARRAY_COUNT(l)}
 from  LineItem as l
 where (l.l_shipdate <= '1998-09-02')
 /* +hash */

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/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/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/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/q02_minimum_cost_supplier/q02_minimum_cost_supplier.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q02_minimum_cost_supplier/q02_minimum_cost_supplier.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q02_minimum_cost_supplier/q02_minimum_cost_supplier.3.query.sqlpp
index f6ad005..93507d9 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q02_minimum_cost_supplier/q02_minimum_cost_supplier.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q02_minimum_cost_supplier/q02_minimum_cost_supplier.3.query.sqlpp
@@ -45,7 +45,7 @@ declare function tmp1() {
 };
 declare function tmp2() {
 (
-    select element {'p_partkey':p_partkey,'ps_min_supplycost':COLL_MIN((
+    select element {'p_partkey':p_partkey,'ps_min_supplycost':ARRAY_MIN((
             select element i.ps_supplycost
             from  pssrn as i
         ))}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/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/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/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/q03_shipping_priority_nt/q03_shipping_priority_nt.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q03_shipping_priority_nt/q03_shipping_priority_nt.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q03_shipping_priority_nt/q03_shipping_priority_nt.3.query.sqlpp
index ef0d15d..774fed9 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q03_shipping_priority_nt/q03_shipping_priority_nt.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q03_shipping_priority_nt/q03_shipping_priority_nt.3.query.sqlpp
@@ -27,7 +27,7 @@ from  Customer as c,
 where (((c.c_mktsegment = 'BUILDING') and (c.c_custkey = o.o_custkey)) and 
((l.l_orderkey = o.o_orderkey) and (o.o_orderdate < '1995-03-15') and 
(l.l_shipdate > '1995-03-15')))
 /* +hash */
 group by l.l_orderkey as l_orderkey,o.o_orderdate as 
o_orderdate,o.o_shippriority as o_shippriority
-with  revenue as COLL_SUM((
+with  revenue as ARRAY_SUM((
       select element (i.l_extendedprice * (1 - i.l_discount))
       from  l as i
   ))

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q04_order_priority/q04_order_priority.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q04_order_priority/q04_order_priority.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q04_order_priority/q04_order_priority.1.ddl.sqlpp
index 3e3f696..6cbdf11 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q04_order_priority/q04_order_priority.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/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/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/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/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/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/q05_local_supplier_volume/q05_local_supplier_volume.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q05_local_supplier_volume/q05_local_supplier_volume.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q05_local_supplier_volume/q05_local_supplier_volume.3.query.sqlpp
index f30ccbe..656c760 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q05_local_supplier_volume/q05_local_supplier_volume.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q05_local_supplier_volume/q05_local_supplier_volume.3.query.sqlpp
@@ -46,7 +46,7 @@ from  Customer as c,
 where ((c.c_nationkey = o1.s_nationkey) and (c.c_custkey = o1.o_custkey))
 /* +hash */
 group by o1.n_name as n_name
-with  revenue as COLL_SUM((
+with  revenue as ARRAY_SUM((
       select element (i.l_extendedprice * (1 - i.l_discount))
       from  o1 as i
   ))

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/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/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/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
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.3.query.sqlpp
index b960393..67cbfdc 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.3.query.sqlpp
@@ -20,7 +20,7 @@
 use tpch;
 
 
-{'revenue':COLL_SUM((
+{'revenue':ARRAY_SUM((
     select element (l.l_extendedprice * l.l_discount)
     from  LineItem as l
     where ((l.l_shipdate >= '1994-01-01') and (l.l_shipdate < '1995-01-01') 
and (l.l_discount >= 0.05) and (l.l_discount <= 0.07) and (l.l_quantity < 24))

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q07_volume_shipping/q07_volume_shipping.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q07_volume_shipping/q07_volume_shipping.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q07_volume_shipping/q07_volume_shipping.1.ddl.sqlpp
index 1871e19..0db8d36 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q07_volume_shipping/q07_volume_shipping.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q07_volume_shipping/q07_volume_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
 }

Reply via email to