asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From buyin...@apache.org
Subject [20/51] [partial] asterixdb git commit: ASTERIXDB-1539: add aliases for several builtin types and builtin functions.
Date Fri, 23 Sep 2016 03:15:02 GMT
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/orders-index-custkey/orders-index-custkey.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/orders-index-custkey/orders-index-custkey.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/orders-index-custkey/orders-index-custkey.1.ddl.sqlpp
index 101a6ad..6e6e8d4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/orders-index-custkey/orders-index-custkey.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/orders-index-custkey/orders-index-custkey.1.ddl.sqlpp
@@ -25,26 +25,26 @@ use tpch;
 
 create type tpch.OrderTypetmp as
  closed {
-  o_orderkey : int64,
-  o_custkey : int64,
+  o_orderkey : bigint,
+  o_custkey : bigint,
   o_orderstatus : string,
   o_totalprice : double,
   o_orderdate : string,
   o_orderpriority : string,
   o_clerk : string,
-  o_shippriority : int64,
+  o_shippriority : bigint,
   o_comment : string
 }
 
 create type tpch.OrderOpenType as
 {
-  o_orderkey : int64,
+  o_orderkey : bigint,
   o_orderstatus : string,
   o_totalprice : double,
   o_orderdate : string,
   o_orderpriority : string,
   o_clerk : string,
-  o_shippriority : int64,
+  o_shippriority : bigint,
   o_comment : string
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/orders-index-custkey/orders-index-custkey.3.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/orders-index-custkey/orders-index-custkey.3.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/orders-index-custkey/orders-index-custkey.3.ddl.sqlpp
index f73984b..7c36e90 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/orders-index-custkey/orders-index-custkey.3.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/orders-index-custkey/orders-index-custkey.3.ddl.sqlpp
@@ -20,5 +20,5 @@
 use tpch;
 
 
-create  index idx_Orders_Custkey  on Orders (nested.o_custkey:int32?) type btree enforced;
+create  index idx_Orders_Custkey  on Orders (nested.o_custkey:integer?) type btree enforced;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/range-search/range-search.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/range-search/range-search.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/range-search/range-search.1.ddl.sqlpp
index cc3b221..5932992 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/range-search/range-search.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/range-search/range-search.1.ddl.sqlpp
@@ -25,10 +25,10 @@ use test;
 
 create type test.LineItemTypetmp as
  closed {
-  l_orderkey : int64,
-  l_partkey : int64,
-  l_suppkey : int64,
-  l_linenumber : int64,
+  l_orderkey : bigint,
+  l_partkey : bigint,
+  l_suppkey : bigint,
+  l_linenumber : bigint,
   l_quantity : double,
   l_extendedprice : double,
   l_discount : double,
@@ -45,9 +45,9 @@ create type test.LineItemTypetmp as
 
 create type test.LineItemOpenType as
 {
-  l_orderkey : int64,
-  l_partkey : int64,
-  l_linenumber : int64,
+  l_orderkey : bigint,
+  l_partkey : bigint,
+  l_linenumber : bigint,
   l_quantity : double,
   l_extendedprice : double,
   l_discount : double,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/range-search/range-search.3.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/range-search/range-search.3.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/range-search/range-search.3.ddl.sqlpp
index 55e28cf..8188703 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/range-search/range-search.3.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/range-search/range-search.3.ddl.sqlpp
@@ -20,5 +20,5 @@
 use test;
 
 
-create  index idx_LineItem_suppkey  on LineItem (nested.l_suppkey:int32?) type btree enforced;
+create  index idx_LineItem_suppkey  on LineItem (nested.l_suppkey:integer?) type btree enforced;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/rtree-secondary-index/rtree-secondary-index.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/rtree-secondary-index/rtree-secondary-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/rtree-secondary-index/rtree-secondary-index.1.ddl.sqlpp
index 24c71b9..ac81f4b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/rtree-secondary-index/rtree-secondary-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/rtree-secondary-index/rtree-secondary-index.1.ddl.sqlpp
@@ -25,7 +25,7 @@ use test;
 
 create type test.MyRecordtmp as
 {
-  id : int64,
+  id : bigint,
   kwds : string,
   line1 : line,
   line2 : line,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/null-missing/group-by-from-dataset/group-by-from-dataset.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/null-missing/group-by-from-dataset/group-by-from-dataset.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/null-missing/group-by-from-dataset/group-by-from-dataset.1.ddl.sqlpp
index fa24551..7bff4ad 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/null-missing/group-by-from-dataset/group-by-from-dataset.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/null-missing/group-by-from-dataset/group-by-from-dataset.1.ddl.sqlpp
@@ -25,7 +25,7 @@ create dataverse test;
 use test;
 
 create type TestType as {
-   b: int64
+   b: bigint
 }
 
 create dataset data(TestType) primary key b;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/null-missing/order-by-from-dataset/order-by-from-dataset.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/null-missing/order-by-from-dataset/order-by-from-dataset.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/null-missing/order-by-from-dataset/order-by-from-dataset.1.ddl.sqlpp
index fa24551..7bff4ad 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/null-missing/order-by-from-dataset/order-by-from-dataset.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/null-missing/order-by-from-dataset/order-by-from-dataset.1.ddl.sqlpp
@@ -25,7 +25,7 @@ create dataverse test;
 use test;
 
 create type TestType as {
-   b: int64
+   b: bigint
 }
 
 create dataset data(TestType) primary key b;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/abs0/abs0.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/abs0/abs0.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/abs0/abs0.3.query.sqlpp
index fdab886..fb11467 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/abs0/abs0.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/abs0/abs0.3.query.sqlpp
@@ -20,4 +20,4 @@
 use test;
 
 
-{'f0':test.abs(test.int8('-0')),'f1':test.abs(test.int16('-0')),'f2':test.abs(test.int32('-0')),'f3':test.abs(test.int64('-0')),'f4':test.abs(test.int8('0')),'f5':test.abs(test.int16('0')),'f6':test.abs(test.int32('0')),'f7':test.abs(test.int64('0'))};
+{'f0':test.abs(test.tinyint('-0')),'f1':test.abs(test.smallint('-0')),'f2':test.abs(test.integer('-0')),'f3':test.abs(test.bigint('-0')),'f4':test.abs(test.tinyint('0')),'f5':test.abs(test.smallint('0')),'f6':test.abs(test.integer('0')),'f7':test.abs(test.bigint('0'))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/abs1/abs1.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/abs1/abs1.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/abs1/abs1.3.query.sqlpp
index adbf013..f6a44bf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/abs1/abs1.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/abs1/abs1.3.query.sqlpp
@@ -20,4 +20,4 @@
 use test;
 
 
-{'f0':test.abs(test.int8('-20')),'f1':test.abs(test.int16('-23')),'f2':test.abs(test.int32('-29')),'f3':test.abs(test.int64('-21')),'f4':test.abs(test.int8('20')),'f5':test.abs(test.int16('22')),'f6':test.abs(test.int32('23')),'f7':test.abs(test.int64('27'))};
+{'f0':test.abs(test.tinyint('-20')),'f1':test.abs(test.smallint('-23')),'f2':test.abs(test.integer('-29')),'f3':test.abs(test.bigint('-21')),'f4':test.abs(test.tinyint('20')),'f5':test.abs(test.smallint('22')),'f6':test.abs(test.integer('23')),'f7':test.abs(test.bigint('27'))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/abs4/abs4.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/abs4/abs4.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/abs4/abs4.3.query.sqlpp
index 7b6a00e..d07cbff 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/abs4/abs4.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/abs4/abs4.3.query.sqlpp
@@ -20,4 +20,4 @@
 use test;
 
 
-{'f0':test.abs(test.int8('-20')),'f1':test.abs(-1.11),'f2':test.abs(12.9),'f3':test.abs(1.11)};
+{'f0':test.abs(test.tinyint('-20')),'f1':test.abs(-1.11),'f2':test.abs(12.9),'f3':test.abs(1.11)};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/acos/acos.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/acos/acos.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/acos/acos.1.query.sqlpp
index c9ae50c..b3f87c9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/acos/acos.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/acos/acos.1.query.sqlpp
@@ -21,9 +21,9 @@
   "a": acos(10.0),
   "b": acos(0.5f),
   "c": acos(100),
-  "d": acos(int32("0")),
-  "e": acos(int8("-1")),
-  "f": acos(int16("1")),
+  "d": acos(integer("0")),
+  "e": acos(tinyint("-1")),
+  "f": acos(smallint("1")),
   "g": acos(null),
   "h": acos(missing)
 };

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/add_double/add_double.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/add_double/add_double.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/add_double/add_double.1.query.sqlpp
index 5065b5f..366f2b1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/add_double/add_double.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/add_double/add_double.1.query.sqlpp
@@ -18,4 +18,4 @@
  */
 
 
-{'result1':(double('-6.5d') + int8('+1')),'result2':(double('-6.5d') + int16('2')),'result3':(double('-6.5d') + int32('+3')),'result4':(double('-6.5d') + int64('-4')),'result5':(double('-6.5d') + float('-5.5f')),'result6':(double('-6.5d') + double('-6.5d')),'result7':(double('-6.5d') + null), 'result8':double('-6.5d') + [1.0][-1]};
+{'result1':(double('-6.5d') + tinyint('+1')),'result2':(double('-6.5d') + smallint('2')),'result3':(double('-6.5d') + integer('+3')),'result4':(double('-6.5d') + bigint('-4')),'result5':(double('-6.5d') + float('-5.5f')),'result6':(double('-6.5d') + double('-6.5d')),'result7':(double('-6.5d') + null), 'result8':double('-6.5d') + [1.0][-1]};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/add_float/add_float.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/add_float/add_float.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/add_float/add_float.1.query.sqlpp
index 46db3dd..b7913b8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/add_float/add_float.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/add_float/add_float.1.query.sqlpp
@@ -18,4 +18,4 @@
  */
 
 
-{'result1':(float('-5.5f') + int8('+1')),'result2':(float('-5.5f') + int16('2')),'result3':(float('-5.5f') + int32('+3')),'result4':(float('-5.5f') + int64('-4')),'result5':(float('-5.5f') + float('-5.5f')),'result6':(float('-5.5f') + double('-6.5d')),'result7':(double('-6.5d') + null), 'result8':double('-6.5d') + [1.0][1]};
+{'result1':(float('-5.5f') + tinyint('+1')),'result2':(float('-5.5f') + smallint('2')),'result3':(float('-5.5f') + integer('+3')),'result4':(float('-5.5f') + bigint('-4')),'result5':(float('-5.5f') + float('-5.5f')),'result6':(float('-5.5f') + double('-6.5d')),'result7':(double('-6.5d') + null), 'result8':double('-6.5d') + [1.0][1]};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/add_int16/add_int16.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/add_int16/add_int16.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/add_int16/add_int16.1.query.sqlpp
index 3403466..f7dd3db 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/add_int16/add_int16.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/add_int16/add_int16.1.query.sqlpp
@@ -18,4 +18,4 @@
  */
 
 
-{'result1':(int16('2') + int8('+1')),'result2':(int16('2') + int16('2')),'result3':(int16('2') + int32('+3')),'result4':(int16('2') + int64('-4')),'result5':(int16('2') + float('-5.5f')),'result6':(int16('2') + double('-6.5d')),'result7':(double('-6.5d') + null), 'result8':double('-6.5d') + [1.0][1]};
+{'result1':(smallint('2') + tinyint('+1')),'result2':(smallint('2') + smallint('2')),'result3':(smallint('2') + integer('+3')),'result4':(smallint('2') + bigint('-4')),'result5':(smallint('2') + float('-5.5f')),'result6':(smallint('2') + double('-6.5d')),'result7':(double('-6.5d') + null), 'result8':double('-6.5d') + [1.0][1]};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/add_int32/add_int32.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/add_int32/add_int32.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/add_int32/add_int32.1.query.sqlpp
index 1b3b89b..c63c6f5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/add_int32/add_int32.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/add_int32/add_int32.1.query.sqlpp
@@ -18,4 +18,4 @@
  */
 
 
-{'result1':(int32('+3') + int8('+1')),'result2':(int32('+3') + int16('2')),'result3':(int32('+3') + int32('+3')),'result4':(int32('+3') + int64('-4')),'result5':(int32('+3') + float('-5.5f')),'result6':(int32('+3') + double('-6.5d')),'result7':(double('-6.5d') + null), 'result8':double('-6.5d') + [1.0][1]};
+{'result1':(integer('+3') + tinyint('+1')),'result2':(integer('+3') + smallint('2')),'result3':(integer('+3') + integer('+3')),'result4':(integer('+3') + bigint('-4')),'result5':(integer('+3') + float('-5.5f')),'result6':(integer('+3') + double('-6.5d')),'result7':(double('-6.5d') + null), 'result8':double('-6.5d') + [1.0][1]};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/add_int64/add_int64.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/add_int64/add_int64.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/add_int64/add_int64.1.query.sqlpp
index 7608d33..e7e9495 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/add_int64/add_int64.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/add_int64/add_int64.1.query.sqlpp
@@ -18,4 +18,4 @@
  */
 
 
-{'result1':(int64('-4') + int8('+1')),'result2':(int64('-4') + int16('2')),'result3':(int64('-4') + int32('+3')),'result4':(int64('-4') + int64('-4')),'result5':(int64('-4') + float('-5.5f')),'result6':(int64('-4') + double('-6.5d')),'result7':(double('-6.5d') + null), 'result8':double('-6.5d') + [1.0][1]};
+{'result1':(bigint('-4') + tinyint('+1')),'result2':(bigint('-4') + smallint('2')),'result3':(bigint('-4') + integer('+3')),'result4':(bigint('-4') + bigint('-4')),'result5':(bigint('-4') + float('-5.5f')),'result6':(bigint('-4') + double('-6.5d')),'result7':(double('-6.5d') + null), 'result8':double('-6.5d') + [1.0][1]};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/add_int8/add_int8.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/add_int8/add_int8.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/add_int8/add_int8.3.query.sqlpp
index 31cbf6c..7e14663 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/add_int8/add_int8.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/add_int8/add_int8.3.query.sqlpp
@@ -18,4 +18,4 @@
  */
 
 
-{'result1':(int8('+1') + int8('+1')),'result2':(int8('+1') + int16('2')),'result3':(int8('+1') + int32('+3')),'result4':(int8('+1') + int64('-4')),'result5':(int8('+1') + float('-5.5f')),'result6':(int8('+1') + double('-6.5d')),'result7':(double('-6.5d') + null), 'result8':double('-6.5d') + [1.0][1]};
+{'result1':(tinyint('+1') + tinyint('+1')),'result2':(tinyint('+1') + smallint('2')),'result3':(tinyint('+1') + integer('+3')),'result4':(tinyint('+1') + bigint('-4')),'result5':(tinyint('+1') + float('-5.5f')),'result6':(tinyint('+1') + double('-6.5d')),'result7':(double('-6.5d') + null), 'result8':double('-6.5d') + [1.0][1]};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/asin/asin.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/asin/asin.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/asin/asin.1.query.sqlpp
index 4807859..b0cb3ac 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/asin/asin.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/asin/asin.1.query.sqlpp
@@ -21,9 +21,9 @@
   "a": asin(10.0),
   "b": asin(0.5f),
   "c": asin(100),
-  "d": asin(int32("0")),
-  "e": asin(int8("-1")),
-  "f": asin(int16("1")),
+  "d": asin(integer("0")),
+  "e": asin(tinyint("-1")),
+  "f": asin(smallint("1")),
   "g": asin(null),
   "h": asin(missing)
 };

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/atan/atan.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/atan/atan.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/atan/atan.1.query.sqlpp
index 1ca0e6e..5e900a5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/atan/atan.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/atan/atan.1.query.sqlpp
@@ -21,9 +21,9 @@
   "a": atan(10.0),
   "b": atan(0.5f),
   "c": atan(100),
-  "d": atan(int32("0")),
-  "e": atan(int8("-1")),
-  "f": atan(int16("1")),
+  "d": atan(integer("0")),
+  "e": atan(tinyint("-1")),
+  "f": atan(smallint("1")),
   "g": atan(null),
   "h": atan(missing)
 };

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/atan2/atan2.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/atan2/atan2.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/atan2/atan2.1.query.sqlpp
index 46d8480..cfbb0e5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/atan2/atan2.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/atan2/atan2.1.query.sqlpp
@@ -20,11 +20,11 @@
 {
   "a": atan2(10.0, 1.0f),
   "b": atan2(0.5f, 10.0),
-  "c": atan2(100, int8("1")),
-  "d": atan2(int32("0"), 0.5f),
-  "e": atan2(int8("-1"), 3.5),
-  "f": atan2(int16("1"), int16("20")),
-  "g": atan2(int16("1"), null),
+  "c": atan2(100, tinyint("1")),
+  "d": atan2(integer("0"), 0.5f),
+  "e": atan2(tinyint("-1"), 3.5),
+  "f": atan2(smallint("1"), smallint("20")),
+  "g": atan2(smallint("1"), null),
   "h": atan2(missing, 1.5),
   "i": atan2(null, missing),
   "j": atan2(null, null),

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/ceiling0/ceiling0.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/ceiling0/ceiling0.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/ceiling0/ceiling0.3.query.sqlpp
index b4361e6..15a7d8f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/ceiling0/ceiling0.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/ceiling0/ceiling0.3.query.sqlpp
@@ -20,4 +20,4 @@
 use test;
 
 
-{'f0':test.ceiling(test.int8('-0')),'f1':test.ceiling(test.int16('-0')),'f2':test.ceiling(test.int32('-0')),'f3':test.ceiling(test.int64('-0')),'f4':test.ceiling(test.int8('0')),'f5':test.ceiling(test.int16('0')),'f6':test.ceiling(test.int32('0')),'f7':test.ceiling(test.int64('0'))};
+{'f0':test.ceiling(test.tinyint('-0')),'f1':test.ceiling(test.smallint('-0')),'f2':test.ceiling(test.integer('-0')),'f3':test.ceiling(test.bigint('-0')),'f4':test.ceiling(test.tinyint('0')),'f5':test.ceiling(test.smallint('0')),'f6':test.ceiling(test.integer('0')),'f7':test.ceiling(test.bigint('0'))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/ceiling1/ceiling1.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/ceiling1/ceiling1.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/ceiling1/ceiling1.3.query.sqlpp
index 06282e4..70ab3af 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/ceiling1/ceiling1.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/ceiling1/ceiling1.3.query.sqlpp
@@ -20,4 +20,4 @@
 use test;
 
 
-{'f0':test.ceiling(test.int8('-20')),'f1':test.ceiling(test.int16('-23')),'f2':test.ceiling(test.int32('-29')),'f3':test.ceiling(test.int64('-21')),'f4':test.ceiling(test.int8('20')),'f5':test.ceiling(test.int16('22')),'f6':test.ceiling(test.int32('23')),'f7':test.ceiling(test.int64('27'))};
+{'f0':test.ceiling(test.tinyint('-20')),'f1':test.ceiling(test.smallint('-23')),'f2':test.ceiling(test.integer('-29')),'f3':test.ceiling(test.bigint('-21')),'f4':test.ceiling(test.tinyint('20')),'f5':test.ceiling(test.smallint('22')),'f6':test.ceiling(test.integer('23')),'f7':test.ceiling(test.bigint('27'))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/ceiling4/ceiling4.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/ceiling4/ceiling4.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/ceiling4/ceiling4.3.query.sqlpp
index 6447632..a3aa913 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/ceiling4/ceiling4.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/ceiling4/ceiling4.3.query.sqlpp
@@ -20,4 +20,4 @@
 use test;
 
 
-{'f0':test.ceiling(test.int8('-20')),'f1':test.ceiling(-1.11),'f2':test.ceiling(12.9),'f3':test.ceiling(1.11)};
+{'f0':test.ceiling(test.tinyint('-20')),'f1':test.ceiling(-1.11),'f2':test.ceiling(12.9),'f3':test.ceiling(1.11)};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/cos/cos.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/cos/cos.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/cos/cos.1.query.sqlpp
index 78940b2..e2cf138 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/cos/cos.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/cos/cos.1.query.sqlpp
@@ -20,9 +20,9 @@
 {
   "a": cos(120.0),
   "b": cos(90.5f),
-  "c": cos(int32("90")),
-  "d": cos(int16("0")),
-  "e": cos(int8("-45")),
+  "c": cos(integer("90")),
+  "d": cos(smallint("0")),
+  "e": cos(tinyint("-45")),
   "f": cos(1),
   "g": cos(null),
   "h": cos(missing)

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/divide_double/divide_double.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/divide_double/divide_double.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/divide_double/divide_double.1.query.sqlpp
index cd0c281..901be61 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/divide_double/divide_double.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/divide_double/divide_double.1.query.sqlpp
@@ -18,4 +18,4 @@
  */
 
 
-{'result1':(double('-6.5d') / int8('+1')),'result2':(double('-6.5d') / int16('2')),'result3':(double('-6.5d') / int32('+3')),'result4':(double('-6.5d') / int64('-4')),'result5':(double('-6.5d') / float('-5.5f')),'result6':(double('-6.5d') / double('-6.5d')),'result7':(double('-6.5d') / null), 'result8':double('-6.5d') / {}.a};
+{'result1':(double('-6.5d') / tinyint('+1')),'result2':(double('-6.5d') / smallint('2')),'result3':(double('-6.5d') / integer('+3')),'result4':(double('-6.5d') / bigint('-4')),'result5':(double('-6.5d') / float('-5.5f')),'result6':(double('-6.5d') / double('-6.5d')),'result7':(double('-6.5d') / null), 'result8':double('-6.5d') / {}.a};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/divide_float/divide_float.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/divide_float/divide_float.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/divide_float/divide_float.1.query.sqlpp
index 9abdaca..7dfdcd2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/divide_float/divide_float.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/divide_float/divide_float.1.query.sqlpp
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-{'result1':(float('-5.5f') / int8('+1')),'result2':(float('-5.5f') / int16('2')),'result3':(float('-5.5f') / int32('+3')),'result4':(float('-5.5f') / int64('-4')),'result5':(float('-5.5f') / float('-5.5f')),'result6':(float('-5.5f') / double('-6.5d')),'result7':(double('-6.5d') / null), 'result8':double('-6.5d') / {}.a};
+{'result1':(float('-5.5f') / tinyint('+1')),'result2':(float('-5.5f') / smallint('2')),'result3':(float('-5.5f') / integer('+3')),'result4':(float('-5.5f') / bigint('-4')),'result5':(float('-5.5f') / float('-5.5f')),'result6':(float('-5.5f') / double('-6.5d')),'result7':(double('-6.5d') / null), 'result8':double('-6.5d') / {}.a};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/divide_int16/divide_int16.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/divide_int16/divide_int16.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/divide_int16/divide_int16.1.query.sqlpp
index 9d2672f..b0f315d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/divide_int16/divide_int16.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/divide_int16/divide_int16.1.query.sqlpp
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-{'result1':(int16('2') / int8('+1')),'result2':(int16('2') / int16('2')),'result3':(int16('2') / int32('+3')),'result4':(int16('2') / int64('-4')),'result5':(int16('2') / float('-5.5f')),'result6':(int16('2') / double('-6.5d')),'result7':(double('-6.5d') / null), 'result8':double('-6.5d') / {}.a};
+{'result1':(smallint('2') / tinyint('+1')),'result2':(smallint('2') / smallint('2')),'result3':(smallint('2') / integer('+3')),'result4':(smallint('2') / bigint('-4')),'result5':(smallint('2') / float('-5.5f')),'result6':(smallint('2') / double('-6.5d')),'result7':(double('-6.5d') / null), 'result8':double('-6.5d') / {}.a};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/divide_int32/divide_int32.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/divide_int32/divide_int32.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/divide_int32/divide_int32.1.query.sqlpp
index d93dc59..4a9810d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/divide_int32/divide_int32.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/divide_int32/divide_int32.1.query.sqlpp
@@ -18,4 +18,4 @@
  */
 
 
-{'result1':(int32('+3') / int8('+1')),'result2':(int32('+3') / int16('2')),'result3':(int32('+3') / int32('+3')),'result4':(int32('+3') / int64('-4')),'result5':(int32('+3') / float('-5.5f')),'result6':(int32('+3') / double('-6.5d')),'result7':(double('-6.5d') / null), 'result8':double('-6.5d') / {}.a};
+{'result1':(integer('+3') / tinyint('+1')),'result2':(integer('+3') / smallint('2')),'result3':(integer('+3') / integer('+3')),'result4':(integer('+3') / bigint('-4')),'result5':(integer('+3') / float('-5.5f')),'result6':(integer('+3') / double('-6.5d')),'result7':(double('-6.5d') / null), 'result8':double('-6.5d') / {}.a};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/divide_int64/divide_int64.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/divide_int64/divide_int64.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/divide_int64/divide_int64.1.query.sqlpp
index cb50075..5b7d8f5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/divide_int64/divide_int64.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/divide_int64/divide_int64.1.query.sqlpp
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-{'result1':(int64('-4') / int8('+1')),'result2':(int64('-4') / int16('2')),'result3':(int64('-4') / int32('+3')),'result4':(int64('-4') / int64('-4')),'result5':(int64('-4') / float('-5.5f')),'result6':(int64('-4') / double('-6.5d')),'result7':(double('-6.5d') / null), 'result8':double('-6.5d') / {}.a};
+{'result1':(bigint('-4') / tinyint('+1')),'result2':(bigint('-4') / smallint('2')),'result3':(bigint('-4') / integer('+3')),'result4':(bigint('-4') / bigint('-4')),'result5':(bigint('-4') / float('-5.5f')),'result6':(bigint('-4') / double('-6.5d')),'result7':(double('-6.5d') / null), 'result8':double('-6.5d') / {}.a};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/divide_int8/divide_int8.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/divide_int8/divide_int8.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/divide_int8/divide_int8.1.query.sqlpp
index 2fe9d55..dd6917d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/divide_int8/divide_int8.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/divide_int8/divide_int8.1.query.sqlpp
@@ -18,4 +18,4 @@
  */
 
 
-{'result1':(int8('+1') / int8('+1')),'result2':(int8('+1') / int16('2')),'result3':(int8('+1') / int32('+3')),'result4':(int8('+1') / int64('-4')),'result5':(int8('+1') / float('-5.5f')),'result6':(int8('+1') / double('-6.5d')),'result7':(double('-6.5d') / null), 'result8':double('-6.5d') / {}.a};
+{'result1':(tinyint('+1') / tinyint('+1')),'result2':(tinyint('+1') / smallint('2')),'result3':(tinyint('+1') / integer('+3')),'result4':(tinyint('+1') / bigint('-4')),'result5':(tinyint('+1') / float('-5.5f')),'result6':(tinyint('+1') / double('-6.5d')),'result7':(double('-6.5d') / null), 'result8':double('-6.5d') / {}.a};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/exp/exp.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/exp/exp.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/exp/exp.1.query.sqlpp
index b3f0354..b82a6d9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/exp/exp.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/exp/exp.1.query.sqlpp
@@ -20,9 +20,9 @@
 {
   "a": exp(120.0),
   "b": exp(90.5f),
-  "c": exp(int32("90")),
-  "d": exp(int16("0")),
-  "e": exp(int8("-45")),
+  "c": exp(integer("90")),
+  "d": exp(smallint("0")),
+  "e": exp(tinyint("-45")),
   "f": exp(1),
   "g": exp(null),
   "h": exp(missing)

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/floor0/floor0.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/floor0/floor0.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/floor0/floor0.3.query.sqlpp
index 9f34df9..0c4d27f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/floor0/floor0.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/floor0/floor0.3.query.sqlpp
@@ -20,4 +20,4 @@
 use test;
 
 
-{'f0':test.floor(test.int8('-0')),'f1':test.floor(test.int16('-0')),'f2':test.floor(test.int32('-0')),'f3':test.floor(test.int64('-0')),'f4':test.floor(test.int8('0')),'f5':test.floor(test.int16('0')),'f6':test.floor(test.int32('0')),'f7':test.floor(test.int64('0'))};
+{'f0':test.floor(test.tinyint('-0')),'f1':test.floor(test.smallint('-0')),'f2':test.floor(test.integer('-0')),'f3':test.floor(test.bigint('-0')),'f4':test.floor(test.tinyint('0')),'f5':test.floor(test.smallint('0')),'f6':test.floor(test.integer('0')),'f7':test.floor(test.bigint('0'))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/floor1/floor1.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/floor1/floor1.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/floor1/floor1.3.query.sqlpp
index 7935c03..06045f4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/floor1/floor1.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/floor1/floor1.3.query.sqlpp
@@ -20,4 +20,4 @@
 use test;
 
 
-{'f0':test.floor(test.int8('-20')),'f1':test.floor(test.int16('-23')),'f2':test.floor(test.int32('-29')),'f3':test.floor(test.int64('-21')),'f4':test.floor(test.int8('20')),'f5':test.floor(test.int16('22')),'f6':test.floor(test.int32('23')),'f7':test.floor(test.int64('27'))};
+{'f0':test.floor(test.tinyint('-20')),'f1':test.floor(test.smallint('-23')),'f2':test.floor(test.integer('-29')),'f3':test.floor(test.bigint('-21')),'f4':test.floor(test.tinyint('20')),'f5':test.floor(test.smallint('22')),'f6':test.floor(test.integer('23')),'f7':test.floor(test.bigint('27'))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/floor4/floor4.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/floor4/floor4.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/floor4/floor4.3.query.sqlpp
index 5de8f2c..a31d49a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/floor4/floor4.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/floor4/floor4.3.query.sqlpp
@@ -20,4 +20,4 @@
 use test;
 
 
-{'f0':test.floor(test.int8('-20')),'f1':test.floor(-1.11),'f2':test.floor(12.9),'f3':test.floor(1.11)};
+{'f0':test.floor(test.tinyint('-20')),'f1':test.floor(-1.11),'f2':test.floor(12.9),'f3':test.floor(1.11)};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/ln/ln.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/ln/ln.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/ln/ln.1.query.sqlpp
index ac0b71e..f6cb334 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/ln/ln.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/ln/ln.1.query.sqlpp
@@ -21,9 +21,9 @@
 {
   "a": ln(120.0),
   "b": ln(90.5f),
-  "c": ln(int32("90")),
-  "d": ln(int16("0")),
-  "e": ln(int8("-45")),
+  "c": ln(integer("90")),
+  "d": ln(smallint("0")),
+  "e": ln(tinyint("-45")),
   "f": ln(1),
   "g": ln(null),
   "h": ln(missing)

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/log/log.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/log/log.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/log/log.1.query.sqlpp
index c9fc2f4..fd9ac78 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/log/log.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/log/log.1.query.sqlpp
@@ -20,9 +20,9 @@
 {
   "a": log(120.0),
   "b": log(90.5f),
-  "c": log(int32("90")),
-  "d": log(int16("0")),
-  "e": log(int8("-45")),
+  "c": log(integer("90")),
+  "d": log(smallint("0")),
+  "e": log(tinyint("-45")),
   "f": log(1),
   "g": log(null),
   "h": log(missing)

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/multiply_double/multiply_double.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/multiply_double/multiply_double.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/multiply_double/multiply_double.1.query.sqlpp
index 136043f..5e59e82 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/multiply_double/multiply_double.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/multiply_double/multiply_double.1.query.sqlpp
@@ -18,4 +18,4 @@
  */
 
 
-{'result1':(double('-6.5d') * int8('+1')),'result2':(double('-6.5d') * int16('2')),'result3':(double('-6.5d') * int32('+3')),'result4':(double('-6.5d') * int64('-4')),'result5':(double('-6.5d') * float('-5.5f')),'result6':(double('-6.5d') * double('-6.5d')),'result7':(double('-6.5d') * null), 'result8':double('-6.5d') * missing};
+{'result1':(double('-6.5d') * tinyint('+1')),'result2':(double('-6.5d') * smallint('2')),'result3':(double('-6.5d') * integer('+3')),'result4':(double('-6.5d') * bigint('-4')),'result5':(double('-6.5d') * float('-5.5f')),'result6':(double('-6.5d') * double('-6.5d')),'result7':(double('-6.5d') * null), 'result8':double('-6.5d') * missing};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/multiply_float/multiply_float.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/multiply_float/multiply_float.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/multiply_float/multiply_float.1.query.sqlpp
index a47af24..781e3f5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/multiply_float/multiply_float.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/multiply_float/multiply_float.1.query.sqlpp
@@ -18,4 +18,4 @@
  */
 
 
-{'result1':(float('-5.5f') * int8('+1')),'result2':(float('-5.5f') * int16('2')),'result3':(float('-5.5f') * int32('+3')),'result4':(float('-5.5f') * int64('-4')),'result5':(float('-5.5f') * float('-5.5f')),'result6':(float('-5.5f') * double('-6.5d')),'result7':(double('-6.5d') * null), 'result8':double('-6.5d') * missing};
+{'result1':(float('-5.5f') * tinyint('+1')),'result2':(float('-5.5f') * smallint('2')),'result3':(float('-5.5f') * integer('+3')),'result4':(float('-5.5f') * bigint('-4')),'result5':(float('-5.5f') * float('-5.5f')),'result6':(float('-5.5f') * double('-6.5d')),'result7':(double('-6.5d') * null), 'result8':double('-6.5d') * missing};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/multiply_int16/multiply_int16.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/multiply_int16/multiply_int16.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/multiply_int16/multiply_int16.1.query.sqlpp
index 9a50d84..64b19b7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/multiply_int16/multiply_int16.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/multiply_int16/multiply_int16.1.query.sqlpp
@@ -18,4 +18,4 @@
  */
 
 
-{'result1':(int16('2') * int8('+1')),'result2':(int16('2') * int16('2')),'result3':(int16('2') * int32('+3')),'result4':(int16('2') * int64('-4')),'result5':(int16('2') * float('-5.5f')),'result6':(int16('2') * double('-6.5d')),'result7':(double('-6.5d') * null), 'result8':double('-6.5d') * missing};
+{'result1':(smallint('2') * tinyint('+1')),'result2':(smallint('2') * smallint('2')),'result3':(smallint('2') * integer('+3')),'result4':(smallint('2') * bigint('-4')),'result5':(smallint('2') * float('-5.5f')),'result6':(smallint('2') * double('-6.5d')),'result7':(double('-6.5d') * null), 'result8':double('-6.5d') * missing};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/multiply_int32/multiply_int32.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/multiply_int32/multiply_int32.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/multiply_int32/multiply_int32.1.query.sqlpp
index 664950a..2ccc104 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/multiply_int32/multiply_int32.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/multiply_int32/multiply_int32.1.query.sqlpp
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-{'result1':(int32('+3') * int8('+1')),'result2':(int32('+3') * int16('2')),'result3':(int32('+3') * int32('+3')),'result4':(int32('+3') * int64('-4')),'result5':(int32('+3') * float('-5.5f')),'result6':(int32('+3') * double('-6.5d')),'result7':(double('-6.5d') * null), 'result8':double('-6.5d') * missing};
+{'result1':(integer('+3') * tinyint('+1')),'result2':(integer('+3') * smallint('2')),'result3':(integer('+3') * integer('+3')),'result4':(integer('+3') * bigint('-4')),'result5':(integer('+3') * float('-5.5f')),'result6':(integer('+3') * double('-6.5d')),'result7':(double('-6.5d') * null), 'result8':double('-6.5d') * missing};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/multiply_int64/multiply_int64.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/multiply_int64/multiply_int64.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/multiply_int64/multiply_int64.1.query.sqlpp
index 8bbcd3a..499f2fc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/multiply_int64/multiply_int64.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/multiply_int64/multiply_int64.1.query.sqlpp
@@ -18,4 +18,4 @@
  */
 
 
-{'result1':(int64('-4') * int8('+1')),'result2':(int64('-4') * int16('2')),'result3':(int64('-4') * int32('+3')),'result4':(int64('-4') * int64('-4')),'result5':(int64('-4') * float('-5.5f')),'result6':(int64('-4') * double('-6.5d')),'result7':(double('-6.5d') * null), 'result8':double('-6.5d') * missing};
+{'result1':(bigint('-4') * tinyint('+1')),'result2':(bigint('-4') * smallint('2')),'result3':(bigint('-4') * integer('+3')),'result4':(bigint('-4') * bigint('-4')),'result5':(bigint('-4') * float('-5.5f')),'result6':(bigint('-4') * double('-6.5d')),'result7':(double('-6.5d') * null), 'result8':double('-6.5d') * missing};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/multiply_int8/multiply_int8.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/multiply_int8/multiply_int8.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/multiply_int8/multiply_int8.1.query.sqlpp
index ae80198..a9bb36d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/multiply_int8/multiply_int8.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/multiply_int8/multiply_int8.1.query.sqlpp
@@ -18,4 +18,4 @@
  */
 
 
-{'result1':(int8('+1') * int8('+1')),'result2':(int8('+1') * int16('2')),'result3':(int8('+1') * int32('+3')),'result4':(int8('+1') * int64('-4')),'result5':(int8('+1') * float('-5.5f')),'result6':(int8('+1') * double('-6.5d')),'result7':(double('-6.5d') * null), 'result8':double('-6.5d') * missing};
+{'result1':(tinyint('+1') * tinyint('+1')),'result2':(tinyint('+1') * smallint('2')),'result3':(tinyint('+1') * integer('+3')),'result4':(tinyint('+1') * bigint('-4')),'result5':(tinyint('+1') * float('-5.5f')),'result6':(tinyint('+1') * double('-6.5d')),'result7':(double('-6.5d') * null), 'result8':double('-6.5d') * missing};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/power/power.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/power/power.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/power/power.1.query.sqlpp
index 7c00589..3038fda 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/power/power.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/power/power.1.query.sqlpp
@@ -20,11 +20,11 @@
 {
   "a": power(10.0, 1.0f),
   "b": power(0.5f, 10.0),
-  "c": power(100, int8("1")),
-  "d": power(int32("0"), 0.5f),
-  "e": power(int8("-1"), 3.5),
-  "f": power(int16("2"), int16("10")),
-  "g": power(int16("1"), null),
+  "c": power(100, tinyint("1")),
+  "d": power(integer("0"), 0.5f),
+  "e": power(tinyint("-1"), 3.5),
+  "f": power(smallint("2"), smallint("10")),
+  "g": power(smallint("1"), null),
   "h": power(missing, 1.5),
   "i": power(null, missing),
   "j": power(null, null),

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round-half-to-even0/round-half-to-even0.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round-half-to-even0/round-half-to-even0.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round-half-to-even0/round-half-to-even0.3.query.sqlpp
index 3cd722c..a630a69 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round-half-to-even0/round-half-to-even0.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round-half-to-even0/round-half-to-even0.3.query.sqlpp
@@ -20,4 +20,4 @@
 use test;
 
 
-{'f0':test.`round-half-to-even`(test.int8('-0')),'f1':test.`round-half-to-even`(test.int16('-0')),'f2':test.`round-half-to-even`(test.int32('-0')),'f3':test.`round-half-to-even`(test.int64('-0')),'f4':test.`round-half-to-even`(test.int8('0')),'f5':test.`round-half-to-even`(test.int16('0')),'f6':test.`round-half-to-even`(test.int32('0')),'f7':test.`round-half-to-even`(test.int64('0'))};
+{'f0':test.`round-half-to-even`(test.tinyint('-0')),'f1':test.`round-half-to-even`(test.smallint('-0')),'f2':test.`round-half-to-even`(test.integer('-0')),'f3':test.`round-half-to-even`(test.bigint('-0')),'f4':test.`round-half-to-even`(test.tinyint('0')),'f5':test.`round-half-to-even`(test.smallint('0')),'f6':test.`round-half-to-even`(test.integer('0')),'f7':test.`round-half-to-even`(test.bigint('0'))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round-half-to-even1/round-half-to-even1.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round-half-to-even1/round-half-to-even1.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round-half-to-even1/round-half-to-even1.3.query.sqlpp
index 1b2a70a..c9b7717 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round-half-to-even1/round-half-to-even1.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round-half-to-even1/round-half-to-even1.3.query.sqlpp
@@ -20,4 +20,4 @@
 use test;
 
 
-{'f0':test.`round-half-to-even`(test.int8('-20')),'f1':test.`round-half-to-even`(test.int16('-23')),'f2':test.`round-half-to-even`(test.int32('-29')),'f3':test.`round-half-to-even`(test.int64('-21')),'f4':test.`round-half-to-even`(test.int8('20')),'f5':test.`round-half-to-even`(test.int16('22')),'f6':test.`round-half-to-even`(test.int32('23')),'f7':test.`round-half-to-even`(test.int64('27'))};
+{'f0':test.`round-half-to-even`(test.tinyint('-20')),'f1':test.`round-half-to-even`(test.smallint('-23')),'f2':test.`round-half-to-even`(test.integer('-29')),'f3':test.`round-half-to-even`(test.bigint('-21')),'f4':test.`round-half-to-even`(test.tinyint('20')),'f5':test.`round-half-to-even`(test.smallint('22')),'f6':test.`round-half-to-even`(test.integer('23')),'f7':test.`round-half-to-even`(test.bigint('27'))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round-half-to-even20/round-half-to-even20.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round-half-to-even20/round-half-to-even20.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round-half-to-even20/round-half-to-even20.3.query.sqlpp
index 50d0b93..ed5f53b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round-half-to-even20/round-half-to-even20.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round-half-to-even20/round-half-to-even20.3.query.sqlpp
@@ -20,4 +20,4 @@
 use test;
 
 
-{'f0':test.`round-half-to-even`(test.int8('-0'),2),'f1':test.`round-half-to-even`(test.int16('-0'),2),'f2':test.`round-half-to-even`(test.int32('-0'),2),'f3':test.`round-half-to-even`(test.int64('-0'),2),'f4':test.`round-half-to-even`(test.int8('0'),2),'f5':test.`round-half-to-even`(test.int16('0'),2),'f6':test.`round-half-to-even`(test.int32('0'),2),'f7':test.`round-half-to-even`(test.int64('0'),2)};
+{'f0':test.`round-half-to-even`(test.tinyint('-0'),2),'f1':test.`round-half-to-even`(test.smallint('-0'),2),'f2':test.`round-half-to-even`(test.integer('-0'),2),'f3':test.`round-half-to-even`(test.bigint('-0'),2),'f4':test.`round-half-to-even`(test.tinyint('0'),2),'f5':test.`round-half-to-even`(test.smallint('0'),2),'f6':test.`round-half-to-even`(test.integer('0'),2),'f7':test.`round-half-to-even`(test.bigint('0'),2)};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round-half-to-even21/round-half-to-even21.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round-half-to-even21/round-half-to-even21.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round-half-to-even21/round-half-to-even21.3.query.sqlpp
index 595182b..b781764 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round-half-to-even21/round-half-to-even21.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round-half-to-even21/round-half-to-even21.3.query.sqlpp
@@ -20,4 +20,4 @@
 use test;
 
 
-{'f0':test.`round-half-to-even`(test.int8('-20'),2),'f1':test.`round-half-to-even`(test.int16('-23'),2),'f2':test.`round-half-to-even`(test.int32('-29'),2),'f3':test.`round-half-to-even`(test.int64('-21'),2),'f4':test.`round-half-to-even`(test.int8('20'),2),'f5':test.`round-half-to-even`(test.int16('22'),2),'f6':test.`round-half-to-even`(test.int32('23'),2),'f7':test.`round-half-to-even`(test.int64('27'),2)};
+{'f0':test.`round-half-to-even`(test.tinyint('-20'),2),'f1':test.`round-half-to-even`(test.smallint('-23'),2),'f2':test.`round-half-to-even`(test.integer('-29'),2),'f3':test.`round-half-to-even`(test.bigint('-21'),2),'f4':test.`round-half-to-even`(test.tinyint('20'),2),'f5':test.`round-half-to-even`(test.smallint('22'),2),'f6':test.`round-half-to-even`(test.integer('23'),2),'f7':test.`round-half-to-even`(test.bigint('27'),2)};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round-half-to-even5/round-half-to-even5.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round-half-to-even5/round-half-to-even5.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round-half-to-even5/round-half-to-even5.3.query.sqlpp
index d87f504..4b4ca46 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round-half-to-even5/round-half-to-even5.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round-half-to-even5/round-half-to-even5.3.query.sqlpp
@@ -20,4 +20,4 @@
 use test;
 
 
-{'f0':test.`round-half-to-even`(test.int8('-20')),'f1':test.`round-half-to-even`(-1.5),'f2':test.`round-half-to-even`(12.5),'f3':test.`round-half-to-even`(1.5)};
+{'f0':test.`round-half-to-even`(test.tinyint('-20')),'f1':test.`round-half-to-even`(-1.5),'f2':test.`round-half-to-even`(12.5),'f3':test.`round-half-to-even`(1.5)};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round0/round0.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round0/round0.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round0/round0.3.query.sqlpp
index 3f7b8f8..9e47ff0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round0/round0.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round0/round0.3.query.sqlpp
@@ -20,4 +20,4 @@
 use test;
 
 
-{'f0':test.round(test.int8('-0')),'f1':test.round(test.int16('-0')),'f2':test.round(test.int32('-0')),'f3':test.round(test.int64('-0')),'f4':test.round(test.int8('0')),'f5':test.round(test.int16('0')),'f6':test.round(test.int32('0')),'f7':test.round(test.int64('0'))};
+{'f0':test.round(test.tinyint('-0')),'f1':test.round(test.smallint('-0')),'f2':test.round(test.integer('-0')),'f3':test.round(test.bigint('-0')),'f4':test.round(test.tinyint('0')),'f5':test.round(test.smallint('0')),'f6':test.round(test.integer('0')),'f7':test.round(test.bigint('0'))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round1/round1.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round1/round1.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round1/round1.3.query.sqlpp
index baa8910..176a649 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round1/round1.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round1/round1.3.query.sqlpp
@@ -20,4 +20,4 @@
 use test;
 
 
-{'f0':test.round(test.int8('-20')),'f1':test.round(test.int16('-23')),'f2':test.round(test.int32('-29')),'f3':test.round(test.int64('-21')),'f4':test.round(test.int8('20')),'f5':test.round(test.int16('22')),'f6':test.round(test.int32('23')),'f7':test.round(test.int64('27'))};
+{'f0':test.round(test.tinyint('-20')),'f1':test.round(test.smallint('-23')),'f2':test.round(test.integer('-29')),'f3':test.round(test.bigint('-21')),'f4':test.round(test.tinyint('20')),'f5':test.round(test.smallint('22')),'f6':test.round(test.integer('23')),'f7':test.round(test.bigint('27'))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round4/round4.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round4/round4.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round4/round4.3.query.sqlpp
index 3abcdfc..89be425 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round4/round4.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/round4/round4.3.query.sqlpp
@@ -20,4 +20,4 @@
 use test;
 
 
-{'f0':test.round(test.int8('-20')),'f1':test.round(-1.11),'f2':test.round(12.9),'f3':test.round(1.11)};
+{'f0':test.round(test.tinyint('-20')),'f1':test.round(-1.11),'f2':test.round(12.9),'f3':test.round(1.11)};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/sign/sign.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/sign/sign.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/sign/sign.1.query.sqlpp
index a73cc55..8e4ab54 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/sign/sign.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/sign/sign.1.query.sqlpp
@@ -20,9 +20,9 @@
 {
   "a": sign(120.0),
   "b": sign(-90.5f),
-  "c": sign(int32("90")),
-  "d": sign(int16("0")),
-  "e": sign(int8("-45")),
+  "c": sign(integer("90")),
+  "d": sign(smallint("0")),
+  "e": sign(tinyint("-45")),
   "f": sign(1),
   "g": sign(null),
   "h": sign(missing)

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/sin/sin.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/sin/sin.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/sin/sin.1.query.sqlpp
index c847b01..2ddb60c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/sin/sin.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/sin/sin.1.query.sqlpp
@@ -20,9 +20,9 @@
 {
   "a": sin(120.0),
   "b": sin(90.5f),
-  "c": sin(int32("90")),
-  "d": sin(int16("0")),
-  "e": sin(int8("-45")),
+  "c": sin(integer("90")),
+  "d": sin(smallint("0")),
+  "e": sin(tinyint("-45")),
   "f": sin(1),
   "g": sin(null),
   "h": sin(missing)

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/sqrt/sqrt.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/sqrt/sqrt.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/sqrt/sqrt.1.query.sqlpp
index 09b6160..3e42b51 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/sqrt/sqrt.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/sqrt/sqrt.1.query.sqlpp
@@ -20,9 +20,9 @@
 {
   "a": sqrt(120.0),
   "b": sqrt(90.5f),
-  "c": sqrt(int32("90")),
-  "d": sqrt(int16("0")),
-  "e": sqrt(int8("-45")),
+  "c": sqrt(integer("90")),
+  "d": sqrt(smallint("0")),
+  "e": sqrt(tinyint("-45")),
   "f": sqrt(1),
   "g": sqrt(null),
   "h": sqrt(missing)

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/subtract_double/subtract_double.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/subtract_double/subtract_double.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/subtract_double/subtract_double.1.query.sqlpp
index 11f3022..4346ca1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/subtract_double/subtract_double.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/subtract_double/subtract_double.1.query.sqlpp
@@ -18,4 +18,4 @@
  */
 
 
-{'result1':(double('-6.5d') - int8('+1')),'result2':(double('-6.5d') - int16('2')),'result3':(double('-6.5d') - int32('+3')),'result4':(double('-6.5d') - int64('-4')),'result5':(double('-6.5d') - float('-5.5f')),'result6':(double('-6.5d') - double('-6.5d')),'result7':(double('-6.5d') - null), 'result8':double('-6.5d') - [1][1]};
+{'result1':(double('-6.5d') - tinyint('+1')),'result2':(double('-6.5d') - smallint('2')),'result3':(double('-6.5d') - integer('+3')),'result4':(double('-6.5d') - bigint('-4')),'result5':(double('-6.5d') - float('-5.5f')),'result6':(double('-6.5d') - double('-6.5d')),'result7':(double('-6.5d') - null), 'result8':double('-6.5d') - [1][1]};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/subtract_float/subtract_float.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/subtract_float/subtract_float.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/subtract_float/subtract_float.1.query.sqlpp
index e69921a..098d839 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/subtract_float/subtract_float.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/subtract_float/subtract_float.1.query.sqlpp
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-{'result1':(float('-5.5f') - int8('+1')),'result2':(float('-5.5f') - int16('2')),'result3':(float('-5.5f') - int32('+3')),'result4':(float('-5.5f') - int64('-4')),'result5':(float('-5.5f') - float('-5.5f')),'result6':(float('-5.5f') - double('-6.5d')),'result7':(double('-6.5d') - null), 'result8':double('-6.5d') - [1][1]};
+{'result1':(float('-5.5f') - tinyint('+1')),'result2':(float('-5.5f') - smallint('2')),'result3':(float('-5.5f') - integer('+3')),'result4':(float('-5.5f') - bigint('-4')),'result5':(float('-5.5f') - float('-5.5f')),'result6':(float('-5.5f') - double('-6.5d')),'result7':(double('-6.5d') - null), 'result8':double('-6.5d') - [1][1]};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/subtract_int16/subtract_int16.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/subtract_int16/subtract_int16.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/subtract_int16/subtract_int16.1.query.sqlpp
index 9b3e6d4..53ccbc7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/subtract_int16/subtract_int16.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/subtract_int16/subtract_int16.1.query.sqlpp
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-{'result1':(int16('2') - int8('+1')),'result2':(int16('2') - int16('2')),'result3':(int16('2') - int32('+3')),'result4':(int16('2') - int64('-4')),'result5':(int16('2') - float('-5.5f')),'result6':(int16('2') - double('-6.5d')),'result7':(double('-6.5d') - null), 'result8':double('-6.5d') - [1][1]};
+{'result1':(smallint('2') - tinyint('+1')),'result2':(smallint('2') - smallint('2')),'result3':(smallint('2') - integer('+3')),'result4':(smallint('2') - bigint('-4')),'result5':(smallint('2') - float('-5.5f')),'result6':(smallint('2') - double('-6.5d')),'result7':(double('-6.5d') - null), 'result8':double('-6.5d') - [1][1]};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/subtract_int32/subtract_int32.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/subtract_int32/subtract_int32.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/subtract_int32/subtract_int32.1.query.sqlpp
index a2b92cf..019e44f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/subtract_int32/subtract_int32.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/subtract_int32/subtract_int32.1.query.sqlpp
@@ -18,4 +18,4 @@
  */
 
 
-{'result1':(int32('+3') - int8('+1')),'result2':(int32('+3') - int16('2')),'result3':(int32('+3') - int32('+3')),'result4':(int32('+3') - int64('-4')),'result5':(int32('+3') - float('-5.5f')),'result6':(int32('+3') - double('-6.5d')),'result7':(double('-6.5d') - null), 'result8':double('-6.5d') - [1][1]};
+{'result1':(integer('+3') - tinyint('+1')),'result2':(integer('+3') - smallint('2')),'result3':(integer('+3') - integer('+3')),'result4':(integer('+3') - bigint('-4')),'result5':(integer('+3') - float('-5.5f')),'result6':(integer('+3') - double('-6.5d')),'result7':(double('-6.5d') - null), 'result8':double('-6.5d') - [1][1]};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/subtract_int64/subtract_int64.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/subtract_int64/subtract_int64.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/subtract_int64/subtract_int64.1.query.sqlpp
index 8c95cda..6ca1bb8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/subtract_int64/subtract_int64.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/subtract_int64/subtract_int64.1.query.sqlpp
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-{'result1':(int64('-4') - int8('+1')),'result2':(int64('-4') - int16('2')),'result3':(int64('-4') - int32('+3')),'result4':(int64('-4') - int64('-4')),'result5':(int64('-4') - float('-5.5f')),'result6':(int64('-4') - double('-6.5d')),'result7':(double('-6.5d') - null), 'result8':double('-6.5d') - [1][1]};
+{'result1':(bigint('-4') - tinyint('+1')),'result2':(bigint('-4') - smallint('2')),'result3':(bigint('-4') - integer('+3')),'result4':(bigint('-4') - bigint('-4')),'result5':(bigint('-4') - float('-5.5f')),'result6':(bigint('-4') - double('-6.5d')),'result7':(double('-6.5d') - null), 'result8':double('-6.5d') - [1][1]};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/subtract_int8/subtract_int8.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/subtract_int8/subtract_int8.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/subtract_int8/subtract_int8.1.query.sqlpp
index 640a058..82f29ba 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/subtract_int8/subtract_int8.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/subtract_int8/subtract_int8.1.query.sqlpp
@@ -18,4 +18,4 @@
  */
 
 
-{'result1':(int8('+1') - int8('+1')),'result2':(int8('+1') - int16('2')),'result3':(int8('+1') - int32('+3')),'result4':(int8('+1') - int64('-4')),'result5':(int8('+1') - float('-5.5f')),'result6':(int8('+1') - double('-6.5d')),'result7':(double('-6.5d') - null), 'result8':double('-6.5d') - [1][1]};
+{'result1':(tinyint('+1') - tinyint('+1')),'result2':(tinyint('+1') - smallint('2')),'result3':(tinyint('+1') - integer('+3')),'result4':(tinyint('+1') - bigint('-4')),'result5':(tinyint('+1') - float('-5.5f')),'result6':(tinyint('+1') - double('-6.5d')),'result7':(double('-6.5d') - null), 'result8':double('-6.5d') - [1][1]};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/tan/tan.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/tan/tan.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/tan/tan.1.query.sqlpp
index 3cfa8b6..ef74e89 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/tan/tan.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/tan/tan.1.query.sqlpp
@@ -20,9 +20,9 @@
 {
   "a": tan(120.0),
   "b": tan(90.5f),
-  "c": tan(int32("90")),
-  "d": tan(int16("0")),
-  "e": tan(int8("-45")),
+  "c": tan(integer("90")),
+  "d": tan(smallint("0")),
+  "e": tan(tinyint("-45")),
   "f": tan(1),
   "g": tan(null),
   "h": tan(missing)

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/trunc/trunc.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/trunc/trunc.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/trunc/trunc.1.query.sqlpp
index e3050d0..69a9e1d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/trunc/trunc.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/trunc/trunc.1.query.sqlpp
@@ -18,14 +18,14 @@
  */
 
 {
-  'f0':trunc(int8('-20'),2),
-  'f1':trunc(int16('-23'),2),
-  'f2':trunc(int32('-29'),2),
-  'f3':trunc(int64('-21'),2),
-  'f4':trunc(int8('20'),2),
-  'f5':trunc(int16('22'),2),
-  'f6':trunc(int32('23'),2),
-  'f7':trunc(int64('27'),2),
+  'f0':trunc(tinyint('-20'),2),
+  'f1':trunc(smallint('-23'),2),
+  'f2':trunc(integer('-29'),2),
+  'f3':trunc(bigint('-21'),2),
+  'f4':trunc(tinyint('20'),2),
+  'f5':trunc(smallint('22'),2),
+  'f6':trunc(integer('23'),2),
+  'f7':trunc(bigint('27'),2),
   'f8':trunc(1.555f,2),
   'f9':trunc(1.7777999, 3),
   'f10':trunc(21.7777999, -1),

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/unary-minus_int_02/unary-minus_int_02.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/unary-minus_int_02/unary-minus_int_02.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/unary-minus_int_02/unary-minus_int_02.3.query.sqlpp
index f8cca3e..d5d19b8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/unary-minus_int_02/unary-minus_int_02.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/unary-minus_int_02/unary-minus_int_02.3.query.sqlpp
@@ -20,4 +20,4 @@
 use test;
 
 
-{'int8':-test.int8('+80'),'int16':-test.int16('160'),'int32':-test.int32('+320'),'int64':-test.int64('-640')};
+{'int8':-test.tinyint('+80'),'int16':-test.smallint('160'),'int32':-test.integer('+320'),'int64':-test.bigint('-640')};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/c2c-w-optional/c2c-w-option.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/c2c-w-optional/c2c-w-option.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/c2c-w-optional/c2c-w-option.1.ddl.sqlpp
index d415535..ad99903 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/c2c-w-optional/c2c-w-option.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/c2c-w-optional/c2c-w-option.1.ddl.sqlpp
@@ -33,7 +33,7 @@ use test;
 
 create type test.TestType as
  closed {
-  id : int32,
+  id : integer,
   description : string,
   name : string,
   optnl_fld : string?

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/c2c-wo-optional/c2c-wo-optional.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/c2c-wo-optional/c2c-wo-optional.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/c2c-wo-optional/c2c-wo-optional.1.ddl.sqlpp
index e131e66..249456f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/c2c-wo-optional/c2c-wo-optional.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/c2c-wo-optional/c2c-wo-optional.1.ddl.sqlpp
@@ -34,7 +34,7 @@ use test;
 
 create type test.TestType as
  closed {
-  id : int32,
+  id : integer,
   description : string,
   name : string,
   optnl_fld : string?

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/c2c/c2c.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/c2c/c2c.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/c2c/c2c.1.ddl.sqlpp
index ba51d1d..b6c0395 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/c2c/c2c.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/c2c/c2c.1.ddl.sqlpp
@@ -32,7 +32,7 @@ use test;
 
 create type test.TestType as
  closed {
-  id : int32,
+  id : integer,
   description : string,
   name : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/heterog-list-ordered01/heterog-list-ordered01.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/heterog-list-ordered01/heterog-list-ordered01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/heterog-list-ordered01/heterog-list-ordered01.1.ddl.sqlpp
index 5c09efe..6a025f1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/heterog-list-ordered01/heterog-list-ordered01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/heterog-list-ordered01/heterog-list-ordered01.1.ddl.sqlpp
@@ -32,13 +32,13 @@ use test;
 
 create type test.BatterType as
 {
-  id : int64,
+  id : bigint,
   descrpt : string
 }
 
 create type test.TestType as
  closed {
-  id : int64,
+  id : bigint,
   description : string,
   name : string,
   batters : [[BatterType]]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/heterog-list01/heterog-list01.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/heterog-list01/heterog-list01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/heterog-list01/heterog-list01.1.ddl.sqlpp
index 1441794..853e580 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/heterog-list01/heterog-list01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/heterog-list01/heterog-list01.1.ddl.sqlpp
@@ -32,13 +32,13 @@ use test;
 
 create type test.BatterType as
 {
-  id : int64,
+  id : bigint,
   descrpt : string
 }
 
 create type test.TestType as
  closed {
-  id : int64,
+  id : bigint,
   description : string,
   name : string,
   batters : {{BatterType}}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/heterog-list02/heterog-list02.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/heterog-list02/heterog-list02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/heterog-list02/heterog-list02.1.ddl.sqlpp
index 91f65ff..7f847d8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/heterog-list02/heterog-list02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/heterog-list02/heterog-list02.1.ddl.sqlpp
@@ -32,13 +32,13 @@ use test;
 
 create type test.BatterType as
 {
-  id : int32,
+  id : integer,
   descrpt : string
 }
 
 create type test.TestType as
 {
-  id : int32,
+  id : integer,
   description : string,
   name : string,
   batters : [[BatterType]]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/heterog-list03/heterog-list03.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/heterog-list03/heterog-list03.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/heterog-list03/heterog-list03.1.ddl.sqlpp
index 6640586..44f8aed 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/heterog-list03/heterog-list03.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/heterog-list03/heterog-list03.1.ddl.sqlpp
@@ -33,13 +33,13 @@ use test;
 
 create type test.BatterType as
 {
-  id : int32,
+  id : integer,
   descrpt : string
 }
 
 create type test.TestType as
 {
-  id : int32,
+  id : integer,
   description : string,
   name : string,
   batters : [[BatterType]]?

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-01/open-closed-01.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-01/open-closed-01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-01/open-closed-01.1.ddl.sqlpp
index 213715f..43197d7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-01/open-closed-01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-01/open-closed-01.1.ddl.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.testType as
 {
-  id : int64,
+  id : bigint,
   name : string
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-15/open-closed-15.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-15/open-closed-15.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-15/open-closed-15.1.ddl.sqlpp
index 3d8a8ac..8baedfa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-15/open-closed-15.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-15/open-closed-15.1.ddl.sqlpp
@@ -33,10 +33,10 @@ use test;
 
 create type test.Schema as
  closed {
-  id_8 : int8,
-  id_16 : int16,
-  id_32 : int32,
-  id_64 : int64,
+  id_8 : tinyint,
+  id_16 : smallint,
+  id_32 : integer,
+  id_64 : bigint,
   fp : float,
   name : string,
   dt : date,


Mime
View raw message