http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-16/open-closed-16.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-16/open-closed-16.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-16/open-closed-16.1.ddl.sqlpp
index 666032a..c60d6a9 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-16/open-closed-16.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-16/open-closed-16.1.ddl.sqlpp
@@ -33,10 +33,10 @@ use test;
 
 create type test.Schema as
 {
-  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,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-17/open-closed-17.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-17/open-closed-17.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-17/open-closed-17.1.ddl.sqlpp
index 78af7d5..6bc4008 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-17/open-closed-17.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-17/open-closed-17.1.ddl.sqlpp
@@ -31,10 +31,10 @@ use test;
 
 create type test.Schema as
 {
-  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,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-20/open-closed-20.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-20/open-closed-20.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-20/open-closed-20.1.ddl.sqlpp
index 1b6d9e1..fe4d0a4 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-20/open-closed-20.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-20/open-closed-20.1.ddl.sqlpp
@@ -33,16 +33,16 @@ use test;
 
 create type test.TestType as
 {
-  id : int32
+  id : integer
 }
 
 create  dataset dtst01(TestType) primary key id;
 
 create type test.Emp as
 {
-  id : int32,
+  id : integer,
   name : string,
-  age : int8,
+  age : tinyint,
   sex : string?,
   dob : date?
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-21/open-closed-21.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-21/open-closed-21.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-21/open-closed-21.1.ddl.sqlpp
index 568aca5..a9b7ee0 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-21/open-closed-21.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-21/open-closed-21.1.ddl.sqlpp
@@ -32,16 +32,16 @@ use test;
 
 create type test.TestType as
 {
-  id : int32
+  id : integer
 }
 
 create  dataset dtst01(TestType) primary key id;
 
 create type test.Emp as
 {
-  id : int32,
+  id : integer,
   name : string,
-  age : int8,
+  age : tinyint,
   sex : string,
   dob : date
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-22/open-closed-22.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-22/open-closed-22.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-22/open-closed-22.1.ddl.sqlpp
index 53f2993..a50bcf9 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-22/open-closed-22.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-22/open-closed-22.1.ddl.sqlpp
@@ -31,9 +31,9 @@ use test;
 
 create type test.Emp as
  closed {
-  id : int32,
+  id : integer,
   name : string,
-  age : int8?,
+  age : tinyint?,
   dept : string?,
   sex : string,
   dob : date?

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-24/open-closed-24.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-24/open-closed-24.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-24/open-closed-24.1.ddl.sqlpp
index ae22824..fb84205 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-24/open-closed-24.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-24/open-closed-24.1.ddl.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.testType as
 {
-  id : int64,
+  id : bigint,
   name : string,
   opt_tag : {{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-25/open-closed-25.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-25/open-closed-25.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-25/open-closed-25.1.ddl.sqlpp
index f889066..d4da2a6 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-25/open-closed-25.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-25/open-closed-25.1.ddl.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.testType as
 {
-  id : int64,
+  id : bigint,
   name : string,
   opt_tag : {{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-26/open-closed-26.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-26/open-closed-26.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-26/open-closed-26.1.ddl.sqlpp
index 23e32c4..7d449db 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-26/open-closed-26.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-26/open-closed-26.1.ddl.sqlpp
@@ -32,7 +32,7 @@ use test;
 
 create type test.testType as
 {
-  id : int64,
+  id : bigint,
   name : string,
   opt_tag : {{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-32/open-closed-32.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-32/open-closed-32.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-32/open-closed-32.1.ddl.sqlpp
index c83958e..5dade52 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-32/open-closed-32.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-32/open-closed-32.1.ddl.sqlpp
@@ -41,7 +41,7 @@ create type testdv2.testtype02 as
   name : string,
   sex : string,
   dept : string,
-  salary : int32,
+  salary : integer,
   interests : {{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-33/open-closed-33.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-33/open-closed-33.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-33/open-closed-33.1.ddl.sqlpp
index 6114ae1..2638a39 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-33/open-closed-33.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-33/open-closed-33.1.ddl.sqlpp
@@ -42,7 +42,7 @@ create type testdv2.testtype02 as
   name : string,
   sex : string,
   dept : string,
-  salary : int32,
+  salary : integer,
   interests : {{string}}?
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue196/query-issue196.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue196/query-issue196.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue196/query-issue196.1.ddl.sqlpp
index f2bc199..0744efc 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue196/query-issue196.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue196/query-issue196.1.ddl.sqlpp
@@ -31,12 +31,12 @@ use test;
 
 create type test.testtype1 as
 {
-  id : int64
+  id : bigint
 }
 
 create type test.testtype2 as
 {
-  id : int64
+  id : bigint
 }
 
 create  dataset t1(testtype1) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue208/query-issue208.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue208/query-issue208.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue208/query-issue208.1.ddl.sqlpp
index ebdc10b..50a476a 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue208/query-issue208.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue208/query-issue208.1.ddl.sqlpp
@@ -33,10 +33,10 @@ create type OpenSocialNetworkData.TwitterUserType as
 {
   `screen-name` : string,
   lang : string,
-  friends_count : int64,
-  statuses_count : int64,
+  friends_count : bigint,
+  statuses_count : bigint,
   name : string,
-  followers_count : int64
+  followers_count : bigint
 }
 
 create type OpenSocialNetworkData.TweetMessageType as

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue236/query-issue236.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue236/query-issue236.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue236/query-issue236.1.ddl.sqlpp
index 7072c9a..763057e 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue236/query-issue236.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue236/query-issue236.1.ddl.sqlpp
@@ -33,10 +33,10 @@ create type SocialNetworkData.TwitterUserType as
 {
   `screen-name` : string,
   lang : string,
-  friends_count : int64,
-  statuses_count : int64,
+  friends_count : bigint,
+  statuses_count : bigint,
   name : string,
-  followers_count : int64
+  followers_count : bigint
 }
 
 create type SocialNetworkData.TweetMessageType as

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue258/query-issue258.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue258/query-issue258.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue258/query-issue258.1.ddl.sqlpp
index 95d23c7..323a8df 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue258/query-issue258.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue258/query-issue258.1.ddl.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.t1 as
  closed {
-  id : int64
+  id : bigint
 }
 
 create  dataset ds1(t1) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue258/query-issue258.2.update.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue258/query-issue258.2.update.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue258/query-issue258.2.update.sqlpp
index 2b009ae..552460b 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue258/query-issue258.2.update.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue258/query-issue258.2.update.sqlpp
@@ -28,7 +28,7 @@ USE test;
 
 INSERT INTO ds1
 CASE
-  WHEN coll_count((
+  WHEN array_count((
       select element x
       from  ds2 as x
       where (x.id = 10)

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue343-2/query-issue343-2.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue343-2/query-issue343-2.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue343-2/query-issue343-2.1.ddl.sqlpp
index 1ec77a3..10c4b1c 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue343-2/query-issue343-2.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue343-2/query-issue343-2.1.ddl.sqlpp
@@ -31,14 +31,14 @@ use test;
 
 create type test.AddressType as
 {
-  number : int64,
+  number : bigint,
   street : string,
   city : string
 }
 
 create type test.AllType as
 {
-  id : int64,
+  id : bigint,
   name : string,
   age : float,
   salary : double,
@@ -59,7 +59,7 @@ create type test.AllType as
 
 create type test.MyListType as
 {
-  id : int64,
+  id : bigint,
   mylist : [string]
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue343/query-issue343.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue343/query-issue343.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue343/query-issue343.1.ddl.sqlpp
index e5b90ae..72e4c8f 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue343/query-issue343.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue343/query-issue343.1.ddl.sqlpp
@@ -31,14 +31,14 @@ use test;
 
 create type test.AddressType as
 {
-  number : int64,
+  number : bigint,
   street : string,
   city : string
 }
 
 create type test.AllType as
 {
-  id : int64,
+  id : bigint,
   name : string,
   age : float,
   salary : double,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue377/query-issue377.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue377/query-issue377.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue377/query-issue377.1.ddl.sqlpp
index 450805b..2485a26 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue377/query-issue377.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue377/query-issue377.1.ddl.sqlpp
@@ -41,12 +41,12 @@ create type TinySocial.TweetMessageType as
 
 create type TinySocial.FacebookUserType as
 {
-  id : int64
+  id : bigint
 }
 
 create type TinySocial.FacebookMessageType as
 {
-  `message-id` : int64
+  `message-id` : bigint
 }
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue410/query-issue410.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue410/query-issue410.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue410/query-issue410.1.ddl.sqlpp
index 2c2408a..b1f092d 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue410/query-issue410.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue410/query-issue410.1.ddl.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.Emp 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/open-closed/query-issue423-2/query-issue423-2.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue423-2/query-issue423-2.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue423-2/query-issue423-2.1.ddl.sqlpp
index b341bf1..83d13d8 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue423-2/query-issue423-2.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue423-2/query-issue423-2.1.ddl.sqlpp
@@ -32,7 +32,7 @@ use test;
 
 create type test.TestType as
 {
-  id : int32,
+  id : integer,
   fname : string,
   lname : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue423/query-issue423.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue423/query-issue423.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue423/query-issue423.1.ddl.sqlpp
index 87d63be..101106f 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue423/query-issue423.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue423/query-issue423.1.ddl.sqlpp
@@ -32,7 +32,7 @@ use test;
 
 create type test.TestType as
 {
-  id : int32,
+  id : integer,
   fname : string,
   lname : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue453-2/query-issue453-2.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue453-2/query-issue453-2.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue453-2/query-issue453-2.1.ddl.sqlpp
index 0039963..1470776 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue453-2/query-issue453-2.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue453-2/query-issue453-2.1.ddl.sqlpp
@@ -31,9 +31,9 @@ use test;
 
 create type test.TypeOpen as
 {
-  id : int64,
-  int_m : int64,
-  int_o : int64?,
+  id : bigint,
+  int_m : bigint,
+  int_o : bigint?,
   string_m : string,
   string_o : string?
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue453/query-issue453.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue453/query-issue453.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue453/query-issue453.1.ddl.sqlpp
index 0039963..1470776 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue453/query-issue453.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue453/query-issue453.1.ddl.sqlpp
@@ -31,9 +31,9 @@ use test;
 
 create type test.TypeOpen as
 {
-  id : int64,
-  int_m : int64,
-  int_o : int64?,
+  id : bigint,
+  int_m : bigint,
+  int_o : bigint?,
   string_m : string,
   string_o : string?
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue456/query-issue456.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue456/query-issue456.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue456/query-issue456.1.ddl.sqlpp
index d2219ef..4c95e28 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue456/query-issue456.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue456/query-issue456.1.ddl.sqlpp
@@ -31,9 +31,9 @@ use test;
 
 create type test.TypeOpen as
 {
-  id : int64,
-  int_m : int64,
-  int_o : int64?,
+  id : bigint,
+  int_m : bigint,
+  int_o : bigint?,
   string_m : string,
   string_o : string?
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue487/query-issue487.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue487/query-issue487.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue487/query-issue487.1.ddl.sqlpp
index 9fbd3fb..285dab1 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue487/query-issue487.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue487/query-issue487.1.ddl.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.EmpType 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/open-closed/query-issue592/query-issue592.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue592/query-issue592.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue592/query-issue592.1.ddl.sqlpp
index a840999..83f71de 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue592/query-issue592.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue592/query-issue592.1.ddl.sqlpp
@@ -31,12 +31,12 @@ use fooverse;
 
 create type fooverse.bartype as
 {
-  baz : int64
+  baz : bigint
 }
 
 create type fooverse.footype as
 {
-  id : int64,
+  id : bigint,
   bars : [bartype]?
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue625/query-issue625.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue625/query-issue625.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue625/query-issue625.1.ddl.sqlpp
index 451ad53..5a14110 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue625/query-issue625.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue625/query-issue625.1.ddl.sqlpp
@@ -31,8 +31,8 @@ use fooverse;
 
 create type fooverse.FooType as
 {
-  id : int64,
-  numbers : [int64]
+  id : bigint,
+  numbers : [bigint]
 }
 
 create  dataset Foo(FooType) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue625/query-issue625.2.update.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue625/query-issue625.2.update.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue625/query-issue625.2.update.sqlpp
index 2f90fe3..82fd039 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue625/query-issue625.2.update.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue625/query-issue625.2.update.sqlpp
@@ -28,6 +28,6 @@ use fooverse;
 
 insert into Foo
 {'id':1,'numbers':(
-    select element fooverse.int32(x)
+    select element fooverse.integer(x)
     from  ['1','2','3'] as x
 )};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-proposal/query-proposal.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-proposal/query-proposal.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-proposal/query-proposal.1.ddl.sqlpp
index 5a801ed..5550c87 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-proposal/query-proposal.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-proposal/query-proposal.1.ddl.sqlpp
@@ -35,10 +35,10 @@ create type test.TweetMessageType as
   user : {
       `screen-name` : string,
       lang : string,
-      friends_count : int64,
-      statuses_count : int64,
+      friends_count : bigint,
+      statuses_count : bigint,
       name : string,
-      followers_count : int64
+      followers_count : bigint
   }
 ,
   `sender-location` : point?,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-proposal02/query-proposal02.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-proposal02/query-proposal02.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-proposal02/query-proposal02.1.ddl.sqlpp
index defd482..84fd45a 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-proposal02/query-proposal02.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-proposal02/query-proposal02.1.ddl.sqlpp
@@ -36,10 +36,10 @@ create type test.TweetMessageType as
   user : {
       `screen-name` : string,
       lang : string,
-      friends_count : int64,
-      statuses_count : int64,
+      friends_count : bigint,
+      statuses_count : bigint,
       name : string,
-      followers_count : int64
+      followers_count : bigint
   }
 ,
   `sender-location` : point?,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/enforced-field-name-collision/enforced-field-name-collision.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/enforced-field-name-collision/enforced-field-name-collision.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/enforced-field-name-collision/enforced-field-name-collision.1.ddl.sqlpp
index 735412f..7fdb027 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/enforced-field-name-collision/enforced-field-name-collision.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/enforced-field-name-collision/enforced-field-name-collision.1.ddl.sqlpp
@@ -25,7 +25,7 @@ use test;
 
 create type test.testType as
 {
-  id : int32,
+  id : integer,
   `value` : string
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/enforced-field-type-collision/enforced-field-name-collision.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/enforced-field-type-collision/enforced-field-name-collision.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/enforced-field-type-collision/enforced-field-name-collision.1.ddl.sqlpp
index 381c726..7ae0485 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/enforced-field-type-collision/enforced-field-name-collision.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/enforced-field-type-collision/enforced-field-name-collision.1.ddl.sqlpp
@@ -25,11 +25,11 @@ use test;
 
 create type test.testType as
 {
-  id : int32,
+  id : integer,
   `value` : string
 }
 
 create  dataset testDS(testType) primary key id;
 
-create  index testIdx  on testDS (`value`:int32?) type btree enforced;
+create  index testIdx  on testDS (`value`:integer?) type btree enforced;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/index-on-closed-type/index-on-closed-type.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/index-on-closed-type/index-on-closed-type.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/index-on-closed-type/index-on-closed-type.1.ddl.sqlpp
index c9eca9a..d7c6279 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/index-on-closed-type/index-on-closed-type.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/index-on-closed-type/index-on-closed-type.1.ddl.sqlpp
@@ -25,7 +25,7 @@ use test;
 
 create type test.testType as
  closed {
-  id : int32
+  id : integer
 }
 
 create  dataset testDS(testType) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/missing-enforce-statement/missing-enforce-statement.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/missing-enforce-statement/missing-enforce-statement.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/missing-enforce-statement/missing-enforce-statement.1.ddl.sqlpp
index 278a08d..f74baa3 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/missing-enforce-statement/missing-enforce-statement.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/missing-enforce-statement/missing-enforce-statement.1.ddl.sqlpp
@@ -25,7 +25,7 @@ use test;
 
 create type test.testType as
 {
-  id : int32
+  id : integer
 }
 
 create  dataset testDS(testType) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/missing-optionality/missing-optionality.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/missing-optionality/missing-optionality.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/missing-optionality/missing-optionality.1.ddl.sqlpp
index ef0285f..8dab33e 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/missing-optionality/missing-optionality.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/missing-optionality/missing-optionality.1.ddl.sqlpp
@@ -21,7 +21,7 @@ create dataverse test;
 use test;
 
 create type testType as open {
-   `id`: int32
+   `id`: integer
 }
 
 create dataset testDS(testType) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/adm-format/adm-format.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/adm-format/adm-format.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/adm-format/adm-format.1.ddl.sqlpp
index f504c35..5a182f8 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/adm-format/adm-format.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/adm-format/adm-format.1.ddl.sqlpp
@@ -44,5 +44,5 @@ create type test.MyRecord as
 
 create external  dataset MyData(MyRecord) using 
`hdfs`((`hdfs`=`hdfs://127.0.0.1:31888`),(`path`=`/asterix/spatialData.json`),(`input-format`=`text-input-format`),(`format`=`adm`));
 
-create  index idx  on MyData (id:int64?) type btree enforced;
+create  index idx  on MyData (id:bigint?) type btree enforced;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.1.ddl.sqlpp
index 4dbce7c..2a9a89a 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.1.ddl.sqlpp
@@ -33,10 +33,10 @@ create type test.TwitterUserType as
  closed {
   `screen-name` : string,
   lang : string,
-  `friends-count` : int64,
-  `statuses-count` : int64,
+  `friends-count` : bigint,
+  `statuses-count` : bigint,
   name : string,
-  `followers-count` : int64
+  `followers-count` : bigint
 }
 
 create type test.TweetMessageType as
@@ -49,11 +49,11 @@ create type test.TweetMessageType as
 
 create external  dataset TweetMessages(TweetMessageType) using 
`hdfs`((`hdfs`=`hdfs://127.0.0.1:31888`),(`path`=`/asterix/tw_for_indexleftouterjoin.adm`),(`input-format`=`text-input-format`),(`format`=`adm`));
 
-create  index IdIx  on TweetMessages (tweetid:int64?) type btree enforced;
+create  index IdIx  on TweetMessages (tweetid:bigint?) type btree enforced;
 
-create  index msgCountAIx  on TweetMessages (countA:int64?) type btree 
enforced;
+create  index msgCountAIx  on TweetMessages (countA:bigint?) type btree 
enforced;
 
-create  index msgCountBIx  on TweetMessages (countB:int64?) type btree 
enforced;
+create  index msgCountBIx  on TweetMessages (countB:bigint?) type btree 
enforced;
 
 create  index twmSndLocIx  on TweetMessages (`sender-location`:point?) type 
rtree enforced;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.3.query.sqlpp
index aaf9dcf..56615ce 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.3.query.sqlpp
@@ -34,6 +34,6 @@ select element 
{'tweetid1':t1.tweetid,'loc1':t1.`sender-location`,'nearby-messag
     )}
 from  TweetMessages as t1
 with  n as test.`create-circle`(t1.`sender-location`,0.5)
-where (t1.tweetid < test.int64('10'))
+where (t1.tweetid < test.bigint('10'))
 order by t1.tweetid
 ;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/leftouterjoin/leftouterjoin.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/leftouterjoin/leftouterjoin.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/leftouterjoin/leftouterjoin.1.ddl.sqlpp
index eabc35b..acd0397 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/leftouterjoin/leftouterjoin.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/leftouterjoin/leftouterjoin.1.ddl.sqlpp
@@ -33,10 +33,10 @@ create type test.TwitterUserType as
  closed {
   `screen-name` : string,
   lang : string,
-  `friends-count` : int64,
-  `statuses-count` : int64,
+  `friends-count` : bigint,
+  `statuses-count` : bigint,
   name : string,
-  `followers-count` : int64
+  `followers-count` : bigint
 }
 
 create type test.TweetMessageType as
@@ -50,9 +50,9 @@ create type test.TweetMessageType as
 
 create external  dataset TweetMessages(TweetMessageType) using 
`hdfs`((`hdfs`=`hdfs://127.0.0.1:31888`),(`path`=`/asterix/tw_for_indexleftouterjoin.adm`),(`input-format`=`text-input-format`),(`format`=`adm`));
 
-create  index IdIx  on TweetMessages (tweetid:int64?) type btree enforced;
+create  index IdIx  on TweetMessages (tweetid:bigint?) type btree enforced;
 
-create  index msgCountAIx  on TweetMessages (countA:int64?) type btree 
enforced;
+create  index msgCountAIx  on TweetMessages (countA:bigint?) type btree 
enforced;
 
-create  index msgCountBIx  on TweetMessages (countB:int64?) type btree 
enforced;
+create  index msgCountBIx  on TweetMessages (countB:bigint?) type btree 
enforced;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/leftouterjoin/leftouterjoin.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/leftouterjoin/leftouterjoin.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/leftouterjoin/leftouterjoin.3.query.sqlpp
index 6b44e0a..86fc87b 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/leftouterjoin/leftouterjoin.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/leftouterjoin/leftouterjoin.3.query.sqlpp
@@ -27,6 +27,6 @@ select element 
{'tweetid1':t1.tweetid,'count1':t1.countA,'t2info':(
         order by t2.tweetid
     )}
 from  TweetMessages as t1
-where (t1.tweetid < test.int64('10'))
+where (t1.tweetid < test.bigint('10'))
 order by t1.tweetid
 ;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/rtree-index/rtree-index.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/rtree-index/rtree-index.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/rtree-index/rtree-index.1.ddl.sqlpp
index 8737627..3e1c1a0 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/rtree-index/rtree-index.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/rtree-index/rtree-index.1.ddl.sqlpp
@@ -25,7 +25,7 @@ use test;
 
 create type test.MyRecord 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/open-index-enforced/index-join/btree-secondary-equi-join/btree-secondary-equi-join.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/btree-secondary-equi-join/btree-secondary-equi-join.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/btree-secondary-equi-join/btree-secondary-equi-join.1.ddl.sqlpp
index 32b2fc5..d0916ec 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/btree-secondary-equi-join/btree-secondary-equi-join.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/btree-secondary-equi-join/btree-secondary-equi-join.1.ddl.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.DBLPType as
  closed {
-  id : int64,
+  id : bigint,
   dblpid : string,
   title : string,
   authors : string,
@@ -40,7 +40,7 @@ create type test.DBLPType as
 
 create type test.DBLPOpenType as
 {
-  id : int64,
+  id : bigint,
   dblpid : string,
   title : string,
   misc : string
@@ -48,7 +48,7 @@ create type test.DBLPOpenType as
 
 create type test.CSXType as
  closed {
-  id : int64,
+  id : bigint,
   csxid : string,
   title : string,
   authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.sqlpp
index c672980..90f8358 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.sqlpp
@@ -31,34 +31,34 @@ 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,
-  age : int64?,
+  age : bigint?,
   address : AddressType?,
   interests : [string],
   children : [{
           name : string,
-          age : int64?
+          age : bigint?
       }
 ]
 }
 
 create type test.CustomerOpenType as
 {
-  cid : int64,
-  age : int64?,
+  cid : bigint,
+  age : bigint?,
   address : AddressType?,
   interests : [string],
   children : [{
           name : string,
-          age : int64?
+          age : bigint?
       }
 ]
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/ngram-edit-distance/ngram-edit-distance.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/ngram-edit-distance/ngram-edit-distance.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/ngram-edit-distance/ngram-edit-distance.1.ddl.sqlpp
index edfda4f..54dc417 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/ngram-edit-distance/ngram-edit-distance.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/ngram-edit-distance/ngram-edit-distance.1.ddl.sqlpp
@@ -30,34 +30,34 @@ use test;
 
 create type test.AddressType as
 {
-  number : int64,
+  number : bigint,
   street : string,
   city : string
 }
 
 create type test.CustomerOpenType as
 {
-  cid : int64,
-  age : int64?,
+  cid : bigint,
+  age : bigint?,
   address : AddressType?,
   interests : [string],
   children : [{
           name : string,
-          age : int64?
+          age : bigint?
       }
 ]
 }
 
 create type test.CustomerType as
  closed {
-  cid : int64,
+  cid : bigint,
   name : string,
-  age : int64?,
+  age : bigint?,
   address : AddressType?,
   interests : [string],
   children : [{
           name : string,
-          age : int64?
+          age : bigint?
       }
 ]
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.sqlpp
index 6236b1f..5d7dc99 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.DBLPType as
  closed {
-  id : int64,
+  id : bigint,
   dblpid : string,
   title : string,
   authors : string,
@@ -40,7 +40,7 @@ create type test.DBLPType as
 
 create type test.DBLPOpenType as
 {
-  id : int64,
+  id : bigint,
   dblpid : string,
   authors : string,
   misc : string
@@ -48,7 +48,7 @@ create type test.DBLPOpenType as
 
 create type test.CSXType as
  closed {
-  id : int64,
+  id : bigint,
   csxid : string,
   title : string,
   authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/ngram-jaccard/ngram-jaccard.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/ngram-jaccard/ngram-jaccard.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/ngram-jaccard/ngram-jaccard.1.ddl.sqlpp
index c3cfc38..f5f3225 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/ngram-jaccard/ngram-jaccard.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/ngram-jaccard/ngram-jaccard.1.ddl.sqlpp
@@ -30,7 +30,7 @@ use test;
 
 create type test.DBLPType as
  closed {
-  id : int64,
+  id : bigint,
   dblpid : string,
   title : string,
   authors : string,
@@ -39,7 +39,7 @@ create type test.DBLPType as
 
 create type test.DBLPOpenType as
 {
-  id : int64,
+  id : bigint,
   dblpid : string,
   authors : string,
   misc : string
@@ -47,7 +47,7 @@ create type test.DBLPOpenType as
 
 create type test.CSXType as
  closed {
-  id : int64,
+  id : bigint,
   csxid : string,
   title : string,
   authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.1.ddl.sqlpp
index ee49170..7c8a22a 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.1.ddl.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.MyRecord as
  closed {
-  id : int64,
+  id : bigint,
   point : point,
   kwds : string,
   line1 : line,
@@ -44,7 +44,7 @@ create type test.MyRecord as
 
 create type test.MyRecordOpen 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/open-index-enforced/index-join/word-jaccard-inline/word-jaccard-inline.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/word-jaccard-inline/word-jaccard-inline.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/word-jaccard-inline/word-jaccard-inline.1.ddl.sqlpp
index c9b60eb..205df03 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/word-jaccard-inline/word-jaccard-inline.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/word-jaccard-inline/word-jaccard-inline.1.ddl.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.DBLPType as
  closed {
-  id : int64,
+  id : bigint,
   dblpid : string,
   title : string,
   authors : string,
@@ -40,7 +40,7 @@ create type test.DBLPType as
 
 create type test.DBLPOpenType as
 {
-  id : int64,
+  id : bigint,
   dblpid : string,
   authors : string,
   misc : string
@@ -48,7 +48,7 @@ create type test.DBLPOpenType as
 
 create type test.CSXType as
  closed {
-  id : int64,
+  id : bigint,
   csxid : string,
   title : string,
   authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/word-jaccard/word-jaccard.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/word-jaccard/word-jaccard.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/word-jaccard/word-jaccard.1.ddl.sqlpp
index 3b57305..0ef34a4 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/word-jaccard/word-jaccard.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/word-jaccard/word-jaccard.1.ddl.sqlpp
@@ -30,7 +30,7 @@ use test;
 
 create type test.DBLPType as
  closed {
-  id : int64,
+  id : bigint,
   dblpid : string,
   title : string,
   authors : string,
@@ -39,7 +39,7 @@ create type test.DBLPType as
 
 create type test.DBLPOpenType as
 {
-  id : int64,
+  id : bigint,
   dblpid : string,
   authors : string,
   misc : string
@@ -47,7 +47,7 @@ create type test.DBLPOpenType as
 
 create type test.CSXType as
  closed {
-  id : int64,
+  id : bigint,
   csxid : string,
   title : string,
   authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.1.ddl.sqlpp
index 7ed7fbf..1aed597 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.1.ddl.sqlpp
@@ -33,26 +33,26 @@ create type test.TwitterUserType as
  closed {
   `screen-name` : string,
   lang : string,
-  `friends-count` : int64,
-  `statuses-count` : int64,
+  `friends-count` : bigint,
+  `statuses-count` : bigint,
   name : string,
-  `followers-count` : int64
+  `followers-count` : bigint
 }
 
 create type test.TweetMessageType as
 {
-  tweetid : int64,
+  tweetid : bigint,
   user : TwitterUserType,
   `sender-location` : point,
   `send-time` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string,
-  countA : int64
+  countA : bigint
 }
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
 create  dataset TweetMessagesTmp(TweetMessageType) primary key tweetid;
 
-create  index msgCountBIx  on TweetMessages (countB:int64?) type btree 
enforced;
+create  index msgCountBIx  on TweetMessages (countB:bigint?) type btree 
enforced;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.2.update.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.2.update.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.2.update.sqlpp
index ed3552b..418adb4 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.2.update.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.2.update.sqlpp
@@ -31,10 +31,10 @@ load  dataset TweetMessagesTmp using localfs 
((`path`=`asterix_nc1://data/twitte
 insert into TweetMessages
 select element c
 from  TweetMessagesTmp as c
-where (c.tweetid < test.int64('125'))
+where (c.tweetid < test.bigint('125'))
 ;
 insert into TweetMessages
 select element 
{'tweetid':c.tweetid,'user':c.user,'sender-location':c.`sender-location`,'send-time':c.`send-time`,'referred-topics':c.`referred-topics`,'message-text':c.`message-text`,'countA':c.countA}
 from  TweetMessagesTmp as c
-where (c.tweetid >= test.int64('125'))
+where (c.tweetid >= test.bigint('125'))
 ;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.3.query.sqlpp
index 7c26c1a..77a844a 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.3.query.sqlpp
@@ -33,6 +33,6 @@ select element 
{'tweetid1':t1.tweetid,'count1':t1.countA,'t2info':(
         order by t2.tweetid
     )}
 from  TweetMessages as t1
-where (t1.tweetid < test.int64('10'))
+where (t1.tweetid < test.bigint('10'))
 order by t1.tweetid
 ;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.1.ddl.sqlpp
index 7ed7fbf..1aed597 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.1.ddl.sqlpp
@@ -33,26 +33,26 @@ create type test.TwitterUserType as
  closed {
   `screen-name` : string,
   lang : string,
-  `friends-count` : int64,
-  `statuses-count` : int64,
+  `friends-count` : bigint,
+  `statuses-count` : bigint,
   name : string,
-  `followers-count` : int64
+  `followers-count` : bigint
 }
 
 create type test.TweetMessageType as
 {
-  tweetid : int64,
+  tweetid : bigint,
   user : TwitterUserType,
   `sender-location` : point,
   `send-time` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string,
-  countA : int64
+  countA : bigint
 }
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
 create  dataset TweetMessagesTmp(TweetMessageType) primary key tweetid;
 
-create  index msgCountBIx  on TweetMessages (countB:int64?) type btree 
enforced;
+create  index msgCountBIx  on TweetMessages (countB:bigint?) type btree 
enforced;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.2.update.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.2.update.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.2.update.sqlpp
index ed3552b..418adb4 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.2.update.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.2.update.sqlpp
@@ -31,10 +31,10 @@ load  dataset TweetMessagesTmp using localfs 
((`path`=`asterix_nc1://data/twitte
 insert into TweetMessages
 select element c
 from  TweetMessagesTmp as c
-where (c.tweetid < test.int64('125'))
+where (c.tweetid < test.bigint('125'))
 ;
 insert into TweetMessages
 select element 
{'tweetid':c.tweetid,'user':c.user,'sender-location':c.`sender-location`,'send-time':c.`send-time`,'referred-topics':c.`referred-topics`,'message-text':c.`message-text`,'countA':c.countA}
 from  TweetMessagesTmp as c
-where (c.tweetid >= test.int64('125'))
+where (c.tweetid >= test.bigint('125'))
 ;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.3.query.sqlpp
index 7f1e799..a86e450 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.3.query.sqlpp
@@ -33,6 +33,6 @@ select element 
{'tweetid1':t1.tweetid,'count1':t1.countA,'t2info':(
         order by t2.tweetid
     )}
 from  TweetMessages as t1
-where (t1.tweetid < test.int64('10'))
+where (t1.tweetid < test.bigint('10'))
 order by t1.tweetid
 ;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.1.ddl.sqlpp
index f84f6fa..bcc2ce1 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.1.ddl.sqlpp
@@ -33,21 +33,21 @@ create type test.TwitterUserType as
  closed {
   `screen-name` : string,
   lang : string,
-  `friends-count` : int64,
-  `statuses-count` : int64,
+  `friends-count` : bigint,
+  `statuses-count` : bigint,
   name : string,
-  `followers-count` : int64
+  `followers-count` : bigint
 }
 
 create type test.TweetMessageType as
 {
-  tweetid : int64,
+  tweetid : bigint,
   user : TwitterUserType,
   `sender-location` : point,
   `send-time` : datetime,
   `referred-topics` : {{string}},
-  countA : int64,
-  countB : int64
+  countA : bigint,
+  countB : bigint
 }
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.2.update.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.2.update.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.2.update.sqlpp
index 39fade5..ba1592e 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.2.update.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.2.update.sqlpp
@@ -31,10 +31,10 @@ load  dataset TweetMessagesTmp using localfs 
((`path`=`asterix_nc1://data/twitte
 insert into TweetMessages
 select element c
 from  TweetMessagesTmp as c
-where (c.tweetid < test.int64('125'))
+where (c.tweetid < test.bigint('125'))
 ;
 insert into TweetMessages
 select element 
{'tweetid':c.tweetid,'user':c.user,'sender-location':c.`sender-location`,'send-time':c.`send-time`,'referred-topics':c.`referred-topics`,'countA':c.countA,'countB':c.countB}
 from  TweetMessagesTmp as c
-where (c.tweetid >= test.int64('125'))
+where (c.tweetid >= test.bigint('125'))
 ;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.query.sqlpp
index 36c22a1..f441956 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.query.sqlpp
@@ -34,6 +34,6 @@ select element 
{'tweet':{'id':t1.tweetid,'topics':t1.`message-text`},'similar-tw
         order by t2.tweetid
     )}
 from  TweetMessagesTmp as t1
-where (t1.tweetid > test.int64('240'))
+where (t1.tweetid > test.bigint('240'))
 order by t1.tweetid
 ;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.1.ddl.sqlpp
index 447fd04..7735b46 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.1.ddl.sqlpp
@@ -33,21 +33,21 @@ create type test.TwitterUserType as
  closed {
   `screen-name` : string,
   lang : string,
-  `friends-count` : int64,
-  `statuses-count` : int64,
+  `friends-count` : bigint,
+  `statuses-count` : bigint,
   name : string,
-  `followers-count` : int64
+  `followers-count` : bigint
 }
 
 create type test.TweetMessageType as
 {
-  tweetid : int64,
+  tweetid : bigint,
   user : TwitterUserType,
   `send-time` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string,
-  countA : int64,
-  countB : int64
+  countA : bigint,
+  countB : bigint
 }
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.2.update.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.2.update.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.2.update.sqlpp
index 8a89c6f..f8e79e4 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.2.update.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.2.update.sqlpp
@@ -31,10 +31,10 @@ load  dataset TweetMessagesTmp using localfs 
((`path`=`asterix_nc1://data/twitte
 insert into TweetMessages
 select element c
 from  TweetMessagesTmp as c
-where (c.tweetid < test.int64('125'))
+where (c.tweetid < test.bigint('125'))
 ;
 insert into TweetMessages
 select element 
{'tweetid':c.tweetid,'user':c.user,'send-time':c.`send-time`,'referred-topics':c.`referred-topics`,'message-text':c.`message-text`,'countA':c.countA,'countB':c.countB}
 from  TweetMessagesTmp as c
-where (c.tweetid >= test.int64('125'))
+where (c.tweetid >= test.bigint('125'))
 ;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.3.query.sqlpp
index aaf9dcf..56615ce 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.3.query.sqlpp
@@ -34,6 +34,6 @@ select element 
{'tweetid1':t1.tweetid,'loc1':t1.`sender-location`,'nearby-messag
     )}
 from  TweetMessages as t1
 with  n as test.`create-circle`(t1.`sender-location`,0.5)
-where (t1.tweetid < test.int64('10'))
+where (t1.tweetid < test.bigint('10'))
 order by t1.tweetid
 ;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.1.ddl.sqlpp
index 447fd04..7735b46 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.1.ddl.sqlpp
@@ -33,21 +33,21 @@ create type test.TwitterUserType as
  closed {
   `screen-name` : string,
   lang : string,
-  `friends-count` : int64,
-  `statuses-count` : int64,
+  `friends-count` : bigint,
+  `statuses-count` : bigint,
   name : string,
-  `followers-count` : int64
+  `followers-count` : bigint
 }
 
 create type test.TweetMessageType as
 {
-  tweetid : int64,
+  tweetid : bigint,
   user : TwitterUserType,
   `send-time` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string,
-  countA : int64,
-  countB : int64
+  countA : bigint,
+  countB : bigint
 }
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.2.update.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.2.update.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.2.update.sqlpp
index 8a89c6f..f8e79e4 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.2.update.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.2.update.sqlpp
@@ -31,10 +31,10 @@ load  dataset TweetMessagesTmp using localfs 
((`path`=`asterix_nc1://data/twitte
 insert into TweetMessages
 select element c
 from  TweetMessagesTmp as c
-where (c.tweetid < test.int64('125'))
+where (c.tweetid < test.bigint('125'))
 ;
 insert into TweetMessages
 select element 
{'tweetid':c.tweetid,'user':c.user,'send-time':c.`send-time`,'referred-topics':c.`referred-topics`,'message-text':c.`message-text`,'countA':c.countA,'countB':c.countB}
 from  TweetMessagesTmp as c
-where (c.tweetid >= test.int64('125'))
+where (c.tweetid >= test.bigint('125'))
 ;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.3.query.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.3.query.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.3.query.sqlpp
index f6dbd12..6ade280 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.3.query.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.3.query.sqlpp
@@ -34,6 +34,6 @@ select element 
{'tweetid1':t1.tweetid,'loc1':t1.`sender-location`,'nearby-messag
     )}
 from  TweetMessages as t1
 with  n as test.`create-circle`(t1.`sender-location`,0.5)
-where (t1.tweetid < test.int64('10'))
+where (t1.tweetid < test.bigint('10'))
 order by t1.tweetid
 ;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.1.ddl.sqlpp
index f3eeeb8..cd84b8d 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.1.ddl.sqlpp
@@ -34,17 +34,17 @@ use test;
 
 create type test.Emp as
  closed {
-  id : int64,
+  id : bigint,
   fname : string,
   lname : string,
-  age : int64,
+  age : bigint,
   dept : string
 }
 
 create type test.EmpOpen as
 {
-  id : int64,
-  age : int64,
+  id : bigint,
+  age : bigint,
   dept : string
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/btree-index-composite-key/btree-index-composite-key.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/btree-index-composite-key/btree-index-composite-key.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/btree-index-composite-key/btree-index-composite-key.1.ddl.sqlpp
index f82a8f5..87baa8a 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/btree-index-composite-key/btree-index-composite-key.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/btree-index-composite-key/btree-index-composite-key.1.ddl.sqlpp
@@ -33,17 +33,17 @@ use test;
 
 create type test.Emp as
  closed {
-  id : int64,
+  id : bigint,
   fname : string,
   lname : string,
-  age : int64,
+  age : bigint,
   dept : string
 }
 
 create type test.EmpOpen as
 {
-  id : int64,
-  age : int64,
+  id : bigint,
+  age : bigint,
   dept : string
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.1.ddl.sqlpp
index 6c00dfe..aff170f 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.1.ddl.sqlpp
@@ -32,26 +32,26 @@ use tpch;
 
 create type tpch.OrderType as
  closed {
-  o_orderkey : int64,
-  o_custkey : int64,
+  o_orderkey : bigint,
+  o_custkey : bigint,
   o_orderstatus : string,
   o_totalprice : double,
   o_orderdate : string,
   o_orderpriority : string,
   o_clerk : string,
-  o_shippriority : int64,
+  o_shippriority : bigint,
   o_comment : string
 }
 
 create type tpch.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/open-index-enforced/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.3.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.3.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.3.ddl.sqlpp
index 8e14d52..1377c4d 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.3.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.3.ddl.sqlpp
@@ -20,5 +20,5 @@
 use tpch;
 
 
-create  index idx_Orders_Custkey  on OrdersOpen (o_custkey:int32?) type btree 
enforced;
+create  index idx_Orders_Custkey  on OrdersOpen (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/open-index-enforced/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.sqlpp
index df3bf58..52f0ec7 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.sqlpp
@@ -25,7 +25,7 @@ use test;
 
 create type test.DBLPType as
  closed {
-  id : int64,
+  id : bigint,
   dblpid : string,
   title : string,
   authors : string,
@@ -34,7 +34,7 @@ create type test.DBLPType as
 
 create type test.DBLPOpenType as
 {
-  id : int64,
+  id : bigint,
   dblpid : string,
   authors : string,
   misc : string

Reply via email to