asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From buyin...@apache.org
Subject [14/51] [partial] incubator-asterixdb git commit: ASTERIXDB-1226: implement SQL++ core group-by semantics and syntatic sugars.
Date Mon, 28 Mar 2016 20:18:41 GMT
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ulist-jaccard/ulist-jaccard.4.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ulist-jaccard/ulist-jaccard.4.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ulist-jaccard/ulist-jaccard.4.ast
index 7b9e57f..e58c7f5 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ulist-jaccard/ulist-jaccard.4.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ulist-jaccard/ulist-jaccard.4.ast
@@ -5,12 +5,12 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [a]
     :
-    Variable [ Name=a ]
+    Variable [ Name=$a ]
   )
   (
     LiteralExpr [STRING] [b]
     :
-    Variable [ Name=b ]
+    Variable [ Name=$b ]
   )
 ]
 ]
@@ -18,24 +18,24 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Customers]
   ]
   AS
-  Variable [ Name=a ]
+  Variable [ Name=$a ]
 ,
   FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Customers2]
   ]
   AS
-  Variable [ Name=b ]
+  Variable [ Name=$b ]
 ]
 Where
   OperatorExpr [
     OperatorExpr [
       FunctionCall test.similarity-jaccard@2[
         FieldAccessor [
-          Variable [ Name=a ]
+          Variable [ Name=$a ]
           Field=interests
         ]
         FieldAccessor [
-          Variable [ Name=b ]
+          Variable [ Name=$b ]
           Field=interests
         ]
       ]
@@ -45,12 +45,12 @@ Where
     and
     OperatorExpr [
       FieldAccessor [
-        Variable [ Name=a ]
+        Variable [ Name=$a ]
         Field=cid
       ]
       <
       FieldAccessor [
-        Variable [ Name=b ]
+        Variable [ Name=$b ]
         Field=cid
       ]
     ]
@@ -58,7 +58,7 @@ Where
     OperatorExpr [
       FunctionCall test.len@1[
         FieldAccessor [
-          Variable [ Name=a ]
+          Variable [ Name=$a ]
           Field=interests
         ]
       ]
@@ -69,7 +69,7 @@ Where
     OperatorExpr [
       FunctionCall test.len@1[
         FieldAccessor [
-          Variable [ Name=b ]
+          Variable [ Name=$b ]
           Field=interests
         ]
       ]
@@ -79,12 +79,12 @@ Where
   ]
 Orderby
   FieldAccessor [
-    Variable [ Name=a ]
+    Variable [ Name=$a ]
     Field=cid
   ]
   ASC
   FieldAccessor [
-    Variable [ Name=b ]
+    Variable [ Name=$b ]
     Field=cid
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/word-jaccard-inline/word-jaccard-inline.4.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/word-jaccard-inline/word-jaccard-inline.4.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/word-jaccard-inline/word-jaccard-inline.4.ast
index 74ae0a8..cbc0f05 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/word-jaccard-inline/word-jaccard-inline.4.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/word-jaccard-inline/word-jaccard-inline.4.ast
@@ -5,17 +5,17 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [arec]
     :
-    Variable [ Name=a ]
+    Variable [ Name=$a ]
   )
   (
     LiteralExpr [STRING] [brec]
     :
-    Variable [ Name=b ]
+    Variable [ Name=$b ]
   )
   (
     LiteralExpr [STRING] [jacc]
     :
-    Variable [ Name=jacc ]
+    Variable [ Name=$jacc ]
   )
 ]
 ]
@@ -23,26 +23,26 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
   AS
-  Variable [ Name=a ]
+  Variable [ Name=$a ]
 ,
   FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [CSX]
   ]
   AS
-  Variable [ Name=b ]
+  Variable [ Name=$b ]
 ]
-LetVariable [ Name=jacc ]
+Let Variable [ Name=$jacc ]
   :=
   FunctionCall test.similarity-jaccard@2[
     FunctionCall test.word-tokens@1[
       FieldAccessor [
-        Variable [ Name=a ]
+        Variable [ Name=$a ]
         Field=title
       ]
     ]
     FunctionCall test.word-tokens@1[
       FieldAccessor [
-        Variable [ Name=b ]
+        Variable [ Name=$b ]
         Field=title
       ]
     ]
@@ -50,33 +50,33 @@ LetVariable [ Name=jacc ]
 Where
   OperatorExpr [
     OperatorExpr [
-      Variable [ Name=jacc ]
+      Variable [ Name=$jacc ]
       >=
       LiteralExpr [FLOAT] [0.5]
     ]
     and
     OperatorExpr [
       FieldAccessor [
-        Variable [ Name=a ]
+        Variable [ Name=$a ]
         Field=id
       ]
       <
       FieldAccessor [
-        Variable [ Name=b ]
+        Variable [ Name=$b ]
         Field=id
       ]
     ]
   ]
 Orderby
-  Variable [ Name=jacc ]
+  Variable [ Name=$jacc ]
   ASC
   FieldAccessor [
-    Variable [ Name=a ]
+    Variable [ Name=$a ]
     Field=id
   ]
   ASC
   FieldAccessor [
-    Variable [ Name=b ]
+    Variable [ Name=$b ]
     Field=id
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/word-jaccard/word-jaccard.4.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/word-jaccard/word-jaccard.4.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/word-jaccard/word-jaccard.4.ast
index 1fc8979..978c7ce 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/word-jaccard/word-jaccard.4.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/word-jaccard/word-jaccard.4.ast
@@ -5,12 +5,12 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [arec]
     :
-    Variable [ Name=a ]
+    Variable [ Name=$a ]
   )
   (
     LiteralExpr [STRING] [brec]
     :
-    Variable [ Name=b ]
+    Variable [ Name=$b ]
   )
 ]
 ]
@@ -18,13 +18,13 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
   AS
-  Variable [ Name=a ]
+  Variable [ Name=$a ]
 ,
   FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [CSX]
   ]
   AS
