http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-jaccard-check.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-jaccard-check.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-jaccard-check.ast
index 07e3a69..7414699 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-jaccard-check.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-jaccard-check.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Set import-private-functions=true
 TypeDecl DBLPTypetmp [
   closed 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/nested-index/inverted-index-basic/ngram-jaccard.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-jaccard.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-jaccard.ast
index 9bb7f9b..21c6e81 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-jaccard.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-jaccard.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Set import-private-functions=true
 TypeDecl DBLPTypetmp [
   closed 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/nested-index/inverted-index-basic/olist-edit-distance-check-panic.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-check-panic.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-check-panic.ast
index 1aff230..81ae9bf 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-check-panic.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-check-panic.ast
@@ -1,22 +1,22 @@
 DataverseUse test
 TypeDecl AddressType [
   closed RecordType {
-    number : int32,
+    number : integer,
     street : string,
     city : string
   }
 ]
 TypeDecl CustomerTypetmp [
   closed RecordType {
-    cid : int32,
+    cid : integer,
     name : string,
-    age : int32?,
+    age : integer?,
     address : AddressType?,
     interests : OrderedList [string]
 ,
     children : OrderedList [          open RecordType {
             name : string,
-            age : int32?
+            age : integer?
           }
 ]
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-check.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-check.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-check.ast
index 3bbac54..1753700 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-check.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-check.ast
@@ -1,22 +1,22 @@
 DataverseUse test
 TypeDecl AddressType [
   closed RecordType {
-    number : int32,
+    number : integer,
     street : string,
     city : string
   }
 ]
 TypeDecl CustomerTypetmp [
   closed RecordType {
-    cid : int32,
+    cid : integer,
     name : string,
-    age : int32?,
+    age : integer?,
     address : AddressType?,
     interests : OrderedList [string]
 ,
     children : OrderedList [          open RecordType {
             name : string,
-            age : int32?
+            age : integer?
           }
 ]
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-panic.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-panic.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-panic.ast
index fb4293a..60e740c 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-panic.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-panic.ast
@@ -1,22 +1,22 @@
 DataverseUse test
 TypeDecl AddressType [
   closed RecordType {
-    number : int32,
+    number : integer,
     street : string,
     city : string
   }
 ]
 TypeDecl CustomerTypetmp [
   closed RecordType {
-    cid : int32,
+    cid : integer,
     name : string,
-    age : int32?,
+    age : integer?,
     address : AddressType?,
     interests : OrderedList [string]
 ,
     children : OrderedList [          open RecordType {
             name : string,
-            age : int32?
+            age : integer?
           }
 ]
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance.ast
index df3a328..2066429 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance.ast
@@ -1,22 +1,22 @@
 DataverseUse test
 TypeDecl AddressType [
   closed RecordType {
-    number : int32,
+    number : integer,
     street : string,
     city : string
   }
 ]
 TypeDecl CustomerTypetmp [
   closed RecordType {
-    cid : int32,
+    cid : integer,
     name : string,
-    age : int32?,
+    age : integer?,
     address : AddressType?,
     interests : OrderedList [string]
 ,
     children : OrderedList [          open RecordType {
             name : string,
-            age : int32?
+            age : integer?
           }
 ]
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-fuzzyeq-edit-distance.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-fuzzyeq-edit-distance.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-fuzzyeq-edit-distance.ast
index ee70178..e6b0d33 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-fuzzyeq-edit-distance.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-fuzzyeq-edit-distance.ast
@@ -1,22 +1,22 @@
 DataverseUse test
 TypeDecl AddressType [
   closed RecordType {
-    number : int32,
+    number : integer,
     street : string,
     city : string
   }
 ]
 TypeDecl CustomerTypetmp [
   closed RecordType {
-    cid : int32,
+    cid : integer,
     name : string,
-    age : int32?,
+    age : integer?,
     address : AddressType?,
     interests : OrderedList [string]
 ,
     children : OrderedList [          open RecordType {
             name : string,
-            age : int32?
+            age : integer?
           }
 ]
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-fuzzyeq-jaccard.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-fuzzyeq-jaccard.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-fuzzyeq-jaccard.ast
index b5842f3..e36bce4 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-fuzzyeq-jaccard.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-fuzzyeq-jaccard.ast
@@ -1,22 +1,22 @@
 DataverseUse test
 TypeDecl AddressType [
   closed RecordType {
-    number : int32,
+    number : integer,
     street : string,
     city : string
   }
 ]
 TypeDecl CustomerTypetmp [
   closed RecordType {
-    cid : int32,
+    cid : integer,
     name : string,
-    age : int32?,
+    age : integer?,
     address : AddressType?,
     interests : OrderedList [string]
 ,
     children : OrderedList [          open RecordType {
             name : string,
-            age : int32?
+            age : integer?
           }
 ]
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-jaccard-check.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-jaccard-check.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-jaccard-check.ast
index 0474a62..766e622 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-jaccard-check.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-jaccard-check.ast
@@ -1,22 +1,22 @@
 DataverseUse test
 TypeDecl AddressType [
   closed RecordType {
-    number : int32,
+    number : integer,
     street : string,
     city : string
   }
 ]
 TypeDecl CustomerTypetmp [
   closed RecordType {
-    cid : int32,
+    cid : integer,
     name : string,
-    age : int32?,
+    age : integer?,
     address : AddressType?,
     interests : OrderedList [string]
 ,
     children : OrderedList [          open RecordType {
             name : string,
-            age : int32?
+            age : integer?
           }
 ]
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-jaccard.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-jaccard.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-jaccard.ast
index a85f2ac..a4c5bf6 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-jaccard.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-jaccard.ast
@@ -1,22 +1,22 @@
 DataverseUse test
 TypeDecl AddressType [
   closed RecordType {
-    number : int32,
+    number : integer,
     street : string,
     city : string
   }
 ]
 TypeDecl CustomerTypetmp [
   closed RecordType {
-    cid : int32,
+    cid : integer,
     name : string,
-    age : int32?,
+    age : integer?,
     address : AddressType?,
     interests : OrderedList [string]
 ,
     children : OrderedList [          open RecordType {
             name : string,
-            age : int32?
+            age : integer?
           }
 ]
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ulist-fuzzyeq-jaccard.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ulist-fuzzyeq-jaccard.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ulist-fuzzyeq-jaccard.ast
index b92a95f..e33d0ce 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ulist-fuzzyeq-jaccard.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ulist-fuzzyeq-jaccard.ast
@@ -1,22 +1,22 @@
 DataverseUse test
 TypeDecl AddressType [
   closed RecordType {
-    number : int32,
+    number : integer,
     street : string,
     city : string
   }
 ]
 TypeDecl CustomerTypetmp [
   closed RecordType {
-    cid : int32,
+    cid : integer,
     name : string,
-    age : int32?,
+    age : integer?,
     address : AddressType?,
     interests : UnorderedList <string>
 ,
     children : OrderedList [          open RecordType {
             name : string,
-            age : int32?
+            age : integer?
           }
 ]
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ulist-jaccard-check.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ulist-jaccard-check.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ulist-jaccard-check.ast
index c67381b..a4a9879 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ulist-jaccard-check.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ulist-jaccard-check.ast
@@ -1,22 +1,22 @@
 DataverseUse test
 TypeDecl AddressType [
   closed RecordType {
-    number : int32,
+    number : integer,
     street : string,
     city : string
   }
 ]
 TypeDecl CustomerTypetmp [
   closed RecordType {
-    cid : int32,
+    cid : integer,
     name : string,
-    age : int32?,
+    age : integer?,
     address : AddressType?,
     interests : UnorderedList <string>
 ,
     children : OrderedList [          open RecordType {
             name : string,
-            age : int32?
+            age : integer?
           }
 ]
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ulist-jaccard.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ulist-jaccard.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ulist-jaccard.ast
index 16f1538..bf7fb93 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ulist-jaccard.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ulist-jaccard.ast
@@ -1,22 +1,22 @@
 DataverseUse test
 TypeDecl AddressType [
   closed RecordType {
-    number : int32,
+    number : integer,
     street : string,
     city : string
   }
 ]
 TypeDecl CustomerTypetmp [
   closed RecordType {
-    cid : int32,
+    cid : integer,
     name : string,
-    age : int32?,
+    age : integer?,
     address : AddressType?,
     interests : UnorderedList <string>
 ,
     children : OrderedList [          open RecordType {
             name : string,
-            age : int32?
+            age : integer?
           }
 ]
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-contains.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-contains.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-contains.ast
index e58f478..6da4c73 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-contains.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-contains.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPTypetmp [
   closed 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/nested-index/inverted-index-basic/word-fuzzyeq-jaccard.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-fuzzyeq-jaccard.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-fuzzyeq-jaccard.ast
index a20cb72..cc8bfc0 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-fuzzyeq-jaccard.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-fuzzyeq-jaccard.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPTypetmp [
   closed 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/nested-index/inverted-index-basic/word-jaccard-check.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-jaccard-check.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-jaccard-check.ast
index 9d57591..f972712 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-jaccard-check.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-jaccard-check.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPTypetmp [
   closed 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/nested-index/inverted-index-basic/word-jaccard.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-jaccard.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-jaccard.ast
index 34427ac..e9f84798 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-jaccard.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-jaccard.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPTypetmp [
   closed 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/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.ast
index 9577e90..704d815 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPTypetmp [
   closed 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/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.ast
index 2fddf74..a8fd351 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPTypetmp [
   closed 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/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic.ast
index 3bf5d3e..5a93885 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPTypetmp [
   closed 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/nested-index/inverted-index-complex/ngram-edit-distance-check-let.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let.ast
index ffc049d..9b02a4e 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPTypetmp [
   closed 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/nested-index/inverted-index-complex/ngram-edit-distance-check-substring.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-substring.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-substring.ast
index b6ceb69..7581d8d 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-substring.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-substring.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPNestedType [
   closed 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/nested-index/inverted-index-complex/ngram-edit-distance-check-word-tokens.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-word-tokens.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-word-tokens.ast
index dc5b2da..c935aae 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-word-tokens.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-word-tokens.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPNestedType [
   closed 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/nested-index/inverted-index-complex/ngram-jaccard-check-let.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-jaccard-check-let.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-jaccard-check-let.ast
index 8b834a0..f31064d 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-jaccard-check-let.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-jaccard-check-let.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Set import-private-functions=true
 TypeDecl DBLPTypetmp [
   closed 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/nested-index/inverted-index-complex/ngram-jaccard-check-multi-let.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-jaccard-check-multi-let.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-jaccard-check-multi-let.ast
index 48e7479..a50fd2f 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-jaccard-check-multi-let.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-jaccard-check-multi-let.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Set import-private-functions=true
 TypeDecl DBLPTypetmp [
   closed 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/nested-index/inverted-index-complex/olist-edit-distance-check-let-panic.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-edit-distance-check-let-panic.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-edit-distance-check-let-panic.ast
index 1cd94f6..572c59d 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-edit-distance-check-let-panic.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-edit-distance-check-let-panic.ast
@@ -1,22 +1,22 @@
 DataverseUse test
 TypeDecl AddressType [
   closed RecordType {
-    number : int32,
+    number : integer,
     street : string,
     city : string
   }
 ]
 TypeDecl CustomerTypetmp [
   closed RecordType {
-    cid : int32,
+    cid : integer,
     name : string,
-    age : int32?,
+    age : integer?,
     address : AddressType?,
     interests : OrderedList [string]
 ,
     children : OrderedList [          open RecordType {
             name : string,
-            age : int32?
+            age : integer?
           }
 ]
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-edit-distance-check-let.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-edit-distance-check-let.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-edit-distance-check-let.ast
index 0f9a149..859b2c1 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-edit-distance-check-let.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-edit-distance-check-let.ast
@@ -1,22 +1,22 @@
 DataverseUse test
 TypeDecl AddressType [
   closed RecordType {
-    number : int32,
+    number : integer,
     street : string,
     city : string
   }
 ]
 TypeDecl CustomerTypetmp [
   closed RecordType {
-    cid : int32,
+    cid : integer,
     name : string,
-    age : int32?,
+    age : integer?,
     address : AddressType?,
     interests : OrderedList [string]
 ,
     children : OrderedList [          open RecordType {
             name : string,
-            age : int32?
+            age : integer?
           }
 ]
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-jaccard-check-let.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-jaccard-check-let.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-jaccard-check-let.ast
index ad00f55..d4bec43 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-jaccard-check-let.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-jaccard-check-let.ast
@@ -1,22 +1,22 @@
 DataverseUse test
 TypeDecl AddressType [
   closed RecordType {
-    number : int32,
+    number : integer,
     street : string,
     city : string
   }
 ]
 TypeDecl CustomerTypetmp [
   closed RecordType {
-    cid : int32,
+    cid : integer,
     name : string,
-    age : int32?,
+    age : integer?,
     address : AddressType?,
     interests : OrderedList [string]
 ,
     children : OrderedList [          open RecordType {
             name : string,
-            age : int32?
+            age : integer?
           }
 ]
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ulist-jaccard-check-let.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ulist-jaccard-check-let.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ulist-jaccard-check-let.ast
index 4bf45d8..873107f 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ulist-jaccard-check-let.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ulist-jaccard-check-let.ast
@@ -1,22 +1,22 @@
 DataverseUse test
 TypeDecl AddressType [
   closed RecordType {
-    number : int32,
+    number : integer,
     street : string,
     city : string
   }
 ]
 TypeDecl CustomerTypetmp [
   closed RecordType {
-    cid : int32,
+    cid : integer,
     name : string,
-    age : int32?,
+    age : integer?,
     address : AddressType?,
     interests : UnorderedList <string>
 ,
     children : OrderedList [          open RecordType {
             name : string,
-            age : int32?
+            age : integer?
           }
 ]
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/word-jaccard-check-let.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/word-jaccard-check-let.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/word-jaccard-check-let.ast
index 0ab7fd3..a0eb543 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/word-jaccard-check-let.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/word-jaccard-check-let.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPTypetmp [
   closed 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/nested-index/inverted-index-complex/word-jaccard-check-multi-let.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/word-jaccard-check-multi-let.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/word-jaccard-check-multi-let.ast
index 6c0320b..d9c65f6 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/word-jaccard-check-multi-let.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/word-jaccard-check-multi-let.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPTypetmp [
   closed 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/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.ast
index 7055b2d..6df9bb1 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_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 TweetMessageNestedType [
   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
   }
 ]
 TypeDecl TweetMessageType [

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.ast
index 4f7aebe..e0ec549 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_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 TweetMessageNestedType [
   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
   }
 ]
 TypeDecl TweetMessageType [

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-check_01.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-check_01.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-check_01.ast
index 59b498a..420723a 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-check_01.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-check_01.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPTypetmp [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,
@@ -10,7 +10,7 @@ TypeDecl DBLPTypetmp [
 ]
 TypeDecl CSXTypetmp [
   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/nested-index/inverted-index-join/ngram-edit-distance-contains.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-contains.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-contains.ast
index 73130cd..78f3fe7 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-contains.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-contains.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPTypetmp [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,
@@ -10,7 +10,7 @@ TypeDecl DBLPTypetmp [
 ]
 TypeDecl CSXTypetmp [
   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/nested-index/inverted-index-join/ngram-edit-distance-inline.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-inline.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-inline.ast
index cf1866b..90e59a0 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-inline.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-inline.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPTypetmp [
   closed 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/nested-index/inverted-index-join/ngram-edit-distance_01.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance_01.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance_01.ast
index 3dc98f2..e2d9b25 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance_01.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance_01.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPTypetmp [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,
@@ -10,7 +10,7 @@ TypeDecl DBLPTypetmp [
 ]
 TypeDecl CSXTypetmp [
   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/nested-index/inverted-index-join/ngram-fuzzyeq-edit-distance_01.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-fuzzyeq-edit-distance_01.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-fuzzyeq-edit-distance_01.ast
index 48b4e9a..f0c7b7f 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-fuzzyeq-edit-distance_01.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-fuzzyeq-edit-distance_01.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPTypetmp [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,
@@ -10,7 +10,7 @@ TypeDecl DBLPTypetmp [
 ]
 TypeDecl CSXTypetmp [
   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/nested-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.ast
index db54c81..6c6bd8c 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Set import-private-functions=true
 TypeDecl DBLPTypetmp [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,
@@ -11,7 +11,7 @@ TypeDecl DBLPTypetmp [
 ]
 TypeDecl CSXTypetmp [
   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/nested-index/inverted-index-join/ngram-jaccard-check_01.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-jaccard-check_01.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-jaccard-check_01.ast
index 22c29a8..6db6a5d 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-jaccard-check_01.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-jaccard-check_01.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Set import-private-functions=true
 TypeDecl DBLPTypetmp [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,
@@ -11,7 +11,7 @@ TypeDecl DBLPTypetmp [
 ]
 TypeDecl CSXTypetmp [
   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/nested-index/inverted-index-join/ngram-jaccard-inline.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-jaccard-inline.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-jaccard-inline.ast
index baf8a71..289f8da 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-jaccard-inline.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-jaccard-inline.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Set import-private-functions=true
 TypeDecl DBLPTypetmp [
   closed 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/nested-index/inverted-index-join/ngram-jaccard_01.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-jaccard_01.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-jaccard_01.ast
index 1a25f2e..4763edc 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-jaccard_01.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-jaccard_01.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Set import-private-functions=true
 TypeDecl DBLPTypetmp [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,
@@ -11,7 +11,7 @@ TypeDecl DBLPTypetmp [
 ]
 TypeDecl CSXTypetmp [
   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/nested-index/inverted-index-join/olist-edit-distance-check_01.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance-check_01.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance-check_01.ast
index d4cc0be..8d7f95a 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance-check_01.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance-check_01.ast
@@ -1,22 +1,22 @@
 DataverseUse test
 TypeDecl AddressType [
   closed RecordType {
-    number : int32,
+    number : integer,
     street : string,
     city : string
   }
 ]
 TypeDecl CustomerTypetmp [
   closed RecordType {
-    cid : int32,
+    cid : integer,
     name : string,
-    age : int32?,
+    age : integer?,
     address : AddressType?,
     interests : OrderedList [string]
 ,
     children : OrderedList [          open RecordType {
             name : string,
-            age : int32?
+            age : integer?
           }
 ]
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance-inline.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance-inline.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance-inline.ast
index 8e765f5..2df37e9 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance-inline.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance-inline.ast
@@ -1,22 +1,22 @@
 DataverseUse test
 TypeDecl AddressType [
   closed RecordType {
-    number : int32,
+    number : integer,
     street : string,
     city : string
   }
 ]
 TypeDecl CustomerTypetmp [
   closed RecordType {
-    cid : int32,
+    cid : integer,
     name : string,
-    age : int32?,
+    age : integer?,
     address : AddressType?,
     interests : OrderedList [string]
 ,
     children : OrderedList [          open RecordType {
             name : string,
-            age : int32?
+            age : integer?
           }
 ]
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance_01.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance_01.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance_01.ast
index f658772..a04210e 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance_01.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance_01.ast
@@ -1,22 +1,22 @@
 DataverseUse test
 TypeDecl AddressType [
   closed RecordType {
-    number : int32,
+    number : integer,
     street : string,
     city : string
   }
 ]
 TypeDecl CustomerTypetmp [
   closed RecordType {
-    cid : int32,
+    cid : integer,
     name : string,
-    age : int32?,
+    age : integer?,
     address : AddressType?,
     interests : OrderedList [string]
 ,
     children : OrderedList [          open RecordType {
             name : string,
-            age : int32?
+            age : integer?
           }
 ]
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-fuzzyeq-edit-distance_01.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-fuzzyeq-edit-distance_01.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-fuzzyeq-edit-distance_01.ast
index d33ae9f..abfb1ac 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-fuzzyeq-edit-distance_01.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-fuzzyeq-edit-distance_01.ast
@@ -1,22 +1,22 @@
 DataverseUse test
 TypeDecl AddressType [
   closed RecordType {
-    number : int32,
+    number : integer,
     street : string,
     city : string
   }
 ]
 TypeDecl CustomerTypetmp [
   closed RecordType {
-    cid : int32,
+    cid : integer,
     name : string,
-    age : int32?,
+    age : integer?,
     address : AddressType?,
     interests : OrderedList [string]
 ,
     children : OrderedList [          open RecordType {
             name : string,
-            age : int32?
+            age : integer?
           }
 ]
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-fuzzyeq-jaccard_01.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-fuzzyeq-jaccard_01.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-fuzzyeq-jaccard_01.ast
index 00bf242..9e68d75 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-fuzzyeq-jaccard_01.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-fuzzyeq-jaccard_01.ast
@@ -1,22 +1,22 @@
 DataverseUse test
 TypeDecl AddressType [
   closed RecordType {
-    number : int32,
+    number : integer,
     street : string,
     city : string
   }
 ]
 TypeDecl CustomerTypetmp [
   closed RecordType {
-    cid : int32,
+    cid : integer,
     name : string,
-    age : int32?,
+    age : integer?,
     address : AddressType?,
     interests : OrderedList [string]
 ,
     children : OrderedList [          open RecordType {
             name : string,
-            age : int32?
+            age : integer?
           }
 ]
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard-check_01.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard-check_01.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard-check_01.ast
index a2f20a5..c430b4e 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard-check_01.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard-check_01.ast
@@ -1,22 +1,22 @@
 DataverseUse test
 TypeDecl AddressType [
   closed RecordType {
-    number : int32,
+    number : integer,
     street : string,
     city : string
   }
 ]
 TypeDecl CustomerTypetmp [
   closed RecordType {
-    cid : int32,
+    cid : integer,
     name : string,
-    age : int32?,
+    age : integer?,
     address : AddressType?,
     interests : OrderedList [string]
 ,
     children : OrderedList [          open RecordType {
             name : string,
-            age : int32?
+            age : integer?
           }
 ]
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard-inline.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard-inline.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard-inline.ast
index 132d299..ead2509 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard-inline.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard-inline.ast
@@ -1,22 +1,22 @@
 DataverseUse test
 TypeDecl AddressType [
   closed RecordType {
-    number : int32,
+    number : integer,
     street : string,
     city : string
   }
 ]
 TypeDecl CustomerTypetmp [
   closed RecordType {
-    cid : int32,
+    cid : integer,
     name : string,
-    age : int32?,
+    age : integer?,
     address : AddressType?,
     interests : OrderedList [string]
 ,
     children : OrderedList [          open RecordType {
             name : string,
-            age : int32?
+            age : integer?
           }
 ]
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard_01.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard_01.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard_01.ast
index 1f9ce9e..bceac1d 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard_01.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard_01.ast
@@ -1,22 +1,22 @@
 DataverseUse test
 TypeDecl AddressType [
   closed RecordType {
-    number : int32,
+    number : integer,
     street : string,
     city : string
   }
 ]
 TypeDecl CustomerTypetmp [
   closed RecordType {
-    cid : int32,
+    cid : integer,
     name : string,
-    age : int32?,
+    age : integer?,
     address : AddressType?,
     interests : OrderedList [string]
 ,
     children : OrderedList [          open RecordType {
             name : string,
-            age : int32?
+            age : integer?
           }
 ]
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-fuzzyeq-jaccard_01.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-fuzzyeq-jaccard_01.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-fuzzyeq-jaccard_01.ast
index da3cc7d..91f7838 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-fuzzyeq-jaccard_01.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-fuzzyeq-jaccard_01.ast
@@ -1,22 +1,22 @@
 DataverseUse test
 TypeDecl AddressType [
   closed RecordType {
-    number : int32,
+    number : integer,
     street : string,
     city : string
   }
 ]
 TypeDecl CustomerTypetmp [
   closed RecordType {
-    cid : int32,
+    cid : integer,
     name : string,
-    age : int32?,
+    age : integer?,
     address : AddressType?,
     interests : UnorderedList <string>
 ,
     children : OrderedList [          open RecordType {
             name : string,
-            age : int32?
+            age : integer?
           }
 ]
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard-check_01.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard-check_01.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard-check_01.ast
index 1547fe2..ac0603d 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard-check_01.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard-check_01.ast
@@ -1,22 +1,22 @@
 DataverseUse test
 TypeDecl AddressType [
   closed RecordType {
-    number : int32,
+    number : integer,
     street : string,
     city : string
   }
 ]
 TypeDecl CustomerTypetmp [
   closed RecordType {
-    cid : int32,
+    cid : integer,
     name : string,
-    age : int32?,
+    age : integer?,
     address : AddressType?,
     interests : UnorderedList <string>
 ,
     children : OrderedList [          open RecordType {
             name : string,
-            age : int32?
+            age : integer?
           }
 ]
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard-inline.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard-inline.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard-inline.ast
index 4d229f5..e1eba33 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard-inline.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard-inline.ast
@@ -1,22 +1,22 @@
 DataverseUse test
 TypeDecl AddressType [
   closed RecordType {
-    number : int32,
+    number : integer,
     street : string,
     city : string
   }
 ]
 TypeDecl CustomerTypetmp [
   closed RecordType {
-    cid : int32,
+    cid : integer,
     name : string,
-    age : int32?,
+    age : integer?,
     address : AddressType?,
     interests : UnorderedList <string>
 ,
     children : OrderedList [          open RecordType {
             name : string,
-            age : int32?
+            age : integer?
           }
 ]
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard_01.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard_01.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard_01.ast
index cec52a9..fca8e85 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard_01.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard_01.ast
@@ -1,22 +1,22 @@
 DataverseUse test
 TypeDecl AddressType [
   closed RecordType {
-    number : int32,
+    number : integer,
     street : string,
     city : string
   }
 ]
 TypeDecl CustomerTypetmp [
   closed RecordType {
-    cid : int32,
+    cid : integer,
     name : string,
-    age : int32?,
+    age : integer?,
     address : AddressType?,
     interests : UnorderedList <string>
 ,
     children : OrderedList [          open RecordType {
             name : string,
-            age : int32?
+            age : integer?
           }
 ]
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-fuzzyeq-jaccard_01.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-fuzzyeq-jaccard_01.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-fuzzyeq-jaccard_01.ast
index cc9568c..42c94d8 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-fuzzyeq-jaccard_01.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-fuzzyeq-jaccard_01.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPTypetmp [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,
@@ -10,7 +10,7 @@ TypeDecl DBLPTypetmp [
 ]
 TypeDecl CSXTypetmp [
   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/nested-index/inverted-index-join/word-jaccard-check-after-btree-access.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard-check-after-btree-access.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard-check-after-btree-access.ast
index 11e931f..8eaaa9b 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard-check-after-btree-access.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard-check-after-btree-access.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 TweetMessageNestedType [
   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
   }
 ]
 TypeDecl TweetMessageType [

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard-check_01.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard-check_01.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard-check_01.ast
index bc4dbe1..c1a2b32 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard-check_01.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard-check_01.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPTypetmp [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,
@@ -10,7 +10,7 @@ TypeDecl DBLPTypetmp [
 ]
 TypeDecl CSXTypetmp [
   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/nested-index/inverted-index-join/word-jaccard-inline.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard-inline.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard-inline.ast
index 6a553a9..bf78930 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard-inline.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard-inline.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPTypetmp [
   closed 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/nested-index/inverted-index-join/word-jaccard_01.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard_01.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard_01.ast
index e997a8f..c883e13 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard_01.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard_01.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 TypeDecl DBLPTypetmp [
   closed RecordType {
-    id : int32,
+    id : integer,
     dblpid : string,
     title : string,
     authors : string,
@@ -10,7 +10,7 @@ TypeDecl DBLPTypetmp [
 ]
 TypeDecl CSXTypetmp [
   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/nested-index/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/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
index cba7d62..45f442f 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/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 TweetMessageNestedType [
   open 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
   }
 ]
 TypeDecl TweetMessageType [

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/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/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
index 0627f9e..6958ec3 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/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 TweetMessageNestedType [
   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
   }
 ]
 TypeDecl TweetMessageType [

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_01.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_01.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_01.ast
index 23c9f97..50b50a6 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_01.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/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/nested-index/rtree-index-join/spatial-intersect-point_02.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_02.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_02.ast
index 5dca6be..9e68e92 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_02.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/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,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_03.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_03.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_03.ast
index 7761734..9f2f3e5 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_03.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_03.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/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.ast
index 7ff16fb..4f36425 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.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 TweetMessageNestedType [
   open RecordType {
-    tweetid : int64,
+    tweetid : bigint,
     user : TwitterUserType,
     sender-location : point,
     send-time : datetime,
     referred-topics : UnorderedList <string>
 ,
     message-text : string,
-    countA : int32
+    countA : integer
   }
 ]
 TypeDecl TweetMessageType [

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.ast
index a383bff..15ba229 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.ast
@@ -3,15 +3,15 @@ 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 TweetMessageNestedType [
   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/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.ast
index 75d429f..5718c4b 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.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 TweetMessageNestedType [
   open RecordType {
-    tweetid : int64,
+    tweetid : bigint,
     user : TwitterUserType,
     sender-location : point,
     send-time : datetime,
     referred-topics : UnorderedList <string>
 ,
     message-text : string,
-    countA : int32
+    countA : integer
   }
 ]
 TypeDecl TweetMessageType [

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.ast
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.ast
index 512b788..50a1282 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.ast
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.ast
@@ -3,15 +3,15 @@ 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 TweetMessageNestedType [
   open RecordType {
-    tweetid : int64,
+    tweetid : bigint,
     user : TwitterUserType,
     sender-location : point,
     send-time : datetime,

Reply via email to