You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by bu...@apache.org on 2016/09/23 03:15:10 UTC

[28/51] [partial] asterixdb git commit: ASTERIXDB-1539: add aliases for several builtin types and builtin functions.

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_null-with-pred/sum_null-with-pred.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_null-with-pred/sum_null-with-pred.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_null-with-pred/sum_null-with-pred.2.update.sqlpp
index fdc8b57..66fe850 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_null-with-pred/sum_null-with-pred.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_null-with-pred/sum_null-with-pred.2.update.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description      :   coll_sum() aggregate function must return the numeric sum, when non null values are given as input to coll_sum().
+ * Description      :   array_sum() aggregate function must return the numeric sum, when non null values are given as input to array_sum().
  *                  :   Get the sum for those tuples which are non null for salary fields.
  * Expected result  :   Success
  * Date             :   July 20th 2012

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_null-with-pred/sum_null-with-pred.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_null-with-pred/sum_null-with-pred.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_null-with-pred/sum_null-with-pred.3.query.sqlpp
index 263ce45..f59b2f3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_null-with-pred/sum_null-with-pred.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_null-with-pred/sum_null-with-pred.3.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description      :   coll_sum() aggregate function must return the numeric sum, when non null values are given as input to coll_sum().
+ * Description      :   array_sum() aggregate function must return the numeric sum, when non null values are given as input to array_sum().
  *                  :   Get the sum for those tuples which are non null for salary fields.
  * Expected result  :   Success
  * Date             :   July 20th 2012
@@ -26,7 +26,7 @@
 use test;
 
 