-  Variable [ Name=b ]
+  Variable [ Name=$b ]
 ]
 Where
   OperatorExpr [
@@ -32,13 +32,13 @@ Where
       FunctionCall test.similarity-jaccard@2[
         FunctionCall test.word-tokens@1[
           FieldAccessor [
-            Variable [ Name=a ]
+            Variable [ Name=$a ]
             Field=title
           ]
         ]
         FunctionCall test.word-tokens@1[
           FieldAccessor [
-            Variable [ Name=b ]
+            Variable [ Name=$b ]
             Field=title
           ]
         ]
@@ -49,24 +49,24 @@ Where
     and
     OperatorExpr [
       FieldAccessor [
-        Variable [ Name=a ]
+        Variable [ Name=$a ]
         Field=id
       ]
       <
       FieldAccessor [
-        Variable [ Name=b ]
+        Variable [ Name=$b ]
         Field=id
       ]
     ]
   ]
 Orderby
   FieldAccessor [
-    Variable [ Name=a ]
+    Variable [ Name=$a ]
     Field=id
   ]
   ASC
   FieldAccessor [
-    Variable [ Name=b ]
+    Variable [ Name=$b ]
     Field=id
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue285-2/query_issue285-2.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue285-2/query_issue285-2.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue285-2/query_issue285-2.3.ast
index 57f2c39..79290f8 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue285-2/query_issue285-2.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue285-2/query_issue285-2.3.ast
@@ -6,7 +6,7 @@ RecordConstructor [
     LiteralExpr [STRING] [aid]
     :
     FieldAccessor [
-      Variable [ Name=a ]
+      Variable [ Name=$a ]
       Field=id
     ]
   )
@@ -16,7 +16,7 @@ RecordConstructor [
     (
       SELECT ELEMENT [
       FieldAccessor [
-        Variable [ Name=b ]
+        Variable [ Name=$b ]
         Field=id
       ]
       ]
@@ -24,23 +24,23 @@ RecordConstructor [
           LiteralExpr [STRING] [CSX]
         ]
         AS
-        Variable [ Name=b ]
+        Variable [ Name=$b ]
       ]
       Where
         OperatorExpr [
           FieldAccessor [
-            Variable [ Name=a ]
+            Variable [ Name=$a ]
             Field=authors
           ]
           =
           FieldAccessor [
-            Variable [ Name=b ]
+            Variable [ Name=$b ]
             Field=authors
           ]
         ]
       Orderby
         FieldAccessor [
-          Variable [ Name=b ]
+          Variable [ Name=$b ]
           Field=id
         ]
         ASC
@@ -53,11 +53,11 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
   AS
-  Variable [ Name=a ]
+  Variable [ Name=$a ]
 ]
 Orderby
   FieldAccessor [
-    Variable [ Name=a ]
+    Variable [ Name=$a ]
     Field=id
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue285/query_issue285.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue285/query_issue285.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue285/query_issue285.3.ast
index ed0638e..265ea02 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue285/query_issue285.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue285/query_issue285.3.ast
@@ -6,7 +6,7 @@ RecordConstructor [
     LiteralExpr [STRING] [aid]
     :
     FieldAccessor [
-      Variable [ Name=a ]
+      Variable [ Name=$a ]
       Field=id
     ]
   )
@@ -16,7 +16,7 @@ RecordConstructor [
     (
       SELECT ELEMENT [
       FieldAccessor [
-        Variable [ Name=b ]
+        Variable [ Name=$b ]
         Field=id
       ]
       ]
@@ -24,23 +24,23 @@ RecordConstructor [
           LiteralExpr [STRING] [CSX]
         ]
         AS
-        Variable [ Name=b ]
+        Variable [ Name=$b ]
       ]
       Where
         OperatorExpr [
           FieldAccessor [
-            Variable [ Name=a ]
+            Variable [ Name=$a ]
             Field=authors
           ]
           =
           FieldAccessor [
-            Variable [ Name=b ]
+            Variable [ Name=$b ]
             Field=authors
           ]
         ]
       Orderby
         FieldAccessor [
-          Variable [ Name=b ]
+          Variable [ Name=$b ]
           Field=id
         ]
         ASC
@@ -53,11 +53,11 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
   AS
-  Variable [ Name=a ]
+  Variable [ Name=$a ]
 ]
 Orderby
   FieldAccessor [
-    Variable [ Name=a ]
+    Variable [ Name=$a ]
     Field=id
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue658/query_issue658.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue658/query_issue658.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue658/query_issue658.3.ast
index 3c6cea7..cbe0ff1 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue658/query_issue658.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue658/query_issue658.3.ast
@@ -6,7 +6,7 @@ RecordConstructor [
     LiteralExpr [STRING] [aid]
     :
     FieldAccessor [
-      Variable [ Name=a ]
+      Variable [ Name=$a ]
       Field=id
     ]
   )
@@ -16,7 +16,7 @@ RecordConstructor [
     (
       SELECT ELEMENT [
       FieldAccessor [
-        Variable [ Name=b ]
+        Variable [ Name=$b ]
         Field=id
       ]
       ]
@@ -24,37 +24,37 @@ RecordConstructor [
           LiteralExpr [STRING] [CSX]
         ]
         AS
-        Variable [ Name=b ]
+        Variable [ Name=$b ]
       ]
       Where
         OperatorExpr [
           OperatorExpr [
             FieldAccessor [
-              Variable [ Name=a ]
+              Variable [ Name=$a ]
               Field=authors
             ]
             =
             FieldAccessor [
-              Variable [ Name=b ]
+              Variable [ Name=$b ]
               Field=authors
             ]
           ]
           and
           OperatorExpr [
             FieldAccessor [
-              Variable [ Name=a ]
+              Variable [ Name=$a ]
               Field=title
             ]
             !=
             FieldAccessor [
-              Variable [ Name=b ]
+              Variable [ Name=$b ]
               Field=title
             ]
           ]
         ]
       Orderby
         FieldAccessor [
-          Variable [ Name=b ]
+          Variable [ Name=$b ]
           Field=id
         ]
         ASC
@@ -67,11 +67,11 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
   AS
-  Variable [ Name=a ]
+  Variable [ Name=$a ]
 ]
 Orderby
   FieldAccessor [
-    Variable [ Name=a ]
+    Variable [ Name=$a ]
     Field=id
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue849-2/query_issue849-2.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue849-2/query_issue849-2.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue849-2/query_issue849-2.3.ast
index 6f7bde6..4f5b4e0 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue849-2/query_issue849-2.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue849-2/query_issue849-2.3.ast
@@ -5,12 +5,12 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [x]
     :
-    Variable [ Name=x ]
+    Variable [ Name=$x ]
   )
   (
     LiteralExpr [STRING] [y]
     :
-    Variable [ Name=y ]
+    Variable [ Name=$y ]
   )
 ]
 ]
@@ -18,12 +18,12 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [s]
   ]
   AS
-  Variable [ Name=x ]
+  Variable [ Name=$x ]
 ,
   (
     SELECT ELEMENT [
     FieldAccessor [
-      Variable [ Name=z ]
+      Variable [ Name=$z ]
       Field=c
     ]
     ]
@@ -66,21 +66,21 @@ FROM [  FunctionCall Metadata.dataset@1[
         ]
       ]
       AS
-      Variable [ Name=z ]
+      Variable [ Name=$z ]
     ]
     Where
       OperatorExpr [
         FieldAccessor [
-          Variable [ Name=x ]
+          Variable [ Name=$x ]
           Field=b
         ]
         =
         FieldAccessor [
-          Variable [ Name=z ]
+          Variable [ Name=$z ]
           Field=a
         ]
       ]
   )
   AS
-  Variable [ Name=y ]
+  Variable [ Name=$y ]
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue849/query_issue849.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue849/query_issue849.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue849/query_issue849.3.ast
index 19f3d09..654e008 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue849/query_issue849.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue849/query_issue849.3.ast
@@ -5,12 +5,12 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [x]
     :
-    Variable [ Name=x ]
+    Variable [ Name=$x ]
   )
   (
     LiteralExpr [STRING] [y]
     :
-    Variable [ Name=y ]
+    Variable [ Name=$y ]
   )
 ]
 ]
@@ -31,12 +31,12 @@ FROM [  UnorderedListConstructor [
     ]
   ]
   AS
-  Variable [ Name=x ]
+  Variable [ Name=$x ]
 ,
   (
     SELECT ELEMENT [
     FieldAccessor [
-      Variable [ Name=z ]
+      Variable [ Name=$z ]
       Field=b
     ]
     ]
@@ -44,21 +44,21 @@ FROM [  UnorderedListConstructor [
         LiteralExpr [STRING] [s]
       ]
       AS
-      Variable [ Name=z ]
+      Variable [ Name=$z ]
     ]
     Where
       OperatorExpr [
         FieldAccessor [
-          Variable [ Name=x ]
+          Variable [ Name=$x ]
           Field=a
         ]
         =
         FieldAccessor [
-          Variable [ Name=z ]
+          Variable [ Name=$z ]
           Field=b
         ]
       ]
   )
   AS
