http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_ext_ds/insert_from_ext_ds.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_ext_ds/insert_from_ext_ds.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_ext_ds/insert_from_ext_ds.1.ddl.sqlpp
index 07e19b4..10c6d29 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_ext_ds/insert_from_ext_ds.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_ext_ds/insert_from_ext_ds.1.ddl.sqlpp
@@ -36,8 +36,8 @@ create type testdvt.testtype as
   datetimeField : datetime?,
   durationField : duration?,
   intervalField : interval?,
-  yearMonthDurationField : `year-month-duration`?,
-  dayTimeDurationField : `day-time-duration`?
+  yearMonthDurationField : `year_month_duration`?,
+  dayTimeDurationField : `day_time_duration`?
 }
 
 create external  dataset testds(testtype) using 
localfs((`path`=`asterix_nc1://data/temporal/temporalData.json`),(`format`=`adm`));

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_ext_ds_2/insert_from_ext_ds_2.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_ext_ds_2/insert_from_ext_ds_2.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_ext_ds_2/insert_from_ext_ds_2.1.ddl.sqlpp
index 5a0bebb..0ad459c 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_ext_ds_2/insert_from_ext_ds_2.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_ext_ds_2/insert_from_ext_ds_2.1.ddl.sqlpp
@@ -34,8 +34,8 @@ create type timeTest.timesType as
   time : time,
   datetime : datetime,
   duration : duration,
-  `year-month-duration` : `year-month-duration`,
-  `day-time-duration` : `day-time-duration`,
+  `year-month-duration` : `year_month_duration`,
+  `day-time-duration` : `day_time_duration`,
   `date-interval` : interval,
   `time-interval` : interval,
   `datetime-interval` : interval

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin/interval_bin.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin/interval_bin.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin/interval_bin.3.query.sqlpp
index 1798d59..9c9caaa 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin/interval_bin.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin/interval_bin.3.query.sqlpp
@@ -24,4 +24,4 @@
 use test;
 
 
