http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_04.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_04.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_04.sqlpp
index 3c84505..8c2b515 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_04.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_04.sqlpp
@@ -30,7 +30,7 @@ use test;
 
 create type test.DBLPTypetmp as
 {
-  id : int32,
+  id : integer,
   dblpid : string,
   title : string,
   misc : string
@@ -38,7 +38,7 @@ create type test.DBLPTypetmp as
 
 create type test.CSXTypetmp as
 {
-  id : int32,
+  id : integer,
   csxid : string,
   title : string,
   misc : string

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_05.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_05.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_05.sqlpp
index da13fd5..9b68a89 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_05.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_05.sqlpp
@@ -30,7 +30,7 @@ use test;
 
 create type test.DBLPTypetmp as
 {
-  id : int32,
+  id : integer,
   dblpid : string,
   title : string,
   misc : string
@@ -38,7 +38,7 @@ create type test.DBLPTypetmp as
 
 create type test.CSXTypetmp as
 {
-  id : int32,
+  id : integer,
   csxid : string,
   title : string,
   misc : string

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_01.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_01.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_01.sqlpp
index 3d310d5..9e2c69f 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_01.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_01.sqlpp
@@ -30,7 +30,7 @@ use test;
 
 create type test.DBLPTypetmp as
 {
-  id : int32,
+  id : integer,
   dblpid : string,
   title : string,
   misc : string
@@ -38,7 +38,7 @@ create type test.DBLPTypetmp as
 
 create type test.CSXTypetmp as
  closed {
-  id : int32,
+  id : integer,
   csxid : string,
   title : string,
   authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_02.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_02.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_02.sqlpp
index 0570fad..5eb7f01 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_02.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_02.sqlpp
@@ -30,7 +30,7 @@ use test;
 
 create type test.DBLPTypetmp as
  closed {
-  id : int32,
+  id : integer,
   dblpid : string,
   title : string,
   authors : string,
@@ -39,7 +39,7 @@ create type test.DBLPTypetmp as
 
 create type test.CSXTypetmp as
 {
-  id : int32,
+  id : integer,
   csxid : string,
   title : string,
   misc : string

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_03.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_03.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_03.sqlpp
index 774ea99..e5b4b83 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_03.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_03.sqlpp
@@ -30,7 +30,7 @@ use test;
 
 create type test.DBLPTypetmp as
 {
-  id : int32,
+  id : integer,
   dblpid : string,
   title : string,
   misc : string

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_04.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_04.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_04.sqlpp
index 1d36874..61df0a5 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_04.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_04.sqlpp
@@ -30,7 +30,7 @@ use test;
 
 create type test.DBLPTypetmp as
 {
-  id : int32,
+  id : integer,
   dblpid : string,
   title : string,
   misc : string
@@ -38,7 +38,7 @@ create type test.DBLPTypetmp as
 
 create type test.CSXTypetmp as
 {
-  id : int32,
+  id : integer,
   csxid : string,
   title : string,
   misc : string

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_05.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_05.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_05.sqlpp
index 5da6d79..83fd6bd 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_05.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_05.sqlpp
@@ -30,7 +30,7 @@ use test;
 
 create type test.DBLPTypetmp as
 {
-  id : int32,
+  id : integer,
   dblpid : string,
   title : string,
   misc : string
@@ -38,7 +38,7 @@ create type test.DBLPTypetmp as
 
 create type test.CSXTypetmp as
 {
-  id : int32,
+  id : integer,
   csxid : string,
   title : string,
   misc : string

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.sqlpp
index d036270..27dfe8c 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.sqlpp
@@ -32,7 +32,7 @@ set `import-private-functions` `true`;
 
 create type test.DBLPTypetmp as
 {
-  id : int32,
+  id : integer,
   dblpid : string,
   authors : string,
   misc : string
@@ -40,7 +40,7 @@ create type test.DBLPTypetmp as
 
 create type test.CSXTypetmp as
  closed {
-  id : int32,
+  id : integer,
   csxid : string,
   title : string,
   authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_02.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_02.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_02.sqlpp
index dcfeff8..7038239 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_02.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_02.sqlpp
@@ -32,7 +32,7 @@ set `import-private-functions` `true`;
 
 create type test.DBLPTypetmp as
  closed {
-  id : int32,
+  id : integer,
   dblpid : string,
   title : string,
   authors : string,
@@ -41,7 +41,7 @@ create type test.DBLPTypetmp as
 
 create type test.CSXTypetmp as
 {
-  id : int32,
+  id : integer,
   csxid : string,
   authors : string,
   misc : string

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_03.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_03.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_03.sqlpp
index 7735290..7313ef2 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_03.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_03.sqlpp
@@ -32,7 +32,7 @@ set `import-private-functions` `true`;
 
 create type test.DBLPTypetmp as
 {
-  id : int32,
+  id : integer,
   dblpid : string,
   authors : string,
   misc : string

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_04.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_04.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_04.sqlpp
index 049a6c9..3ea7aca 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_04.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_04.sqlpp
@@ -32,7 +32,7 @@ set `import-private-functions` `true`;
 
 create type test.DBLPTypetmp as
 {
-  id : int32,
+  id : integer,
   dblpid : string,
   authors : string,
   misc : string
@@ -40,7 +40,7 @@ create type test.DBLPTypetmp as
 
 create type test.CSXTypetmp as
 {
-  id : int32,
+  id : integer,
   csxid : string,
   authors : string,
   misc : string

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_01.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_01.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_01.sqlpp
index 2f89621..199c3c5 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_01.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_01.sqlpp
@@ -32,7 +32,7 @@ set `import-private-functions` `true`;
 
 create type test.DBLPTypetmp as
 {
-  id : int32,
+  id : integer,
   dblpid : string,
   authors : string,
   misc : string
@@ -40,7 +40,7 @@ create type test.DBLPTypetmp as
 
 create type test.CSXTypetmp as
  closed {
-  id : int32,
+  id : integer,
   csxid : string,
   title : string,
   authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_02.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_02.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_02.sqlpp
index 991c751..057b5dc 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_02.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_02.sqlpp
@@ -32,7 +32,7 @@ set `import-private-functions` `true`;
 
 create type test.DBLPTypetmp as
  closed {
-  id : int32,
+  id : integer,
   dblpid : string,
   title : string,
   authors : string,
@@ -41,7 +41,7 @@ create type test.DBLPTypetmp as
 
 create type test.CSXTypetmp as
 {
-  id : int32,
+  id : integer,
   csxid : string,
   authors : string,
   misc : string

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_03.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_03.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_03.sqlpp
index ee9be08..3feddf8 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_03.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_03.sqlpp
@@ -32,7 +32,7 @@ set `import-private-functions` `true`;
 
 create type test.DBLPTypetmp as
 {
-  id : int32,
+  id : integer,
   dblpid : string,
   authors : string,
   misc : string

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_04.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_04.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_04.sqlpp
index 105cd51..9f255b7 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_04.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_04.sqlpp
@@ -32,7 +32,7 @@ set `import-private-functions` `true`;
 
 create type test.DBLPTypetmp as
 {
-  id : int32,
+  id : integer,
   dblpid : string,
   authors : string,
   misc : string
@@ -40,7 +40,7 @@ create type test.DBLPTypetmp as
 
 create type test.CSXTypetmp as
 {
-  id : int32,
+  id : integer,
   csxid : string,
   authors : string,
   misc : string

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-inline.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-inline.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-inline.sqlpp
index da2f066..0b34fd8 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-inline.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-inline.sqlpp
@@ -34,7 +34,7 @@ set `import-private-functions` `true`;
 
 create type test.DBLPTypetmp as
 {
-  id : int32,
+  id : integer,
   dblpid : string,
   authors : string,
   misc : string

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_01.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_01.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_01.sqlpp
index cb53734..ad47867 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_01.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_01.sqlpp
@@ -32,7 +32,7 @@ set `import-private-functions` `true`;
 
 create type test.DBLPTypetmp as
 {
-  id : int32,
+  id : integer,
   dblpid : string,
   authors : string,
   misc : string
@@ -40,7 +40,7 @@ create type test.DBLPTypetmp as
 
 create type test.CSXTypetmp as
  closed {
-  id : int32,
+  id : integer,
   csxid : string,
   title : string,
   authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_02.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_02.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_02.sqlpp
index f2ee2c9..42ecfd0 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_02.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_02.sqlpp
@@ -32,7 +32,7 @@ set `import-private-functions` `true`;
 
 create type test.DBLPTypetmp as
  closed {
-  id : int32,
+  id : integer,
   dblpid : string,
   title : string,
   authors : string,
@@ -41,7 +41,7 @@ create type test.DBLPTypetmp as
 
 create type test.CSXTypetmp as
 {
-  id : int32,
+  id : integer,
   csxid : string,
   authors : string,
   misc : string

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_03.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_03.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_03.sqlpp
index d71aac6..d57230e 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_03.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_03.sqlpp
@@ -32,7 +32,7 @@ set `import-private-functions` `true`;
 
 create type test.DBLPTypetmp as
 {
-  id : int32,
+  id : integer,
   dblpid : string,
   authors : string,
   misc : string

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_04.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_04.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_04.sqlpp
index 7d543b5..7cc7819 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_04.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_04.sqlpp
@@ -32,7 +32,7 @@ set `import-private-functions` `true`;
 
 create type test.DBLPTypetmp as
 {
-  id : int32,
+  id : integer,
   dblpid : string,
   authors : string,
   misc : string
@@ -40,7 +40,7 @@ create type test.DBLPTypetmp as
 
 create type test.CSXTypetmp as
 {
-  id : int32,
+  id : integer,
   csxid : string,
   authors : string,
   misc : string

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_01.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_01.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_01.sqlpp
index 5ae9fee..396ed40 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_01.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_01.sqlpp
@@ -30,7 +30,7 @@ use test;
 
 create type test.DBLPTypetmp as
 {
-  id : int32,
+  id : integer,
   dblpid : string,
   authors : string,
   misc : string
@@ -38,7 +38,7 @@ create type test.DBLPTypetmp as
 
 create type test.CSXTypetmp as
  closed {
-  id : int32,
+  id : integer,
   csxid : string,
   title : string,
   authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_02.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_02.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_02.sqlpp
index 82d00e8..14ac42b 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_02.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_02.sqlpp
@@ -30,7 +30,7 @@ use test;
 
 create type test.DBLPTypetmp as
  closed {
-  id : int32,
+  id : integer,
   dblpid : string,
   title : string,
   authors : string,
@@ -39,7 +39,7 @@ create type test.DBLPTypetmp as
 
 create type test.CSXTypetmp as
 {
-  id : int32,
+  id : integer,
   csxid : string,
   authors : string,
   misc : string

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_03.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_03.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_03.sqlpp
index 5f46785..e12c6d9 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_03.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_03.sqlpp
@@ -30,7 +30,7 @@ use test;
 
 create type test.DBLPTypetmp as
 {
-  id : int32,
+  id : integer,
   dblpid : string,
   authors : string,
   misc : string

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_04.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_04.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_04.sqlpp
index 4608aa1..265af81 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_04.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_04.sqlpp
@@ -30,7 +30,7 @@ use test;
 
 create type test.DBLPTypetmp as
 {
-  id : int32,
+  id : integer,
   dblpid : string,
   authors : string,
   misc : string
@@ -38,7 +38,7 @@ create type test.DBLPTypetmp as
 
 create type test.CSXTypetmp as
 {
-  id : int32,
+  id : integer,
   csxid : string,
   authors : string,
   misc : string

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check-after-btree-access.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check-after-btree-access.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check-after-btree-access.sqlpp
index d564cc5..13c2eab 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check-after-btree-access.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check-after-btree-access.sqlpp
@@ -34,21 +34,21 @@ create type test.TwitterUserType as
  closed {
   `screen-name` : string,
   lang : string,
-  `friends-count` : int32,
-  `statuses-count` : int32,
+  `friends-count` : integer,
+  `statuses-count` : integer,
   name : string,
-  `followers-count` : int32
+  `followers-count` : integer
 }
 
 create type test.TweetMessageNestedType as
 {
-  tweetid : int64,
+  tweetid : bigint,
   user : TwitterUserType,
   `sender-location` : point,
   `send-time` : datetime,
   `referred-topics` : {{string}},
-  countA : int32,
-  countB : int32
+  countA : integer,
+  countB : integer
 }
 
 create type test.TweetMessageType as
@@ -71,5 +71,5 @@ select element 
{'t1':t1.nested.tweetid,'t2':t2.nested.tweetid,'sim':sim[1]}
 from  TweetMessages as t1,
       TweetMessages as t2
 with  sim as 
test.`similarity-jaccard-check`(test.`word-tokens`(t1.nested.`message-text`),test.`word-tokens`(t2.nested.`message-text`),0.600000f)
-where (sim[0] and (t1.nested.tweetid < test.int64('20')) and 
(t2.nested.tweetid != t1.nested.tweetid))
+where (sim[0] and (t1.nested.tweetid < test.bigint('20')) and 
(t2.nested.tweetid != t1.nested.tweetid))
 ;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_01.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_01.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_01.sqlpp
index f7405a6..1ddd310 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_01.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_01.sqlpp
@@ -30,7 +30,7 @@ use test;
 
 create type test.DBLPTypetmp as
 {
-  id : int32,
+  id : integer,
   dblpid : string,
   authors : string,
   misc : string
@@ -38,7 +38,7 @@ create type test.DBLPTypetmp as
 
 create type test.CSXTypetmp as
  closed {
-  id : int32,
+  id : integer,
   csxid : string,
   title : string,
   authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_02.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_02.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_02.sqlpp
index b0bc9ab..5b17582 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_02.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_02.sqlpp
@@ -30,7 +30,7 @@ use test;
 
 create type test.DBLPTypetmp as
  closed {
-  id : int32,
+  id : integer,
   dblpid : string,
   title : string,
   authors : string,
@@ -39,7 +39,7 @@ create type test.DBLPTypetmp as
 
 create type test.CSXTypetmp as
 {
-  id : int32,
+  id : integer,
   csxid : string,
   authors : string,
   misc : string

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_03.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_03.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_03.sqlpp
index 69c75a5..e47df3f 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_03.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_03.sqlpp
@@ -30,7 +30,7 @@ use test;
 
 create type test.DBLPTypetmp as
 {
-  id : int32,
+  id : integer,
   dblpid : string,
   authors : string,
   misc : string

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_04.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_04.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_04.sqlpp
index a567aca..f3a42fb 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_04.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_04.sqlpp
@@ -30,7 +30,7 @@ use test;
 
 create type test.DBLPTypetmp as
 {
-  id : int32,
+  id : integer,
   dblpid : string,
   authors : string,
   misc : string
@@ -38,7 +38,7 @@ create type test.DBLPTypetmp as
 
 create type test.CSXTypetmp as
 {
-  id : int32,
+  id : integer,
   dblpid : string,
   authors : string,
   misc : string

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-inline.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-inline.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-inline.sqlpp
index 9e0c4b7..a8fac65 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-inline.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-inline.sqlpp
@@ -32,7 +32,7 @@ use test;
 
 create type test.DBLPTypetmp as
 {
-  id : int32,
+  id : integer,
   dblpid : string,
   authors : string,
   misc : string

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard_01.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard_01.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard_01.sqlpp
index 41bac97..e08b76b 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard_01.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard_01.sqlpp
@@ -30,7 +30,7 @@ use test;
 
 create type test.DBLPTypetmp as
 {
-  id : int32,
+  id : integer,
   dblpid : string,
   authors : string,
   misc : string
@@ -38,7 +38,7 @@ create type test.DBLPTypetmp as
 
 create type test.CSXTypetmp as
  closed {
-  id : int32,
+  id : integer,
   csxid : string,
   title : string,
   authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard_02.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard_02.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard_02.sqlpp
index a4613cd..827fc48 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard_02.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard_02.sqlpp
@@ -30,7 +30,7 @@ use test;
 
 create type test.DBLPTypetmp as
  closed {
-  id : int32,
+  id : integer,
   dblpid : string,
   title : string,
   authors : string,
@@ -39,7 +39,7 @@ create type test.DBLPTypetmp as
 
 create type test.CSXTypetmp as
 {
-  id : int32,
+  id : integer,
   csxid : string,
   authors : string,
   misc : string

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard_03.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard_03.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard_03.sqlpp
index c78763e..a93396f 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard_03.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard_03.sqlpp
@@ -30,7 +30,7 @@ use test;
 
 create type test.DBLPTypetmp as
 {
-  id : int32,
+  id : integer,
   dblpid : string,
   authors : string,
   misc : string

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard_04.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard_04.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard_04.sqlpp
index 13e92d7..22992bc 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard_04.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard_04.sqlpp
@@ -30,7 +30,7 @@ use test;
 
 create type test.DBLPTypetmp as
 {
-  id : int32,
+  id : integer,
   dblpid : string,
   authors : string,
   misc : string
@@ -38,7 +38,7 @@ create type test.DBLPTypetmp as
 
 create type test.CSXTypetmp as
 {
-  id : int32,
+  id : integer,
   csxid : string,
   authors : string,
   misc : string

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.sqlpp
index 0f6afda..78ae7bf 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.sqlpp
@@ -33,21 +33,21 @@ create type test.TwitterUserType as
  closed {
   `screen-name` : string,
   lang : string,
-  `friends-count` : int32,
-  `statuses-count` : int32,
+  `friends-count` : integer,
+  `statuses-count` : integer,
   name : string,
-  `followers-count` : int32
+  `followers-count` : integer
 }
 
 create type test.TweetMessageNestedType as
 {
-  tweetid : int64,
+  tweetid : bigint,
   user : TwitterUserType,
   `send-time` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string,
-  countA : int32,
-  countB : int32
+  countA : integer,
+  countB : integer
 }
 
 create type test.TweetMessageType as
@@ -74,6 +74,6 @@ select element 
{'tweetid1':t1.nested.tweetid,'loc1':t1.nested.`sender-location`,
     )}
 from  TweetMessages as t1
 with  n as test.`create-circle`(t1.nested.`sender-location`,0.5)
-where (t1.nested.tweetid < test.int64('10'))
+where (t1.nested.tweetid < test.bigint('10'))
 order by t1.nested.tweetid
 ;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.sqlpp
index 611ba39..5fd44ec 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.sqlpp
@@ -33,21 +33,21 @@ create type test.TwitterUserType as
  closed {
   `screen-name` : string,
   lang : string,
-  `friends-count` : int32,
-  `statuses-count` : int32,
+  `friends-count` : integer,
+  `statuses-count` : integer,
   name : string,
-  `followers-count` : int32
+  `followers-count` : integer
 }
 
 create type test.TweetMessageNestedType as
 {
-  tweetid : int64,
+  tweetid : bigint,
   user : TwitterUserType,
   `send-time` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string,
-  countA : int32,
-  countB : int32
+  countA : integer,
+  countB : integer
 }
 
 create type test.TweetMessageType as
@@ -74,6 +74,6 @@ select element 
{'tweetid1':t1.nested.tweetid,'loc1':t1.nested.`sender-location`,
     )}
 from  TweetMessages as t1
 with  n as test.`create-circle`(t1.nested.`sender-location`,0.5)
-where (t1.nested.tweetid < test.int64('10'))
+where (t1.nested.tweetid < test.bigint('10'))
 order by t1.nested.tweetid
 ;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_01.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_01.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_01.sqlpp
index 69dfb0a..b38a6e3 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_01.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_01.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.MyRecord as
  closed {
-  id : int32,
+  id : integer,
   point : point,
   kwds : string,
   line1 : line,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_02.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_02.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_02.sqlpp
index bd6797e..67cfc52 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_02.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_02.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.MyRecord as
  closed {
-  id : int32,
+  id : integer,
   point : point,
   kwds : string,
   line1 : line,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_03.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_03.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_03.sqlpp
index a6e4cbb..2fc5cc5 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_03.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_03.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.MyRecord as
  closed {
-  id : int32,
+  id : integer,
   point : point,
   kwds : string,
   line1 : line,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_04.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_04.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_04.sqlpp
index 942edfa..bf11ae2 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_04.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_04.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.MyRecordNestedOpen as
 {
-  id : int32,
+  id : integer,
   kwds : string,
   line1 : line,
   line2 : line,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_05.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_05.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_05.sqlpp
index 6241800..6b7e58c 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_05.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_05.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.MyRecordNestedOpen as
 {
-  id : int32,
+  id : integer,
   kwds : string,
   line1 : line,
   line2 : line,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested_loj2.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested_loj2.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested_loj2.sqlpp
index 0380f53..eb113d7 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested_loj2.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested_loj2.sqlpp
@@ -25,10 +25,10 @@ use tpch;
 
 create type tpch.LineItemType as
  closed {
-  l_orderkey : int32,
-  l_partkey : int32,
-  l_suppkey : int32,
-  l_linenumber : int32,
+  l_orderkey : integer,
+  l_partkey : integer,
+  l_suppkey : integer,
+  l_linenumber : integer,
   l_quantity : double,
   l_extendedprice : double,
   l_discount : double,
@@ -45,23 +45,23 @@ create type tpch.LineItemType as
 
 create type tpch.OrderType as
  closed {
-  o_orderkey : int32,
-  o_custkey : int32,
+  o_orderkey : integer,
+  o_custkey : integer,
   o_orderstatus : string,
   o_totalprice : double,
   o_orderdate : string,
   o_orderpriority : string,
   o_clerk : string,
-  o_shippriority : int32,
+  o_shippriority : integer,
   o_comment : string
 }
 
 create type tpch.CustomerType as
  closed {
-  c_custkey : int32,
+  c_custkey : integer,
   c_name : string,
   c_address : string,
-  c_nationkey : int32,
+  c_nationkey : integer,
   c_phone : string,
   c_acctbal : double,
   c_mktsegment : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested_loj3.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested_loj3.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested_loj3.sqlpp
index 18e7a03..b8cd6d1 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested_loj3.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested_loj3.sqlpp
@@ -25,10 +25,10 @@ use tpch;
 
 create type tpch.LineItemType as
  closed {
-  l_orderkey : int32,
-  l_partkey : int32,
-  l_suppkey : int32,
-  l_linenumber : int32,
+  l_orderkey : integer,
+  l_partkey : integer,
+  l_suppkey : integer,
+  l_linenumber : integer,
   l_quantity : double,
   l_extendedprice : double,
   l_discount : double,
@@ -45,23 +45,23 @@ create type tpch.LineItemType as
 
 create type tpch.OrderType as
  closed {
-  o_orderkey : int32,
-  o_custkey : int32,
+  o_orderkey : integer,
+  o_custkey : integer,
   o_orderstatus : string,
   o_totalprice : double,
   o_orderdate : string,
   o_orderpriority : string,
   o_clerk : string,
-  o_shippriority : int32,
+  o_shippriority : integer,
   o_comment : string
 }
 
 create type tpch.CustomerType as
  closed {
-  c_custkey : int32,
+  c_custkey : integer,
   c_name : string,
   c_address : string,
-  c_nationkey : int32,
+  c_nationkey : integer,
   c_phone : string,
   c_acctbal : double,
   c_mktsegment : string,
@@ -70,9 +70,9 @@ create type tpch.CustomerType as
 
 create type tpch.PartSuppType as
  closed {
-  ps_partkey : int32,
-  ps_suppkey : int32,
-  ps_availqty : int32,
+  ps_partkey : integer,
+  ps_suppkey : integer,
+  ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.sqlpp
index d5f8b57..2995866 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.sqlpp
@@ -33,26 +33,26 @@ create type test.TwitterUserType as
  closed {
   `screen-name` : string,
   lang : string,
-  `friends-count` : int32,
-  `statuses-count` : int32,
+  `friends-count` : integer,
+  `statuses-count` : integer,
   name : string,
-  `followers-count` : int32
+  `followers-count` : integer
 }
 
 create type test.TweetMessageType as
 {
-  tweetid : int64,
+  tweetid : bigint,
   user : TwitterUserType,
   `sender-location` : point,
   `send-time` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string,
-  countA : int32
+  countA : integer
 }
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
-create  index msgCountBIx  on TweetMessages (countB:int32?) type btree 
enforced;
+create  index msgCountBIx  on TweetMessages (countB:integer?) type btree 
enforced;
 
 write output to 
asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_01.adm"
 select element {'tweetid1':t1.tweetid,'count1':t1.countA,'t2info':(
@@ -62,6 +62,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/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.sqlpp
index e1e7dbc..bbffccc 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.sqlpp
@@ -33,15 +33,15 @@ create type test.TwitterUserType as
  closed {
   `screen-name` : string,
   lang : string,
-  `friends-count` : int32,
-  `statuses-count` : int32,
+  `friends-count` : integer,
+  `statuses-count` : integer,
   name : string,
-  `followers-count` : int32
+  `followers-count` : integer
 }
 
 create type test.TweetMessageType as
 {
-  tweetid : int64,
+  tweetid : bigint,
   user : TwitterUserType,
   `sender-location` : point,
   `send-time` : datetime,
@@ -51,9 +51,9 @@ create type test.TweetMessageType as
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
-create  index msgCountAIx  on TweetMessages (countA:int32?) type btree 
enforced;
+create  index msgCountAIx  on TweetMessages (countA:integer?) type btree 
enforced;
 
-create  index msgCountBIx  on TweetMessages (countB:int32?) type btree 
enforced;
+create  index msgCountBIx  on TweetMessages (countB:integer?) type btree 
enforced;
 
 write output to 
asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_01.adm"
 select element {'tweetid1':t1.tweetid,'count1':t1.countA,'t2info':(
@@ -63,6 +63,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/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.sqlpp
index 55a2eef..28959b4 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.sqlpp
@@ -33,26 +33,26 @@ create type test.TwitterUserType as
  closed {
   `screen-name` : string,
   lang : string,
-  `friends-count` : int32,
-  `statuses-count` : int32,
+  `friends-count` : integer,
+  `statuses-count` : integer,
   name : string,
-  `followers-count` : int32
+  `followers-count` : integer
 }
 
 create type test.TweetMessageType as
 {
-  tweetid : int64,
+  tweetid : bigint,
   user : TwitterUserType,
   `sender-location` : point,
   `send-time` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string,
-  countA : int32
+  countA : integer
 }
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
-create  index msgCountBIx  on TweetMessages (countB:int32?) type btree 
enforced;
+create  index msgCountBIx  on TweetMessages (countB:integer?) type btree 
enforced;
 
 write output to 
asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_02.adm"
 select element {'tweetid1':t1.tweetid,'count1':t1.countA,'t2info':(
@@ -62,6 +62,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/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.sqlpp
index 19dfce8..ce88e60 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.sqlpp
@@ -33,15 +33,15 @@ create type test.TwitterUserType as
  closed {
   `screen-name` : string,
   lang : string,
-  `friends-count` : int32,
-  `statuses-count` : int32,
+  `friends-count` : integer,
+  `statuses-count` : integer,
   name : string,
-  `followers-count` : int32
+  `followers-count` : integer
 }
 
 create type test.TweetMessageType as
 {
-  tweetid : int64,
+  tweetid : bigint,
   user : TwitterUserType,
   `sender-location` : point,
   `send-time` : datetime,
@@ -51,9 +51,9 @@ create type test.TweetMessageType as
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
-create  index msgCountAIx  on TweetMessages (countA:int32?) type btree 
enforced;
+create  index msgCountAIx  on TweetMessages (countA:integer?) type btree 
enforced;
 
-create  index msgCountBIx  on TweetMessages (countB:int32?) type btree 
enforced;
+create  index msgCountBIx  on TweetMessages (countB:integer?) type btree 
enforced;
 
 write output to 
asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_02.adm"
 select element {'tweetid1':t1.tweetid,'count1':t1.countA,'t2info':(
@@ -63,6 +63,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/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_01.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_01.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_01.sqlpp
index 95ea3be..683fac0 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_01.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_01.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.Name as
 {
-  id : int32
+  id : integer
 }
 
 create  dataset Names(Name) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_02.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_02.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_02.sqlpp
index a4a75c3..c71faf9 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_02.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_02.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.Name as
 {
-  id : int32
+  id : integer
 }
 
 create  dataset Names(Name) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_03.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_03.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_03.sqlpp
index 5b8bf85..e60b352 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_03.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_03.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.Name as
 {
-  id : int32
+  id : integer
 }
 
 create  dataset Names(Name) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_01.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_01.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_01.sqlpp
index 01a1ff0..ec084f4 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_01.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_01.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.Name as
 {
-  id : int32
+  id : integer
 }
 
 create  dataset Names(Name) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_02.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_02.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_02.sqlpp
index a2be61f..88c833f 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_02.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_02.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.Name as
 {
-  id : int32
+  id : integer
 }
 
 create  dataset Names(Name) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_03.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_03.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_03.sqlpp
index d24e480..ac41385 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_03.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_03.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.Name as
 {
-  id : int32
+  id : integer
 }
 
 create  dataset Names(Name) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_04.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_04.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_04.sqlpp
index aab9fc5..1aed2f9 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_04.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_04.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.Name as
 {
-  id : int32
+  id : integer
 }
 
 create  dataset Names(Name) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_05.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_05.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_05.sqlpp
index 911b100..4bc05bd 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_05.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_05.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.Name as
 {
-  id : int32
+  id : integer
 }
 
 create  dataset Names(Name) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_06.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_06.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_06.sqlpp
index f8a12a7..2e101c5 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_06.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_06.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.Name as
 {
-  id : int32
+  id : integer
 }
 
 create  dataset Names(Name) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join-multiindex.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join-multiindex.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join-multiindex.sqlpp
index cb39151..e2c6242 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join-multiindex.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join-multiindex.sqlpp
@@ -40,22 +40,22 @@ create type test.EmploymentType as
 
 create type test.FacebookUserType as
  closed {
-  id : int32,
-  `id-copy` : int32,
+  id : integer,
+  `id-copy` : integer,
   alias : string,
   name : string,
   `user-since` : datetime,
   `user-since-copy` : datetime,
-  `friend-ids` : {{int32}},
+  `friend-ids` : {{integer}},
   employment : [EmploymentType]
 }
 
 create type test.FacebookMessageType as
 {
-  `message-id` : int32,
-  `message-id-copy` : int32,
-  `author-id` : int32,
-  `in-response-to` : int32?,
+  `message-id` : integer,
+  `message-id-copy` : integer,
+  `author-id` : integer,
+  `in-response-to` : integer?,
   `sender-location` : point?,
   message : string
 }
@@ -64,7 +64,7 @@ create  dataset FacebookUsers(FacebookUserType) primary key 
id;
 
 create  dataset FacebookMessages(FacebookMessageType) primary key `message-id`;
 
-create  index fbmIdxAutId  if not exists  on FacebookMessages 
(`author-id-copy`:int32?) type btree enforced;
+create  index fbmIdxAutId  if not exists  on FacebookMessages 
(`author-id-copy`:integer?) type btree enforced;
 
 write output to 
asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join-multiindex.adm"
 select element 
{'fbu-ID':user.id,'fbm-auth-ID':message.`author-id`,'uname':user.name,'message':message.message}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join-multipred.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join-multipred.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join-multipred.sqlpp
index 66cb93c..bef57e1 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join-multipred.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join-multipred.sqlpp
@@ -33,7 +33,7 @@ use test;
 
 create type test.DBLPType as
 {
-  id : int32,
+  id : integer,
   dblpid : string,
   authors : string,
   misc : string
@@ -41,7 +41,7 @@ create type test.DBLPType as
 
 create type test.CSXType as
  closed {
-  id : int32,
+  id : integer,
   csxid : string,
   title : string,
   authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_01.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_01.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_01.sqlpp
index cb5c68f..a5d3d7b 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_01.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_01.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.DBLPType as
 {
-  id : int32,
+  id : integer,
   dblpid : string,
   authors : string,
   misc : string
@@ -39,7 +39,7 @@ create type test.DBLPType as
 
 create type test.CSXType as
  closed {
-  id : int32,
+  id : integer,
   csxid : string,
   title : string,
   authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_02.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_02.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_02.sqlpp
index 42a936e..04e1a25 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_02.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_02.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.DBLPType as
  closed {
-  id : int32,
+  id : integer,
   dblpid : string,
   title : string,
   authors : string,
@@ -40,7 +40,7 @@ create type test.DBLPType as
 
 create type test.CSXType as
 {
-  id : int32,
+  id : integer,
   csxid : string,
   authors : string,
   misc : string

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_03.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_03.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_03.sqlpp
index 8192d3b..a623356 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_03.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_03.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.DBLPType as
 {
-  id : int32,
+  id : integer,
   dblpid : string,
   authors : string,
   misc : string

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_04.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_04.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_04.sqlpp
index 38433b3..b0eaef0 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_04.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_04.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.DBLPType as
 {
-  id : int32,
+  id : integer,
   dblpid : string,
   authors : string,
   misc : string
@@ -39,7 +39,7 @@ create type test.DBLPType as
 
 create type test.CSXType as
 {
-  id : int32,
+  id : integer,
   csxid : string,
   authors : string,
   misc : string

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_05.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_05.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_05.sqlpp
index 2de47db..050d58f 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_05.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_05.sqlpp
@@ -32,7 +32,7 @@ use test;
 
 create type test.DBLPType as
 {
-  id : int32,
+  id : integer,
   dblpid : string,
   authors : string,
   misc : string
@@ -40,7 +40,7 @@ create type test.DBLPType as
 
 create type test.CSXType as
 {
-  id : int32,
+  id : integer,
   csxid : string,
   authors : string,
   misc : string

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-33.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-33.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-33.sqlpp
index 779c692..4156eb7 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-33.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-33.sqlpp
@@ -33,7 +33,7 @@ use test;
 write output to asterix_nc1:"rttest/btree-index_btree-primary-31.adm"
 create type test.TestType as
 {
-  id : int32
+  id : integer
 }
 
 create  dataset testdst(TestType) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-34.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-34.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-34.sqlpp
index 6fa7129..c622c5e 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-34.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-34.sqlpp
@@ -33,7 +33,7 @@ use test;
 write output to asterix_nc1:"rttest/btree-index_btree-secondary-32.adm"
 create type test.TestType as
 {
-  id : int32
+  id : integer
 }
 
 create  dataset testdst(TestType) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-35.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-35.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-35.sqlpp
index 8d70329..0cd0de2 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-35.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-35.sqlpp
@@ -33,7 +33,7 @@ use test;
 write output to asterix_nc1:"rttest/btree-index_btree-secondary-33.adm"
 create type test.TestType as
 {
-  id : int32
+  id : integer
 }
 
 create  dataset testdst(TestType) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-36.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-36.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-36.sqlpp
index f8d9d42..0cd320e 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-36.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-36.sqlpp
@@ -33,7 +33,7 @@ use test;
 write output to asterix_nc1:"rttest/btree-index_btree-secondary-34.adm"
 create type test.TestType as
 {
-  id : int32
+  id : integer
 }
 
 create  dataset testdst(TestType) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-37.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-37.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-37.sqlpp
index 0d42542..559620b 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-37.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-37.sqlpp
@@ -33,7 +33,7 @@ use test;
 write output to asterix_nc1:"rttest/btree-index_btree-secondary-35.adm"
 create type test.TestType as
 {
-  id : int32
+  id : integer
 }
 
 create  dataset testdst(TestType) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-38.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-38.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-38.sqlpp
index 6c1484f..a9f60cf 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-38.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-38.sqlpp
@@ -33,7 +33,7 @@ use test;
 write output to asterix_nc1:"rttest/btree-index_btree-secondary-36.adm"
 create type test.TestType as
 {
-  id : int32
+  id : integer
 }
 
 create  dataset testdst(TestType) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-39.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-39.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-39.sqlpp
index 470371d..6a1bea8 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-39.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-39.sqlpp
@@ -32,7 +32,7 @@ use test;
 write output to asterix_nc1:"rttest/btree-index_btree-secondary-37.adm"
 create type test.TestType as
 {
-  id : int32
+  id : integer
 }
 
 create  dataset testdst(TestType) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-40.sqlpp
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-40.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-40.sqlpp
index 53e28b2..d731726 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-40.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-40.sqlpp
@@ -32,7 +32,7 @@ use test;
 write output to asterix_nc1:"rttest/btree-index_btree-secondary-38.adm"
 create type test.TestType as
 {
-  id : int32
+  id : integer
 }
 
 create  dataset testdst(TestType) primary key id;

Reply via email to