-  Variable [ Name=y ]
+  Variable [ Name=$y ]
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/len_01/len_01.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/len_01/len_01.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/len_01/len_01.3.ast
index b485e15..94f0c25 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/len_01/len_01.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/len_01/len_01.3.ast
@@ -52,5 +52,5 @@ FROM [  OrderedListConstructor [
     LiteralExpr [LONG] [1]
   ]
   AS
-  Variable [ Name=l ]
+  Variable [ Name=$l ]
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/listify_01/listify_01.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/listify_01/listify_01.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/listify_01/listify_01.3.ast
index 3c7cc1a..19e047c 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/listify_01/listify_01.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/listify_01/listify_01.3.ast
@@ -1,10 +1,10 @@
 DataverseUse test
 Query:
-LetVariable [ Name=token_list ]
+Let Variable [ Name=$token_list ]
   :=
   (
     SELECT ELEMENT [
-    Variable [ Name=token ]
+    Variable [ Name=$token ]
     ]
     FROM [      OrderedListConstructor [
         LiteralExpr [LONG] [1]
@@ -12,9 +12,9 @@ LetVariable [ Name=token_list ]
         LiteralExpr [LONG] [3]
       ]
       AS
-      Variable [ Name=token ]
+      Variable [ Name=$token ]
     ]
   )
 SELECT ELEMENT [
-Variable [ Name=token_list ]
+Variable [ Name=$token_list ]
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/listify_02/listify_02.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/listify_02/listify_02.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/listify_02/listify_02.3.ast
index 4d1a23c..7fb49b5 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/listify_02/listify_02.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/listify_02/listify_02.3.ast
@@ -1,19 +1,19 @@
 DataverseUse test
 Query:
-LetVariable [ Name=token_list ]
+Let Variable [ Name=$token_list ]
   :=
   (
     SELECT ELEMENT [
-    Variable [ Name=token ]
+    Variable [ Name=$token ]
     ]
     FROM [      OrderedListConstructor [
         LiteralExpr [STRING] [foo]
         LiteralExpr [STRING] [bar]
       ]
       AS
-      Variable [ Name=token ]
+      Variable [ Name=$token ]
     ]
   )
 SELECT ELEMENT [
-Variable [ Name=token_list ]
+Variable [ Name=$token_list ]
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/listify_03/listify_03.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/listify_03/listify_03.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/listify_03/listify_03.3.ast
index 81cb2a2..3eb686c 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/listify_03/listify_03.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/listify_03/listify_03.3.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Query:
 SELECT ELEMENT [
 FunctionCall test.min@1[
-  Variable [ Name=y ]
+  Variable [ Name=$y ]
 ]
 ]
 FROM [  OrderedListConstructor [
@@ -10,14 +10,14 @@ FROM [  OrderedListConstructor [
     LiteralExpr [LONG] [2]
   ]
   AS
-  Variable [ Name=x ]
+  Variable [ Name=$x ]
 ]
-LetVariable [ Name=y ]
+Let Variable [ Name=$y ]
   :=
   (
     SELECT ELEMENT [
     FunctionCall test.min@1[
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
     ]
     ]
     FROM [      OrderedListConstructor [
@@ -38,6 +38,6 @@ LetVariable [ Name=y ]
         ]
       ]
       AS
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
     ]
   )

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/query-issue428/query-issue428.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/query-issue428/query-issue428.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/query-issue428/query-issue428.3.ast
index 912a549..e441381 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/query-issue428/query-issue428.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/query-issue428/query-issue428.3.ast
@@ -1,19 +1,19 @@
 Query:
 SELECT ELEMENT [
 QuantifiedExpression SOME [
-  [Variable [ Name=a1 ]
+  [Variable [ Name=$a1 ]
   In
-    Variable [ Name=a ]
+    Variable [ Name=$a ]
   ]
-  [Variable [ Name=b1 ]
+  [Variable [ Name=$b1 ]
   In
-    Variable [ Name=b ]
+    Variable [ Name=$b ]
   ]
   Satifies [
     OperatorExpr [
-      Variable [ Name=a1 ]
+      Variable [ Name=$a1 ]
       <
-      Variable [ Name=b1 ]
+      Variable [ Name=$b1 ]
     ]
   ]
 ]
@@ -30,7 +30,7 @@ FROM [  OrderedListConstructor [
     ]
   ]
   AS
-  Variable [ Name=a ]
+  Variable [ Name=$a ]
 ,
   OrderedListConstructor [
     OrderedListConstructor [
@@ -44,5 +44,5 @@ FROM [  OrderedListConstructor [
     ]
   ]
   AS
-  Variable [ Name=b ]
+  Variable [ Name=$b ]
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/scan-collection_01/scan-collection_01.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/scan-collection_01/scan-collection_01.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/scan-collection_01/scan-collection_01.3.ast
index 53e2019..ff7058d 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/scan-collection_01/scan-collection_01.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/scan-collection_01/scan-collection_01.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-Variable [ Name=u ]
+Variable [ Name=$u ]
 ]
 FROM [  OrderedListConstructor [
     LiteralExpr [LONG] [1]
@@ -9,5 +9,5 @@ FROM [  OrderedListConstructor [
     LiteralExpr [LONG] [3]
   ]
   AS
-  Variable [ Name=u ]
+  Variable [ Name=$u ]
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/adm_binary/adm_binary.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/adm_binary/adm_binary.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/adm_binary/adm_binary.3.ast
index dfdb7a9..3d46dd9 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/adm_binary/adm_binary.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/adm_binary/adm_binary.3.ast
@@ -1,11 +1,11 @@
 DataverseUse temp
 Query:
 SELECT ELEMENT [
-Variable [ Name=i ]
+Variable [ Name=$i ]
 ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [testds]
   ]
   AS
-  Variable [ Name=i ]
+  Variable [ Name=$i ]
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_01/csv_01.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_01/csv_01.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_01/csv_01.3.ast
index b884844..76e0eec 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_01/csv_01.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_01/csv_01.3.ast
@@ -6,7 +6,7 @@ RecordConstructor [
     LiteralExpr [STRING] [id]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=id
     ]
   )
@@ -14,7 +14,7 @@ RecordConstructor [
     LiteralExpr [STRING] [float]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=float
     ]
   )
@@ -22,7 +22,7 @@ RecordConstructor [
     LiteralExpr [STRING] [double]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=double
     ]
   )
@@ -30,7 +30,7 @@ RecordConstructor [
     LiteralExpr [STRING] [date-before]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=date
     ]
   )
@@ -39,7 +39,7 @@ RecordConstructor [
     :
     FunctionCall temp.date@1[
       FieldAccessor [
-        Variable [ Name=i ]
+        Variable [ Name=$i ]
         Field=date
       ]
     ]
@@ -48,7 +48,7 @@ RecordConstructor [
     LiteralExpr [STRING] [time-before]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=time
     ]
   )
@@ -57,7 +57,7 @@ RecordConstructor [
     :
     FunctionCall temp.time@1[
       FieldAccessor [
-        Variable [ Name=i ]
+        Variable [ Name=$i ]
         Field=time
       ]
     ]
@@ -66,7 +66,7 @@ RecordConstructor [
     LiteralExpr [STRING] [datetime-before]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=datetime
     ]
   )
@@ -75,7 +75,7 @@ RecordConstructor [
     :
     FunctionCall temp.datetime@1[
       FieldAccessor [
-        Variable [ Name=i ]
+        Variable [ Name=$i ]
         Field=datetime
       ]
     ]
@@ -86,11 +86,11 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [testds]
   ]
   AS
-  Variable [ Name=i ]
+  Variable [ Name=$i ]
 ]
 Orderby
   FieldAccessor [
-    Variable [ Name=i ]
+    Variable [ Name=$i ]
     Field=id
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_02/csv_02.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_02/csv_02.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_02/csv_02.3.ast
index 482a28e..5b3143d 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_02/csv_02.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_02/csv_02.3.ast
@@ -6,7 +6,7 @@ RecordConstructor [
     LiteralExpr [STRING] [id]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=id
     ]
   )
@@ -14,7 +14,7 @@ RecordConstructor [
     LiteralExpr [STRING] [float]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=float
     ]
   )
@@ -22,7 +22,7 @@ RecordConstructor [
     LiteralExpr [STRING] [double]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=double
     ]
   )
@@ -30,7 +30,7 @@ RecordConstructor [
     LiteralExpr [STRING] [date-string]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=date
     ]
   )
@@ -38,7 +38,7 @@ RecordConstructor [
     LiteralExpr [STRING] [time-string]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=time
     ]
   )
@@ -46,7 +46,7 @@ RecordConstructor [
     LiteralExpr [STRING] [datetime-string]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=datetime
     ]
   )
@@ -56,11 +56,11 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [testds]
   ]
   AS
-  Variable [ Name=i ]
+  Variable [ Name=$i ]
 ]
 Orderby
   FieldAccessor [
-    Variable [ Name=i ]
+    Variable [ Name=$i ]
     Field=id
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_03/csv_03.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_03/csv_03.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_03/csv_03.3.ast
index ac77c83..834efdf 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_03/csv_03.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_03/csv_03.3.ast
@@ -6,7 +6,7 @@ RecordConstructor [
     LiteralExpr [STRING] [id]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=id
     ]
   )
@@ -14,7 +14,7 @@ RecordConstructor [
     LiteralExpr [STRING] [float]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=float
     ]
   )
@@ -22,7 +22,7 @@ RecordConstructor [
     LiteralExpr [STRING] [floatq]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=floatq
     ]
   )
@@ -30,7 +30,7 @@ RecordConstructor [
     LiteralExpr [STRING] [double]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=double
     ]
   )
@@ -38,7 +38,7 @@ RecordConstructor [
     LiteralExpr [STRING] [doubleq]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=doubleq
     ]
   )
@@ -46,7 +46,7 @@ RecordConstructor [
     LiteralExpr [STRING] [string]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=string
     ]
   )
@@ -54,7 +54,7 @@ RecordConstructor [
     LiteralExpr [STRING] [stringq]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=stringq
     ]
   )