-{'bin1':test.`interval-bin`(test.date('2010-10-30'),test.date('1990-01-01'),test.`year-month-duration`('P1Y')),'bin2':test.`interval-bin`(test.date('2010-10-30'),test.date('-1990-01-01'),test.`year-month-duration`('P1Y')),'bin3':test.`interval-bin`(test.datetime('-1987-11-19T23:49:23.938'),test.datetime('1990-01-01T00:00:00.000Z'),test.`year-month-duration`('P6M')),'bin4':test.`interval-bin`(test.datetime('-1987-11-19T23:49:23.938'),test.datetime('-1990-01-01T00:00:00.000Z'),test.`day-time-duration`('PT12H')),'bin5':test.`interval-bin`(test.time('12:23:34.930+07:00'),test.time('12:00:00'),test.`day-time-duration`('PT2H')),'bin6':test.`interval-bin`(null,test.date('-0023-01-01'),test.`year-month-duration`('P6M')),'bin7':test.`interval-bin`(test.date('2010-10-30'),null,test.`year-month-duration`('P6M')),'bin8':test.`interval-bin`(test.date('2010-10-30'),test.date('-0023-01-01'),null)};
+{'bin1':test.`interval-bin`(test.date('2010-10-30'),test.date('1990-01-01'),test.`year_month_duration`('P1Y')),'bin2':test.`interval-bin`(test.date('2010-10-30'),test.date('-1990-01-01'),test.`year_month_duration`('P1Y')),'bin3':test.`interval-bin`(test.datetime('-1987-11-19T23:49:23.938'),test.datetime('1990-01-01T00:00:00.000Z'),test.`year_month_duration`('P6M')),'bin4':test.`interval-bin`(test.datetime('-1987-11-19T23:49:23.938'),test.datetime('-1990-01-01T00:00:00.000Z'),test.`day_time_duration`('PT12H')),'bin5':test.`interval-bin`(test.time('12:23:34.930+07:00'),test.time('12:00:00'),test.`day_time_duration`('PT2H')),'bin6':test.`interval-bin`(null,test.date('-0023-01-01'),test.`year_month_duration`('P6M')),'bin7':test.`interval-bin`(test.date('2010-10-30'),null,test.`year_month_duration`('P6M')),'bin8':test.`interval-bin`(test.date('2010-10-30'),test.date('-0023-01-01'),null)};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_0/interval_bin_gby_0.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_0/interval_bin_gby_0.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_0/interval_bin_gby_0.1.ddl.sqlpp
index 250a836..8bd2355 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_0/interval_bin_gby_0.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_0/interval_bin_gby_0.1.ddl.sqlpp
@@ -29,7 +29,7 @@ use test;
 
 create type test.Schema as
  closed {
-  id : int64,
+  id : bigint,
   timestamp : datetime
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_0/interval_bin_gby_0.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_0/interval_bin_gby_0.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_0/interval_bin_gby_0.3.query.sqlpp
index 884ded4..bebc724 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_0/interval_bin_gby_0.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_0/interval_bin_gby_0.3.query.sqlpp
@@ -26,6 +26,6 @@ use test;
 
 select element {'tbin':d,'count':test.count(i)}
 from  tsdata as i
-group by 
test.`interval-bin`(i.timestamp,test.datetime('1990-01-01T00:00:00.000Z'),test.`year-month-duration`('P20Y'))
 as d
+group by 
test.`interval-bin`(i.timestamp,test.datetime('1990-01-01T00:00:00.000Z'),test.`year_month_duration`('P20Y'))
 as d
 order by test.`get-interval-start`(d)
 ;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_1/interval_bin_gby_1.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_1/interval_bin_gby_1.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_1/interval_bin_gby_1.1.ddl.sqlpp
index 250a836..8bd2355 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_1/interval_bin_gby_1.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_1/interval_bin_gby_1.1.ddl.sqlpp
@@ -29,7 +29,7 @@ use test;
 
 create type test.Schema as
  closed {
-  id : int64,
+  id : bigint,
   timestamp : datetime
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_1/interval_bin_gby_1.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_1/interval_bin_gby_1.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_1/interval_bin_gby_1.3.query.sqlpp
index 8c4934c..03984ae 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_1/interval_bin_gby_1.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_1/interval_bin_gby_1.3.query.sqlpp
@@ -26,6 +26,6 @@ use test;
 
 select element {'tbin':d,'count':test.count(i)}
 from  tsdata as i
-group by 
test.`interval-bin`(test.`get-time-from-datetime`(i.timestamp),test.time('00:00:00.000Z'),test.`day-time-duration`('PT10M'))
 as d
+group by 
test.`interval-bin`(test.`get-time-from-datetime`(i.timestamp),test.time('00:00:00.000Z'),test.`day_time_duration`('PT10M'))
 as d
 order by test.`get-interval-start`(d)
 ;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins/overlap_bins.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins/overlap_bins.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins/overlap_bins.3.query.sqlpp
index 90cd95e..2568918 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins/overlap_bins.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins/overlap_bins.3.query.sqlpp
@@ -21,7 +21,7 @@
  * Expected result: success
  **/
 
-{ 
'timebins':`overlap-bins`(interval(time('17:23:37'),time('18:30:21')),time('00:00:00'),`day-time-duration`('PT30M')),
-  
'datebins':`overlap-bins`(interval(date('1984-03-17'),date('2013-08-22')),date('1990-01-01'),`year-month-duration`('P10Y')),
+{ 
'timebins':`overlap-bins`(interval(time('17:23:37'),time('18:30:21')),time('00:00:00'),`day_time_duration`('PT30M')),
+  
'datebins':`overlap-bins`(interval(date('1984-03-17'),date('2013-08-22')),date('1990-01-01'),`year_month_duration`('P10Y')),
   
'datetimebins':`overlap-bins`(interval(datetime('1800-01-01T23:59:48.938'),datetime('2015-07-26T13:28:30.218')),datetime('1900-01-01T00:00:00.000'),
-  `year-month-duration`('P100Y'))};
+  `year_month_duration`('P100Y'))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_0/overlap_bins_gby_0.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_0/overlap_bins_gby_0.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_0/overlap_bins_gby_0.1.ddl.sqlpp
index 8fe76df..c2e083b 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_0/overlap_bins_gby_0.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_0/overlap_bins_gby_0.1.ddl.sqlpp
@@ -29,9 +29,9 @@ use test;
 
 create type test.Schema as
  closed {
-  id : int32,
+  id : integer,
   time : time,
-  duration : `day-time-duration`
+  duration : `day_time_duration`
 }
 
 create  dataset tsdata(Schema) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_0/overlap_bins_gby_0.2.update.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_0/overlap_bins_gby_0.2.update.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_0/overlap_bins_gby_0.2.update.sqlpp
index a302aaa..5c8348a 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_0/overlap_bins_gby_0.2.update.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_0/overlap_bins_gby_0.2.update.sqlpp
@@ -25,24 +25,24 @@ use test;
 
 
 insert into tsdata
-select element 
{'id':1,'time':test.time('23:49:23.938'),'duration':test.`day-time-duration`('PT5M')};
+select element 
{'id':1,'time':test.time('23:49:23.938'),'duration':test.`day_time_duration`('PT5M')};
 insert into tsdata
-select element 
{'id':2,'time':test.time('00:27:13.432'),'duration':test.`day-time-duration`('PT1H')};
+select element 
{'id':2,'time':test.time('00:27:13.432'),'duration':test.`day_time_duration`('PT1H')};
 insert into tsdata
-select element 
{'id':3,'time':test.time('18:00:00'),'duration':test.`day-time-duration`('PT2H')};
+select element 
{'id':3,'time':test.time('18:00:00'),'duration':test.`day_time_duration`('PT2H')};
 insert into tsdata
-select element 
{'id':4,'time':test.time('234933938'),'duration':test.`day-time-duration`('PT30S')};
+select element 
{'id':4,'time':test.time('234933938'),'duration':test.`day_time_duration`('PT30S')};
 insert into tsdata
-select element 
{'id':5,'time':test.time('23:58:17.038'),'duration':test.`day-time-duration`('PT39.382S')};
+select element 
{'id':5,'time':test.time('23:58:17.038'),'duration':test.`day_time_duration`('PT39.382S')};
 insert into tsdata
-select element 
{'id':6,'time':test.time('23:30:00'),'duration':test.`day-time-duration`('PT2M')};
+select element 
{'id':6,'time':test.time('23:30:00'),'duration':test.`day_time_duration`('PT2M')};
 insert into tsdata
-select element 
{'id':7,'time':test.time('23:22:38'),'duration':test.`day-time-duration`('PT20M')};
+select element 
{'id':7,'time':test.time('23:22:38'),'duration':test.`day_time_duration`('PT20M')};
 insert into tsdata
-select element 
{'id':8,'time':test.time('17:28:13.900'),'duration':test.`day-time-duration`('PT19S')};
+select element 
{'id':8,'time':test.time('17:28:13.900'),'duration':test.`day_time_duration`('PT19S')};
 insert into tsdata
-select element 
{'id':9,'time':test.time('07:49:23.938'),'duration':test.`day-time-duration`('PT3H')};
+select element 
{'id':9,'time':test.time('07:49:23.938'),'duration':test.`day_time_duration`('PT3H')};
 insert into tsdata
-select element 
{'id':10,'time':test.time('09:35:28.039'),'duration':test.`day-time-duration`('PT10H50M')};
+select element 
{'id':10,'time':test.time('09:35:28.039'),'duration':test.`day_time_duration`('PT10H50M')};
 insert into tsdata
-select element 
{'id':11,'time':test.time('12:49:23.938'),'duration':test.`day-time-duration`('PT3H')};
+select element 
{'id':11,'time':test.time('12:49:23.938'),'duration':test.`day_time_duration`('PT3H')};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_0/overlap_bins_gby_0.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_0/overlap_bins_gby_0.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_0/overlap_bins_gby_0.3.query.sqlpp
index 42ca67b..40fcaea 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_0/overlap_bins_gby_0.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_0/overlap_bins_gby_0.3.query.sqlpp
@@ -28,7 +28,7 @@ select element 
{'tbin':gen0.bin,'interval':itv,'overlap':test.`get-overlapping-i
 from
     ( select element {'bin':bin,'i':i}
       from (select element i from tsdata as i order by i.time) as i,
-            
test.`overlap-bins`(test.`interval-start-from-time`(i.time,i.duration),test.time('00:00:00'),test.`day-time-duration`('PT1H30M'))
 as j
+            
test.`overlap-bins`(test.`interval-start-from-time`(i.time,i.duration),test.time('00:00:00'),test.`day_time_duration`('PT1H30M'))
 as j
       group by j as bin
       order by `get-interval-start`(bin)
     ) as gen0,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_1/overlap_bins_gby_1.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_1/overlap_bins_gby_1.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_1/overlap_bins_gby_1.1.ddl.sqlpp
index 8fe76df..c2e083b 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_1/overlap_bins_gby_1.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_1/overlap_bins_gby_1.1.ddl.sqlpp
@@ -29,9 +29,9 @@ use test;
 
 create type test.Schema as
  closed {
-  id : int32,
+  id : integer,
   time : time,
-  duration : `day-time-duration`
+  duration : `day_time_duration`
 }
 
 create  dataset tsdata(Schema) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_1/overlap_bins_gby_1.2.update.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_1/overlap_bins_gby_1.2.update.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_1/overlap_bins_gby_1.2.update.sqlpp
index a302aaa..5c8348a 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_1/overlap_bins_gby_1.2.update.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_1/overlap_bins_gby_1.2.update.sqlpp
@@ -25,24 +25,24 @@ use test;
 
 
 insert into tsdata
-select element 
{'id':1,'time':test.time('23:49:23.938'),'duration':test.`day-time-duration`('PT5M')};
+select element 
{'id':1,'time':test.time('23:49:23.938'),'duration':test.`day_time_duration`('PT5M')};
 insert into tsdata
-select element 
{'id':2,'time':test.time('00:27:13.432'),'duration':test.`day-time-duration`('PT1H')};
+select element 
{'id':2,'time':test.time('00:27:13.432'),'duration':test.`day_time_duration`('PT1H')};
 insert into tsdata
-select element 
{'id':3,'time':test.time('18:00:00'),'duration':test.`day-time-duration`('PT2H')};
+select element 
{'id':3,'time':test.time('18:00:00'),'duration':test.`day_time_duration`('PT2H')};
 insert into tsdata
-select element 
{'id':4,'time':test.time('234933938'),'duration':test.`day-time-duration`('PT30S')};
+select element 
{'id':4,'time':test.time('234933938'),'duration':test.`day_time_duration`('PT30S')};
 insert into tsdata
-select element 
{'id':5,'time':test.time('23:58:17.038'),'duration':test.`day-time-duration`('PT39.382S')};
+select element 
{'id':5,'time':test.time('23:58:17.038'),'duration':test.`day_time_duration`('PT39.382S')};
 insert into tsdata
-select element 
{'id':6,'time':test.time('23:30:00'),'duration':test.`day-time-duration`('PT2M')};
+select element 
{'id':6,'time':test.time('23:30:00'),'duration':test.`day_time_duration`('PT2M')};
 insert into tsdata
-select element 
{'id':7,'time':test.time('23:22:38'),'duration':test.`day-time-duration`('PT20M')};
+select element 
{'id':7,'time':test.time('23:22:38'),'duration':test.`day_time_duration`('PT20M')};
 insert into tsdata
-select element 
{'id':8,'time':test.time('17:28:13.900'),'duration':test.`day-time-duration`('PT19S')};
+select element 
{'id':8,'time':test.time('17:28:13.900'),'duration':test.`day_time_duration`('PT19S')};
 insert into tsdata
-select element 
{'id':9,'time':test.time('07:49:23.938'),'duration':test.`day-time-duration`('PT3H')};
+select element 
{'id':9,'time':test.time('07:49:23.938'),'duration':test.`day_time_duration`('PT3H')};
 insert into tsdata
-select element 
{'id':10,'time':test.time('09:35:28.039'),'duration':test.`day-time-duration`('PT10H50M')};
+select element 
{'id':10,'time':test.time('09:35:28.039'),'duration':test.`day_time_duration`('PT10H50M')};
 insert into tsdata
-select element 
{'id':11,'time':test.time('12:49:23.938'),'duration':test.`day-time-duration`('PT3H')};
+select element 
{'id':11,'time':test.time('12:49:23.938'),'duration':test.`day_time_duration`('PT3H')};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_1/overlap_bins_gby_1.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_1/overlap_bins_gby_1.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_1/overlap_bins_gby_1.3.query.sqlpp
index 32b10c8..1974f18 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_1/overlap_bins_gby_1.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_1/overlap_bins_gby_1.3.query.sqlpp
@@ -24,16 +24,16 @@
 use test;
 
 
-select element {'timebin':bin,'count':test.count(i2),'total_ms':test.coll_sum((
-        select element 
test.`ms-from-day-time-duration`(test.`duration-from-interval`(test.`get-overlapping-interval`(bin,i3.interval)))
+select element {'timebin':bin,'count':count(i2),'total_ms':array_sum((
+        select element 
`ms_from_day_time_duration`(`duration-from-interval`(`get-overlapping-interval`(bin,i3.interval)))
         from  i2 as i3
     ))}
 from  (
-    select element 
{'interval':test.`interval-start-from-time`(i1.time,i1.duration)}
+    select element {'interval':`interval-start-from-time`(i1.time,i1.duration)}
     from  tsdata as i1
     order by i1.time
 ) as i2,
-      
test.`overlap-bins`(i2.interval,test.time('00:00:00'),test.`day-time-duration`('PT1H30M'))
 as j
+      
`overlap-bins`(i2.interval,time('00:00:00'),`day_time_duration`('PT1H30M')) as j
 group by j as bin
-order by test.`get-interval-start`(bin)
+order by `get-interval-start`(bin)
 ;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_3/overlap_bins_gby_3.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_3/overlap_bins_gby_3.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_3/overlap_bins_gby_3.1.ddl.sqlpp
index 9352ae3..275df35 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_3/overlap_bins_gby_3.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_3/overlap_bins_gby_3.1.ddl.sqlpp
@@ -29,9 +29,9 @@ use multitask;
 
 create type multitask.LogType as
  closed {
-  row_id : int32,
+  row_id : integer,
   time : time,
-  duration : int32,
+  duration : integer,
   app : string
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_3/overlap_bins_gby_3.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_3/overlap_bins_gby_3.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_3/overlap_bins_gby_3.3.query.sqlpp
index 4a0d468..368484e 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_3/overlap_bins_gby_3.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_3/overlap_bins_gby_3.3.query.sqlpp
@@ -27,12 +27,12 @@ select element {'timebin':bin,'subgroups':(
         group by i.app as subgid
         order by subgid,multitask.count(i)
     )}
-from  multitask.`overlap-bins`(multitask.interval(multitask.coll_min((
+from  multitask.`overlap-bins`(multitask.interval(multitask.array_min((
     select element i.time
     from  logs as i
-)),multitask.coll_max((
+)),multitask.array_max((
     select element (i.time + multitask.`duration-from-ms`((i.duration * 1000)))
     from  logs as i
-))),multitask.time('00:00:00.000'),multitask.`day-time-duration`('PT1M')) as 
bin
+))),multitask.time('00:00:00.000'),multitask.`day_time_duration`('PT1M')) as 
bin
 order by multitask.`get-interval-start`(bin)
 ;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/time_functions/time_functions.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/time_functions/time_functions.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/time_functions/time_functions.3.query.sqlpp
index c24a431..b3ac853 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/time_functions/time_functions.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/time_functions/time_functions.3.query.sqlpp
@@ -25,18 +25,18 @@ set `import-private-functions` `true`;
 { 'time1' : test.`time-from-unix-time-in-ms`(1560074)
 , 'time2' : 
test.`get-time-from-datetime`(test.datetime('1327-12-02T23:35:49.938Z'))
 , 'time3' : 
test.`get-time-from-datetime`(test.datetime('2012-10-11T02:30:23+03:00'))
-, 'time4' : (test.`time-from-unix-time-in-ms`(1560074) + 
test.`day-time-duration`('-PT30H'))
-, 'time5' : 
(test.`get-time-from-datetime`(test.datetime('1327-12-02T23:35:49.938Z')) + 
test.`day-time-duration`('PT36M'))
+, 'time4' : (test.`time-from-unix-time-in-ms`(1560074) + 
test.`day_time_duration`('-PT30H'))
+, 'time5' : 
(test.`get-time-from-datetime`(test.datetime('1327-12-02T23:35:49.938Z')) + 
test.`day_time_duration`('PT36M'))
 , 'unix1' : 
test.`unix-time-from-time-in-ms`(test.`time-from-unix-time-in-ms`(1560074))
-, 'duration1' : 
((test.`get-time-from-datetime`(test.datetime('1327-12-02T23:35:49.938Z')) + 
test.`day-time-duration`('PT36M')) - 
test.`get-time-from-datetime`(test.datetime('1327-12-02T23:35:49.938Z')))
-, 'duration2' : ((test.`time-from-unix-time-in-ms`(1560074) + 
test.`day-time-duration`('-PT30H')) - test.`time-from-unix-time-in-ms`(1560074))
-, 'c1' : (test.`time-from-unix-time-in-ms`(1560074) = 
((test.`time-from-unix-time-in-ms`(1560074) - 
(test.`time-from-unix-time-in-ms`(1560074) + 
test.`day-time-duration`('-PT30H'))) + 
(test.`time-from-unix-time-in-ms`(1560074) + 
test.`day-time-duration`('-PT30H'))))
-, 'c2' : 
(test.`get-time-from-datetime`(test.datetime('1327-12-02T23:35:49.938Z')) = 
((test.`get-time-from-datetime`(test.datetime('1327-12-02T23:35:49.938Z')) + 
test.`day-time-duration`('PT36M')) + 
(test.`get-time-from-datetime`(test.datetime('1327-12-02T23:35:49.938Z')) - 
(test.`get-time-from-datetime`(test.datetime('1327-12-02T23:35:49.938Z')) + 
test.`day-time-duration`('PT36M')))))
+, 'duration1' : 
((test.`get-time-from-datetime`(test.datetime('1327-12-02T23:35:49.938Z')) + 
test.`day_time_duration`('PT36M')) - 
test.`get-time-from-datetime`(test.datetime('1327-12-02T23:35:49.938Z')))
+, 'duration2' : ((test.`time-from-unix-time-in-ms`(1560074) + 
test.`day_time_duration`('-PT30H')) - test.`time-from-unix-time-in-ms`(1560074))
+, 'c1' : (test.`time-from-unix-time-in-ms`(1560074) = 
((test.`time-from-unix-time-in-ms`(1560074) - 
(test.`time-from-unix-time-in-ms`(1560074) + 
test.`day_time_duration`('-PT30H'))) + 
(test.`time-from-unix-time-in-ms`(1560074) + 
test.`day_time_duration`('-PT30H'))))
+, 'c2' : 
(test.`get-time-from-datetime`(test.datetime('1327-12-02T23:35:49.938Z')) = 
((test.`get-time-from-datetime`(test.datetime('1327-12-02T23:35:49.938Z')) + 
test.`day_time_duration`('PT36M')) + 
(test.`get-time-from-datetime`(test.datetime('1327-12-02T23:35:49.938Z')) - 
(test.`get-time-from-datetime`(test.datetime('1327-12-02T23:35:49.938Z')) + 
test.`day_time_duration`('PT36M')))))
 , 'null1' : test.`time-from-unix-time-in-ms`(null)
 , 'nullunix1' : test.`unix-time-from-time-in-ms`(null)
 , 'null2' : test.`get-time-from-datetime`(null)
-, 'null3' : (null + test.`day-time-duration`('-PT30H'))
+, 'null3' : (null + test.`day_time_duration`('-PT30H'))
 , 'null4' : (test.`time-from-unix-time-in-ms`(1560074) + null)
 , 'null5' : (null - test.`time-from-unix-time-in-ms`(1560074))
-, 'null6' : ((test.`time-from-unix-time-in-ms`(1560074) + 
test.`day-time-duration`('-PT30H')) - null)
+, 'null6' : ((test.`time-from-unix-time-in-ms`(1560074) + 
test.`day_time_duration`('-PT30H')) - null)
 };

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/query-ASTERIXDB-1331.25.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/query-ASTERIXDB-1331.25.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/query-ASTERIXDB-1331.25.query.sqlpp
index 85a66f2..cee64cc 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/query-ASTERIXDB-1331.25.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/query-ASTERIXDB-1331.25.query.sqlpp
@@ -21,7 +21,7 @@
 
 USE TinySocial;
 
-SELECT ELEMENT coll_avg((
+SELECT ELEMENT array_avg((
 select element LENGTH(message.message)
 FROM FacebookMessages AS message
 WHERE message.`in-response-to` >= 1 and

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.1.ddl.sqlpp
index c210744..7b30331 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.1.ddl.sqlpp
@@ -34,11 +34,11 @@ create type TinySocial.TweetMessageType as {
 
 create type TinySocial.FacebookUserType as
  open {
-  id : int64
+  id : bigint
 }
 
 create type TinySocial.FacebookMessageType as
  open {
-  `message-id` : int64
+  `message-id` : bigint
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.14.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.14.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.14.query.sqlpp
index 7ca10bd..89ee2f8 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.14.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.14.query.sqlpp
@@ -23,7 +23,7 @@
 use TinySocial;
 
 
-select element coll_count((
+select element array_count((
     select element fbu
     from  FacebookUsers as fbu
 ));

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.2.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.2.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.2.ddl.sqlpp
index 2c41b64..22ba0f7 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.2.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.2.ddl.sqlpp
@@ -30,5 +30,5 @@ create  dataset TweetMessages(TweetMessageType) primary key 
tweetid hints (`CARD
 
 create  index fbUserSinceIdx  on FacebookUsers (`user-since`:datetime?) type 
btree enforced;
 
-create  index fbAuthorIdx  on FacebookMessages (`author-id`:int64?) type btree 
enforced;
+create  index fbAuthorIdx  on FacebookMessages (`author-id`:bigint?) type 
btree enforced;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.22.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.22.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.22.query.sqlpp
index ac378d0..7724e57 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.22.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.22.query.sqlpp
@@ -23,7 +23,7 @@
 use TinySocial;
 
 
-select element coll_count((
+select element array_count((
     select element t
     from  TweetMessages as t
     where (t.tweetid = '13')

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.1.ddl.sqlpp
index d6fa514..1de9aa5 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.1.ddl.sqlpp
@@ -27,10 +27,10 @@ create type TinySocial.TwitterUserType as
 {
   `screen-name` : string,
   lang : string,
-  friends_count : int64,
-  statuses_count : int64,
+  friends_count : bigint,
+  statuses_count : bigint,
   name : string,
-  followers_count : int64
+  followers_count : bigint
 }
 
 create type TinySocial.TweetMessageType as
@@ -52,19 +52,19 @@ create type TinySocial.EmploymentType as
 
 create type TinySocial.FacebookUserType as
  closed {
-  id : int64,
+  id : bigint,
   alias : string,
   name : string,
   `user-since` : datetime,
-  `friend-ids` : {{int64}},
+  `friend-ids` : {{bigint}},
   employment : [EmploymentType]
 }
 
 create type TinySocial.FacebookMessageType as
  closed {
-  `message-id` : int64,
-  `author-id` : int64,
-  `in-response-to` : int64?,
+  `message-id` : bigint,
+  `author-id` : bigint,
+  `in-response-to` : bigint?,
   `sender-location` : point?,
   message : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.14.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.14.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.14.query.sqlpp
index 7ca10bd..89ee2f8 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.14.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.14.query.sqlpp
@@ -23,7 +23,7 @@
 use TinySocial;
 
 
-select element coll_count((
+select element array_count((
     select element fbu
     from  FacebookUsers as fbu
 ));

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.22.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.22.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.22.query.sqlpp
index ac378d0..7724e57 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.22.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.22.query.sqlpp
@@ -23,7 +23,7 @@
 use TinySocial;
 
 
-select element coll_count((
+select element array_count((
     select element t
     from  TweetMessages as t
     where (t.tweetid = '13')

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.25.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.25.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.25.query.sqlpp
index fa84678..4bf2b61 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.25.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.25.query.sqlpp
@@ -19,7 +19,7 @@
 
 USE TinySocial;
 
-SELECT ELEMENT coll_avg((
+SELECT ELEMENT array_avg((
 select element LENGTH(message.message)
 FROM FacebookMessages AS message
 WHERE message.`in-response-to` >= 1 and

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1580/query-ASTERIXDB-1580.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1580/query-ASTERIXDB-1580.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1580/query-ASTERIXDB-1580.1.ddl.sqlpp
index fb600d2..52b0a89 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1580/query-ASTERIXDB-1580.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1580/query-ASTERIXDB-1580.1.ddl.sqlpp
@@ -23,7 +23,7 @@ create dataverse tpcds;
 use tpcds;
 
 create type tpcds.customer_address_type as closed {
-    ca_address_sk:              int64,
+    ca_address_sk:              bigint,
     ca_address_id:              string,
     ca_street_number:           string?,
     ca_street_name:             string?,
@@ -39,20 +39,20 @@ create type tpcds.customer_address_type as closed {
 }
 
 create type tpcds.customer_type as closed {
-    c_customer_sk:             int64,
+    c_customer_sk:             bigint,
     c_customer_id:             string,
-    c_current_cdemo_sk:        int64?,
-    c_current_hdemo_sk:        int64?,
-    c_current_addr_sk:         int64?,
-    c_first_shipto_date_sk:    int64?,
-    c_first_sales_date_sk:     int64?,
+    c_current_cdemo_sk:        bigint?,
+    c_current_hdemo_sk:        bigint?,
+    c_current_addr_sk:         bigint?,
+    c_first_shipto_date_sk:    bigint?,
+    c_first_sales_date_sk:     bigint?,
     c_salutation:              string?,
     c_first_name:              string?,
     c_last_name:               string?,
     c_preferred_cust_flag:     string?,
-    c_birth_day:               int64?,
-    c_birth_month:             int64?,
-    c_birth_year:              int64?,
+    c_birth_day:               bigint?,
+    c_birth_month:             bigint?,
+    c_birth_year:              bigint?,
     c_birth_country:           string?,
     c_login:                   string?,
     c_email_address:           string?,
@@ -60,17 +60,17 @@ create type tpcds.customer_type as closed {
 }
 
 create type tpcds.store_sales_type as closed {
-    ss_sold_date_sk:           int64?,
-    ss_sold_time_sk:           int64?,
-    ss_item_sk:                int64,
-    ss_customer_sk:            int64?,
-    ss_cdemo_sk:               int64?,
-    ss_hdemo_sk:               int64?,
-    ss_addr_sk:                int64?,
-    ss_store_sk:               int64?,
-    ss_promo_sk:               int64?,
-    ss_ticket_number:          int64,
-    ss_quantity:               int64?,
+    ss_sold_date_sk:           bigint?,
+    ss_sold_time_sk:           bigint?,
+    ss_item_sk:                bigint,
+    ss_customer_sk:            bigint?,
+    ss_cdemo_sk:               bigint?,
+    ss_hdemo_sk:               bigint?,
+    ss_addr_sk:                bigint?,
+    ss_store_sk:               bigint?,
+    ss_promo_sk:               bigint?,
+    ss_ticket_number:          bigint,
+    ss_quantity:               bigint?,
     ss_wholesale_cost:         double?,
     ss_list_price:             double?,
     ss_sales_price:            double?,
@@ -86,29 +86,29 @@ create type tpcds.store_sales_type as closed {
 }
 
 create type tpcds.date_dim_type as closed {
-    d_date_sk:                 int64,
+    d_date_sk:                 bigint,
     d_date_id:                 string,
     d_date:                    string? ,
-    d_month_seq:               int64?,
-    d_week_seq:                int64?,
-    d_quarter_seq:             int64?,
-    d_year:                    int64?,
-    d_dow:                     int64?,
-    d_moy:                     int64?,
-    d_dom:                     int64?,
-    d_qoy:                     int64?,
-    d_fy_year:                 int64?,
-    d_fy_quarter_seq:          int64?,
-    d_fy_week_seq:             int64?,
+    d_month_seq:               bigint?,
+    d_week_seq:                bigint?,
+    d_quarter_seq:             bigint?,
+    d_year:                    bigint?,
+    d_dow:                     bigint?,
+    d_moy:                     bigint?,
+    d_dom:                     bigint?,
+    d_qoy:                     bigint?,
+    d_fy_year:                 bigint?,
+    d_fy_quarter_seq:          bigint?,
+    d_fy_week_seq:             bigint?,
     d_day_name:                string?,
     d_quarter_name:            string?,
     d_holiday:                 string?,
     d_weekend:                 string?,
     d_following_holiday:       string?,
-    d_first_dom:               int64?,
-    d_last_dom:                int64?,
-    d_same_day_ly:             int64?,
-    d_same_day_lq:             int64?,
+    d_first_dom:               bigint?,
+    d_last_dom:                bigint?,
+    d_same_day_ly:             bigint?,
+    d_same_day_lq:             bigint?,
     d_current_day:             string?,
     d_current_week:            string?,
     d_current_month:           string?,
@@ -117,27 +117,27 @@ create type tpcds.date_dim_type as closed {
 }
 
 create type tpcds.item_type as closed {
-    i_item_sk:                 int64,
+    i_item_sk:                 bigint,
     i_item_id:                 string,
     i_rec_start_date:          string?,
     i_rec_end_date:            string?,
     i_item_desc:               string?,
     i_current_price:           double?,
     i_wholesale_cost:          double?,
-    i_brand_id:                int64? ,
+    i_brand_id:                bigint? ,
     i_brand:                   string?,
-    i_class_id:                int64? ,
+    i_class_id:                bigint? ,
     i_class:                   string?,
-    i_category_id:             int64? ,
+    i_category_id:             bigint? ,
     i_category:                string?,
-    i_manufact_id:             int64? ,
+    i_manufact_id:             bigint? ,
     i_manufact:                string?,
     i_size:                    string?,
     i_formulation:             string?,
     i_color:                   string?,
     i_units:                   string?,
     i_container:               string?,
-    i_manager_id:              int64?,
+    i_manager_id:              bigint?,
     i_product_name:            string?
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1580/query-ASTERIXDB-1580.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1580/query-ASTERIXDB-1580.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1580/query-ASTERIXDB-1580.3.query.sqlpp
index c13f668..f3d80e5 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1580/query-ASTERIXDB-1580.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1580/query-ASTERIXDB-1580.3.query.sqlpp
@@ -30,6 +30,6 @@ where  a.ca_address_sk = c.c_current_addr_sk
     and s.ss_sold_date_sk = d.d_date_sk
     and s.ss_item_sk = i.i_item_sk
 group by a.ca_state group as stategrp
-having coll_count((select value a from stategrp)) >= 10
+having array_count((select value a from stategrp)) >= 10
 order by cnt
 limit 100;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-2/query-ASTERIXDB-1581-2.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-2/query-ASTERIXDB-1581-2.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-2/query-ASTERIXDB-1581-2.1.ddl.sqlpp
index 2e4844e..23b6fa3 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-2/query-ASTERIXDB-1581-2.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-2/query-ASTERIXDB-1581-2.1.ddl.sqlpp
@@ -24,17 +24,17 @@ create dataverse tpcds;
 use tpcds;
 
 create type tpcds.store_sales_type as closed {
-    ss_sold_date_sk:           int64?,
-    ss_sold_time_sk:           int64?,
-    ss_item_sk:                int64,
-    ss_customer_sk:            int64?,
-    ss_cdemo_sk:               int64?,
-    ss_hdemo_sk:               int64?,
-    ss_addr_sk:                int64?,
-    ss_store_sk:               int64?,
-    ss_promo_sk:               int64?,
-    ss_ticket_number:          int64,
-    ss_quantity:               int64?,
+    ss_sold_date_sk:           bigint?,
+    ss_sold_time_sk:           bigint?,
+    ss_item_sk:                bigint,
+    ss_customer_sk:            bigint?,
+    ss_cdemo_sk:               bigint?,
+    ss_hdemo_sk:               bigint?,
+    ss_addr_sk:                bigint?,
+    ss_store_sk:               bigint?,
+    ss_promo_sk:               bigint?,
+    ss_ticket_number:          bigint,
+    ss_quantity:               bigint?,
     ss_wholesale_cost:         double?,
     ss_list_price:             double?,
     ss_sales_price:            double?,
@@ -51,27 +51,27 @@ create type tpcds.store_sales_type as closed {
 
 
 create type tpcds.item_type as closed {
-    i_item_sk:                 int64,
+    i_item_sk:                 bigint,
     i_item_id:                 string,
     i_rec_start_date:          string?,
     i_rec_end_date:            string?,
     i_item_desc:               string?,
     i_current_price:           double?,
     i_wholesale_cost:          double?,
-    i_brand_id:                int64? ,
+    i_brand_id:                bigint? ,
     i_brand:                   string?,
-    i_class_id:                int64? ,
+    i_class_id:                bigint? ,
     i_class:                   string?,
-    i_category_id:             int64? ,
+    i_category_id:             bigint? ,
     i_category:                string?,
-    i_manufact_id:             int64? ,
+    i_manufact_id:             bigint? ,
     i_manufact:                string?,
     i_size:                    string?,
     i_formulation:             string?,
     i_color:                   string?,
     i_units:                   string?,
     i_container:               string?,
-    i_manager_id:              int64?,
+    i_manager_id:              bigint?,
     i_product_name:            string?
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-3/query-ASTERIXDB-1581-3.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-3/query-ASTERIXDB-1581-3.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-3/query-ASTERIXDB-1581-3.1.ddl.sqlpp
index 2e4844e..23b6fa3 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-3/query-ASTERIXDB-1581-3.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-3/query-ASTERIXDB-1581-3.1.ddl.sqlpp
@@ -24,17 +24,17 @@ create dataverse tpcds;
 use tpcds;
 
 create type tpcds.store_sales_type as closed {
-    ss_sold_date_sk:           int64?,
-    ss_sold_time_sk:           int64?,
-    ss_item_sk:                int64,
-    ss_customer_sk:            int64?,
-    ss_cdemo_sk:               int64?,
-    ss_hdemo_sk:               int64?,
-    ss_addr_sk:                int64?,
-    ss_store_sk:               int64?,
-    ss_promo_sk:               int64?,
-    ss_ticket_number:          int64,
-    ss_quantity:               int64?,
+    ss_sold_date_sk:           bigint?,
+    ss_sold_time_sk:           bigint?,
+    ss_item_sk:                bigint,
+    ss_customer_sk:            bigint?,
+    ss_cdemo_sk:               bigint?,
+    ss_hdemo_sk:               bigint?,
+    ss_addr_sk:                bigint?,
+    ss_store_sk:               bigint?,
+    ss_promo_sk:               bigint?,
+    ss_ticket_number:          bigint,
+    ss_quantity:               bigint?,
     ss_wholesale_cost:         double?,
     ss_list_price:             double?,
     ss_sales_price:            double?,
@@ -51,27 +51,27 @@ create type tpcds.store_sales_type as closed {
 
 
 create type tpcds.item_type as closed {
-    i_item_sk:                 int64,
+    i_item_sk:                 bigint,
     i_item_id:                 string,
     i_rec_start_date:          string?,
     i_rec_end_date:            string?,
     i_item_desc:               string?,
     i_current_price:           double?,
     i_wholesale_cost:          double?,
-    i_brand_id:                int64? ,
+    i_brand_id:                bigint? ,
     i_brand:                   string?,
-    i_class_id:                int64? ,
+    i_class_id:                bigint? ,
     i_class:                   string?,
-    i_category_id:             int64? ,
+    i_category_id:             bigint? ,
     i_category:                string?,
-    i_manufact_id:             int64? ,
+    i_manufact_id:             bigint? ,
     i_manufact:                string?,
     i_size:                    string?,
     i_formulation:             string?,
     i_color:                   string?,
     i_units:                   string?,
     i_container:               string?,
-    i_manager_id:              int64?,
+    i_manager_id:              bigint?,
     i_product_name:            string?
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-4/query-ASTERIXDB-1581-4.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-4/query-ASTERIXDB-1581-4.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-4/query-ASTERIXDB-1581-4.1.ddl.sqlpp
index 2e4844e..23b6fa3 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-4/query-ASTERIXDB-1581-4.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-4/query-ASTERIXDB-1581-4.1.ddl.sqlpp
@@ -24,17 +24,17 @@ create dataverse tpcds;
 use tpcds;
 
 create type tpcds.store_sales_type as closed {
-    ss_sold_date_sk:           int64?,
-    ss_sold_time_sk:           int64?,
-    ss_item_sk:                int64,
-    ss_customer_sk:            int64?,
-    ss_cdemo_sk:               int64?,
-    ss_hdemo_sk:               int64?,
-    ss_addr_sk:                int64?,
-    ss_store_sk:               int64?,
-    ss_promo_sk:               int64?,
-    ss_ticket_number:          int64,
-    ss_quantity:               int64?,
+    ss_sold_date_sk:           bigint?,
+    ss_sold_time_sk:           bigint?,
+    ss_item_sk:                bigint,
+    ss_customer_sk:            bigint?,
+    ss_cdemo_sk:               bigint?,
+    ss_hdemo_sk:               bigint?,
+    ss_addr_sk:                bigint?,
+    ss_store_sk:               bigint?,
+    ss_promo_sk:               bigint?,
+    ss_ticket_number:          bigint,
+    ss_quantity:               bigint?,
     ss_wholesale_cost:         double?,
     ss_list_price:             double?,
     ss_sales_price:            double?,
@@ -51,27 +51,27 @@ create type tpcds.store_sales_type as closed {
 
 
 create type tpcds.item_type as closed {
-    i_item_sk:                 int64,
+    i_item_sk:                 bigint,
     i_item_id:                 string,
     i_rec_start_date:          string?,
     i_rec_end_date:            string?,
     i_item_desc:               string?,
     i_current_price:           double?,
     i_wholesale_cost:          double?,
-    i_brand_id:                int64? ,
+    i_brand_id:                bigint? ,
     i_brand:                   string?,
-    i_class_id:                int64? ,
+    i_class_id:                bigint? ,
     i_class:                   string?,
-    i_category_id:             int64? ,
+    i_category_id:             bigint? ,
     i_category:                string?,
-    i_manufact_id:             int64? ,
+    i_manufact_id:             bigint? ,
     i_manufact:                string?,
     i_size:                    string?,
     i_formulation:             string?,
     i_color:                   string?,
     i_units:                   string?,
     i_container:               string?,
-    i_manager_id:              int64?,
+    i_manager_id:              bigint?,
     i_product_name:            string?
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-5/query-ASTERIXDB-1581-5.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-5/query-ASTERIXDB-1581-5.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-5/query-ASTERIXDB-1581-5.1.ddl.sqlpp
index 2e4844e..23b6fa3 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-5/query-ASTERIXDB-1581-5.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-5/query-ASTERIXDB-1581-5.1.ddl.sqlpp
@@ -24,17 +24,17 @@ create dataverse tpcds;
 use tpcds;
 
 create type tpcds.store_sales_type as closed {
-    ss_sold_date_sk:           int64?,
-    ss_sold_time_sk:           int64?,
-    ss_item_sk:                int64,
-    ss_customer_sk:            int64?,
-    ss_cdemo_sk:               int64?,
-    ss_hdemo_sk:               int64?,
-    ss_addr_sk:                int64?,
-    ss_store_sk:               int64?,
-    ss_promo_sk:               int64?,
-    ss_ticket_number:          int64,
-    ss_quantity:               int64?,
+    ss_sold_date_sk:           bigint?,
+    ss_sold_time_sk:           bigint?,
+    ss_item_sk:                bigint,
+    ss_customer_sk:            bigint?,
+    ss_cdemo_sk:               bigint?,
+    ss_hdemo_sk:               bigint?,
+    ss_addr_sk:                bigint?,
+    ss_store_sk:               bigint?,
+    ss_promo_sk:               bigint?,
+    ss_ticket_number:          bigint,
+    ss_quantity:               bigint?,
     ss_wholesale_cost:         double?,
     ss_list_price:             double?,
     ss_sales_price:            double?,
@@ -51,27 +51,27 @@ create type tpcds.store_sales_type as closed {
 
 
 create type tpcds.item_type as closed {
-    i_item_sk:                 int64,
+    i_item_sk:                 bigint,
     i_item_id:                 string,
     i_rec_start_date:          string?,
     i_rec_end_date:            string?,
     i_item_desc:               string?,
     i_current_price:           double?,
     i_wholesale_cost:          double?,
-    i_brand_id:                int64? ,
+    i_brand_id:                bigint? ,
     i_brand:                   string?,
-    i_class_id:                int64? ,
+    i_class_id:                bigint? ,
     i_class:                   string?,
-    i_category_id:             int64? ,
+    i_category_id:             bigint? ,
     i_category:                string?,
-    i_manufact_id:             int64? ,
+    i_manufact_id:             bigint? ,
     i_manufact:                string?,
     i_size:                    string?,
     i_formulation:             string?,
     i_color:                   string?,
     i_units:                   string?,
     i_container:               string?,
-    i_manager_id:              int64?,
+    i_manager_id:              bigint?,
     i_product_name:            string?
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-6/query-ASTERIXDB-1581-6.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-6/query-ASTERIXDB-1581-6.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-6/query-ASTERIXDB-1581-6.1.ddl.sqlpp
index 2e4844e..23b6fa3 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-6/query-ASTERIXDB-1581-6.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-6/query-ASTERIXDB-1581-6.1.ddl.sqlpp
@@ -24,17 +24,17 @@ create dataverse tpcds;
 use tpcds;
 
 create type tpcds.store_sales_type as closed {
-    ss_sold_date_sk:           int64?,
-    ss_sold_time_sk:           int64?,
-    ss_item_sk:                int64,
-    ss_customer_sk:            int64?,
-    ss_cdemo_sk:               int64?,
-    ss_hdemo_sk:               int64?,
-    ss_addr_sk:                int64?,
-    ss_store_sk:               int64?,
-    ss_promo_sk:               int64?,
-    ss_ticket_number:          int64,
-    ss_quantity:               int64?,
+    ss_sold_date_sk:           bigint?,
+    ss_sold_time_sk:           bigint?,
+    ss_item_sk:                bigint,
+    ss_customer_sk:            bigint?,
+    ss_cdemo_sk:               bigint?,
+    ss_hdemo_sk:               bigint?,
+    ss_addr_sk:                bigint?,
+    ss_store_sk:               bigint?,
+    ss_promo_sk:               bigint?,
+    ss_ticket_number:          bigint,
+    ss_quantity:               bigint?,
     ss_wholesale_cost:         double?,
     ss_list_price:             double?,
     ss_sales_price:            double?,
@@ -51,27 +51,27 @@ create type tpcds.store_sales_type as closed {
 
 
 create type tpcds.item_type as closed {
-    i_item_sk:                 int64,
+    i_item_sk:                 bigint,
     i_item_id:                 string,
     i_rec_start_date:          string?,
     i_rec_end_date:            string?,
     i_item_desc:               string?,
     i_current_price:           double?,
     i_wholesale_cost:          double?,
-    i_brand_id:                int64? ,
+    i_brand_id:                bigint? ,
     i_brand:                   string?,
-    i_class_id:                int64? ,
+    i_class_id:                bigint? ,
     i_class:                   string?,
-    i_category_id:             int64? ,
+    i_category_id:             bigint? ,
     i_category:                string?,
-    i_manufact_id:             int64? ,
+    i_manufact_id:             bigint? ,
     i_manufact:                string?,
     i_size:                    string?,
     i_formulation:             string?,
     i_color:                   string?,
     i_units:                   string?,
     i_container:               string?,
-    i_manager_id:              int64?,
+    i_manager_id:              bigint?,
     i_product_name:            string?
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-correlated-2/query-ASTERIXDB-1581-correlated-2.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-correlated-2/query-ASTERIXDB-1581-correlated-2.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-correlated-2/query-ASTERIXDB-1581-correlated-2.1.ddl.sqlpp
index 2e4844e..23b6fa3 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-correlated-2/query-ASTERIXDB-1581-correlated-2.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-correlated-2/query-ASTERIXDB-1581-correlated-2.1.ddl.sqlpp
@@ -24,17 +24,17 @@ create dataverse tpcds;
 use tpcds;
 
 create type tpcds.store_sales_type as closed {
-    ss_sold_date_sk:           int64?,
-    ss_sold_time_sk:           int64?,
-    ss_item_sk:                int64,
-    ss_customer_sk:            int64?,
-    ss_cdemo_sk:               int64?,
-    ss_hdemo_sk:               int64?,
-    ss_addr_sk:                int64?,
-    ss_store_sk:               int64?,
-    ss_promo_sk:               int64?,
-    ss_ticket_number:          int64,
-    ss_quantity:               int64?,
+    ss_sold_date_sk:           bigint?,
+    ss_sold_time_sk:           bigint?,
+    ss_item_sk:                bigint,
+    ss_customer_sk:            bigint?,
+    ss_cdemo_sk:               bigint?,
+    ss_hdemo_sk:               bigint?,
+    ss_addr_sk:                bigint?,
+    ss_store_sk:               bigint?,
+    ss_promo_sk:               bigint?,
+    ss_ticket_number:          bigint,
+    ss_quantity:               bigint?,
     ss_wholesale_cost:         double?,
     ss_list_price:             double?,
     ss_sales_price:            double?,
@@ -51,27 +51,27 @@ create type tpcds.store_sales_type as closed {
 
 
 create type tpcds.item_type as closed {
-    i_item_sk:                 int64,
+    i_item_sk:                 bigint,
     i_item_id:                 string,
     i_rec_start_date:          string?,
     i_rec_end_date:            string?,
     i_item_desc:               string?,
     i_current_price:           double?,
     i_wholesale_cost:          double?,
-    i_brand_id:                int64? ,
+    i_brand_id:                bigint? ,
     i_brand:                   string?,
-    i_class_id:                int64? ,
+    i_class_id:                bigint? ,
     i_class:                   string?,
-    i_category_id:             int64? ,
+    i_category_id:             bigint? ,
     i_category:                string?,
-    i_manufact_id:             int64? ,
+    i_manufact_id:             bigint? ,
     i_manufact:                string?,
     i_size:                    string?,
     i_formulation:             string?,
     i_color:                   string?,
     i_units:                   string?,
     i_container:               string?,
-    i_manager_id:              int64?,
+    i_manager_id:              bigint?,
     i_product_name:            string?
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-correlated/query-ASTERIXDB-1581-correlated.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-correlated/query-ASTERIXDB-1581-correlated.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-correlated/query-ASTERIXDB-1581-correlated.1.ddl.sqlpp
index 2e4844e..23b6fa3 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-correlated/query-ASTERIXDB-1581-correlated.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-correlated/query-ASTERIXDB-1581-correlated.1.ddl.sqlpp
@@ -24,17 +24,17 @@ create dataverse tpcds;
 use tpcds;
 
 create type tpcds.store_sales_type as closed {
-    ss_sold_date_sk:           int64?,
-    ss_sold_time_sk:           int64?,
-    ss_item_sk:                int64,
-    ss_customer_sk:            int64?,
-    ss_cdemo_sk:               int64?,
-    ss_hdemo_sk:               int64?,
-    ss_addr_sk:                int64?,
-    ss_store_sk:               int64?,
-    ss_promo_sk:               int64?,
-    ss_ticket_number:          int64,
-    ss_quantity:               int64?,
+    ss_sold_date_sk:           bigint?,
+    ss_sold_time_sk:           bigint?,
+    ss_item_sk:                bigint,
+    ss_customer_sk:            bigint?,
+    ss_cdemo_sk:               bigint?,
+    ss_hdemo_sk:               bigint?,
+    ss_addr_sk:                bigint?,
+    ss_store_sk:               bigint?,
+    ss_promo_sk:               bigint?,
+    ss_ticket_number:          bigint,
+    ss_quantity:               bigint?,
     ss_wholesale_cost:         double?,
     ss_list_price:             double?,
     ss_sales_price:            double?,
@@ -51,27 +51,27 @@ create type tpcds.store_sales_type as closed {
 
 
 create type tpcds.item_type as closed {
-    i_item_sk:                 int64,
+    i_item_sk:                 bigint,
     i_item_id:                 string,
     i_rec_start_date:          string?,
     i_rec_end_date:            string?,
     i_item_desc:               string?,
     i_current_price:           double?,
     i_wholesale_cost:          double?,
-    i_brand_id:                int64? ,
+    i_brand_id:                bigint? ,
     i_brand:                   string?,
-    i_class_id:                int64? ,
+    i_class_id:                bigint? ,
     i_class:                   string?,
-    i_category_id:             int64? ,
+    i_category_id:             bigint? ,
     i_category:                string?,
-    i_manufact_id:             int64? ,
+    i_manufact_id:             bigint? ,
     i_manufact:                string?,
     i_size:                    string?,
     i_formulation:             string?,
     i_color:                   string?,
     i_units:                   string?,
     i_container:               string?,
-    i_manager_id:              int64?,
+    i_manager_id:              bigint?,
     i_product_name:            string?
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581/query-ASTERIXDB-1581.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581/query-ASTERIXDB-1581.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581/query-ASTERIXDB-1581.1.ddl.sqlpp
index 2e4844e..23b6fa3 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581/query-ASTERIXDB-1581.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581/query-ASTERIXDB-1581.1.ddl.sqlpp
@@ -24,17 +24,17 @@ create dataverse tpcds;
 use tpcds;
 
 create type tpcds.store_sales_type as closed {
-    ss_sold_date_sk:           int64?,
-    ss_sold_time_sk:           int64?,
-    ss_item_sk:                int64,
-    ss_customer_sk:            int64?,
-    ss_cdemo_sk:               int64?,
-    ss_hdemo_sk:               int64?,
-    ss_addr_sk:                int64?,
-    ss_store_sk:               int64?,
-    ss_promo_sk:               int64?,
-    ss_ticket_number:          int64,
-    ss_quantity:               int64?,
+    ss_sold_date_sk:           bigint?,
+    ss_sold_time_sk:           bigint?,
+    ss_item_sk:                bigint,
+    ss_customer_sk:            bigint?,
+    ss_cdemo_sk:               bigint?,
+    ss_hdemo_sk:               bigint?,
+    ss_addr_sk:                bigint?,
+    ss_store_sk:               bigint?,
+    ss_promo_sk:               bigint?,
+    ss_ticket_number:          bigint,
+    ss_quantity:               bigint?,
     ss_wholesale_cost:         double?,
     ss_list_price:             double?,
     ss_sales_price:            double?,
@@ -51,27 +51,27 @@ create type tpcds.store_sales_type as closed {
 
 
 create type tpcds.item_type as closed {
-    i_item_sk:                 int64,
+    i_item_sk:                 bigint,
     i_item_id:                 string,
     i_rec_start_date:          string?,
     i_rec_end_date:            string?,
     i_item_desc:               string?,
     i_current_price:           double?,
     i_wholesale_cost:          double?,
-    i_brand_id:                int64? ,
+    i_brand_id:                bigint? ,
     i_brand:                   string?,
-    i_class_id:                int64? ,
+    i_class_id:                bigint? ,
     i_class:                   string?,
-    i_category_id:             int64? ,
+    i_category_id:             bigint? ,
     i_category:                string?,
-    i_manufact_id:             int64? ,
+    i_manufact_id:             bigint? ,
     i_manufact:                string?,
     i_size:                    string?,
     i_formulation:             string?,
     i_color:                   string?,
     i_units:                   string?,
     i_container:               string?,
-    i_manager_id:              int64?,
+    i_manager_id:              bigint?,
     i_product_name:            string?
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1591/query-ASTERIXDB-1591.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1591/query-ASTERIXDB-1591.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1591/query-ASTERIXDB-1591.1.ddl.sqlpp
index c0e9f7c..6ee8559 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1591/query-ASTERIXDB-1591.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1591/query-ASTERIXDB-1591.1.ddl.sqlpp
@@ -23,7 +23,7 @@ create dataverse tpcds;
 use tpcds;
 
 create type customer_address_type as closed {
-    ca_address_sk:              int64,
+    ca_address_sk:              bigint,
     ca_address_id:              string,
     ca_street_number:           string?,
     ca_street_name:             string?,
@@ -39,20 +39,20 @@ create type customer_address_type as closed {
 }
 
 create type customer_type as closed {
-    c_customer_sk:             int64,
+    c_customer_sk:             bigint,
     c_customer_id:             string,
-    c_current_cdemo_sk:        int64?,
-    c_current_hdemo_sk:        int64?,
-    c_current_addr_sk:         int64?,
-    c_first_shipto_date_sk:    int64?,
-    c_first_sales_date_sk:     int64?,
+    c_current_cdemo_sk:        bigint?,
+    c_current_hdemo_sk:        bigint?,
+    c_current_addr_sk:         bigint?,
+    c_first_shipto_date_sk:    bigint?,
+    c_first_sales_date_sk:     bigint?,
     c_salutation:              string?,
     c_first_name:              string?,
     c_last_name:               string?,
     c_preferred_cust_flag:     string?,
-    c_birth_day:               int64?,
-    c_birth_month:             int64?,
-    c_birth_year:              int64?,
+    c_birth_day:               bigint?,
+    c_birth_month:             bigint?,
+    c_birth_year:              bigint?,
     c_birth_country:           string?,
     c_login:                   string?,
     c_email_address:           string?,
@@ -60,17 +60,17 @@ create type customer_type as closed {
 }
 
 create type store_sales_type as closed {
-    ss_sold_date_sk:           int64?,
-    ss_sold_time_sk:           int64?,
-    ss_item_sk:                int64,
-    ss_customer_sk:            int64?,
-    ss_cdemo_sk:               int64?,
-    ss_hdemo_sk:               int64?,
-    ss_addr_sk:                int64?,
-    ss_store_sk:               int64?,
-    ss_promo_sk:               int64?,
-    ss_ticket_number:          int64,
-    ss_quantity:               int64?,
+    ss_sold_date_sk:           bigint?,
+    ss_sold_time_sk:           bigint?,
+    ss_item_sk:                bigint,
+    ss_customer_sk:            bigint?,
+    ss_cdemo_sk:               bigint?,
+    ss_hdemo_sk:               bigint?,
+    ss_addr_sk:                bigint?,
+    ss_store_sk:               bigint?,
+    ss_promo_sk:               bigint?,
+    ss_ticket_number:          bigint,
+    ss_quantity:               bigint?,
     ss_wholesale_cost:         double?,
     ss_list_price:             double?,
     ss_sales_price:            double?,
@@ -86,25 +86,25 @@ create type store_sales_type as closed {
 }
 
 create type catalog_sales_type as closed {
-    cs_sold_date_sk:           int64?,
-    cs_sold_time_sk:           int64?,
-    cs_ship_date_sk:           int64?,
-    cs_bill_customer_sk:       int64?,
-    cs_bill_cdemo_sk:          int64?,
-    cs_bill_hdemo_sk:          int64?,
-    cs_bill_addr_sk:           int64?,
-    cs_ship_customer_sk:       int64?,
-    cs_ship_cdemo_sk:          int64?,
-    cs_ship_hdemo_sk:          int64?,
-    cs_ship_addr_sk:           int64?,
-    cs_call_center_sk:         int64?,
-    cs_catalog_page_sk:        int64?,
-    cs_ship_mode_sk:           int64?,
-    cs_warehouse_sk:           int64?,
-    cs_item_sk:                int64,
-    cs_promo_sk:               int64?,
-    cs_order_number:           int64,
-    cs_quantity:               int64?,
+    cs_sold_date_sk:           bigint?,
+    cs_sold_time_sk:           bigint?,
+    cs_ship_date_sk:           bigint?,
+    cs_bill_customer_sk:       bigint?,
+    cs_bill_cdemo_sk:          bigint?,
+    cs_bill_hdemo_sk:          bigint?,
+    cs_bill_addr_sk:           bigint?,
+    cs_ship_customer_sk:       bigint?,
+    cs_ship_cdemo_sk:          bigint?,
+    cs_ship_hdemo_sk:          bigint?,
+    cs_ship_addr_sk:           bigint?,
+    cs_call_center_sk:         bigint?,
+    cs_catalog_page_sk:        bigint?,
+    cs_ship_mode_sk:           bigint?,
+    cs_warehouse_sk:           bigint?,
+    cs_item_sk:                bigint,
+    cs_promo_sk:               bigint?,
+    cs_order_number:           bigint,
+    cs_quantity:               bigint?,
     cs_wholesale_cost:         double?,
     cs_list_price:             double?,
     cs_sales_price:            double?,
@@ -123,24 +123,24 @@ create type catalog_sales_type as closed {
 }
 
 create type catalog_returns_type as closed {
-    cr_returned_date_sk:       int64?,
-    cr_returned_time_sk:       int64?,
-    cr_item_sk:                int64,
-    cr_refunded_customer_sk:   int64?,
-    cr_refunded_cdemo_sk:      int64?,
-    cr_refunded_hdemo_sk:      int64?,
-    cr_refunded_addr_sk:       int64?,
-    cr_returning_customer_sk:  int64?,
-    cr_returning_cdemo_sk:     int64?,
-    cr_returning_hdemo_sk:     int64?,
-    cr_returning_addr_sk:      int64?,
-    cr_call_center_sk:         int64?,
-    cr_catalog_page_sk:        int64?,
-    cr_ship_mode_sk:           int64?,
-    cr_warehouse_sk:           int64?,
-    cr_reason_sk:              int64?,
-    cr_order_number:           int64,
-    cr_return_quantity:        int64?,
+    cr_returned_date_sk:       bigint?,
+    cr_returned_time_sk:       bigint?,
+    cr_item_sk:                bigint,
+    cr_refunded_customer_sk:   bigint?,
+    cr_refunded_cdemo_sk:      bigint?,
+    cr_refunded_hdemo_sk:      bigint?,
+    cr_refunded_addr_sk:       bigint?,
+    cr_returning_customer_sk:  bigint?,
+    cr_returning_cdemo_sk:     bigint?,
+    cr_returning_hdemo_sk:     bigint?,
+    cr_returning_addr_sk:      bigint?,
+    cr_call_center_sk:         bigint?,
+    cr_catalog_page_sk:        bigint?,
+    cr_ship_mode_sk:           bigint?,
+    cr_warehouse_sk:           bigint?,
+    cr_reason_sk:              bigint?,
+    cr_order_number:           bigint,
+    cr_return_quantity:        bigint?,
     cr_return_amount:          double?,
     cr_return_tax:             double?,
     cr_return_amt_inc_tax:     double?,
@@ -153,29 +153,29 @@ create type catalog_returns_type as closed {
 }
 
 create type tpcds.date_dim_type as closed {
-    d_date_sk:                 int64,
+    d_date_sk:                 bigint,
     d_date_id:                 string,
     d_date:                    string? ,
-    d_month_seq:               int64?,
-    d_week_seq:                int64?,
-    d_quarter_seq:             int64?,
-    d_year:                    int64?,
-    d_dow:                     int64?,
-    d_moy:                     int64?,
-    d_dom:                     int64?,
-    d_qoy:                     int64?,
-    d_fy_year:                 int64?,
-    d_fy_quarter_seq:          int64?,
-    d_fy_week_seq:             int64?,
+    d_month_seq:               bigint?,
+    d_week_seq:                bigint?,
+    d_quarter_seq:             bigint?,
+    d_year:                    bigint?,
+    d_dow:                     bigint?,
+    d_moy:                     bigint?,
+    d_dom:                     bigint?,
+    d_qoy:                     bigint?,
+    d_fy_year:                 bigint?,
+    d_fy_quarter_seq:          bigint?,
+    d_fy_week_seq:             bigint?,
     d_day_name:                string?,
     d_quarter_name:            string?,
     d_holiday:                 string?,
     d_weekend:                 string?,
     d_following_holiday:       string?,
-    d_first_dom:               int64?,
-    d_last_dom:                int64?,
-    d_same_day_ly:             int64?,
-    d_same_day_lq:             int64?,
+    d_first_dom:               bigint?,
+    d_last_dom:                bigint?,
+    d_same_day_ly:             bigint?,
+    d_same_day_lq:             bigint?,
     d_current_day:             string?,
     d_current_week:            string?,
     d_current_month:           string?,
@@ -184,50 +184,50 @@ create type tpcds.date_dim_type as closed {
 }
 
 create type item_type as closed {
-    i_item_sk:                 int64,
+    i_item_sk:                 bigint,
     i_item_id:                 string,
     i_rec_start_date:          string?,
     i_rec_end_date:            string?,
     i_item_desc:               string?,
     i_current_price:           double?,
     i_wholesale_cost:          double?,
-    i_brand_id:                int64? ,
+    i_brand_id:                bigint? ,
     i_brand:                   string?,
-    i_class_id:                int64? ,
+    i_class_id:                bigint? ,
     i_class:                   string?,
-    i_category_id:             int64? ,
+    i_category_id:             bigint? ,
     i_category:                string?,
-    i_manufact_id:             int64? ,
+    i_manufact_id:             bigint? ,
     i_manufact:                string?,
     i_size:                    string?,
     i_formulation:             string?,
     i_color:                   string?,
     i_units:                   string?,
     i_container:               string?,
-    i_manager_id:              int64?,
+    i_manager_id:              bigint?,
     i_product_name:            string?
 }
 
 create type web_sales_type as closed {
-    ws_sold_date_sk:           int64?,
-    ws_sold_time_sk:           int64?,
-    ws_ship_date_sk:           int64?,
-    ws_item_sk:                int64,
-    ws_bill_customer_sk:       int64?,
-    ws_bill_cdemo_sk:          int64?,
-    ws_bill_hdemo_sk:          int64?,
-    ws_bill_addr_sk:           int64?,
-    ws_ship_customer_sk:       int64?,
-    ws_ship_cdemo_sk:          int64?,
-    ws_ship_hdemo_sk:          int64?,
-    ws_ship_addr_sk:           int64?,
-    ws_web_page_sk:            int64?,
-    ws_web_site_sk:            int64?,
-    ws_ship_mode_sk:           int64?,
-    ws_warehouse_sk:           int64?,
-    ws_promo_sk:               int64?,
-    ws_order_number:           int64,
-    ws_quantity:               int64?,
+    ws_sold_date_sk:           bigint?,
+    ws_sold_time_sk:           bigint?,
+    ws_ship_date_sk:           bigint?,
+    ws_item_sk:                bigint,
+    ws_bill_customer_sk:       bigint?,
+    ws_bill_cdemo_sk:          bigint?,
+    ws_bill_hdemo_sk:          bigint?,
+    ws_bill_addr_sk:           bigint?,
+    ws_ship_customer_sk:       bigint?,
+    ws_ship_cdemo_sk:          bigint?,
+    ws_ship_hdemo_sk:          bigint?,
+    ws_ship_addr_sk:           bigint?,
+    ws_web_page_sk:            bigint?,
+    ws_web_site_sk:            bigint?,
+    ws_ship_mode_sk:           bigint?,
+    ws_warehouse_sk:           bigint?,
+    ws_promo_sk:               bigint?,
+    ws_order_number:           bigint,
+    ws_quantity:               bigint?,
     ws_wholesale_cost:         double?,
     ws_list_price:             double?,
     ws_sales_price:            double?,

Reply via email to