-select element test.coll_sum((
+select element test.array_sum((
     select element l.sal
     from  tdst as l
     where l.sal IS NOT NULL

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_numeric_null/sum_numeric_null.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_numeric_null/sum_numeric_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_numeric_null/sum_numeric_null.1.ddl.sqlpp
index d4225c4..420644a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_numeric_null/sum_numeric_null.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_numeric_null/sum_numeric_null.1.ddl.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description      :   Add numeric values with a null value, coll_sum() aggregate function must return null.
+ * Description      :   Add numeric values with a null value, array_sum() aggregate function must return null.
  * Expected result  :   Success
  * Date             :   July 20th 2012
  */
@@ -30,8 +30,8 @@ use test;
 
 create type test.TestType as
 {
-  id : int32,
-  sal : int32?
+  id : integer,
+  sal : integer?
 }
 
 create  dataset tdst(TestType) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_numeric_null/sum_numeric_null.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_numeric_null/sum_numeric_null.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_numeric_null/sum_numeric_null.2.update.sqlpp
index 10f6c7e..a5cd218 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_numeric_null/sum_numeric_null.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_numeric_null/sum_numeric_null.2.update.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description      :   Add numeric values with a null value, coll_sum() aggregate function must return null.
+ * Description      :   Add numeric values with a null value, array_sum() aggregate function must return null.
  * Expected result  :   Success
  * Date             :   July 20th 2012
  */

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_numeric_null/sum_numeric_null.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_numeric_null/sum_numeric_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_numeric_null/sum_numeric_null.3.query.sqlpp
index 7b771d7..22a70c2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_numeric_null/sum_numeric_null.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_numeric_null/sum_numeric_null.3.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description      :   Add numeric values with a null value, coll_sum() aggregate function must return null.
+ * Description      :   Add numeric values with a null value, array_sum() aggregate function must return null.
  * Expected result  :   Success
  * Date             :   July 20th 2012
  */
@@ -25,7 +25,7 @@
 use test;
 
 
-select element test.coll_sum((
+select element test.array_sum((
     select element l.sal
     from  tdst as l
 ));

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_groupby-2/big_object_groupby.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_groupby-2/big_object_groupby.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_groupby-2/big_object_groupby.1.ddl.sqlpp
index 6129703..ac98b64c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_groupby-2/big_object_groupby.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_groupby-2/big_object_groupby.1.ddl.sqlpp
@@ -32,10 +32,10 @@ use test;
 
 create type test.LineType 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,
@@ -52,23 +52,23 @@ create type test.LineType as
 
 create type test.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 test.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,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_groupby/big_object_groupby.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_groupby/big_object_groupby.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_groupby/big_object_groupby.1.ddl.sqlpp
index 568a07c..88786ab 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_groupby/big_object_groupby.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_groupby/big_object_groupby.1.ddl.sqlpp
@@ -30,10 +30,10 @@ use test;
 
 create type test.LineType 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,
@@ -50,23 +50,23 @@ create type test.LineType as
 
 create type test.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 test.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,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_join/big_object_join.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_join/big_object_join.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_join/big_object_join.1.ddl.sqlpp
index 08e9e1d..8a39ac8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_join/big_object_join.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_join/big_object_join.1.ddl.sqlpp
@@ -31,10 +31,10 @@ use test;
 
 create type test.LineType 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,
@@ -51,23 +51,23 @@ create type test.LineType as
 
 create type test.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 test.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,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_load/big_object_load.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_load/big_object_load.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_load/big_object_load.1.ddl.sqlpp
index e0c5838..06d1a7c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_load/big_object_load.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_load/big_object_load.1.ddl.sqlpp
@@ -31,10 +31,10 @@ use test;
 
 create type test.LineType 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,
@@ -51,23 +51,23 @@ create type test.LineType as
 
 create type test.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 test.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,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_sort/big_object_sort.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_sort/big_object_sort.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_sort/big_object_sort.1.ddl.sqlpp
index 08e9e1d..8a39ac8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_sort/big_object_sort.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_sort/big_object_sort.1.ddl.sqlpp
@@ -31,10 +31,10 @@ use test;
 
 create type test.LineType 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,
@@ -51,23 +51,23 @@ create type test.LineType as
 
 create type test.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 test.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,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/binary/equal_join/equal_join.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/binary/equal_join/equal_join.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/binary/equal_join/equal_join.1.ddl.sqlpp
index f7755af..d11e3b0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/binary/equal_join/equal_join.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/binary/equal_join/equal_join.1.ddl.sqlpp
@@ -25,7 +25,7 @@ use test;
 
 create type test.UserType as
  closed {
-  id : int64,
+  id : bigint,
   name : string,
   md5 : binary
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/binary/index_join/index_join.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/binary/index_join/index_join.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/binary/index_join/index_join.1.ddl.sqlpp
index 7a0cde1..86d1a65 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/binary/index_join/index_join.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/binary/index_join/index_join.1.ddl.sqlpp
@@ -25,7 +25,7 @@ use test;
 
 create type test.UserType as
  closed {
-  id : int64,
+  id : bigint,
   name : string,
   md5 : binary
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/binary/insert/insert.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/binary/insert/insert.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/binary/insert/insert.1.ddl.sqlpp
index f577d6d..0578d2f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/binary/insert/insert.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/binary/insert/insert.1.ddl.sqlpp
@@ -25,12 +25,12 @@ use test;
 
 create type test.UserTypeOpen as
 {
-  id : int64
+  id : bigint
 }
 
 create type test.UserTypeClose as
  closed {
-  id : int64,
+  id : bigint,
   name : string,
   md5 : binary
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/datetime_range/datetime_range.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/datetime_range/datetime_range.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/datetime_range/datetime_range.1.ddl.sqlpp
index 152a529..9d2a12d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/datetime_range/datetime_range.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/datetime_range/datetime_range.1.ddl.sqlpp
@@ -25,8 +25,8 @@ use test;
 
 create type test.Tweet as
  closed {
-  id : int64,
-  tweetid : int64,
+  id : bigint,
+  tweetid : bigint,
   loc : point,
   time : datetime,
   text : string

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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/day_time_duration_order/day_time_duration_order.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/day_time_duration_order/day_time_duration_order.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/day_time_duration_order/day_time_duration_order.1.ddl.sqlpp
index a9688d0..2255079 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/day_time_duration_order/day_time_duration_order.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/day_time_duration_order/day_time_duration_order.1.ddl.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description      :   Check comparison and order-by for day-time-duration
+ * Description      :   Check comparison and order-by for day_time_duration
  * Expected Result  :   Success
  * Date             :   May 18, 2013
  */

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/day_time_duration_order/day_time_duration_order.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/day_time_duration_order/day_time_duration_order.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/day_time_duration_order/day_time_duration_order.2.update.sqlpp
index cc84682..fce19f6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/day_time_duration_order/day_time_duration_order.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/day_time_duration_order/day_time_duration_order.2.update.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description      :   Check comparison and order-by for day-time-duration
+ * Description      :   Check comparison and order-by for day_time_duration
  * Expected Result  :   Success
  * Date             :   May 18, 2013
  */

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/day_time_duration_order/day_time_duration_order.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/day_time_duration_order/day_time_duration_order.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/day_time_duration_order/day_time_duration_order.3.query.sqlpp
index a6f0433..5b7cf0e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/day_time_duration_order/day_time_duration_order.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/day_time_duration_order/day_time_duration_order.3.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description      :   Check comparison and order-by for day-time-duration
+ * Description      :   Check comparison and order-by for day_time_duration
  * Expected Result  :   Success
  * Date             :   May 18, 2013
  */
@@ -25,10 +25,10 @@
 use test;
 
 
-with  dr1 as test.`day-time-duration`('P439D'),
-      dr2 as test.`day-time-duration`('-PT328M'),
-      dr3 as test.`day-time-duration`('-P48DT12M43.932S'),
-      dr4 as test.`day-time-duration`('P12H')
+with  dr1 as test.`day_time_duration`('P439D'),
+      dr2 as test.`day_time_duration`('-PT328M'),
+      dr3 as test.`day_time_duration`('-P48DT12M43.932S'),
+      dr4 as test.`day_time_duration`('P12H')
 select element dr
 from  [dr1,dr2,dr3,dr4] as dr
 order by dr

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/double/double.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/double/double.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/double/double.3.query.sqlpp
index 1bedb4b..d23ff21 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/double/double.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/double/double.3.query.sqlpp
@@ -20,4 +20,4 @@
 use test;
 
 
-{'result1':(test.double('-6.5d') > test.int8('+1')),'result2':(test.double('-6.5d') >= test.int16('2')),'result3':(test.double('-6.5d') < test.int32('+3')),'result4':(test.double('-6.5d') <= test.int64('-4')),'result5':(test.double('-6.5d') = test.float('-5.5f')),'result6':(test.double('-6.5d') != test.double('-6.5d'))};
+{'result1':(test.double('-6.5d') > test.tinyint('+1')),'result2':(test.double('-6.5d') >= test.smallint('2')),'result3':(test.double('-6.5d') < test.integer('+3')),'result4':(test.double('-6.5d') <= test.bigint('-4')),'result5':(test.double('-6.5d') = test.float('-5.5f')),'result6':(test.double('-6.5d') != test.double('-6.5d'))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/float/float.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/float/float.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/float/float.3.query.sqlpp
index fc32c8b..ef63716 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/float/float.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/float/float.3.query.sqlpp
@@ -20,4 +20,4 @@
 use test;
 
 
-{'result1':(test.float('-5.5f') > test.int8('+1')),'result2':(test.float('-5.5f') >= test.int16('2')),'result3':(test.float('-5.5f') < test.int32('+3')),'result4':(test.float('-5.5f') <= test.int64('-4')),'result5':(test.float('-5.5f') = test.float('-5.5f')),'result6':(test.float('-5.5f') != test.double('-6.5d'))};
+{'result1':(test.float('-5.5f') > test.tinyint('+1')),'result2':(test.float('-5.5f') >= test.smallint('2')),'result3':(test.float('-5.5f') < test.integer('+3')),'result4':(test.float('-5.5f') <= test.bigint('-4')),'result5':(test.float('-5.5f') = test.float('-5.5f')),'result6':(test.float('-5.5f') != test.double('-6.5d'))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int16/int16.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int16/int16.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int16/int16.3.query.sqlpp
index a2375e9..df7b7b0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int16/int16.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int16/int16.3.query.sqlpp
@@ -20,4 +20,4 @@
 use test;
 
 
-{'result1':(test.int16('2') > test.int8('+1')),'result2':(test.int16('2') >= test.int16('2')),'result3':(test.int16('2') < test.int32('+3')),'result4':(test.int16('2') <= test.int64('-4')),'result5':(test.int16('2') = test.float('-5.5f')),'result6':(test.int16('2') != test.double('-6.5d'))};
+{'result1':(test.smallint('2') > test.tinyint('+1')),'result2':(test.smallint('2') >= test.smallint('2')),'result3':(test.smallint('2') < test.integer('+3')),'result4':(test.smallint('2') <= test.bigint('-4')),'result5':(test.smallint('2') = test.float('-5.5f')),'result6':(test.smallint('2') != test.double('-6.5d'))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int16_missing/int16_missing.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int16_missing/int16_missing.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int16_missing/int16_missing.1.query.sqlpp
index 3553ac7..9339e02 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int16_missing/int16_missing.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int16_missing/int16_missing.1.query.sqlpp
@@ -18,4 +18,4 @@
  */
 
 
-{'result1':(int16('3') > missing),'result2':(missing >= int16('3')),'result3':(int16('3') < missing),'result4':(missing <= int16('3')),'result5':(int16('3') = missing),'result6':(missing != int16('3'))};
+{'result1':(smallint('3') > missing),'result2':(missing >= smallint('3')),'result3':(smallint('3') < missing),'result4':(missing <= smallint('3')),'result5':(smallint('3') = missing),'result6':(missing != smallint('3'))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int16_null/int16_null.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int16_null/int16_null.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int16_null/int16_null.1.query.sqlpp
index daf2c4f..30d00a9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int16_null/int16_null.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int16_null/int16_null.1.query.sqlpp
@@ -18,4 +18,4 @@
  */
 
 
-{'result1':(int16('3') > null),'result2':(null >= int16('3')),'result3':(int16('3') < null),'result4':(null <= int16('3')),'result5':(int16('3') = null),'result6':(null != int16('3'))};
+{'result1':(smallint('3') > null),'result2':(null >= smallint('3')),'result3':(smallint('3') < null),'result4':(null <= smallint('3')),'result5':(smallint('3') = null),'result6':(null != smallint('3'))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int32/int32.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int32/int32.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int32/int32.3.query.sqlpp
index 4bc09d3..a11d4a9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int32/int32.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int32/int32.3.query.sqlpp
@@ -20,4 +20,4 @@
 use test;
 
 
-{'result1':(test.int32('+3') > test.int8('+1')),'result2':(test.int32('+3') >= test.int16('2')),'result3':(test.int32('+3') < test.int32('+3')),'result4':(test.int32('+3') <= test.int64('-4')),'result5':(test.int32('+3') = test.float('-5.5f')),'result6':(test.int32('+3') != test.double('-6.5d'))};
+{'result1':(test.integer('+3') > test.tinyint('+1')),'result2':(test.integer('+3') >= test.smallint('2')),'result3':(test.integer('+3') < test.integer('+3')),'result4':(test.integer('+3') <= test.bigint('-4')),'result5':(test.integer('+3') = test.float('-5.5f')),'result6':(test.integer('+3') != test.double('-6.5d'))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int32_missing/int32_missing.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int32_missing/int32_missing.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int32_missing/int32_missing.1.query.sqlpp
index 53b904a..3ae19b3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int32_missing/int32_missing.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int32_missing/int32_missing.1.query.sqlpp
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-{'result1':(int32('3') > missing),'result2':(missing >= int32('3')),'result3':(int32('3') < missing),'result4':(missing <= int32('3')),'result5':(int32('3') = missing),'result6':(missing != int32('3'))};
+{'result1':(integer('3') > missing),'result2':(missing >= integer('3')),'result3':(integer('3') < missing),'result4':(missing <= integer('3')),'result5':(integer('3') = missing),'result6':(missing != integer('3'))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int32_null/int32_null.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int32_null/int32_null.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int32_null/int32_null.1.query.sqlpp
index 0ad5073..ae47fe6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int32_null/int32_null.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int32_null/int32_null.1.query.sqlpp
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-{'result1':(int32('3') > null),'result2':(null >= int32('3')),'result3':(int32('3') < null),'result4':(null <= int32('3')),'result5':(int32('3') = null),'result6':(null != int32('3'))};
+{'result1':(integer('3') > null),'result2':(null >= integer('3')),'result3':(integer('3') < null),'result4':(null <= integer('3')),'result5':(integer('3') = null),'result6':(null != integer('3'))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int64/int64.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int64/int64.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int64/int64.3.query.sqlpp
index 974406e..145289d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int64/int64.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int64/int64.3.query.sqlpp
@@ -20,4 +20,4 @@
 use test;
 
 
-{'result1':(test.int64('-4') > test.int8('+1')),'result2':(test.int64('-4') >= test.int16('2')),'result3':(test.int64('-4') <= test.int32('+3')),'result4':(test.int64('-4') < test.int64('-4')),'result5':(test.int64('-4') = test.float('-5.5f')),'result6':(test.int64('-4') != test.double('-6.5d'))};
+{'result1':(test.bigint('-4') > test.tinyint('+1')),'result2':(test.bigint('-4') >= test.smallint('2')),'result3':(test.bigint('-4') <= test.integer('+3')),'result4':(test.bigint('-4') < test.bigint('-4')),'result5':(test.bigint('-4') = test.float('-5.5f')),'result6':(test.bigint('-4') != test.double('-6.5d'))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int64_missing/int64_missing.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int64_missing/int64_missing.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int64_missing/int64_missing.1.query.sqlpp
index 74e25a7..ebb46f3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int64_missing/int64_missing.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int64_missing/int64_missing.1.query.sqlpp
@@ -18,4 +18,5 @@
  */
 
 
-{'result1':(int64('3') > missing),'result2':(missing >= int64('3')),'result3':(int64('3') < missing),'result4':(missing <= int64('3')),'result5':(int64('3') = missing),'result6':(missing != int64('3'))};
+
+{'result1':(bigint('3') > missing),'result2':(missing >= bigint('3')),'result3':(bigint('3') < missing),'result4':(missing <= bigint('3')),'result5':(bigint('3') = missing),'result6':(missing != bigint('3'))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int64_null/int64_null.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int64_null/int64_null.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int64_null/int64_null.1.query.sqlpp
index a6a2163..9421f8e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int64_null/int64_null.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int64_null/int64_null.1.query.sqlpp
@@ -17,4 +17,5 @@
  * under the License.
  */
 
-{'result1':(int64('3') > null),'result2':(null >= int64('3')),'result3':(int64('3') < null),'result4':(null <= int64('3')),'result5':(int64('3') = null),'result6':(null != int64('3'))};
+{'result1':(bigint('3') > null),'result2':(null >= bigint('3')),'result3':(bigint('3') < null),'result4':(null <= bigint('3')),'result5':(bigint('3') = null),'result6':(null != bigint('3'))};
+

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int8/int8.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int8/int8.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int8/int8.3.query.sqlpp
index c69c506..86d2357 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int8/int8.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int8/int8.3.query.sqlpp
@@ -20,4 +20,4 @@
 use test;
 
 
-{'result1':(test.int8('+1') > test.int8('+1')),'result2':(test.int8('+1') >= test.int16('2')),'result3':(test.int8('+1') < test.int32('+3')),'result4':(test.int8('+1') <= test.int64('-4')),'result5':(test.int8('+1') = test.float('-5.5f')),'result6':(test.int8('+1') != test.double('-6.5d'))};
+{'result1':(test.tinyint('+1') > test.tinyint('+1')),'result2':(test.tinyint('+1') >= test.smallint('2')),'result3':(test.tinyint('+1') < test.integer('+3')),'result4':(test.tinyint('+1') <= test.bigint('-4')),'result5':(test.tinyint('+1') = test.float('-5.5f')),'result6':(test.tinyint('+1') != test.double('-6.5d'))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int8_missing/int8_missing.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int8_missing/int8_missing.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int8_missing/int8_missing.1.query.sqlpp
index ad72978..b67fc99 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int8_missing/int8_missing.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int8_missing/int8_missing.1.query.sqlpp
@@ -18,4 +18,4 @@
  */
 
 
-{'result1':(int8('3') > missing),'result2':(missing >= int8('3')),'result3':(int8('3') < missing),'result4':(missing <= int8('3')),'result5':(int8('3') = missing),'result6':(missing != int8('3'))};
+{'result1':(tinyint('3') > missing),'result2':(missing >= tinyint('3')),'result3':(tinyint('3') < missing),'result4':(missing <= tinyint('3')),'result5':(tinyint('3') = missing),'result6':(missing != tinyint('3'))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int8_null/int8_null.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int8_null/int8_null.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int8_null/int8_null.1.query.sqlpp
index ec1485f..4605830 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int8_null/int8_null.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/int8_null/int8_null.1.query.sqlpp
@@ -18,4 +18,4 @@
  */
 
 
-{'result1':(int8('3') > null),'result2':(null >= int8('3')),'result3':(int8('3') < null),'result4':(null <= int8('3')),'result5':(int8('3') = null),'result6':(null != int8('3'))};
+{'result1':(tinyint('3') > null),'result2':(null >= tinyint('3')),'result3':(tinyint('3') < null),'result4':(null <= tinyint('3')),'result5':(tinyint('3') = null),'result6':(null != tinyint('3'))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/issue363_equality/issue363_equality.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/issue363_equality/issue363_equality.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/issue363_equality/issue363_equality.3.query.sqlpp
index 56ae0ad..304f85e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/issue363_equality/issue363_equality.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/issue363_equality/issue363_equality.3.query.sqlpp
@@ -24,8 +24,8 @@
  */
 
 { 'duration':(duration('P3Y6M3DT9H5M2.348S') = duration('P3Y6M3DT9H5M2.348S')),
-  'year-month-duration':(`year-month-duration`('P3Y6M') = `year-month-duration`('P3Y6M')),
-  'day-time-duration':(`day-time-duration`('P3DT9H5M2.348S') = `day-time-duration`('P3DT9H5M2.348S')),
+  'year-month-duration':(`year_month_duration`('P3Y6M') = `year_month_duration`('P3Y6M')),
+  'day-time-duration':(`day_time_duration`('P3DT9H5M2.348S') = `day_time_duration`('P3DT9H5M2.348S')),
   'point':(point('47.44,80.65') = point('47.44,80.65')),
   'line':(line('10.1234,11.1e-1 +10.2E-2,-11.22') = line('10.1234,11.1e-1 +10.2E-2,-11.22')),
   'polygon':(polygon('-1.0,+10.5e2 -02.15E+50,2.5 -1.0,+3.3e3 -2.50E+05,20.15 +3.5e+2,03.6 -4.60E-3,+4.75 -2,+1.0e2 -2.00E+5,20.10 30.5,03.25 -4.33E-3,+4.75') = polygon('-1.0,+10.5e2 -02.15E+50,2.5 -1.0,+3.3e3 -2.50E+05,20.15 +3.5e+2,03.6 -4.60E-3,+4.75 -2,+1.0e2 -2.00E+5,20.10 30.5,03.25 -4.33E-3,+4.75')),
@@ -33,8 +33,8 @@
   'rectangle':(rectangle('0.1234,-1.00e-10 5.5487,0.48765') = rectangle('0.1234,-1.00e-10 5.5487,0.48765')),
   'interval':(interval(datetime('-1987-11-19T02:43:57.938+08:00'),datetime('19991112T124935948-0700')) = interval(datetime('-1987-11-19T02:43:57.938+08:00'),datetime('19991112T124935948-0700'))),
   'duration2':(duration('P3Y6M3DT9H5M2.348S') != duration('P4Y6M3DT9H5M2.348S')),
-  'year-month-duration2':(`year-month-duration`('P3Y6M') != `year-month-duration`('P3Y7M')),
-  'day-time-duration2':(`day-time-duration`('P3DT9H5M2.348S') != `day-time-duration`('P3DT1H5M2.348S')),
+  'year-month-duration2':(`year_month_duration`('P3Y6M') != `year_month_duration`('P3Y7M')),
+  'day-time-duration2':(`day_time_duration`('P3DT9H5M2.348S') != `day_time_duration`('P3DT1H5M2.348S')),
   'point2':(point('47.44,80.65') != point('47.4444,80.65')),
   'line2':(line('10.1234,11.1e-1 +10.2E-2,-11.22') != line('10.5678,11.1e-1 +10.2E-2,-11.22')),
   'polygon2':(polygon('-1.0,+10.5e2 -02.15E+50,2.5 -1.0,+3.3e3 -2.50E+05,20.15 +3.5e+2,03.6 -4.60E-3,+4.75 -2,+1.0e2 -2.00E+5,20.10 30.5,03.25 -4.33E-3,+4.75') != polygon('-1.0,+10.5e2 -02.19E+50,2.5 -1.0,+3.3e3 -2.50E+05,20.15 +3.5e+2,03.6 -4.60E-3,+4.75 -2,+1.0e2 -2.00E+5,20.10 30.5,03.25 -4.33E-3,+4.75')),

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/year_month_duration_order/year_month_duration_order.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/year_month_duration_order/year_month_duration_order.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/year_month_duration_order/year_month_duration_order.1.ddl.sqlpp
index 53be05c..d48531c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/year_month_duration_order/year_month_duration_order.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/year_month_duration_order/year_month_duration_order.1.ddl.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description      :   Check comparison and order-by for year-month-duration
+ * Description      :   Check comparison and order-by for year_month_duration
  * Expected Result  :   Success
  * Date             :   May 18, 2013
  */

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/year_month_duration_order/year_month_duration_order.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/year_month_duration_order/year_month_duration_order.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/year_month_duration_order/year_month_duration_order.2.update.sqlpp
index 2c9a982..1fbcffe 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/year_month_duration_order/year_month_duration_order.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/year_month_duration_order/year_month_duration_order.2.update.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description      :   Check comparison and order-by for year-month-duration
+ * Description      :   Check comparison and order-by for year_month_duration
  * Expected Result  :   Success
  * Date             :   May 18, 2013
  */

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/year_month_duration_order/year_month_duration_order.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/year_month_duration_order/year_month_duration_order.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/year_month_duration_order/year_month_duration_order.3.query.sqlpp
index ddc00c5..614073a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/year_month_duration_order/year_month_duration_order.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/year_month_duration_order/year_month_duration_order.3.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description      :   Check comparison and order-by for year-month-duration
+ * Description      :   Check comparison and order-by for year_month_duration
  * Expected Result  :   Success
  * Date             :   May 18, 2013
  */
@@ -25,10 +25,10 @@
 use test;
 
 
-with  dr1 as test.`year-month-duration`('P439Y'),
-      dr2 as test.`year-month-duration`('-P328M'),
-      dr3 as test.`year-month-duration`('-P48Y12M'),
-      dr4 as test.`year-month-duration`('P12M')
+with  dr1 as test.`year_month_duration`('P439Y'),
+      dr2 as test.`year_month_duration`('-P328M'),
+      dr3 as test.`year_month_duration`('-P48Y12M'),
+      dr4 as test.`year_month_duration`('P12M')
 select element dr
 from  [dr1,dr2,dr3,dr4] as dr
 order by dr

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/duration_02/duration_02.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/duration_02/duration_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/duration_02/duration_02.1.ddl.sqlpp
index e145a58..2b48d01 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/duration_02/duration_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/duration_02/duration_02.1.ddl.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description  : test sub type duration (year-month-duration and day-time-duration) constructors
+ * Description  : test sub type duration (year_month_duration and day_time_duration) constructors
  * Expected Res : Success
  * Date         : 7 May 2013
  * issue        : 363

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/duration_02/duration_02.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/duration_02/duration_02.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/duration_02/duration_02.2.update.sqlpp
index 6d800f3..dbf9050 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/duration_02/duration_02.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/duration_02/duration_02.2.update.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description  : test sub type duration (year-month-duration and day-time-duration) constructors
+ * Description  : test sub type duration (year_month_duration and day_time_duration) constructors
  * Expected Res : Success
  * Date         : 7 May 2013
  * issue        : 363

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/duration_02/duration_02.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/duration_02/duration_02.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/duration_02/duration_02.3.query.sqlpp
index 26ebf69..5a42c34 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/duration_02/duration_02.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/duration_02/duration_02.3.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description  : test sub type duration (year-month-duration and day-time-duration) constructors
+ * Description  : test sub type duration (year_month_duration and day_time_duration) constructors
  * Expected Res : Success
  * Date         : 7 May 2013
  * issue        : 363
@@ -26,4 +26,4 @@
 use test;
 
 
-{'duration1':test.`year-month-duration`('P30Y10M'),'duration2':test.`day-time-duration`('P25DT13H12M50S'),'duration3':test.`day-time-duration`('PT13H12M50S'),'duration4':test.`year-month-duration`('P30Y'),'duration5':test.`day-time-duration`('PT13H'),'duration6':test.`year-month-duration`('-P30Y10M'),'duration7':test.`day-time-duration`('-P25DT13H12M50S'),'duration8':test.`day-time-duration`('-PT13H50S'),'duration9':test.`day-time-duration`('P120D'),'duration10':test.`year-month-duration`('-P28M'),'duration11':test.`day-time-duration`('PT29M90.937S'),'duration12':test.`year-month-duration`('P300Y15M')};
+{'duration1':test.`year_month_duration`('P30Y10M'),'duration2':test.`day_time_duration`('P25DT13H12M50S'),'duration3':test.`day_time_duration`('PT13H12M50S'),'duration4':test.`year_month_duration`('P30Y'),'duration5':test.`day_time_duration`('PT13H'),'duration6':test.`year_month_duration`('-P30Y10M'),'duration7':test.`day_time_duration`('-P25DT13H12M50S'),'duration8':test.`day_time_duration`('-PT13H50S'),'duration9':test.`day_time_duration`('P120D'),'duration10':test.`year_month_duration`('-P28M'),'duration11':test.`day_time_duration`('PT29M90.937S'),'duration12':test.`year_month_duration`('P300Y15M')};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/int_01/int_01.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/int_01/int_01.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/int_01/int_01.3.query.sqlpp
index 7fbc6e7..1d466f2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/int_01/int_01.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/int_01/int_01.3.query.sqlpp
@@ -20,4 +20,4 @@
 use test;
 
 
-{'int8':test.int8('+80i8'),'int16':test.int16('160'),'int32':test.int32('+320i32'),'int64':test.int64('640'),'int8_2':test.int8('-80'),'int16_2':test.int16('-160i16'),'int32_2':test.int32('-320'),'int64_2':test.int64('-640i64'),'int64_min':test.int64('-9223372036854775808')};
+{'int8':test.tinyint('+80i8'),'int16':test.smallint('160'),'int32':test.integer('+320i32'),'int64':test.bigint('640'),'int8_2':test.tinyint('-80'),'int16_2':test.smallint('-160i16'),'int32_2':test.integer('-320'),'int64_2':test.bigint('-640i64'),'int64_min':test.bigint('-9223372036854775808')};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/primitive-01/primitive-01.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/primitive-01/primitive-01.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/primitive-01/primitive-01.3.query.sqlpp
index 99a1c04..d789519 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/primitive-01/primitive-01.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/primitive-01/primitive-01.3.query.sqlpp
@@ -18,10 +18,10 @@
  */
 /*
  * Test case name : primitive-01.aql
- * Description    : Test primitive integer type int8 constructor function with boundary values
+ * Description    : Test primitive integer type tinyint constructor function with boundary values
  * Success        : Yes
  * Date           : May 7th 2012
  *
  */
 
-{'$a':int8('-127'),'$b':int8('127'),'$c':int8('0'),'$d':int8('1'),'$e':int8('-1')};
+{'$a':tinyint('-127'),'$b':tinyint('127'),'$c':tinyint('0'),'$d':tinyint('1'),'$e':tinyint('-1')};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/primitive-02/primitive-02.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/primitive-02/primitive-02.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/primitive-02/primitive-02.3.query.sqlpp
index ad82347..6fca7ac 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/primitive-02/primitive-02.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/primitive-02/primitive-02.3.query.sqlpp
@@ -18,10 +18,10 @@
  */
 /*
  * Test case name : primitive-02.aql
- * Description    : Test primitive integer type int16 constructor function with boundary values
+ * Description    : Test primitive integer type smallint constructor function with boundary values
  * Success        : Yes
  * Date           : May 7th 2012
  *
  */
 
-{'$a':int16('-32767'),'$b':int16('32767'),'$c':int16('0'),'$d':int16('1'),'$e':int16('-1'),'$f':int16('16383'),'$g':int16('-16383')};
+{'$a':smallint('-32767'),'$b':smallint('32767'),'$c':smallint('0'),'$d':smallint('1'),'$e':smallint('-1'),'$f':smallint('16383'),'$g':smallint('-16383')};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/primitive-03/primitive-03.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/primitive-03/primitive-03.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/primitive-03/primitive-03.3.query.sqlpp
index 3297c9e..93a5799 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/primitive-03/primitive-03.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/primitive-03/primitive-03.3.query.sqlpp
@@ -18,10 +18,10 @@
  */
 /*
  * Test case name : primitive-03.aql
- * Description    : Test primitive integer type int32 constructor function with boundary values
+ * Description    : Test primitive integer type integer constructor function with boundary values
  * Success        : Yes
  * Date           : May 7th 2012
  *
  */
 
-{'$a':int32('-2147483647'),'$b':int32('2147483647'),'$c':int32('0'),'$d':int32('1'),'$e':int32('-1'),'$f':int32('1073741828'),'$g':int32('-1073741828')};
+{'$a':integer('-2147483647'),'$b':integer('2147483647'),'$c':integer('0'),'$d':integer('1'),'$e':integer('-1'),'$f':integer('1073741828'),'$g':integer('-1073741828')};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/primitive-04/primitive-04.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/primitive-04/primitive-04.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/primitive-04/primitive-04.3.query.sqlpp
index 8103517..b670bb2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/primitive-04/primitive-04.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/constructor/primitive-04/primitive-04.3.query.sqlpp
@@ -18,10 +18,10 @@
  */
 /*
  * Test case name : primitive-04.aql
- * Description    : Test primitive integer type int64 constructor functions with boundary values
+ * Description    : Test primitive integer type bigint constructor functions with boundary values
  * Success        : Yes
  * Date           : May 7th 2012
  *
  */
 
-{'$a':int64('9222872036854775809'),'$b':int64('-9222872036854775809'),'$c':int64('0'),'$d':int64('1'),'$e':int64('-1'),'$f':int64('4611436018427387904'),'$g':int64('-4611436018427387904')};
+{'$a':bigint('9222872036854775809'),'$b':bigint('-9222872036854775809'),'$c':bigint('0'),'$d':bigint('1'),'$e':bigint('-1'),'$f':bigint('4611436018427387904'),'$g':bigint('-4611436018427387904')};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv01/cross-dv01.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv01/cross-dv01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv01/cross-dv01.1.ddl.sqlpp
index bfe11ef..0d6688a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv01/cross-dv01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv01/cross-dv01.1.ddl.sqlpp
@@ -35,18 +35,18 @@ use teacher;
 
 create type student.stdType as
 {
-  id : int64,
+  id : bigint,
   name : string,
-  age : int64,
+  age : bigint,
   sex : string,
   dept : string
 }
 
 create type teacher.tchrType as
 {
-  id : int64,
+  id : bigint,
   name : string,
-  age : int64,
+  age : bigint,
   sex : string,
   dept : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv02/cross-dv02.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv02/cross-dv02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv02/cross-dv02.1.ddl.sqlpp
index f3eb9cf..e1effc3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv02/cross-dv02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv02/cross-dv02.1.ddl.sqlpp
@@ -32,18 +32,18 @@ create  dataverse teacher;
 
 create type student.stdType as
 {
-  id : int32,
+  id : integer,
   name : string,
-  age : int32,
+  age : integer,
   sex : string,
   dept : string
 }
 
 create type teacher.tchrType as
 {
-  id : int32,
+  id : integer,
   name : string,
-  age : int32,
+  age : integer,
   sex : string,
   dept : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv03/cross-dv03.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv03/cross-dv03.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv03/cross-dv03.1.ddl.sqlpp
index 826150c..b5cb9ca 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv03/cross-dv03.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv03/cross-dv03.1.ddl.sqlpp
@@ -35,18 +35,18 @@ create  dataverse teacher;
 
 create type student.stdType as
 {
-  id : int64,
+  id : bigint,
   name : string,
-  age : int64,
+  age : bigint,
   sex : string,
   dept : string
 }
 
 create type teacher.tchrType as
 {
-  id : int64,
+  id : bigint,
   name : string,
-  age : int64,
+  age : bigint,
   sex : string,
   dept : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv03/cross-dv03.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv03/cross-dv03.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv03/cross-dv03.3.query.sqlpp
index a09512f..f44090e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv03/cross-dv03.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv03/cross-dv03.3.query.sqlpp
@@ -26,7 +26,7 @@
  * Date         : 28th Aug 2012
  */
 
-select element coll_count((
+select element array_count((
     select element l
     from  `Metadata.Dataset` as l
     where ((l.DataverseName = 'student') or (l.DataverseName = 'teacher'))

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv04/cross-dv04.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv04/cross-dv04.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv04/cross-dv04.1.ddl.sqlpp
index 317feec..fa5dadb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv04/cross-dv04.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv04/cross-dv04.1.ddl.sqlpp
@@ -36,18 +36,18 @@ create  dataverse teacher;
 
 create type student.stdType as
 {
-  id : int32,
+  id : integer,
   name : string,
-  age : int32,
+  age : integer,
   sex : string,
   dept : string
 }
 
 create type teacher.tchrType as
 {
-  id : int32,
+  id : integer,
   name : string,
-  age : int32,
+  age : integer,
   sex : string,
   dept : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv07/cross-dv07.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv07/cross-dv07.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv07/cross-dv07.1.ddl.sqlpp
index dfef87c..c4b2248 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv07/cross-dv07.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv07/cross-dv07.1.ddl.sqlpp
@@ -28,10 +28,10 @@ create  dataverse test;
 
 create type test.Emp as
  closed {
-  id : int64,
+  id : bigint,
   fname : string,
   lname : string,
-  age : int64,
+  age : bigint,
   dept : string
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv17/cross-dv17.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv17/cross-dv17.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv17/cross-dv17.1.ddl.sqlpp
index ca051a7..b277601 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv17/cross-dv17.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv17/cross-dv17.1.ddl.sqlpp
@@ -31,11 +31,11 @@ create dataverse test;
 create dataverse fest;
 
 create type test.testtype as open {
-id : int32
+id : integer
 }
 
 create type fest.testtype as open {
-id : int32
+id : integer
 }
 
 create dataset test.t1(testtype) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv18/cross-dv18.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv18/cross-dv18.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv18/cross-dv18.1.ddl.sqlpp
index bd6b5ef..ba8ff37 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv18/cross-dv18.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv18/cross-dv18.1.ddl.sqlpp
@@ -32,12 +32,12 @@ create  dataverse fest;
 
 create type test.testtype as
 {
-  id : int32
+  id : integer
 }
 
 create type fest.testtype as
 {
-  id : int32
+  id : integer
 }
 
 create  dataset test.t1(testtype) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv19/cross-dv19.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv19/cross-dv19.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv19/cross-dv19.1.ddl.sqlpp
index ff434f8..0783879 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv19/cross-dv19.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv19/cross-dv19.1.ddl.sqlpp
@@ -30,7 +30,7 @@ create  dataverse test2;
 
 create type test1.testtype as
 {
-  id : int32,
+  id : integer,
   name : string,
   loc : point,
   time : datetime
@@ -38,7 +38,7 @@ create type test1.testtype as
 
 create type test2.testtype as
 {
-  id : int32,
+  id : integer,
   name : string?,
   loc : point,
   time : datetime
@@ -46,8 +46,8 @@ create type test2.testtype as
 
 create type test1.Tweet as
 {
-  id : int32,
-  tweetid : int64,
+  id : integer,
+  tweetid : bigint,
   loc : point,
   time : datetime,
   text : string

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv20/cross-dv20.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv20/cross-dv20.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv20/cross-dv20.1.ddl.sqlpp
index 0a62043..3ee9f3d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv20/cross-dv20.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv20/cross-dv20.1.ddl.sqlpp
@@ -32,18 +32,18 @@ create  dataverse teacher;
 
 create type student.stdType as
 {
-  id : int64,
+  id : bigint,
   name : string,
-  age : int64,
+  age : bigint,
   sex : string,
   dept : string
 }
 
 create type teacher.tchrType as
 {
-  id : int64,
+  id : bigint,
   name : string,
-  age : int64,
+  age : bigint,
   sex : string,
   dept : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/drop_dataset/drop_dataset.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/drop_dataset/drop_dataset.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/drop_dataset/drop_dataset.1.ddl.sqlpp
index 5d1c481..78d4b2d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/drop_dataset/drop_dataset.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/drop_dataset/drop_dataset.1.ddl.sqlpp
@@ -25,20 +25,20 @@ use test;
 
 create type test.AddressType as
 {
-  number : int32,
+  number : integer,
   street : string,
   city : string
 }
 
 create type test.CustomerType as
  closed {
-  cid : int32,
+  cid : integer,
   name : string,
-  cashBack : int32,
-  age : int32?,
+  cashBack : integer,
+  age : integer?,
   address : AddressType?,
   lastorder : {
-      oid : int32,
+      oid : integer,
       total : float
   }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/insert_across_dataverses/insert_across_dataverses.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/insert_across_dataverses/insert_across_dataverses.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/insert_across_dataverses/insert_across_dataverses.1.ddl.sqlpp
index c671212..0942333 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/insert_across_dataverses/insert_across_dataverses.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/insert_across_dataverses/insert_across_dataverses.1.ddl.sqlpp
@@ -25,20 +25,20 @@ create  dataverse test2;
 
 create type test1.AddressType as
 {
-  number : int64,
+  number : bigint,
   street : string,
   city : string
 }
 
 create type test1.CustomerType as
  closed {
-  cid : int64,
+  cid : bigint,
   name : string,
-  cashBack : int64,
-  age : int64?,
+  cashBack : bigint,
+  age : bigint?,
   address : AddressType?,
   lastorder : {
-      oid : int64,
+      oid : bigint,
       total : float
   }
 
@@ -46,20 +46,20 @@ create type test1.CustomerType as
 
 create type test2.AddressType as
 {
-  number : int64,
+  number : bigint,
   street : string,
   city : string
 }
 
 create type test2.CustomerType as
  closed {
-  cid : int64,
+  cid : bigint,
   name : string,
-  cashBack : int64,
-  age : int64?,
+  cashBack : bigint,
+  age : bigint?,
   address : AddressType?,
   lastorder : {
-      oid : int64,
+      oid : bigint,
       total : float
   }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/insert_from_source_dataset/insert_from_source_dataset.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/insert_from_source_dataset/insert_from_source_dataset.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/insert_from_source_dataset/insert_from_source_dataset.1.ddl.sqlpp
index d836108..a2b72e0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/insert_from_source_dataset/insert_from_source_dataset.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/insert_from_source_dataset/insert_from_source_dataset.1.ddl.sqlpp
@@ -30,7 +30,7 @@ use test;
 
 create type test.testtype as
 {
-  id : int32,
+  id : integer,
   name : string
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/join_across_dataverses/join_across_dataverses.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/join_across_dataverses/join_across_dataverses.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/join_across_dataverses/join_across_dataverses.1.ddl.sqlpp
index 5ad2fd0..699a511 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/join_across_dataverses/join_across_dataverses.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/join_across_dataverses/join_across_dataverses.1.ddl.sqlpp
@@ -25,20 +25,20 @@ create  dataverse test2;
 
 create type test1.AddressType as
 {
-  number : int64,
+  number : bigint,
   street : string,
   city : string
 }
 
 create type test1.CustomerType as
  closed {
-  cid : int64,
+  cid : bigint,
   name : string,
-  cashBack : int64,
-  age : int64?,
+  cashBack : bigint,
+  age : bigint?,
   address : AddressType?,
   lastorder : {
-      oid : int64,
+      oid : bigint,
       total : float
   }
 
@@ -48,13 +48,13 @@ create  dataset test1.Customers(CustomerType) primary key cid;
 
 create type test2.OrderType as
 {
-  oid : int64,
-  cid : int64,
+  oid : bigint,
+  cid : bigint,
   orderstatus : string,
   orderpriority : string,
   clerk : string,
   total : float,
-  items : [int64]
+  items : [bigint]
 }
 
 create  dataset test2.Orders(OrderType) primary key oid;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/csv/basic-types/basic-types.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/csv/basic-types/basic-types.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/csv/basic-types/basic-types.1.ddl.sqlpp
index f354565..0346c62 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/csv/basic-types/basic-types.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/csv/basic-types/basic-types.1.ddl.sqlpp
@@ -25,15 +25,15 @@ use test;
 
 create type test.AllType as
 {
-  id : int64,
+  id : bigint,
   string : string,
   float : float,
   double : double,
   boolean : boolean,
-  int8 : int8,
-  int16 : int16,
-  int32 : int32,
-  int64 : int64,
+  int8 : tinyint,
+  int16 : smallint,
+  int32 : integer,
+  int64 : bigint,
   date : date,
   time : time,
   datetime : datetime,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/csv/basic-types/basic-types.2.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/csv/basic-types/basic-types.2.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/csv/basic-types/basic-types.2.query.sqlpp
index 0cd3710..1fdd4bf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/csv/basic-types/basic-types.2.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/csv/basic-types/basic-types.2.query.sqlpp
@@ -22,4 +22,4 @@ use test;
 
 set `output-record-type` `AllType`;
 
-select element {'id':10,'string':test.string('Nancy'),'float':32.500000f,'double':test.double('-2013.5938237483274'),'boolean':true,'int8':test.int8('125'),'int16':test.int16('32765'),'int32':test.int32('294967295'),'int64':test.int64('1700000000000000000'),'date':test.date('-2011-01-27'),'time':test.time('12:20:30Z'),'datetime':test.datetime('-1951-12-27T12:20:30'),'duration':test.duration('P10Y11M12DT10H50M30S'),'point':test.point('41.00,44.00'),'point3d':test.point3d('44.00,13.00,41.00'),'line':test.line('10.1,11.1 10.2,11.2'),'rectangle':test.rectangle('5.1,11.8 87.6,15.6548'),'polygon':test.polygon('1.2,1.3 2.1,2.5 3.5,3.6 4.6,4.8'),'circle':test.circle('10.1,11.1 10.2'),'binary':test.hex('ABCDEF0123456789'),'uuid':test.uuid('5c848e5c-6b6a-498f-8452-8847a2957421')};
+select element {'id':10,'string':test.string('Nancy'),'float':32.500000f,'double':test.double('-2013.5938237483274'),'boolean':true,'int8':test.tinyint('125'),'int16':test.smallint('32765'),'int32':test.integer('294967295'),'int64':test.bigint('1700000000000000000'),'date':test.date('-2011-01-27'),'time':test.time('12:20:30Z'),'datetime':test.datetime('-1951-12-27T12:20:30'),'duration':test.duration('P10Y11M12DT10H50M30S'),'point':test.point('41.00,44.00'),'point3d':test.point3d('44.00,13.00,41.00'),'line':test.line('10.1,11.1 10.2,11.2'),'rectangle':test.rectangle('5.1,11.8 87.6,15.6548'),'polygon':test.polygon('1.2,1.3 2.1,2.5 3.5,3.6 4.6,4.8'),'circle':test.circle('10.1,11.1 10.2'),'binary':test.hex('ABCDEF0123456789'),'uuid':test.uuid('5c848e5c-6b6a-498f-8452-8847a2957421')};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/co/co.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/co/co.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/co/co.1.ddl.sqlpp
index 1035d67..0ffe834 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/co/co.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/co/co.1.ddl.sqlpp
@@ -25,19 +25,19 @@ use custord;
 
 create type custord.AddressType as
 {
-  number : int32,
+  number : integer,
   street : string,
   city : string
 }
 
 create type custord.CustomerType as
 {
-  cid : int32,
+  cid : integer,
   name : string,
-  age : int32?,
+  age : integer?,
   address : AddressType?,
   lastorder : {
-      oid : int32,
+      oid : integer,
       total : float
   }
 
@@ -45,8 +45,8 @@ create type custord.CustomerType as
 
 create type custord.OrderType as
 {
-  oid : int32,
-  cid : int32,
+  oid : integer,
+  cid : integer,
   orderstatus : string,
   orderpriority : string,
   clerk : string,
@@ -55,7 +55,7 @@ create type custord.OrderType as
 
 create type custord.CustomerOrdersType as
 {
-  cid : int32,
+  cid : integer,
   cust : CustomerType,
   orders : [OrderType]
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_01/customer_q_01.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_01/customer_q_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_01/customer_q_01.1.ddl.sqlpp
index 715f414..ae71544 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_01/customer_q_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_01/customer_q_01.1.ddl.sqlpp
@@ -25,20 +25,20 @@ use test;
 
 create type test.AddressType as
 {
-  number : int64,
+  number : bigint,
   street : string,
   city : string
 }
 
 create type test.CustomerType as
  closed {
-  cid : int64,
+  cid : bigint,
   name : string,
-  cashBack : int64,
-  age : int64?,
+  cashBack : bigint,
+  age : bigint?,
   address : AddressType?,
   lastorder : {
-      oid : int64,
+      oid : bigint,
       total : float
   }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_02/customer_q_02.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_02/customer_q_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_02/customer_q_02.1.ddl.sqlpp
index b027a9c..3d78d5d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_02/customer_q_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_02/customer_q_02.1.ddl.sqlpp
@@ -25,20 +25,20 @@ use test;
 
 create type test.AddressType as
 {
-  number : int32,
+  number : integer,
   street : string,
   city : string
 }
 
 create type test.CustomerType as
  closed {
-  cid : int64,
+  cid : bigint,
   name : string,
-  cashBack : int64,
-  age : int64?,
+  cashBack : bigint,
+  age : bigint?,
   address : AddressType?,
   lastorder : {
-      oid : int64,
+      oid : bigint,
       total : float
   }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_03/customer_q_03.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_03/customer_q_03.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_03/customer_q_03.1.ddl.sqlpp
index b027a9c..3d78d5d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_03/customer_q_03.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_03/customer_q_03.1.ddl.sqlpp
@@ -25,20 +25,20 @@ use test;
 
 create type test.AddressType as
 {
-  number : int32,
+  number : integer,
   street : string,
   city : string
 }
 
 create type test.CustomerType as
  closed {
-  cid : int64,
+  cid : bigint,
   name : string,
-  cashBack : int64,
-  age : int64?,
+  cashBack : bigint,
+  age : bigint?,
   address : AddressType?,
   lastorder : {
-      oid : int64,
+      oid : bigint,
       total : float
   }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_03/customer_q_03.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_03/customer_q_03.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_03/customer_q_03.3.query.sqlpp
index 6baabd6..206cdd4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_03/customer_q_03.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_03/customer_q_03.3.query.sqlpp
@@ -27,5 +27,5 @@ with  nestedRec as c.lastorder,
       c2 as {{c.cid,nestedRec.oid}},
       c3 as [c.lastorder,nestedRec],
       c4 as {{c.lastorder,nestedRec}}
-where (c.cid >= test.int32('3'))
+where (c.cid >= test.integer('3'))
 ;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_04/customer_q_04.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_04/customer_q_04.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_04/customer_q_04.1.ddl.sqlpp
index b027a9c..3d78d5d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_04/customer_q_04.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_04/customer_q_04.1.ddl.sqlpp
@@ -25,20 +25,20 @@ use test;
 
 create type test.AddressType as
 {
-  number : int32,
+  number : integer,
   street : string,
   city : string
 }
 
 create type test.CustomerType as
  closed {
-  cid : int64,
+  cid : bigint,
   name : string,
-  cashBack : int64,
-  age : int64?,
+  cashBack : bigint,
+  age : bigint?,
   address : AddressType?,
   lastorder : {
-      oid : int64,
+      oid : bigint,
       total : float
   }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_04/customer_q_04.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_04/customer_q_04.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_04/customer_q_04.3.query.sqlpp
index a725391..9dc96d3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_04/customer_q_04.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_04/customer_q_04.3.query.sqlpp
@@ -23,5 +23,5 @@ use test;
 select element {'id':c.cid,'custname':c.name,'age':c.age,'MathcashBack':rec}
 from  Customers as c
 with  rec as {'cashBack':c.cashBack,'cashBack+5':(c.cashBack + 5),'cashBack-5':(c.cashBack - 5),'cashBack*5':(c.cashBack * 5),'cashBack/5':(c.cashBack / 5),'-cashBack':-c.cashBack}
-where (c.cid >= test.int32('3'))
+where (c.cid >= test.integer('3'))
 ;