@@ -64,11 +64,11 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [testds]
   ]
   AS
-  Variable [ Name=i ]
+  Variable [ Name=$i ]
 ]
 Orderby
   FieldAccessor [
-    Variable [ Name=i ]
+    Variable [ Name=$i ]
     Field=id
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_04/csv_04.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_04/csv_04.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_04/csv_04.3.ast
index 8fd7d90..b7cbd4b 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_04/csv_04.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_04/csv_04.3.ast
@@ -6,7 +6,7 @@ RecordConstructor [
     LiteralExpr [STRING] [id]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=id
     ]
   )
@@ -14,7 +14,7 @@ RecordConstructor [
     LiteralExpr [STRING] [float]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=float
     ]
   )
@@ -22,7 +22,7 @@ RecordConstructor [
     LiteralExpr [STRING] [stringa]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=stringa
     ]
   )
@@ -30,7 +30,7 @@ RecordConstructor [
     LiteralExpr [STRING] [stringb]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=stringb
     ]
   )
@@ -40,11 +40,11 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [testds]
   ]
   AS
-  Variable [ Name=i ]
+  Variable [ Name=$i ]
 ]
 Orderby
   FieldAccessor [
-    Variable [ Name=i ]
+    Variable [ Name=$i ]
     Field=id
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_05/csv_05.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_05/csv_05.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_05/csv_05.3.ast
index 8fd7d90..b7cbd4b 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_05/csv_05.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_05/csv_05.3.ast
@@ -6,7 +6,7 @@ RecordConstructor [
     LiteralExpr [STRING] [id]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=id
     ]
   )
@@ -14,7 +14,7 @@ RecordConstructor [
     LiteralExpr [STRING] [float]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=float
     ]
   )
@@ -22,7 +22,7 @@ RecordConstructor [
     LiteralExpr [STRING] [stringa]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=stringa
     ]
   )
@@ -30,7 +30,7 @@ RecordConstructor [
     LiteralExpr [STRING] [stringb]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=stringb
     ]
   )
@@ -40,11 +40,11 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [testds]
   ]
   AS
-  Variable [ Name=i ]
+  Variable [ Name=$i ]
 ]
 Orderby
   FieldAccessor [
-    Variable [ Name=i ]
+    Variable [ Name=$i ]
     Field=id
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_06/csv_06.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_06/csv_06.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_06/csv_06.3.ast
index 8fd7d90..b7cbd4b 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_06/csv_06.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_06/csv_06.3.ast
@@ -6,7 +6,7 @@ RecordConstructor [
     LiteralExpr [STRING] [id]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=id
     ]
   )
@@ -14,7 +14,7 @@ RecordConstructor [
     LiteralExpr [STRING] [float]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=float
     ]
   )
@@ -22,7 +22,7 @@ RecordConstructor [
     LiteralExpr [STRING] [stringa]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=stringa
     ]
   )
@@ -30,7 +30,7 @@ RecordConstructor [
     LiteralExpr [STRING] [stringb]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=stringb
     ]
   )
@@ -40,11 +40,11 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [testds]
   ]
   AS
-  Variable [ Name=i ]
+  Variable [ Name=$i ]
 ]
 Orderby
   FieldAccessor [
-    Variable [ Name=i ]
+    Variable [ Name=$i ]
     Field=id
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_07/csv_07.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_07/csv_07.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_07/csv_07.3.ast
index 8fd7d90..b7cbd4b 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_07/csv_07.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_07/csv_07.3.ast
@@ -6,7 +6,7 @@ RecordConstructor [
     LiteralExpr [STRING] [id]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=id
     ]
   )
@@ -14,7 +14,7 @@ RecordConstructor [
     LiteralExpr [STRING] [float]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=float
     ]
   )
@@ -22,7 +22,7 @@ RecordConstructor [
     LiteralExpr [STRING] [stringa]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=stringa
     ]
   )
@@ -30,7 +30,7 @@ RecordConstructor [
     LiteralExpr [STRING] [stringb]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=stringb
     ]
   )
@@ -40,11 +40,11 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [testds]
   ]
   AS
-  Variable [ Name=i ]
+  Variable [ Name=$i ]
 ]
 Orderby
   FieldAccessor [
-    Variable [ Name=i ]
+    Variable [ Name=$i ]
     Field=id
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_cr/csv_08.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_cr/csv_08.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_cr/csv_08.3.ast
index b884844..76e0eec 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_cr/csv_08.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_cr/csv_08.3.ast
@@ -6,7 +6,7 @@ RecordConstructor [
     LiteralExpr [STRING] [id]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=id
     ]
   )
@@ -14,7 +14,7 @@ RecordConstructor [
     LiteralExpr [STRING] [float]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=float
     ]
   )
@@ -22,7 +22,7 @@ RecordConstructor [
     LiteralExpr [STRING] [double]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=double
     ]
   )
@@ -30,7 +30,7 @@ RecordConstructor [
     LiteralExpr [STRING] [date-before]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=date
     ]
   )
@@ -39,7 +39,7 @@ RecordConstructor [
     :
     FunctionCall temp.date@1[
       FieldAccessor [
-        Variable [ Name=i ]
+        Variable [ Name=$i ]
         Field=date
       ]
     ]
@@ -48,7 +48,7 @@ RecordConstructor [
     LiteralExpr [STRING] [time-before]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=time
     ]
   )
@@ -57,7 +57,7 @@ RecordConstructor [
     :
     FunctionCall temp.time@1[
       FieldAccessor [
-        Variable [ Name=i ]
+        Variable [ Name=$i ]
         Field=time
       ]
     ]
@@ -66,7 +66,7 @@ RecordConstructor [
     LiteralExpr [STRING] [datetime-before]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=datetime
     ]
   )
@@ -75,7 +75,7 @@ RecordConstructor [
     :
     FunctionCall temp.datetime@1[
       FieldAccessor [
-        Variable [ Name=i ]
+        Variable [ Name=$i ]
         Field=datetime
       ]
     ]
@@ -86,11 +86,11 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [testds]
   ]
   AS
-  Variable [ Name=i ]
+  Variable [ Name=$i ]
 ]
 Orderby
   FieldAccessor [
-    Variable [ Name=i ]
+    Variable [ Name=$i ]
     Field=id
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_crlf/csv_08.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_crlf/csv_08.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_crlf/csv_08.3.ast
index b884844..76e0eec 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_crlf/csv_08.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_crlf/csv_08.3.ast
@@ -6,7 +6,7 @@ RecordConstructor [
     LiteralExpr [STRING] [id]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=id
     ]
   )
@@ -14,7 +14,7 @@ RecordConstructor [
     LiteralExpr [STRING] [float]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=float
     ]
   )
@@ -22,7 +22,7 @@ RecordConstructor [
     LiteralExpr [STRING] [double]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=double
     ]
   )
@@ -30,7 +30,7 @@ RecordConstructor [
     LiteralExpr [STRING] [date-before]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=date
     ]
   )
@@ -39,7 +39,7 @@ RecordConstructor [
     :
     FunctionCall temp.date@1[
       FieldAccessor [
-        Variable [ Name=i ]
+        Variable [ Name=$i ]
         Field=date
       ]
     ]
@@ -48,7 +48,7 @@ RecordConstructor [
     LiteralExpr [STRING] [time-before]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=time
     ]
   )
@@ -57,7 +57,7 @@ RecordConstructor [
     :
     FunctionCall temp.time@1[
       FieldAccessor [
-        Variable [ Name=i ]
+        Variable [ Name=$i ]
         Field=time
       ]
     ]
@@ -66,7 +66,7 @@ RecordConstructor [
     LiteralExpr [STRING] [datetime-before]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=datetime
     ]
   )
@@ -75,7 +75,7 @@ RecordConstructor [
     :
     FunctionCall temp.datetime@1[
       FieldAccessor [
-        Variable [ Name=i ]
+        Variable [ Name=$i ]
         Field=datetime
       ]
     ]
@@ -86,11 +86,11 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [testds]
   ]
   AS
-  Variable [ Name=i ]
+  Variable [ Name=$i ]
 ]
 Orderby
   FieldAccessor [
-    Variable [ Name=i ]
+    Variable [ Name=$i ]
     Field=id
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_lf/csv_08.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_lf/csv_08.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_lf/csv_08.3.ast
index b884844..76e0eec 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_lf/csv_08.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_lf/csv_08.3.ast
@@ -6,7 +6,7 @@ RecordConstructor [
     LiteralExpr [STRING] [id]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=id
     ]
   )
