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

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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_01.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_01.ast
index 5cd18a9..dfc5806 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_01.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Set import-private-functions=true
 TypeDecl DBLPType [
   open RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     authors : string,
     misc : string
@@ -10,7 +10,7 @@ TypeDecl DBLPType [
 ]
 TypeDecl CSXType [
   closed RecordType {
-    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/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_02.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_02.ast
index 350b374..17b5d69 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_02.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Set import-private-functions=true
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,
@@ -11,7 +11,7 @@ TypeDecl DBLPType [
 ]
 TypeDecl CSXType [
   open RecordType {
-    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/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_03.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_03.ast
index e66eb56..0d988a9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_03.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Set import-private-functions=true
 TypeDecl DBLPType [
   open RecordType {
-    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/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_04.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_04.ast
index 5d5a853..0063692 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_04.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Set import-private-functions=true
 TypeDecl DBLPType [
   open RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     authors : string,
     misc : string
@@ -10,7 +10,7 @@ TypeDecl DBLPType [
 ]
 TypeDecl CSXType [
   open RecordType {
-    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/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_inline_03.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_inline_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_inline_03.ast
index f704f9e..a7f8c69 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_inline_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_inline_03.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Set import-private-functions=true
 TypeDecl DBLPType [
   open RecordType {
-    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/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_01.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_01.ast
index 0d2b444..2c470d0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_01.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Set import-private-functions=true
 TypeDecl DBLPType [
   open RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     authors : string,
     misc : string
@@ -10,7 +10,7 @@ TypeDecl DBLPType [
 ]
 TypeDecl CSXType [
   closed RecordType {
-    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/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_02.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_02.ast
index ee2e336..4eaed02 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_02.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Set import-private-functions=true
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,
@@ -11,7 +11,7 @@ TypeDecl DBLPType [
 ]
 TypeDecl CSXType [
   open RecordType {
-    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/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_03.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_03.ast
index 4b297e1..85c0135 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_03.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Set import-private-functions=true
 TypeDecl DBLPType [
   open RecordType {
-    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/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_04.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_04.ast
index e630757..bfd6fa9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_04.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Set import-private-functions=true
 TypeDecl DBLPType [
   open RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     authors : string,
     misc : string
@@ -10,7 +10,7 @@ TypeDecl DBLPType [
 ]
 TypeDecl CSXType [
   open RecordType {
-    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/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_inline_03.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_inline_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_inline_03.ast
index b244ffb..336e8b6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_inline_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_inline_03.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Set import-private-functions=true
 TypeDecl DBLPType [
   open RecordType {
-    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/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_01.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_01.ast
index 0e58695..5b9fd80 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_01.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   open RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     authors : string,
     misc : string
@@ -9,7 +9,7 @@ TypeDecl DBLPType [
 ]
 TypeDecl CSXType [
   closed RecordType {
-    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/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_02.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_02.ast
index 407bcf7..54dc66e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_02.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,
@@ -10,7 +10,7 @@ TypeDecl DBLPType [
 ]
 TypeDecl CSXType [
   open RecordType {
-    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/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_03.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_03.ast
index b25b620..c88e567 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_03.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   open RecordType {
-    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/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_04.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_04.ast
index 627ccae..31a2d5d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_04.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   open RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     authors : string,
     misc : string
@@ -9,7 +9,7 @@ TypeDecl DBLPType [
 ]
 TypeDecl CSXType [
   open RecordType {
-    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/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check-after-btree-access.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check-after-btree-access.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check-after-btree-access.ast
index f547643..15be700 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check-after-btree-access.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check-after-btree-access.ast
@@ -3,22 +3,22 @@ TypeDecl TwitterUserType [
   closed RecordType {
     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
   }
 ]
 TypeDecl TweetMessageType [
   open RecordType {
-    tweetid : int64,
+    tweetid : bigint,
     user : TwitterUserType,
     sender-location : point,
     send-time : datetime,
     referred-topics : UnorderedList <string>
 ,
-    countA : int32,
-    countB : int32
+    countA : integer,
+    countB : integer
   }
 ]
 DatasetDecl TweetMessages(TweetMessageType) partitioned by [[tweetid]]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_01.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_01.ast
index 293612b..c7b47c7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_01.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   open RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     authors : string,
     misc : string
@@ -9,7 +9,7 @@ TypeDecl DBLPType [
 ]
 TypeDecl CSXType [
   closed RecordType {
-    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/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_02.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_02.ast
index f66ffa7..a62d8da 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_02.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,
@@ -10,7 +10,7 @@ TypeDecl DBLPType [
 ]
 TypeDecl CSXType [
   open RecordType {
-    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/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_03.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_03.ast
index 0d50b5d..2052511 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_03.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   open RecordType {
-    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/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_04.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_04.ast
index 1220f3f..cb55ef9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_04.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   open RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     authors : string,
     misc : string
@@ -9,7 +9,7 @@ TypeDecl DBLPType [
 ]
 TypeDecl CSXType [
   open RecordType {
-    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/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_inline_03.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_inline_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_inline_03.ast
index 9c9fff8..7030392 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_inline_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_inline_03.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   open RecordType {
-    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/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_01.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_01.ast
index 16fad9b..2cbe046 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_01.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   open RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     authors : string,
     misc : string
@@ -9,7 +9,7 @@ TypeDecl DBLPType [
 ]
 TypeDecl CSXType [
   closed RecordType {
-    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/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_02.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_02.ast
index 7442f5c..ee010a7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_02.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,
@@ -10,7 +10,7 @@ TypeDecl DBLPType [
 ]
 TypeDecl CSXType [
   open RecordType {
-    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/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_03.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_03.ast
index 39aab29..c6f2392 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_03.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   open RecordType {
-    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/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_04.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_04.ast
index ea7d4cd..b35e9db 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_04.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   open RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     authors : string,
     misc : string
@@ -9,7 +9,7 @@ TypeDecl DBLPType [
 ]
 TypeDecl CSXType [
   open RecordType {
-    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/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_inline_03.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_inline_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_inline_03.ast
index 5d3058e..e7c6029 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_inline_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_inline_03.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPType [
   open RecordType {
-    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/results_parser_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
index eaf0b26..c86b6fc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
@@ -3,22 +3,22 @@ TypeDecl TwitterUserType [
   closed RecordType {
     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
   }
 ]
 TypeDecl TweetMessageType [
   open RecordType {
-    tweetid : int64,
+    tweetid : bigint,
     user : TwitterUserType,
     send-time : datetime,
     referred-topics : UnorderedList <string>
 ,
     message-text : string,
-    countA : int32,
-    countB : int32
+    countA : integer,
+    countB : integer
   }
 ]
 DatasetDecl TweetMessages(TweetMessageType) partitioned by [[tweetid]]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
index 3bc4067..e8b41fb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
@@ -3,22 +3,22 @@ TypeDecl TwitterUserType [
   closed RecordType {
     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
   }
 ]
 TypeDecl TweetMessageType [
   open RecordType {
-    tweetid : int64,
+    tweetid : bigint,
     user : TwitterUserType,
     send-time : datetime,
     referred-topics : UnorderedList <string>
 ,
     message-text : string,
-    countA : int32,
-    countB : int32
+    countA : integer,
+    countB : integer
   }
 ]
 DatasetDecl TweetMessages(TweetMessageType) partitioned by [[tweetid]]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_01.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_01.ast
index 5ca33b1..5217c93 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_01.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl MyRecord [
   closed RecordType {
-    id : int32,
+    id : integer,
     point : point,
     kwds : string,
     line1 : line,
@@ -13,7 +13,7 @@ TypeDecl MyRecord [
 ]
 TypeDecl MyRecordOpen [
   open RecordType {
-    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/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_02.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_02.ast
index b98868a..0472b4b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_02.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl MyRecord [
   closed RecordType {
-    id : int32,
+    id : integer,
     point : point,
     kwds : string,
     line1 : line,
@@ -13,7 +13,7 @@ TypeDecl MyRecord [
 ]
 TypeDecl MyRecordOpen [
   open RecordType {
-    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/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_03.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_03.ast
index a05ea27..b8f0de2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_03.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl MyRecord [
   open RecordType {
-    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/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_04.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_04.ast
index edf9f3c..b3a61a3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_04.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl MyRecord [
   open RecordType {
-    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/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_05.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_05.ast
index edf9f3c..b3a61a3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_05.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl MyRecord [
   open RecordType {
-    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/results_parser_sqlpp/orderby-desc-using-gby.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orderby-desc-using-gby.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orderby-desc-using-gby.ast
index 8de7e6f..e92496d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orderby-desc-using-gby.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orderby-desc-using-gby.ast
@@ -1,19 +1,19 @@
 DataverseUse gby-using-orderby-desc
 TypeDecl AddressType [
   closed RecordType {
-    number : int32,
+    number : integer,
     street : string,
     city : string
   }
 ]
 TypeDecl CustomerType [
   closed RecordType {
-    cid : int32,
+    cid : integer,
     name : string,
-    age : int32?,
+    age : integer?,
     address : AddressType?,
     lastorder :       open RecordType {
-        oid : int32,
+        oid : integer,
         total : float
       }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-aggreg.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-aggreg.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-aggreg.ast
index 91378e0..422ca7b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-aggreg.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-aggreg.ast
@@ -1,8 +1,8 @@
 DataverseUse orders-aggreg
 TypeDecl OrderType [
   closed RecordType {
-    oid : int32,
-    cid : int32,
+    oid : integer,
+    cid : integer,
     orderstatus : string,
     orderpriority : string,
     clerk : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-composite-index-search.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-composite-index-search.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-composite-index-search.ast
index 964efa8..96a4bc9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-composite-index-search.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-composite-index-search.ast
@@ -1,14 +1,14 @@
 DataverseUse index_search
 TypeDecl OrderType [
   closed RecordType {
-    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
   }
 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-conjunctive-open_01.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-conjunctive-open_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-conjunctive-open_01.ast
index db63af0..dd0c4ea 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-conjunctive-open_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-conjunctive-open_01.ast
@@ -1,14 +1,14 @@
 DataverseUse tpch
 TypeDecl OrderType [
   open RecordType {
-    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
   }
 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-conjunctive-open_02.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-conjunctive-open_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-conjunctive-open_02.ast
index 1d0084f..97b43b2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-conjunctive-open_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-conjunctive-open_02.ast
@@ -1,14 +1,14 @@
 DataverseUse tpch
 TypeDecl OrderType [
   open RecordType {
-    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
   }
 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-conjunctive_01.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-conjunctive_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-conjunctive_01.ast
index 9b910fc..2cc53a8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-conjunctive_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-conjunctive_01.ast
@@ -1,14 +1,14 @@
 DataverseUse tpch
 TypeDecl OrderType [
   closed RecordType {
-    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
   }
 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-conjunctive_02.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-conjunctive_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-conjunctive_02.ast
index 006cc86..3609c78 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-conjunctive_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-conjunctive_02.ast
@@ -1,14 +1,14 @@
 DataverseUse tpch
 TypeDecl OrderType [
   closed RecordType {
-    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
   }
 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-open.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-open.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-open.ast
index eb2a419..9222a7e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-open.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-open.ast
@@ -1,14 +1,14 @@
 DataverseUse index_search
 TypeDecl OrderType [
   open RecordType {
-    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
   }
 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search.ast
index a76d6eb..5f4d438 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search.ast
@@ -1,14 +1,14 @@
 DataverseUse index_search
 TypeDecl OrderType [
   closed RecordType {
-    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
   }
 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/prim-idx-search-open.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/prim-idx-search-open.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/prim-idx-search-open.ast
index 22a1c0a..bd7c74c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/prim-idx-search-open.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/prim-idx-search-open.ast
@@ -1,14 +1,14 @@
 DataverseUse prim_index_search
 TypeDecl OrderType [
   open RecordType {
-    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
   }
 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/prim-idx-search.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/prim-idx-search.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/prim-idx-search.ast
index 815b2f1..da4c90b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/prim-idx-search.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/prim-idx-search.ast
@@ -1,14 +1,14 @@
 DataverseUse prim_index_search
 TypeDecl OrderType [
   closed RecordType {
-    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
   }
 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/pull_select_above_eq_join.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/pull_select_above_eq_join.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/pull_select_above_eq_join.ast
index c0010bf..7b5ac60 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/pull_select_above_eq_join.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/pull_select_above_eq_join.ast
@@ -1,19 +1,19 @@
 DataverseUse pull-select-above-eq-join
 TypeDecl UserType [
   open RecordType {
-    uid : int32,
+    uid : integer,
     name : string,
     city : string,
-    lottery_numbers : UnorderedList <int32>
+    lottery_numbers : UnorderedList <integer>
 
   }
 ]
 TypeDecl VisitorType [
   open RecordType {
-    vid : int32,
+    vid : integer,
     name : string,
     city : string,
-    lottery_numbers : UnorderedList <int32>
+    lottery_numbers : UnorderedList <integer>
 
   }
 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/push-project-through-group.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/push-project-through-group.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/push-project-through-group.ast
index 239c3ff..6bb15c8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/push-project-through-group.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/push-project-through-group.ast
@@ -1,7 +1,7 @@
 DataverseUse fuzzyjoin_080
 TypeDecl DBLPType [
   open RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/push_limit.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/push_limit.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/push_limit.ast
index d4b596b..833d67f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/push_limit.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/push_limit.ast
@@ -1,14 +1,14 @@
 DataverseUse tpch
 TypeDecl OrderType [
   closed RecordType {
-    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
   }
 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q01_pricing_summary_report_nt.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q01_pricing_summary_report_nt.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q01_pricing_summary_report_nt.ast
index d36738f..92fe1f6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q01_pricing_summary_report_nt.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q01_pricing_summary_report_nt.ast
@@ -1,10 +1,10 @@
 DataverseUse tpch
 TypeDecl LineItemType [
   closed RecordType {
-    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,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q03_shipping_priority.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q03_shipping_priority.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q03_shipping_priority.ast
index 041dfb7..368f4c2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q03_shipping_priority.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q03_shipping_priority.ast
@@ -1,10 +1,10 @@
 DataverseUse q3_shipping_priority
 TypeDecl LineItemType [
   closed RecordType {
-    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,
@@ -21,23 +21,23 @@ TypeDecl LineItemType [
 ]
 TypeDecl OrderType [
   closed RecordType {
-    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
   }
 ]
 TypeDecl CustomerType [
   closed RecordType {
-    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/results_parser_sqlpp/q05_local_supplier_volume.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q05_local_supplier_volume.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q05_local_supplier_volume.ast
index 4340fed..2c40155 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q05_local_supplier_volume.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q05_local_supplier_volume.ast
@@ -1,10 +1,10 @@
 DataverseUse q5_local_supplier
 TypeDecl LineItemType [
   closed RecordType {
-    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,
@@ -21,23 +21,23 @@ TypeDecl LineItemType [
 ]
 TypeDecl OrderType [
   closed RecordType {
-    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
   }
 ]
 TypeDecl CustomerType [
   closed RecordType {
-    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,
@@ -46,10 +46,10 @@ TypeDecl CustomerType [
 ]
 TypeDecl SupplierType [
   closed RecordType {
-    s_suppkey : int32,
+    s_suppkey : integer,
     s_name : string,
     s_address : string,
-    s_nationkey : int32,
+    s_nationkey : integer,
     s_phone : string,
     s_acctbal : double,
     s_comment : string
@@ -57,15 +57,15 @@ TypeDecl SupplierType [
 ]
 TypeDecl NationType [
   closed RecordType {
-    n_nationkey : int32,
+    n_nationkey : integer,
     n_name : string,
-    n_regionkey : int32,
+    n_regionkey : integer,
     n_comment : string
   }
 ]
 TypeDecl RegionType [
   closed RecordType {
-    r_regionkey : int32,
+    r_regionkey : integer,
     r_name : string,
     r_comment : string
   }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q08_group_by.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q08_group_by.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q08_group_by.ast
index 38a3add..b50fc64 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q08_group_by.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q08_group_by.ast
@@ -1,10 +1,10 @@
 DataverseUse q08_group_by
 TypeDecl LineItemType [
   closed RecordType {
-    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,
@@ -21,23 +21,23 @@ TypeDecl LineItemType [
 ]
 TypeDecl OrderType [
   closed RecordType {
-    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
   }
 ]
 TypeDecl CustomerType [
   closed RecordType {
-    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,
@@ -46,10 +46,10 @@ TypeDecl CustomerType [
 ]
 TypeDecl SupplierType [
   closed RecordType {
-    s_suppkey : int32,
+    s_suppkey : integer,
     s_name : string,
     s_address : string,
-    s_nationkey : int32,
+    s_nationkey : integer,
     s_phone : string,
     s_acctbal : double,
     s_comment : string
@@ -57,27 +57,27 @@ TypeDecl SupplierType [
 ]
 TypeDecl NationType [
   closed RecordType {
-    n_nationkey : int32,
+    n_nationkey : integer,
     n_name : string,
-    n_regionkey : int32,
+    n_regionkey : integer,
     n_comment : string
   }
 ]
 TypeDecl RegionType [
   closed RecordType {
-    r_regionkey : int32,
+    r_regionkey : integer,
     r_name : string,
     r_comment : string
   }
 ]
 TypeDecl PartType [
   closed RecordType {
-    p_partkey : int32,
+    p_partkey : integer,
     p_name : string,
     p_mfgr : string,
     p_brand : string,
     p_type : string,
-    p_size : int32,
+    p_size : integer,
     p_container : string,
     p_retailprice : double,
     p_comment : string

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q09_group_by.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q09_group_by.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q09_group_by.ast
index 4c3349b..37fecbd 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q09_group_by.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q09_group_by.ast
@@ -1,11 +1,11 @@
 DataverseUse q09_group_by
 TypeDecl LineItemType [
   closed RecordType {
-    l_orderkey : int32,
-    l_partkey : int32,
-    l_suppkey : int32,
-    l_linenumber : int32,
-    l_quantity : int32,
+    l_orderkey : integer,
+    l_partkey : integer,
+    l_suppkey : integer,
+    l_linenumber : integer,
+    l_quantity : integer,
     l_extendedprice : double,
     l_discount : double,
     l_tax : double,
@@ -21,23 +21,23 @@ TypeDecl LineItemType [
 ]
 TypeDecl OrderType [
   closed RecordType {
-    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
   }
 ]
 TypeDecl CustomerType [
   closed RecordType {
-    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,
@@ -46,10 +46,10 @@ TypeDecl CustomerType [
 ]
 TypeDecl SupplierType [
   closed RecordType {
-    s_suppkey : int32,
+    s_suppkey : integer,
     s_name : string,
     s_address : string,
-    s_nationkey : int32,
+    s_nationkey : integer,
     s_phone : string,
     s_acctbal : double,
     s_comment : string
@@ -57,27 +57,27 @@ TypeDecl SupplierType [
 ]
 TypeDecl NationType [
   closed RecordType {
-    n_nationkey : int32,
+    n_nationkey : integer,
     n_name : string,
-    n_regionkey : int32,
+    n_regionkey : integer,
     n_comment : string
   }
 ]
 TypeDecl RegionType [
   closed RecordType {
-    r_regionkey : int32,
+    r_regionkey : integer,
     r_name : string,
     r_comment : string
   }
 ]
 TypeDecl PartType [
   closed RecordType {
-    p_partkey : int32,
+    p_partkey : integer,
     p_name : string,
     p_mfgr : string,
     p_brand : string,
     p_type : string,
-    p_size : int32,
+    p_size : integer,
     p_container : string,
     p_retailprice : double,
     p_comment : string
@@ -85,9 +85,9 @@ TypeDecl PartType [
 ]
 TypeDecl PartSuppType [
   closed RecordType {
-    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/results_parser_sqlpp/query-issue562.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue562.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue562.ast
index 24cafba..10f53bb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue562.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue562.ast
@@ -1,11 +1,11 @@
 DataverseUse tpch
 TypeDecl LineItemType [
   closed RecordType {
-    l_orderkey : int32,
-    l_partkey : int32,
-    l_suppkey : int32,
-    l_linenumber : int32,
-    l_quantity : int32,
+    l_orderkey : integer,
+    l_partkey : integer,
+    l_suppkey : integer,
+    l_linenumber : integer,
+    l_quantity : integer,
     l_extendedprice : double,
     l_discount : double,
     l_tax : double,
@@ -21,23 +21,23 @@ TypeDecl LineItemType [
 ]
 TypeDecl OrderType [
   closed RecordType {
-    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
   }
 ]
 TypeDecl CustomerType [
   closed RecordType {
-    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/results_parser_sqlpp/query-issue601.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue601.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue601.ast
index fdcafeb..5cffeb4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue601.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue601.ast
@@ -1,10 +1,10 @@
 DataverseUse tpch
 TypeDecl LineItemType [
   closed RecordType {
-    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,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue697.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue697.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue697.ast
index 0a1e13f..e028ef8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue697.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue697.ast
@@ -1,8 +1,8 @@
 DataverseUse test
 TypeDecl TestType [
   closed RecordType {
-    key1 : int32,
-    value : int32
+    key1 : integer,
+    value : integer
   }
 ]
 DatasetDecl test(TestType) partitioned by [[key1]]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue785.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue785.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue785.ast
index cf4c9c1..fb94b42 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue785.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue785.ast
@@ -1,23 +1,23 @@
 DataverseUse tpch
 TypeDecl OrderType [
   closed RecordType {
-    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
   }
 ]
 TypeDecl CustomerType [
   closed RecordType {
-    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,
@@ -26,10 +26,10 @@ TypeDecl CustomerType [
 ]
 TypeDecl SupplierType [
   closed RecordType {
-    s_suppkey : int32,
+    s_suppkey : integer,
     s_name : string,
     s_address : string,
-    s_nationkey : int32,
+    s_nationkey : integer,
     s_phone : string,
     s_acctbal : double,
     s_comment : string
@@ -37,15 +37,15 @@ TypeDecl SupplierType [
 ]
 TypeDecl NationType [
   closed RecordType {
-    n_nationkey : int32,
+    n_nationkey : integer,
     n_name : string,
-    n_regionkey : int32,
+    n_regionkey : integer,
     n_comment : string
   }
 ]
 TypeDecl RegionType [
   closed RecordType {
-    r_regionkey : int32,
+    r_regionkey : integer,
     r_name : string,
     r_comment : string
   }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue810-2.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue810-2.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue810-2.ast
index ec8955d..8b9e4b9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue810-2.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue810-2.ast
@@ -1,10 +1,10 @@
 DataverseUse tpch
 TypeDecl LineItemType [
   closed RecordType {
-    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,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue810.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue810.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue810.ast
index 04e6b63..a7dec25 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue810.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue810.ast
@@ -1,10 +1,10 @@
 DataverseUse tpch
 TypeDecl LineItemType [
   closed RecordType {
-    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,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue827-2.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue827-2.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue827-2.ast
index 23e2076..61c78ef 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue827-2.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue827-2.ast
@@ -1,10 +1,10 @@
 DataverseUse tpch
 TypeDecl LineItemType [
   closed RecordType {
-    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,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query_issue849-2.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query_issue849-2.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query_issue849-2.ast
index 99cc6fa..6150c74 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query_issue849-2.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query_issue849-2.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl sType [
   closed RecordType {
-    b : int32
+    b : integer
   }
 ]
 DatasetDecl s(sType) partitioned by [[b]]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query_issue849.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query_issue849.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query_issue849.ast
index d0c967b..b83b445e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query_issue849.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query_issue849.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl sType [
   closed RecordType {
-    b : int32
+    b : integer
   }
 ]
 DatasetDecl s(sType) partitioned by [[b]]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-numeric-desc.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-numeric-desc.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-numeric-desc.ast
index faa79c1..4ac7aa6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-numeric-desc.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-numeric-desc.ast
@@ -3,10 +3,10 @@ TypeDecl TwitterUserType [
   open RecordType {
     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
   }
 ]
 DatasetDecl TwitterUsers(TwitterUserType) partitioned by [[screen-name]]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-numeric.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-numeric.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-numeric.ast
index cf34acc..f0c9b9b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-numeric.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-numeric.ast
@@ -3,10 +3,10 @@ TypeDecl TwitterUserType [
   open RecordType {
     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
   }
 ]
 DatasetDecl TwitterUsers(TwitterUserType) partitioned by [[screen-name]]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-string-desc.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-string-desc.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-string-desc.ast
index 2f803f6..e3e358e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-string-desc.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-string-desc.ast
@@ -3,10 +3,10 @@ TypeDecl TwitterUserType [
   open RecordType {
     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
   }
 ]
 DatasetDecl TwitterUsers(TwitterUserType) partitioned by [[screen-name]]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-string.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-string.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-string.ast
index 3aedf4d..d0f4e62 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-string.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-string.ast
@@ -3,10 +3,10 @@ TypeDecl TwitterUserType [
   open RecordType {
     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
   }
 ]
 DatasetDecl TwitterUsers(TwitterUserType) partitioned by [[screen-name]]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/issue730.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/issue730.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/issue730.ast
index 2efa289..8bef230 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/issue730.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/issue730.ast
@@ -3,15 +3,15 @@ TypeDecl TwitterUserType [
   open RecordType {
     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
   }
 ]
 TypeDecl TweetMessageType [
   open RecordType {
-    tweetid : int64,
+    tweetid : bigint,
     user : TwitterUserType,
     sender_location : point?,
     send_time : datetime,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
index f09e21b..3ad79eb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
@@ -3,23 +3,23 @@ TypeDecl TwitterUserType [
   closed RecordType {
     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
   }
 ]
 TypeDecl TweetMessageType [
   closed RecordType {
-    tweetid : int64,
+    tweetid : bigint,
     user : TwitterUserType,
     sender-location : point,
     send-time : datetime,
     referred-topics : UnorderedList <string>
 ,
     message-text : string,
-    countA : int32,
-    countB : int32
+    countA : integer,
+    countB : integer
   }
 ]
 DatasetDecl TweetMessages(TweetMessageType) partitioned by [[tweetid]]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
index ae63a0a..2fa343b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
@@ -3,23 +3,23 @@ TypeDecl TwitterUserType [
   closed RecordType {
     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
   }
 ]
 TypeDecl TweetMessageType [
   closed RecordType {
-    tweetid : int64,
+    tweetid : bigint,
     user : TwitterUserType,
     sender-location : point,
     send-time : datetime,
     referred-topics : UnorderedList <string>
 ,
     message-text : string,
-    countA : int32,
-    countB : int32
+    countA : integer,
+    countB : integer
   }
 ]
 DatasetDecl TweetMessages(TweetMessageType) partitioned by [[tweetid]]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/query-issue838.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/query-issue838.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/query-issue838.ast
index a6266b8..8868c2f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/query-issue838.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/query-issue838.ast
@@ -1,14 +1,14 @@
 DataverseUse twitter
 TypeDecl TweetMessageType [
   closed RecordType {
-    tweetid : int64,
+    tweetid : bigint,
     sender-location : point,
     text : string
   }
 ]
 TypeDecl TweetHistorySubscription [
   open RecordType {
-    subscription-id : int32,
+    subscription-id : integer,
     location : point
   }
 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_01.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_01.ast
index 988c5be..ffa9ba7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_01.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl MyRecord [
   closed RecordType {
-    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/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_02.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_02.ast
index 7c60f2b..5bbcf02 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_02.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl MyRecord [
   closed RecordType {
-    id : int32,
+    id : integer,
     point : point,
     kwds : string,
     line1 : line,