@@ -14,7 +14,7 @@ RecordConstructor [
     LiteralExpr [STRING] [float]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=float
     ]
   )
@@ -22,7 +22,7 @@ RecordConstructor [
     LiteralExpr [STRING] [double]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=double
     ]
   )
@@ -30,7 +30,7 @@ RecordConstructor [
     LiteralExpr [STRING] [date-before]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=date
     ]
   )
@@ -39,7 +39,7 @@ RecordConstructor [
     :
     FunctionCall temp.date@1[
       FieldAccessor [
-        Variable [ Name=i ]
+        Variable [ Name=$i ]
         Field=date
       ]
     ]
@@ -48,7 +48,7 @@ RecordConstructor [
     LiteralExpr [STRING] [time-before]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=time
     ]
   )
@@ -57,7 +57,7 @@ RecordConstructor [
     :
     FunctionCall temp.time@1[
       FieldAccessor [
-        Variable [ Name=i ]
+        Variable [ Name=$i ]
         Field=time
       ]
     ]
@@ -66,7 +66,7 @@ RecordConstructor [
     LiteralExpr [STRING] [datetime-before]
     :
     FieldAccessor [
-      Variable [ Name=i ]
+      Variable [ Name=$i ]
       Field=datetime
     ]
   )
@@ -75,7 +75,7 @@ RecordConstructor [
     :
     FunctionCall temp.datetime@1[
       FieldAccessor [
-        Variable [ Name=i ]
+        Variable [ Name=$i ]
         Field=datetime
       ]
     ]
@@ -86,11 +86,11 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [testds]
   ]
   AS
-  Variable [ Name=i ]
+  Variable [ Name=$i ]
 ]
 Orderby
   FieldAccessor [
-    Variable [ Name=i ]
+    Variable [ Name=$i ]
     Field=id
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/escapes01/escapes01.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/escapes01/escapes01.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/escapes01/escapes01.3.ast
index 176ce1e..2b37a8e 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/escapes01/escapes01.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/escapes01/escapes01.3.ast
@@ -1,17 +1,17 @@
 DataverseUse TestDataverse
 Query:
 SELECT ELEMENT [
-Variable [ Name=i ]
+Variable [ Name=$i ]
 ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [TestSet]
   ]
   AS
-  Variable [ Name=i ]
+  Variable [ Name=$i ]
 ]
 Orderby
   FieldAccessor [
-    Variable [ Name=i ]
+    Variable [ Name=$i ]
     Field=id
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/escapes02/escapes02.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/escapes02/escapes02.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/escapes02/escapes02.3.ast
index 176ce1e..2b37a8e 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/escapes02/escapes02.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/escapes02/escapes02.3.ast
@@ -1,17 +1,17 @@
 DataverseUse TestDataverse
 Query:
 SELECT ELEMENT [
-Variable [ Name=i ]
+Variable [ Name=$i ]
 ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [TestSet]
   ]
   AS
-  Variable [ Name=i ]
+  Variable [ Name=$i ]
 ]
 Orderby
   FieldAccessor [
-    Variable [ Name=i ]
+    Variable [ Name=$i ]
     Field=id
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/issue289_query/issue289_query.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/issue289_query/issue289_query.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/issue289_query/issue289_query.3.ast
index 323b20d..3645723 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/issue289_query/issue289_query.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/issue289_query/issue289_query.3.ast
@@ -4,13 +4,13 @@ SELECT ELEMENT [
 FunctionCall test.count@1[
   (
     SELECT ELEMENT [
-    Variable [ Name=l ]
+    Variable [ Name=$l ]
     ]
     FROM [      FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [Customers]
       ]
       AS
-      Variable [ Name=l ]
+      Variable [ Name=$l ]
     ]
   )
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/type_promotion_0/type_promotion_0.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/type_promotion_0/type_promotion_0.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/type_promotion_0/type_promotion_0.3.ast
index 176ce1e..2b37a8e 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/type_promotion_0/type_promotion_0.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/type_promotion_0/type_promotion_0.3.ast
@@ -1,17 +1,17 @@
 DataverseUse TestDataverse
 Query:
 SELECT ELEMENT [
-Variable [ Name=i ]
+Variable [ Name=$i ]
 ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [TestSet]
   ]
   AS
-  Variable [ Name=i ]
+  Variable [ Name=$i ]
 ]
 Orderby
   FieldAccessor [
-    Variable [ Name=i ]
+    Variable [ Name=$i ]
     Field=id
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/materialization/assign-reuse/assign-reuse.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/materialization/assign-reuse/assign-reuse.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/materialization/assign-reuse/assign-reuse.3.ast
index c0fdc76..23559fa 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/materialization/assign-reuse/assign-reuse.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/materialization/assign-reuse/assign-reuse.3.ast
@@ -1,22 +1,22 @@
 DataverseUse TinySocial
 Query:
-LetVariable [ Name=lonelyusers ]
+Let Variable [ Name=$lonelyusers ]
   :=
   (
     SELECT ELEMENT [
-    Variable [ Name=d ]
+    Variable [ Name=$d ]
     ]
     FROM [      FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [FacebookUsers]
       ]
       AS
-      Variable [ Name=d ]
+      Variable [ Name=$d ]
     ]
     Where
       OperatorExpr [
         FunctionCall TinySocial.count@1[
           FieldAccessor [
-            Variable [ Name=d ]
+            Variable [ Name=$d ]
             Field=friend-ids
           ]
         ]
@@ -24,23 +24,23 @@ LetVariable [ Name=lonelyusers ]
         LiteralExpr [LONG] [2]
       ]
   )
-LetVariable [ Name=lonelyusers2 ]
+Let Variable [ Name=$lonelyusers2 ]
   :=
   (
     SELECT ELEMENT [
-    Variable [ Name=d ]
+    Variable [ Name=$d ]
     ]
     FROM [      FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [FacebookUsers]
       ]
       AS
-      Variable [ Name=d ]
+      Variable [ Name=$d ]
     ]
     Where
       OperatorExpr [
         FunctionCall TinySocial.count@1[
           FieldAccessor [
-            Variable [ Name=d ]
+            Variable [ Name=$d ]
             Field=friend-ids
           ]
         ]
@@ -58,7 +58,7 @@ RecordConstructor [
         LiteralExpr [STRING] [id]
         :
         FieldAccessor [
-          Variable [ Name=l1 ]
+          Variable [ Name=$l1 ]
           Field=id
         ]
       )
@@ -66,7 +66,7 @@ RecordConstructor [
         LiteralExpr [STRING] [name]
         :
         FieldAccessor [
-          Variable [ Name=l1 ]
+          Variable [ Name=$l1 ]
           Field=name
         ]
       )
@@ -80,7 +80,7 @@ RecordConstructor [
         LiteralExpr [STRING] [id]
         :
         FieldAccessor [
-          Variable [ Name=l2 ]
+          Variable [ Name=$l2 ]
           Field=id
         ]
       )
@@ -88,7 +88,7 @@ RecordConstructor [
         LiteralExpr [STRING] [name]
         :
         FieldAccessor [
-          Variable [ Name=l2 ]
+          Variable [ Name=$l2 ]
           Field=name
         ]
       )
@@ -96,34 +96,34 @@ RecordConstructor [
   )
 ]
 ]
-FROM [  Variable [ Name=lonelyusers ]
+FROM [  Variable [ Name=$lonelyusers ]
   AS
-  Variable [ Name=l1 ]
+  Variable [ Name=$l1 ]
 ,
-  Variable [ Name=lonelyusers2 ]
+  Variable [ Name=$lonelyusers2 ]
   AS
-  Variable [ Name=l2 ]
+  Variable [ Name=$l2 ]
 ]
 Where
   OperatorExpr [
     FieldAccessor [
-      Variable [ Name=l1 ]
+      Variable [ Name=$l1 ]
       Field=id
     ]
     <
     FieldAccessor [
-      Variable [ Name=l2 ]
+      Variable [ Name=$l2 ]
       Field=id
     ]
   ]
 Orderby
   FieldAccessor [
-    Variable [ Name=l1 ]
+    Variable [ Name=$l1 ]
     Field=id
   ]
   ASC
   FieldAccessor [
-    Variable [ Name=l2 ]
+    Variable [ Name=$l2 ]
     Field=id
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/float_01/float_01.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/float_01/float_01.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/float_01/float_01.3.ast
index 69b596c..85ceb1a 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/float_01/float_01.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/float_01/float_01.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-Variable [ Name=f ]
+Variable [ Name=$f ]
 ]
 FROM [  OrderedListConstructor [
     LiteralExpr [FLOAT] [1.0]
@@ -12,5 +12,5 @@ FROM [  OrderedListConstructor [
     LiteralExpr [FLOAT] [0.1]
   ]
   AS
-  Variable [ Name=f ]
+  Variable [ Name=$f ]
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/flushtest/flushtest.4.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/flushtest/flushtest.4.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/flushtest/flushtest.4.ast
index fc3a08a..cdd2ab6 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/flushtest/flushtest.4.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/flushtest/flushtest.4.ast
@@ -1,11 +1,11 @@
 DataverseUse DMLTest
 Query:
 SELECT ELEMENT [
-Variable [ Name=t ]
+Variable [ Name=$t ]
 ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [FacebookUsers2]
   ]
   AS
-  Variable [ Name=t ]
+  Variable [ Name=$t ]
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/groupby-orderby-count/groupby-orderby-count.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/groupby-orderby-count/groupby-orderby-count.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/groupby-orderby-count/groupby-orderby-count.3.ast
index c68fa11..2399e4b 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/groupby-orderby-count/groupby-orderby-count.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/groupby-orderby-count/groupby-orderby-count.3.ast
@@ -5,13 +5,24 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [word]
     :
-    Variable [ Name=tok ]
+    Variable [ Name=$tok ]
   )
   (
     LiteralExpr [STRING] [count]
     :
     FunctionCall twitter.count@1[
-      Variable [ Name=token ]
+      (
+        SELECT ELEMENT [
+        FieldAccessor [
+          Variable [ Name=#2 ]
+          Field=token
+        ]
+        ]
+        FROM [          Variable [ Name=#1 ]
+          AS
+          Variable [ Name=#2 ]
+        ]
+      )
     ]
   )
 ]
@@ -20,30 +31,46 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [TwitterData]
   ]
   AS
-  Variable [ Name=t ]
+  Variable [ Name=$t ]
 ,
   FunctionCall twitter.word-tokens@1[
     FieldAccessor [
-      Variable [ Name=t ]
+      Variable [ Name=$t ]
       Field=text
     ]
   ]
   AS
-  Variable [ Name=token ]
+  Variable [ Name=$token ]
 ]
 Groupby
-  Variable [ Name=tok ]
+  Variable [ Name=$tok ]
   :=
-  Variable [ Name=token ]
-  With
-  Variable [ Name=t ]
-  Variable [ Name=token ]
+  Variable [ Name=$token ]
+  GROUP AS
+  Variable [ Name=#1 ]
+  (
+  Variable [ Name=$token ]
+   AS token
+  Variable [ Name=$t ]
+   AS t
+  )
 
 Orderby
   FunctionCall twitter.count@1[
-    Variable [ Name=token ]
+    (
+      SELECT ELEMENT [
+      FieldAccessor [
+        Variable [ Name=#3 ]
+        Field=token
+      ]
+      ]
+      FROM [        Variable [ Name=#1 ]
+        AS
+        Variable [ Name=#3 ]
+      ]
+    )
   ]
   DESC
-  Variable [ Name=tok ]
+  Variable [ Name=$tok ]
   ASC
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/nested-loop-join_01/nested-loop-join_01.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/nested-loop-join_01/nested-loop-join_01.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/nested-loop-join_01/nested-loop-join_01.3.ast
index 3c322fa..7e52ea1 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/nested-loop-join_01/nested-loop-join_01.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/nested-loop-join_01/nested-loop-join_01.3.ast
@@ -5,19 +5,19 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [user]
     :
-    Variable [ Name=user ]
+    Variable [ Name=$user ]
   )
   (
     LiteralExpr [STRING] [visitor]
     :
-    Variable [ Name=visitor ]
+    Variable [ Name=$visitor ]
   )
   (
     LiteralExpr [STRING] [user-lottery_numbers-len]
     :
     FunctionCall test.len@1[
       FieldAccessor [
-        Variable [ Name=user ]
+        Variable [ Name=$user ]
         Field=lottery_numbers
       ]
     ]
@@ -27,7 +27,7 @@ RecordConstructor [
     :
     FunctionCall test.len@1[
       FieldAccessor [
-        Variable [ Name=visitor ]
+        Variable [ Name=$visitor ]
         Field=lottery_numbers
       ]
     ]
@@ -38,38 +38,38 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Users]
   ]
   AS
-  Variable [ Name=user ]
+  Variable [ Name=$user ]
 ,
   FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Visitors]
   ]
   AS
-  Variable [ Name=visitor ]
+  Variable [ Name=$visitor ]
 ]
 Where
   OperatorExpr [
     FunctionCall test.len@1[
       FieldAccessor [
-        Variable [ Name=user ]
+        Variable [ Name=$user ]
         Field=lottery_numbers
       ]
     ]
     =
     FunctionCall test.len@1[
       FieldAccessor [
-        Variable [ Name=visitor ]
+        Variable [ Name=$visitor ]
         Field=lottery_numbers
       ]
     ]
   ]
 Orderby
   FieldAccessor [
-    Variable [ Name=user ]
+    Variable [ Name=$user ]
     Field=uid
   ]
   ASC
   FieldAccessor [
-    Variable [ Name=visitor ]
+    Variable [ Name=$visitor ]
     Field=vid
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/partition-by-nonexistent-field/partition-by-nonexistent-field.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/partition-by-nonexistent-field/partition-by-nonexistent-field.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/partition-by-nonexistent-field/partition-by-nonexistent-field.3.ast
index 16bb849..ef5fc9e 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/partition-by-nonexistent-field/partition-by-nonexistent-field.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/partition-by-nonexistent-field/partition-by-nonexistent-field.3.ast
@@ -1,11 +1,11 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-Variable [ Name=l ]
+Variable [ Name=$l ]
 ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [testds]
   ]
   AS
-  Variable [ Name=l ]
+  Variable [ Name=$l ]
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/prefix-search/prefix-search.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/prefix-search/prefix-search.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/prefix-search/prefix-search.3.ast
index eb41e9f..f549338 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/prefix-search/prefix-search.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/prefix-search/prefix-search.3.ast
@@ -6,7 +6,7 @@ RecordConstructor [
     LiteralExpr [STRING] [l_linenumber]
     :
     FieldAccessor [
-      Variable [ Name=l ]
+      Variable [ Name=$l ]
       Field=l_linenumber
     ]
   )
@@ -14,7 +14,7 @@ RecordConstructor [
     LiteralExpr [STRING] [l_l_orderkey]
     :
     FieldAccessor [
-      Variable [ Name=l ]
+      Variable [ Name=$l ]
       Field=l_orderkey
     ]
   )
@@ -24,13 +24,13 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [LineItem]
   ]
   AS
-  Variable [ Name=l ]
+  Variable [ Name=$l ]
 ]
 Where
   OperatorExpr [
     OperatorExpr [
       FieldAccessor [
-        Variable [ Name=l ]
+        Variable [ Name=$l ]
         Field=l_orderkey
       ]
       >=
@@ -39,7 +39,7 @@ Where
     and
     OperatorExpr [
       FieldAccessor [
-        Variable [ Name=l ]
+        Variable [ Name=$l ]
         Field=l_orderkey
       ]
       <
@@ -48,7 +48,7 @@ Where
   ]
 Orderby
   FieldAccessor [
-    Variable [ Name=l ]
+    Variable [ Name=$l ]
     Field=l_linenumber
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/query_issue267/query_issue267.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/query_issue267/query_issue267.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/query_issue267/query_issue267.3.ast
index 59cf201..45b8f56 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/query_issue267/query_issue267.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/query_issue267/query_issue267.3.ast
@@ -1,33 +1,33 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-Variable [ Name=l ]
+Variable [ Name=$l ]
 ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [t1]
   ]
   AS
-  Variable [ Name=l ]
+  Variable [ Name=$l ]
 ,
   FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [t2]
   ]
   AS
-  Variable [ Name=m ]
+  Variable [ Name=$m ]
 ]
 Where
   OperatorExpr [
     OperatorExpr [
       FunctionCall test.lowercase@1[
         FieldAccessor [
-          Variable [ Name=m ]
+          Variable [ Name=$m ]
           Field=name
         ]
       ]
       =
       FunctionCall test.lowercase@1[
         FieldAccessor [
-          Variable [ Name=l ]
+          Variable [ Name=$l ]
           Field=name
         ]
       ]
@@ -36,14 +36,14 @@ Where
     OperatorExpr [
       FunctionCall test.string-length@1[
         FieldAccessor [
-          Variable [ Name=m ]
+          Variable [ Name=$m ]
           Field=name
         ]
       ]
       =
       FunctionCall test.string-length@1[
         FieldAccessor [
-          Variable [ Name=l ]
+          Variable [ Name=$l ]
           Field=name
         ]
       ]
@@ -51,7 +51,7 @@ Where
   ]
 Orderby
   FieldAccessor [
-    Variable [ Name=l ]
+    Variable [ Name=$l ]
     Field=name
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/stable_sort/stable_sort.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/stable_sort/stable_sort.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/stable_sort/stable_sort.3.ast
index 92440cc..2627232 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/stable_sort/stable_sort.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/stable_sort/stable_sort.3.ast
@@ -1,17 +1,17 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-Variable [ Name=i ]
+Variable [ Name=$i ]
 ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [LineItem]
   ]
   AS
-  Variable [ Name=i ]
+  Variable [ Name=$i ]
 ]
 Orderby
   FieldAccessor [
-    Variable [ Name=i ]
+    Variable [ Name=$i ]
     Field=l_partkey
   ]
   DESC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/string_eq_01/string_eq_01.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/string_eq_01/string_eq_01.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/string_eq_01/string_eq_01.3.ast
index 9e8ab09..52e2b67 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/string_eq_01/string_eq_01.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/string_eq_01/string_eq_01.3.ast
@@ -1,18 +1,18 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-Variable [ Name=user ]
+Variable [ Name=$user ]
 ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [FacebookUsers]
   ]
   AS
-  Variable [ Name=user ]
+  Variable [ Name=$user ]
 ]
 Where
   OperatorExpr [
     FieldAccessor [
-      Variable [ Name=user ]
+      Variable [ Name=$user ]
       Field=alias
     ]
     =

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/compact-dataset-and-its-indexes/compact-dataset-and-its-indexes.5.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/compact-dataset-and-its-indexes/compact-dataset-and-its-indexes.5.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/compact-dataset-and-its-indexes/compact-dataset-and-its-indexes.5.ast
index 2a1d058..1b58438 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/compact-dataset-and-its-indexes/compact-dataset-and-its-indexes.5.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/compact-dataset-and-its-indexes/compact-dataset-and-its-indexes.5.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Query:
 SELECT ELEMENT [
 FieldAccessor [
-  Variable [ Name=c ]
+  Variable [ Name=$c ]
   Field=nested
 ]
 ]
@@ -10,13 +10,13 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [LineItem]
   ]
   AS
-  Variable [ Name=c ]
+  Variable [ Name=$c ]
 ]
 Where
   OperatorExpr [
     FieldAccessor [
       FieldAccessor [
-        Variable [ Name=c ]
+        Variable [ Name=$c ]
         Field=nested
       ]
       Field=l_suppkey
@@ -27,7 +27,7 @@ Where
 Orderby
   FieldAccessor [
     FieldAccessor [
-      Variable [ Name=c ]
+      Variable [ Name=$c ]
       Field=nested
     ]
     Field=l_orderkey
@@ -35,7 +35,7 @@ Orderby
   ASC
   FieldAccessor [
     FieldAccessor [
-      Variable [ Name=c ]
+      Variable [ Name=$c ]
       Field=nested
     ]
     Field=l_linenumber

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.5.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.5.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.5.ast
index 8daa275..f7e4fee 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.5.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.5.ast
@@ -1,19 +1,19 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-Variable [ Name=c ]
+Variable [ Name=$c ]
 ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [TweetMessages]
   ]
   AS
-  Variable [ Name=c ]
+  Variable [ Name=$c ]
 ]
 Where
   OperatorExpr [
     FieldAccessor [
       FieldAccessor [
-        Variable [ Name=c ]
+        Variable [ Name=$c ]
         Field=user
       ]
       Field=statuses_count
@@ -23,7 +23,7 @@ Where
   ]
 Orderby
   FieldAccessor [
-    Variable [ Name=c ]
+    Variable [ Name=$c ]
     Field=tweetid
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/drop-index/drop-index.4.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/drop-index/drop-index.4.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/drop-index/drop-index.4.ast
index 3301a9a..da06490 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/drop-index/drop-index.4.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/drop-index/drop-index.4.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Query:
 SELECT ELEMENT [
 FieldAccessor [
-  Variable [ Name=a ]
+  Variable [ Name=$a ]
   Field=nested
 ]
 ]
@@ -10,14 +10,14 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [t1]
   ]
   AS
-  Variable [ Name=a ]
+  Variable [ Name=$a ]
 ]
 Where
   OperatorExpr [
     OperatorExpr [
       FieldAccessor [
         FieldAccessor [
-          Variable [ Name=a ]
+          Variable [ Name=$a ]
           Field=nested
         ]
         Field=unique1
@@ -29,7 +29,7 @@ Where
     OperatorExpr [
       FieldAccessor [
         FieldAccessor [
-          Variable [ Name=a ]
+          Variable [ Name=$a ]
           Field=nested
         ]
         Field=stringu1

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/insert-into-empty-dataset-with-index/insert-into-empty-dataset-with-index.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/insert-into-empty-dataset-with-index/insert-into-empty-dataset-with-index.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/insert-into-empty-dataset-with-index/insert-into-empty-dataset-with-index.3.ast
index 7fa9617..f2f7887 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/insert-into-empty-dataset-with-index/insert-into-empty-dataset-with-index.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/insert-into-empty-dataset-with-index/insert-into-empty-dataset-with-index.3.ast
@@ -1,20 +1,20 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-Variable [ Name=c ]
+Variable [ Name=$c ]
 ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [TweetMessages]
   ]
   AS
-  Variable [ Name=c ]
+  Variable [ Name=$c ]
 ]
 Where
   OperatorExpr [
     OperatorExpr [
       FieldAccessor [
         FieldAccessor [
-          Variable [ Name=c ]
+          Variable [ Name=$c ]
           Field=user
         ]
         Field=name
@@ -26,7 +26,7 @@ Where
     OperatorExpr [
       FieldAccessor [
         FieldAccessor [
-          Variable [ Name=c ]
+          Variable [ Name=$c ]
           Field=user
         ]
         Field=statuses_count

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/insert-into-loaded-dataset-with-index_01/insert-into-loaded-dataset-with-index_01.5.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/insert-into-loaded-dataset-with-index_01/insert-into-loaded-dataset-with-index_01.5.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/insert-into-loaded-dataset-with-index_01/insert-into-loaded-dataset-with-index_01.5.ast
index beac285..0ff9dd0 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/insert-into-loaded-dataset-with-index_01/insert-into-loaded-dataset-with-index_01.5.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/insert-into-loaded-dataset-with-index_01/insert-into-loaded-dataset-with-index_01.5.ast
@@ -1,20 +1,20 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-Variable [ Name=c ]
+Variable [ Name=$c ]
 ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [TweetMessages]
   ]
   AS
-  Variable [ Name=c ]
+  Variable [ Name=$c ]
 ]
 Where
   OperatorExpr [
     OperatorExpr [
       FieldAccessor [
         FieldAccessor [
-          Variable [ Name=c ]
+          Variable [ Name=$c ]
           Field=user
         ]
         Field=name
@@ -26,7 +26,7 @@ Where
     OperatorExpr [
       FieldAccessor [
         FieldAccessor [
-          Variable [ Name=c ]
+          Variable [ Name=$c ]
           Field=user
         ]
         Field=statuses_count
@@ -37,7 +37,7 @@ Where
   ]
 Orderby
   FieldAccessor [
-    Variable [ Name=c ]
+    Variable [ Name=$c ]
     Field=tweetid
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/insert-into-loaded-dataset-with-index_02/insert-into-loaded-dataset-with-index_02.5.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/insert-into-loaded-dataset-with-index_02/insert-into-loaded-dataset-with-index_02.5.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/insert-into-loaded-dataset-with-index_02/insert-into-loaded-dataset-with-index_02.5.ast
index a7e785e..3b3131a 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/insert-into-loaded-dataset-with-index_02/insert-into-loaded-dataset-with-index_02.5.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/insert-into-loaded-dataset-with-index_02/insert-into-loaded-dataset-with-index_02.5.ast
@@ -1,20 +1,20 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-Variable [ Name=c ]
+Variable [ Name=$c ]
 ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [TweetMessages]
   ]
   AS
-  Variable [ Name=c ]
+  Variable [ Name=$c ]
 ]
 Where
   OperatorExpr [
     OperatorExpr [
       FieldAccessor [
         FieldAccessor [
-          Variable [ Name=c ]
+          Variable [ Name=$c ]
           Field=user
         ]
         Field=name
@@ -26,7 +26,7 @@ Where
     OperatorExpr [
       FieldAccessor [
         FieldAccessor [
-          Variable [ Name=c ]
+          Variable [ Name=$c ]
           Field=user
         ]
         Field=statuses_count
@@ -37,7 +37,7 @@ Where
   ]
 Orderby
   FieldAccessor [
-    Variable [ Name=c ]
+    Variable [ Name=$c ]
     Field=tweetid
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-index/load-with-index.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-index/load-with-index.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-index/load-with-index.3.ast
index a7e785e..3b3131a 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-index/load-with-index.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-index/load-with-index.3.ast
@@ -1,20 +1,20 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-Variable [ Name=c ]
+Variable [ Name=$c ]
 ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [TweetMessages]
   ]
   AS
-  Variable [ Name=c ]
+  Variable [ Name=$c ]
 ]
 Where
   OperatorExpr [
     OperatorExpr [
       FieldAccessor [
         FieldAccessor [
-          Variable [ Name=c ]
+          Variable [ Name=$c ]
           Field=user
         ]
         Field=name
@@ -26,7 +26,7 @@ Where
     OperatorExpr [
       FieldAccessor [
         FieldAccessor [
-          Variable [ Name=c ]
+          Variable [ Name=$c ]
           Field=user
         ]
         Field=statuses_count
@@ -37,7 +37,7 @@ Where
   ]
 Orderby
   FieldAccessor [
-    Variable [ Name=c ]
+    Variable [ Name=$c ]
     Field=tweetid
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-ngram-index/load-with-ngram-index.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-ngram-index/load-with-ngram-index.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-ngram-index/load-with-ngram-index.3.ast
index 30e9f36..7080c0a 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-ngram-index/load-with-ngram-index.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-ngram-index/load-with-ngram-index.3.ast
@@ -1,19 +1,19 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-Variable [ Name=c ]
+Variable [ Name=$c ]
 ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [TweetMessages]
   ]
   AS
-  Variable [ Name=c ]
+  Variable [ Name=$c ]
 ]
 Where
   FunctionCall TinySocial.contains@2[
     FieldAccessor [
       FieldAccessor [
-        Variable [ Name=c ]
+        Variable [ Name=$c ]
         Field=user
       ]
       Field=name
@@ -22,7 +22,7 @@ Where
   ]
 Orderby
   FieldAccessor [
-    Variable [ Name=c ]
+    Variable [ Name=$c ]
     Field=tweetid
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-rtree-index/load-with-rtree-index.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-rtree-index/load-with-rtree-index.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-rtree-index/load-with-rtree-index.3.ast
index 959db3e..1ef42e0 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-rtree-index/load-with-rtree-index.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-rtree-index/load-with-rtree-index.3.ast
@@ -1,19 +1,19 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-Variable [ Name=c ]
+Variable [ Name=$c ]
 ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [TweetMessages]
   ]
   AS
-  Variable [ Name=c ]
+  Variable [ Name=$c ]
 ]
 Where
   FunctionCall TinySocial.spatial-intersect@2[
     FieldAccessor [
       FieldAccessor [
-        Variable [ Name=c ]
+        Variable [ Name=$c ]
         Field=user
       ]
       Field=sender-location
@@ -31,7 +31,7 @@ Where
   ]
 Orderby
   FieldAccessor [
-    Variable [ Name=c ]
+    Variable [ Name=$c ]
     Field=tweetid
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-word-index/load-with-word-index.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-word-index/load-with-word-index.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-word-index/load-with-word-index.3.ast
index 31da348..6a17d33 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-word-index/load-with-word-index.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-word-index/load-with-word-index.3.ast
@@ -1,21 +1,21 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-Variable [ Name=c ]
+Variable [ Name=$c ]
 ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [TweetMessages]
   ]
   AS
-  Variable [ Name=c ]
+  Variable [ Name=$c ]
 ]
-LetVariable [ Name=jacc ]
+Let Variable [ Name=$jacc ]
   :=
   FunctionCall TinySocial.similarity-jaccard-check@3[
     FunctionCall TinySocial.word-tokens@1[
       FieldAccessor [
         FieldAccessor [
-          Variable [ Name=c ]
+          Variable [ Name=$c ]
           Field=user
         ]
         Field=name
@@ -28,12 +28,12 @@ LetVariable [ Name=jacc ]
   ]
 Where
   IndexAccessor [
-    Variable [ Name=jacc ]
+    Variable [ Name=$jacc ]
     Index:     LiteralExpr [LONG] [0]
   ]
 Orderby
   FieldAccessor [
-    Variable [ Name=c ]
+    Variable [ Name=$c ]
     Field=tweetid
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/nested-uuid-insert/nested-uuid-insert.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/nested-uuid-insert/nested-uuid-insert.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/nested-uuid-insert/nested-uuid-insert.3.ast
index 1c078f0..09b20c6 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/nested-uuid-insert/nested-uuid-insert.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/nested-uuid-insert/nested-uuid-insert.3.ast
@@ -4,7 +4,7 @@ SELECT ELEMENT [
 FieldAccessor [
   FieldAccessor [
     FieldAccessor [
-      Variable [ Name=test ]
+      Variable [ Name=$test ]
       Field=nested
     ]
     Field=nested
@@ -16,5 +16,5 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [doublenests]
   ]
   AS
-  Variable [ Name=test ]
+  Variable [ Name=$test ]
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/nested-uuid-load/nested-uuid-load.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/nested-uuid-load/nested-uuid-load.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/nested-uuid-load/nested-uuid-load.3.ast
index 29b491c..86133b1 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/nested-uuid-load/nested-uuid-load.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/nested-uuid-load/nested-uuid-load.3.ast
@@ -6,7 +6,7 @@ RecordConstructor [
     LiteralExpr [STRING] [tweetid]
     :
     FieldAccessor [
-      Variable [ Name=test ]
+      Variable [ Name=$test ]
       Field=tweetid
     ]
   )
@@ -15,7 +15,7 @@ RecordConstructor [
     :
     FieldAccessor [
       FieldAccessor [
-        Variable [ Name=test ]
+        Variable [ Name=$test ]
         Field=user
       ]
       Field=screen-name
@@ -27,11 +27,11 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [TweetMessages]
   ]
   AS
-  Variable [ Name=test ]
+  Variable [ Name=$test ]
 ]
 Orderby
   FieldAccessor [
-    Variable [ Name=test ]
+    Variable [ Name=$test ]
     Field=tweetid
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-btree-secondary-index-nullable/scan-delete-btree-secondary-index-nullable.5.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-btree-secondary-index-nullable/scan-delete-btree-secondary-index-nullable.5.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-btree-secondary-index-nullable/scan-delete-btree-secondary-index-nullable.5.ast
index 4e91616..3802830 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-btree-secondary-index-nullable/scan-delete-btree-secondary-index-nullable.5.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-btree-secondary-index-nullable/scan-delete-btree-secondary-index-nullable.5.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Query:
 SELECT ELEMENT [
 FieldAccessor [
-  Variable [ Name=c ]
+  Variable [ Name=$c ]
   Field=nested
 ]
 ]
@@ -10,13 +10,13 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Customers]
   ]
   AS
-  Variable [ Name=c ]
+  Variable [ Name=$c ]
 ]
 Where
   OperatorExpr [
     FieldAccessor [
       FieldAccessor [
-        Variable [ Name=c ]
+        Variable [ Name=$c ]
         Field=nested
       ]
       Field=age
@@ -27,7 +27,7 @@ Where
 Orderby
   FieldAccessor [
     FieldAccessor [
-      Variable [ Name=c ]
+      Variable [ Name=$c ]
       Field=nested
     ]
     Field=cid



Mime
View raw message