asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From buyin...@apache.org
Subject [24/51] [partial] incubator-asterixdb git commit: ASTERIXDB-1226: implement SQL++ core group-by semantics and syntatic sugars.
Date Mon, 28 Mar 2016 20:18:51 GMT
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_count/scalar_count.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_count/scalar_count.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_count/scalar_count.3.ast
index 08505d6..7abcc7a 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_count/scalar_count.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_count/scalar_count.3.ast
@@ -1,6 +1,6 @@
 DataverseUse test
 Query:
-LetVariable [ Name=i8 ]
+Let Variable [ Name=$i8 ]
   :=
   FunctionCall test.count@1[
     OrderedListConstructor [
@@ -15,7 +15,7 @@ LetVariable [ Name=i8 ]
       ]
     ]
   ]
-LetVariable [ Name=i16 ]
+Let Variable [ Name=$i16 ]
   :=
   FunctionCall test.count@1[
     OrderedListConstructor [
@@ -30,7 +30,7 @@ LetVariable [ Name=i16 ]
       ]
     ]
   ]
-LetVariable [ Name=i32 ]
+Let Variable [ Name=$i32 ]
   :=
   FunctionCall test.count@1[
     OrderedListConstructor [
@@ -45,7 +45,7 @@ LetVariable [ Name=i32 ]
       ]
     ]
   ]
-LetVariable [ Name=i64 ]
+Let Variable [ Name=$i64 ]
   :=
   FunctionCall test.count@1[
     OrderedListConstructor [
@@ -60,7 +60,7 @@ LetVariable [ Name=i64 ]
       ]
     ]
   ]
-LetVariable [ Name=f ]
+Let Variable [ Name=$f ]
   :=
   FunctionCall test.count@1[
     OrderedListConstructor [
@@ -75,7 +75,7 @@ LetVariable [ Name=f ]
       ]
     ]
   ]
-LetVariable [ Name=d ]
+Let Variable [ Name=$d ]
   :=
   FunctionCall test.count@1[
     OrderedListConstructor [
@@ -90,7 +90,7 @@ LetVariable [ Name=d ]
       ]
     ]
   ]
-LetVariable [ Name=s ]
+Let Variable [ Name=$s ]
   :=
   FunctionCall test.count@1[
     OrderedListConstructor [
@@ -100,17 +100,17 @@ LetVariable [ Name=s ]
     ]
   ]
 SELECT ELEMENT [
-Variable [ Name=i ]
+Variable [ Name=$i ]
 ]
 FROM [  OrderedListConstructor [
-    Variable [ Name=i8 ]
-    Variable [ Name=i16 ]
-    Variable [ Name=i32 ]
-    Variable [ Name=i64 ]
-    Variable [ Name=f ]
-    Variable [ Name=d ]
-    Variable [ Name=s ]
+    Variable [ Name=$i8 ]
+    Variable [ Name=$i16 ]
+    Variable [ Name=$i32 ]
+    Variable [ Name=$i64 ]
+    Variable [ Name=$f ]
+    Variable [ Name=$d ]
+    Variable [ Name=$s ]
   ]
   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/aggregate/scalar_count_null/scalar_count_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_count_null/scalar_count_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_count_null/scalar_count_null.3.ast
index 2496e09..e1e0c6e 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_count_null/scalar_count_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_count_null/scalar_count_null.3.ast
@@ -1,6 +1,6 @@
 DataverseUse test
 Query:
-LetVariable [ Name=i8 ]
+Let Variable [ Name=$i8 ]
   :=
   FunctionCall test.count@1[
     OrderedListConstructor [
@@ -16,7 +16,7 @@ LetVariable [ Name=i8 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=i16 ]
+Let Variable [ Name=$i16 ]
   :=
   FunctionCall test.count@1[
     OrderedListConstructor [
@@ -32,7 +32,7 @@ LetVariable [ Name=i16 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=i32 ]
+Let Variable [ Name=$i32 ]
   :=
   FunctionCall test.count@1[
     OrderedListConstructor [
@@ -48,7 +48,7 @@ LetVariable [ Name=i32 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=i64 ]
+Let Variable [ Name=$i64 ]
   :=
   FunctionCall test.count@1[
     OrderedListConstructor [
@@ -64,7 +64,7 @@ LetVariable [ Name=i64 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=f ]
+Let Variable [ Name=$f ]
   :=
   FunctionCall test.count@1[
     OrderedListConstructor [
@@ -80,7 +80,7 @@ LetVariable [ Name=f ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=d ]
+Let Variable [ Name=$d ]
   :=
   FunctionCall test.count@1[
     OrderedListConstructor [
@@ -96,7 +96,7 @@ LetVariable [ Name=d ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=s ]
+Let Variable [ Name=$s ]
   :=
   FunctionCall test.count@1[
     OrderedListConstructor [
@@ -107,17 +107,17 @@ LetVariable [ Name=s ]
     ]
   ]
 SELECT ELEMENT [
-Variable [ Name=i ]
+Variable [ Name=$i ]
 ]
 FROM [  OrderedListConstructor [
-    Variable [ Name=i8 ]
-    Variable [ Name=i16 ]
-    Variable [ Name=i32 ]
-    Variable [ Name=i64 ]
-    Variable [ Name=f ]
-    Variable [ Name=d ]
-    Variable [ Name=s ]
+    Variable [ Name=$i8 ]
+    Variable [ Name=$i16 ]
+    Variable [ Name=$i32 ]
+    Variable [ Name=$i64 ]
+    Variable [ Name=$f ]
+    Variable [ Name=$d ]
+    Variable [ Name=$s ]
   ]
   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/aggregate/scalar_max/scalar_max.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_max/scalar_max.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_max/scalar_max.3.ast
index 112a12d..b7bd61e 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_max/scalar_max.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_max/scalar_max.3.ast
@@ -1,6 +1,6 @@
 DataverseUse test
 Query:
-LetVariable [ Name=i8 ]
+Let Variable [ Name=$i8 ]
   :=
   FunctionCall test.max@1[
     OrderedListConstructor [
@@ -15,7 +15,7 @@ LetVariable [ Name=i8 ]
       ]
     ]
   ]
-LetVariable [ Name=i16 ]
+Let Variable [ Name=$i16 ]
   :=
   FunctionCall test.max@1[
     OrderedListConstructor [
@@ -30,7 +30,7 @@ LetVariable [ Name=i16 ]
       ]
     ]
   ]
-LetVariable [ Name=i32 ]
+Let Variable [ Name=$i32 ]
   :=
   FunctionCall test.max@1[
     OrderedListConstructor [
@@ -45,7 +45,7 @@ LetVariable [ Name=i32 ]
       ]
     ]
   ]
-LetVariable [ Name=i64 ]
+Let Variable [ Name=$i64 ]
   :=
   FunctionCall test.max@1[
     OrderedListConstructor [
@@ -60,7 +60,7 @@ LetVariable [ Name=i64 ]
       ]
     ]
   ]
-LetVariable [ Name=f ]
+Let Variable [ Name=$f ]
   :=
   FunctionCall test.max@1[
     OrderedListConstructor [
@@ -75,7 +75,7 @@ LetVariable [ Name=f ]
       ]
     ]
   ]
-LetVariable [ Name=d ]
+Let Variable [ Name=$d ]
   :=
   FunctionCall test.max@1[
     OrderedListConstructor [
@@ -90,7 +90,7 @@ LetVariable [ Name=d ]
       ]
     ]
   ]
-LetVariable [ Name=s ]
+Let Variable [ Name=$s ]
   :=
   FunctionCall test.max@1[
     OrderedListConstructor [
@@ -99,7 +99,7 @@ LetVariable [ Name=s ]
       LiteralExpr [STRING] [world]
     ]
   ]
-LetVariable [ Name=dt ]
+Let Variable [ Name=$dt ]
   :=
   FunctionCall test.max@1[
     OrderedListConstructor [
@@ -115,18 +115,18 @@ LetVariable [ Name=dt ]
     ]
   ]
 SELECT ELEMENT [
-Variable [ Name=i ]
+Variable [ Name=$i ]
 ]
 FROM [  OrderedListConstructor [
-    Variable [ Name=i8 ]
-    Variable [ Name=i16 ]
-    Variable [ Name=i32 ]
-    Variable [ Name=i64 ]
-    Variable [ Name=f ]
-    Variable [ Name=d ]
-    Variable [ Name=s ]
-    Variable [ Name=dt ]
+    Variable [ Name=$i8 ]
+    Variable [ Name=$i16 ]
+    Variable [ Name=$i32 ]
+    Variable [ Name=$i64 ]
+    Variable [ Name=$f ]
+    Variable [ Name=$d ]
+    Variable [ Name=$s ]
+    Variable [ Name=$dt ]
   ]
   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/aggregate/scalar_max_null/scalar_max_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_max_null/scalar_max_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_max_null/scalar_max_null.3.ast
index c148cee..da189de 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_max_null/scalar_max_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_max_null/scalar_max_null.3.ast
@@ -1,6 +1,6 @@
 DataverseUse test
 Query:
-LetVariable [ Name=i8 ]
+Let Variable [ Name=$i8 ]
   :=
   FunctionCall test.max@1[
     OrderedListConstructor [
@@ -16,7 +16,7 @@ LetVariable [ Name=i8 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=i16 ]
+Let Variable [ Name=$i16 ]
   :=
   FunctionCall test.max@1[
     OrderedListConstructor [
@@ -32,7 +32,7 @@ LetVariable [ Name=i16 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=i32 ]
+Let Variable [ Name=$i32 ]
   :=
   FunctionCall test.max@1[
     OrderedListConstructor [
@@ -48,7 +48,7 @@ LetVariable [ Name=i32 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=i64 ]
+Let Variable [ Name=$i64 ]
   :=
   FunctionCall test.max@1[
     OrderedListConstructor [
@@ -64,7 +64,7 @@ LetVariable [ Name=i64 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=f ]
+Let Variable [ Name=$f ]
   :=
   FunctionCall test.max@1[
     OrderedListConstructor [
@@ -80,7 +80,7 @@ LetVariable [ Name=f ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=d ]
+Let Variable [ Name=$d ]
   :=
   FunctionCall test.max@1[
     OrderedListConstructor [
@@ -96,7 +96,7 @@ LetVariable [ Name=d ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=s ]
+Let Variable [ Name=$s ]
   :=
   FunctionCall test.max@1[
     OrderedListConstructor [
@@ -106,7 +106,7 @@ LetVariable [ Name=s ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=dt ]
+Let Variable [ Name=$dt ]
   :=
   FunctionCall test.max@1[
     OrderedListConstructor [
@@ -123,18 +123,18 @@ LetVariable [ Name=dt ]
     ]
   ]
 SELECT ELEMENT [
-Variable [ Name=i ]
+Variable [ Name=$i ]
 ]
 FROM [  OrderedListConstructor [
-    Variable [ Name=i8 ]
-    Variable [ Name=i16 ]
-    Variable [ Name=i32 ]
-    Variable [ Name=i64 ]
-    Variable [ Name=f ]
-    Variable [ Name=d ]
-    Variable [ Name=s ]
-    Variable [ Name=dt ]
+    Variable [ Name=$i8 ]
+    Variable [ Name=$i16 ]
+    Variable [ Name=$i32 ]
+    Variable [ Name=$i64 ]
+    Variable [ Name=$f ]
+    Variable [ Name=$d ]
+    Variable [ Name=$s ]
+    Variable [ Name=$dt ]
   ]
   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/aggregate/scalar_min/scalar_min.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_min/scalar_min.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_min/scalar_min.3.ast
index 666e43a..8d150cf 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_min/scalar_min.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_min/scalar_min.3.ast
@@ -1,6 +1,6 @@
 DataverseUse test
 Query:
-LetVariable [ Name=i8 ]
+Let Variable [ Name=$i8 ]
   :=
   FunctionCall test.min@1[
     OrderedListConstructor [
@@ -15,7 +15,7 @@ LetVariable [ Name=i8 ]
       ]
     ]
   ]
-LetVariable [ Name=i16 ]
+Let Variable [ Name=$i16 ]
   :=
   FunctionCall test.min@1[
     OrderedListConstructor [
@@ -30,7 +30,7 @@ LetVariable [ Name=i16 ]
       ]
     ]
   ]
-LetVariable [ Name=i32 ]
+Let Variable [ Name=$i32 ]
   :=
   FunctionCall test.min@1[
     OrderedListConstructor [
@@ -45,7 +45,7 @@ LetVariable [ Name=i32 ]
       ]
     ]
   ]
-LetVariable [ Name=i64 ]
+Let Variable [ Name=$i64 ]
   :=
   FunctionCall test.min@1[
     OrderedListConstructor [
@@ -60,7 +60,7 @@ LetVariable [ Name=i64 ]
       ]
     ]
   ]
-LetVariable [ Name=f ]
+Let Variable [ Name=$f ]
   :=
   FunctionCall test.min@1[
     OrderedListConstructor [
@@ -75,7 +75,7 @@ LetVariable [ Name=f ]
       ]
     ]
   ]
-LetVariable [ Name=d ]
+Let Variable [ Name=$d ]
   :=
   FunctionCall test.min@1[
     OrderedListConstructor [
@@ -90,7 +90,7 @@ LetVariable [ Name=d ]
       ]
     ]
   ]
-LetVariable [ Name=s ]
+Let Variable [ Name=$s ]
   :=
   FunctionCall test.min@1[
     OrderedListConstructor [
@@ -99,7 +99,7 @@ LetVariable [ Name=s ]
       LiteralExpr [STRING] [world]
     ]
   ]
-LetVariable [ Name=dt ]
+Let Variable [ Name=$dt ]
   :=
   FunctionCall test.min@1[
     OrderedListConstructor [
@@ -115,18 +115,18 @@ LetVariable [ Name=dt ]
     ]
   ]
 SELECT ELEMENT [
-Variable [ Name=i ]
+Variable [ Name=$i ]
 ]
 FROM [  OrderedListConstructor [
-    Variable [ Name=i8 ]
-    Variable [ Name=i16 ]
-    Variable [ Name=i32 ]
-    Variable [ Name=i64 ]
-    Variable [ Name=f ]
-    Variable [ Name=d ]
-    Variable [ Name=s ]
-    Variable [ Name=dt ]
+    Variable [ Name=$i8 ]
+    Variable [ Name=$i16 ]
+    Variable [ Name=$i32 ]
+    Variable [ Name=$i64 ]
+    Variable [ Name=$f ]
+    Variable [ Name=$d ]
+    Variable [ Name=$s ]
+    Variable [ Name=$dt ]
   ]
   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/aggregate/scalar_min_null/scalar_min_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_min_null/scalar_min_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_min_null/scalar_min_null.3.ast
index a2cf93f..b35d3d3 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_min_null/scalar_min_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_min_null/scalar_min_null.3.ast
@@ -1,6 +1,6 @@
 DataverseUse test
 Query:
-LetVariable [ Name=i8 ]
+Let Variable [ Name=$i8 ]
   :=
   FunctionCall test.min@1[
     OrderedListConstructor [
@@ -16,7 +16,7 @@ LetVariable [ Name=i8 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=i16 ]
+Let Variable [ Name=$i16 ]
   :=
   FunctionCall test.min@1[
     OrderedListConstructor [
@@ -32,7 +32,7 @@ LetVariable [ Name=i16 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=i32 ]
+Let Variable [ Name=$i32 ]
   :=
   FunctionCall test.min@1[
     OrderedListConstructor [
@@ -48,7 +48,7 @@ LetVariable [ Name=i32 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=i64 ]
+Let Variable [ Name=$i64 ]
   :=
   FunctionCall test.min@1[
     OrderedListConstructor [
@@ -64,7 +64,7 @@ LetVariable [ Name=i64 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=f ]
+Let Variable [ Name=$f ]
   :=
   FunctionCall test.min@1[
     OrderedListConstructor [
@@ -80,7 +80,7 @@ LetVariable [ Name=f ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=d ]
+Let Variable [ Name=$d ]
   :=
   FunctionCall test.min@1[
     OrderedListConstructor [
@@ -96,7 +96,7 @@ LetVariable [ Name=d ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=s ]
+Let Variable [ Name=$s ]
   :=
   FunctionCall test.min@1[
     OrderedListConstructor [
@@ -106,7 +106,7 @@ LetVariable [ Name=s ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=dt ]
+Let Variable [ Name=$dt ]
   :=
   FunctionCall test.min@1[
     OrderedListConstructor [
@@ -123,18 +123,18 @@ LetVariable [ Name=dt ]
     ]
   ]
 SELECT ELEMENT [
-Variable [ Name=i ]
+Variable [ Name=$i ]
 ]
 FROM [  OrderedListConstructor [
-    Variable [ Name=i8 ]
-    Variable [ Name=i16 ]
-    Variable [ Name=i32 ]
-    Variable [ Name=i64 ]
-    Variable [ Name=f ]
-    Variable [ Name=d ]
-    Variable [ Name=s ]
-    Variable [ Name=dt ]
+    Variable [ Name=$i8 ]
+    Variable [ Name=$i16 ]
+    Variable [ Name=$i32 ]
+    Variable [ Name=$i64 ]
+    Variable [ Name=$f ]
+    Variable [ Name=$d ]
+    Variable [ Name=$s ]
+    Variable [ Name=$dt ]
   ]
   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/aggregate/scalar_sum/scalar_sum.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_sum/scalar_sum.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_sum/scalar_sum.3.ast
index 2729c21..32235b5 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_sum/scalar_sum.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_sum/scalar_sum.3.ast
@@ -1,6 +1,6 @@
 DataverseUse test
 Query:
-LetVariable [ Name=i8 ]
+Let Variable [ Name=$i8 ]
   :=
   FunctionCall test.sum@1[
     OrderedListConstructor [
@@ -15,7 +15,7 @@ LetVariable [ Name=i8 ]
       ]
     ]
   ]
-LetVariable [ Name=i16 ]
+Let Variable [ Name=$i16 ]
   :=
   FunctionCall test.sum@1[
     OrderedListConstructor [
@@ -30,7 +30,7 @@ LetVariable [ Name=i16 ]
       ]
     ]
   ]
-LetVariable [ Name=i32 ]
+Let Variable [ Name=$i32 ]
   :=
   FunctionCall test.sum@1[
     OrderedListConstructor [
@@ -45,7 +45,7 @@ LetVariable [ Name=i32 ]
       ]
     ]
   ]
-LetVariable [ Name=i64 ]
+Let Variable [ Name=$i64 ]
   :=
   FunctionCall test.sum@1[
     OrderedListConstructor [
@@ -60,7 +60,7 @@ LetVariable [ Name=i64 ]
       ]
     ]
   ]
-LetVariable [ Name=f ]
+Let Variable [ Name=$f ]
   :=
   FunctionCall test.sum@1[
     OrderedListConstructor [
@@ -75,7 +75,7 @@ LetVariable [ Name=f ]
       ]
     ]
   ]
-LetVariable [ Name=d ]
+Let Variable [ Name=$d ]
   :=
   FunctionCall test.sum@1[
     OrderedListConstructor [
@@ -91,16 +91,16 @@ LetVariable [ Name=d ]
     ]
   ]
 SELECT ELEMENT [
-Variable [ Name=i ]
+Variable [ Name=$i ]
 ]
 FROM [  OrderedListConstructor [
-    Variable [ Name=i8 ]
-    Variable [ Name=i16 ]
-    Variable [ Name=i32 ]
-    Variable [ Name=i64 ]
-    Variable [ Name=f ]
-    Variable [ Name=d ]
+    Variable [ Name=$i8 ]
+    Variable [ Name=$i16 ]
+    Variable [ Name=$i32 ]
+    Variable [ Name=$i64 ]
+    Variable [ Name=$f ]
+    Variable [ Name=$d ]
   ]
   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/aggregate/scalar_sum_null/scalar_sum_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_sum_null/scalar_sum_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_sum_null/scalar_sum_null.3.ast
index df1a452..a75fe6f 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_sum_null/scalar_sum_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_sum_null/scalar_sum_null.3.ast
@@ -1,6 +1,6 @@
 DataverseUse test
 Query:
-LetVariable [ Name=i8 ]
+Let Variable [ Name=$i8 ]
   :=
   FunctionCall test.sum@1[
     OrderedListConstructor [
@@ -16,7 +16,7 @@ LetVariable [ Name=i8 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=i16 ]
+Let Variable [ Name=$i16 ]
   :=
   FunctionCall test.sum@1[
     OrderedListConstructor [
@@ -32,7 +32,7 @@ LetVariable [ Name=i16 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=i32 ]
+Let Variable [ Name=$i32 ]
   :=
   FunctionCall test.sum@1[
     OrderedListConstructor [
@@ -48,7 +48,7 @@ LetVariable [ Name=i32 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=i64 ]
+Let Variable [ Name=$i64 ]
   :=
   FunctionCall test.sum@1[
     OrderedListConstructor [
@@ -64,7 +64,7 @@ LetVariable [ Name=i64 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=f ]
+Let Variable [ Name=$f ]
   :=
   FunctionCall test.sum@1[
     OrderedListConstructor [
@@ -80,7 +80,7 @@ LetVariable [ Name=f ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=d ]
+Let Variable [ Name=$d ]
   :=
   FunctionCall test.sum@1[
     OrderedListConstructor [
@@ -97,16 +97,16 @@ LetVariable [ Name=d ]
     ]
   ]
 SELECT ELEMENT [
-Variable [ Name=i ]
+Variable [ Name=$i ]
 ]
 FROM [  OrderedListConstructor [
-    Variable [ Name=i8 ]
-    Variable [ Name=i16 ]
-    Variable [ Name=i32 ]
-    Variable [ Name=i64 ]
-    Variable [ Name=f ]
-    Variable [ Name=d ]
+    Variable [ Name=$i8 ]
+    Variable [ Name=$i16 ]
+    Variable [ Name=$i32 ]
+    Variable [ Name=$i64 ]
+    Variable [ Name=$f ]
+    Variable [ Name=$d ]
   ]
   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/aggregate/sum_double/sum_double.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_double/sum_double.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_double/sum_double.3.ast
index 4b3c3cd..4299d22 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_double/sum_double.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_double/sum_double.3.ast
@@ -4,7 +4,7 @@ SELECT ELEMENT [
 FunctionCall test.sum@1[
   (
     SELECT ELEMENT [
-    Variable [ Name=x ]
+    Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
         LiteralExpr [DOUBLE] [1.0]
@@ -12,7 +12,7 @@ FunctionCall test.sum@1[
         LiteralExpr [DOUBLE] [3.0]
       ]
       AS
-      Variable [ Name=x ]
+      Variable [ Name=$x ]
     ]
   )
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_double_null/sum_double_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_double_null/sum_double_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_double_null/sum_double_null.3.ast
index 0972479..486ab5c 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_double_null/sum_double_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_double_null/sum_double_null.3.ast
@@ -5,7 +5,7 @@ FunctionCall test.sum@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
-      Variable [ Name=x ]
+      Variable [ Name=$x ]
       Field=doubleField
     ]
     ]
@@ -13,7 +13,7 @@ FunctionCall test.sum@1[
         LiteralExpr [STRING] [Numeric]
       ]
       AS
-      Variable [ Name=x ]
+      Variable [ Name=$x ]
     ]
   )
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_empty_01/sum_empty_01.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_empty_01/sum_empty_01.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_empty_01/sum_empty_01.3.ast
index e2f8ce7..601a419 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_empty_01/sum_empty_01.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_empty_01/sum_empty_01.3.ast
@@ -4,7 +4,7 @@ SELECT ELEMENT [
 FunctionCall test.sum@1[
   (
     SELECT ELEMENT [
-    Variable [ Name=x ]
+    Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
         LiteralExpr [LONG] [1]
@@ -12,11 +12,11 @@ FunctionCall test.sum@1[
         LiteralExpr [LONG] [3]
       ]
       AS
-      Variable [ Name=x ]
+      Variable [ Name=$x ]
     ]
     Where
       OperatorExpr [
-        Variable [ Name=x ]
+        Variable [ Name=$x ]
         >
         LiteralExpr [LONG] [10]
       ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_empty_02/sum_empty_02.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_empty_02/sum_empty_02.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_empty_02/sum_empty_02.3.ast
index bb6cfc0..1a8ee7d 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_empty_02/sum_empty_02.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_empty_02/sum_empty_02.3.ast
@@ -5,7 +5,7 @@ FunctionCall test.sum@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
-      Variable [ Name=x ]
+      Variable [ Name=$x ]
       Field=val
     ]
     ]
@@ -13,7 +13,7 @@ FunctionCall test.sum@1[
         LiteralExpr [STRING] [Test]
       ]
       AS
-      Variable [ Name=x ]
+      Variable [ Name=$x ]
     ]
   )
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_float/sum_float.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_float/sum_float.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_float/sum_float.3.ast
index bc473b4..227e495 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_float/sum_float.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_float/sum_float.3.ast
@@ -4,7 +4,7 @@ SELECT ELEMENT [
 FunctionCall test.sum@1[
   (
     SELECT ELEMENT [
-    Variable [ Name=x ]
+    Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
         FunctionCall test.float@1[
@@ -18,7 +18,7 @@ FunctionCall test.sum@1[
         ]
       ]
       AS
-      Variable [ Name=x ]
+      Variable [ Name=$x ]
     ]
   )
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_float_null/sum_float_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_float_null/sum_float_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_float_null/sum_float_null.3.ast
index a2649d8..cdb85ab 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_float_null/sum_float_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_float_null/sum_float_null.3.ast
@@ -5,7 +5,7 @@ FunctionCall test.sum@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
-      Variable [ Name=x ]
+      Variable [ Name=$x ]
       Field=floatField
     ]
     ]
@@ -13,7 +13,7 @@ FunctionCall test.sum@1[
         LiteralExpr [STRING] [Numeric]
       ]
       AS
-      Variable [ Name=x ]
+      Variable [ Name=$x ]
     ]
   )
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int16/sum_int16.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int16/sum_int16.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int16/sum_int16.3.ast
index 38c2666..2492cfd 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int16/sum_int16.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int16/sum_int16.3.ast
@@ -4,7 +4,7 @@ SELECT ELEMENT [
 FunctionCall test.sum@1[
   (
     SELECT ELEMENT [
-    Variable [ Name=x ]
+    Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
         FunctionCall test.int16@1[
@@ -18,7 +18,7 @@ FunctionCall test.sum@1[
         ]
       ]
       AS
-      Variable [ Name=x ]
+      Variable [ Name=$x ]
     ]
   )
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int16_null/sum_int16_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int16_null/sum_int16_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int16_null/sum_int16_null.3.ast
index 523dcfe..917f0ff 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int16_null/sum_int16_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int16_null/sum_int16_null.3.ast
@@ -5,7 +5,7 @@ FunctionCall test.sum@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
-      Variable [ Name=x ]
+      Variable [ Name=$x ]
       Field=int16Field
     ]
     ]
@@ -13,7 +13,7 @@ FunctionCall test.sum@1[
         LiteralExpr [STRING] [Numeric]
       ]
       AS
-      Variable [ Name=x ]
+      Variable [ Name=$x ]
     ]
   )
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int32/sum_int32.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int32/sum_int32.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int32/sum_int32.3.ast
index d2a5e9c..99ab8bf 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int32/sum_int32.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int32/sum_int32.3.ast
@@ -4,7 +4,7 @@ SELECT ELEMENT [
 FunctionCall test.sum@1[
   (
     SELECT ELEMENT [
-    Variable [ Name=x ]
+    Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
         FunctionCall test.int32@1[
@@ -18,7 +18,7 @@ FunctionCall test.sum@1[
         ]
       ]
       AS
-      Variable [ Name=x ]
+      Variable [ Name=$x ]
     ]
   )
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int32_null/sum_int32_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int32_null/sum_int32_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int32_null/sum_int32_null.3.ast
index 59d3409..3dfc636 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int32_null/sum_int32_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int32_null/sum_int32_null.3.ast
@@ -5,7 +5,7 @@ FunctionCall test.sum@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
-      Variable [ Name=x ]
+      Variable [ Name=$x ]
       Field=int32Field
     ]
     ]
@@ -13,7 +13,7 @@ FunctionCall test.sum@1[
         LiteralExpr [STRING] [Numeric]
       ]
       AS
-      Variable [ Name=x ]
+      Variable [ Name=$x ]
     ]
   )
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int64/sum_int64.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int64/sum_int64.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int64/sum_int64.3.ast
index 081d221..8e9351c 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int64/sum_int64.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int64/sum_int64.3.ast
@@ -4,7 +4,7 @@ SELECT ELEMENT [
 FunctionCall test.sum@1[
   (
     SELECT ELEMENT [
-    Variable [ Name=x ]
+    Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
         FunctionCall test.int64@1[
@@ -18,7 +18,7 @@ FunctionCall test.sum@1[
         ]
       ]
       AS
-      Variable [ Name=x ]
+      Variable [ Name=$x ]
     ]
   )
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int64_null/sum_int64_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int64_null/sum_int64_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int64_null/sum_int64_null.3.ast
index 91ca34d..6b11722 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int64_null/sum_int64_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int64_null/sum_int64_null.3.ast
@@ -5,7 +5,7 @@ FunctionCall test.sum@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
-      Variable [ Name=x ]
+      Variable [ Name=$x ]
       Field=int64Field
     ]
     ]
@@ -13,7 +13,7 @@ FunctionCall test.sum@1[
         LiteralExpr [STRING] [Numeric]
       ]
       AS
-      Variable [ Name=x ]
+      Variable [ Name=$x ]
     ]
   )
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int8/sum_int8.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int8/sum_int8.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int8/sum_int8.3.ast
index 253f544..79b3bf9 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int8/sum_int8.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int8/sum_int8.3.ast
@@ -4,7 +4,7 @@ SELECT ELEMENT [
 FunctionCall test.sum@1[
   (
     SELECT ELEMENT [
-    Variable [ Name=x ]
+    Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
         FunctionCall test.int8@1[
@@ -18,7 +18,7 @@ FunctionCall test.sum@1[
         ]
       ]
       AS
-      Variable [ Name=x ]
+      Variable [ Name=$x ]
     ]
   )
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int8_null/sum_int8_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int8_null/sum_int8_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int8_null/sum_int8_null.3.ast
index 225e565..8ec8d54 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int8_null/sum_int8_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int8_null/sum_int8_null.3.ast
@@ -5,7 +5,7 @@ FunctionCall test.sum@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
-      Variable [ Name=x ]
+      Variable [ Name=$x ]
       Field=int8Field
     ]
     ]
@@ -13,7 +13,7 @@ FunctionCall test.sum@1[
         LiteralExpr [STRING] [Numeric]
       ]
       AS
-      Variable [ Name=x ]
+      Variable [ Name=$x ]
     ]
   )
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_mixed/sum_mixed.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_mixed/sum_mixed.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_mixed/sum_mixed.3.ast
index 6bce314..74a268d 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_mixed/sum_mixed.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_mixed/sum_mixed.3.ast
@@ -3,7 +3,7 @@ SELECT ELEMENT [
 FunctionCall null.sum@1[
   (
     SELECT ELEMENT [
-    Variable [ Name=x ]
+    Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
         FunctionCall null.float@1[
@@ -16,7 +16,7 @@ FunctionCall null.sum@1[
         ]
       ]
       AS
-      Variable [ Name=x ]
+      Variable [ Name=$x ]
     ]
   )
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_null-with-pred/sum_null-with-pred.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_null-with-pred/sum_null-with-pred.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_null-with-pred/sum_null-with-pred.3.ast
index b478771..ccd8438 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_null-with-pred/sum_null-with-pred.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_null-with-pred/sum_null-with-pred.3.ast
@@ -6,7 +6,7 @@ FunctionCall test.sum@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
-      Variable [ Name=l ]
+      Variable [ Name=$l ]
       Field=sal
     ]
     ]
@@ -14,13 +14,13 @@ FunctionCall test.sum@1[
         LiteralExpr [STRING] [tdst]
       ]
       AS
-      Variable [ Name=l ]
+      Variable [ Name=$l ]
     ]
     Where
       FunctionCall test.not@1[
         FunctionCall test.is-null@1[
           FieldAccessor [
-            Variable [ Name=l ]
+            Variable [ Name=$l ]
             Field=sal
           ]
         ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_numeric_null/sum_numeric_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_numeric_null/sum_numeric_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_numeric_null/sum_numeric_null.3.ast
index eadfd99..38b048a 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_numeric_null/sum_numeric_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_numeric_null/sum_numeric_null.3.ast
@@ -5,7 +5,7 @@ FunctionCall test.sum@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
-      Variable [ Name=l ]
+      Variable [ Name=$l ]
       Field=sal
     ]
     ]
@@ -13,7 +13,7 @@ FunctionCall test.sum@1[
         LiteralExpr [STRING] [tdst]
       ]
       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/big-object/big_object_groupby-2/big_object_groupby.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby-2/big_object_groupby.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby-2/big_object_groupby.3.ast
index cb72b70..e02bd2e 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby-2/big_object_groupby.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby-2/big_object_groupby.3.ast
@@ -5,19 +5,19 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [id]
     :
-    Variable [ Name=id ]
+    Variable [ Name=$id ]
   )
   (
     LiteralExpr [STRING] [length]
     :
     FunctionCall test.string-length@1[
-      Variable [ Name=comment ]
+      Variable [ Name=$comment ]
     ]
   )
   (
     LiteralExpr [STRING] [comment]
     :
-    Variable [ Name=comment ]
+    Variable [ Name=$comment ]
   )
 ]
 ]
@@ -25,31 +25,35 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Line]
   ]
   AS
-  Variable [ Name=i ]
+  Variable [ Name=$i ]
 ]
 Groupby
-  Variable [ Name=comment ]
+  Variable [ Name=$comment ]
   :=
   FieldAccessor [
-    Variable [ Name=i ]
+    Variable [ Name=$i ]
     Field=l_comment
   ]
-  Variable [ Name=id ]
+  Variable [ Name=$id ]
   :=
   FieldAccessor [
-    Variable [ Name=i ]
+    Variable [ Name=$i ]
     Field=l_orderkey
   ]
-  With
-  Variable [ Name=i ]
+  GROUP AS
+  Variable [ Name=#1 ]
+  (
+  Variable [ Name=$i ]
+   AS i
+  )
 
 Orderby
-  Variable [ Name=id ]
+  Variable [ Name=$id ]
   ASC
   FunctionCall test.string-length@1[
-    Variable [ Name=comment ]
+    Variable [ Name=$comment ]
   ]
   ASC
-  Variable [ Name=comment ]
+  Variable [ Name=$comment ]
   ASC
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby/big_object_groupby.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby/big_object_groupby.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby/big_object_groupby.3.ast
index 7d82c98..c2d00c9 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby/big_object_groupby.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby/big_object_groupby.3.ast
@@ -5,12 +5,12 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [partkey]
     :
-    Variable [ Name=partkey ]
+    Variable [ Name=$partkey ]
   )
   (
     LiteralExpr [STRING] [lines]
     :
-    Variable [ Name=i ]
+    Variable [ Name=$i ]
   )
 ]
 ]
@@ -18,19 +18,23 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Line]
   ]
   AS
-  Variable [ Name=i ]
+  Variable [ Name=$i ]
 ]
 Groupby
-  Variable [ Name=partkey ]
+  Variable [ Name=$partkey ]
   :=
   FieldAccessor [
-    Variable [ Name=i ]
+    Variable [ Name=$i ]
     Field=l_partkey
   ]
-  With
-  Variable [ Name=i ]
+  GROUP AS
+  Variable [ Name=#1 ]
+  (
+  Variable [ Name=$i ]
+   AS i
+  )
 
 Orderby
-  Variable [ Name=partkey ]
+  Variable [ Name=$partkey ]
   ASC
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_join/big_object_join.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_join/big_object_join.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_join/big_object_join.3.ast
index f3254d4..301c358 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_join/big_object_join.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_join/big_object_join.3.ast
@@ -6,7 +6,7 @@ RecordConstructor [
     LiteralExpr [STRING] [c_custkey]
     :
     FieldAccessor [
-      Variable [ Name=c ]
+      Variable [ Name=$c ]
       Field=c_custkey
     ]
   )
@@ -14,7 +14,7 @@ RecordConstructor [
     LiteralExpr [STRING] [o_orderkey]
     :
     FieldAccessor [
-      Variable [ Name=o ]
+      Variable [ Name=$o ]
       Field=o_orderkey
     ]
   )
@@ -23,7 +23,7 @@ RecordConstructor [
     :
     FunctionCall test.string-length@1[
       FieldAccessor [
-        Variable [ Name=c ]
+        Variable [ Name=$c ]
         Field=c_comment
       ]
     ]
@@ -33,7 +33,7 @@ RecordConstructor [
     :
     FunctionCall test.string-length@1[
       FieldAccessor [
-        Variable [ Name=o ]
+        Variable [ Name=$o ]
         Field=o_comment
       ]
     ]
@@ -42,7 +42,7 @@ RecordConstructor [
     LiteralExpr [STRING] [c_comment]
     :
     FieldAccessor [
-      Variable [ Name=c ]
+      Variable [ Name=$c ]
       Field=c_comment
     ]
   )
@@ -52,34 +52,34 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Customer]
   ]
   AS
-  Variable [ Name=c ]
+  Variable [ Name=$c ]
 ,
   FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Order]
   ]
   AS
-  Variable [ Name=o ]
+  Variable [ Name=$o ]
 ]
 Where
   OperatorExpr [
     FieldAccessor [
-      Variable [ Name=c ]
+      Variable [ Name=$c ]
       Field=c_custkey
     ]
     =
     FieldAccessor [
-      Variable [ Name=o ]
+      Variable [ Name=$o ]
       Field=o_custkey
     ]
   ]
 Orderby
   FieldAccessor [
-    Variable [ Name=o ]
+    Variable [ Name=$o ]
     Field=o_orderkey
   ]
   ASC
   FieldAccessor [
-    Variable [ Name=c ]
+    Variable [ Name=$c ]
     Field=c_custkey
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_sort/big_object_sort.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_sort/big_object_sort.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_sort/big_object_sort.3.ast
index 4d0117e..22f3ccf 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_sort/big_object_sort.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_sort/big_object_sort.3.ast
@@ -6,7 +6,7 @@ RecordConstructor [
     LiteralExpr [STRING] [custkey]
     :
     FieldAccessor [
-      Variable [ Name=o ]
+      Variable [ Name=$o ]
       Field=o_custkey
     ]
   )
@@ -14,7 +14,7 @@ RecordConstructor [
     LiteralExpr [STRING] [orderkey]
     :
     FieldAccessor [
-      Variable [ Name=o ]
+      Variable [ Name=$o ]
       Field=o_orderkey
     ]
   )
@@ -23,7 +23,7 @@ RecordConstructor [
     :
     FunctionCall test.string-length@1[
       FieldAccessor [
-        Variable [ Name=o ]
+        Variable [ Name=$o ]
         Field=o_comment
       ]
     ]
@@ -32,7 +32,7 @@ RecordConstructor [
     LiteralExpr [STRING] [comment]
     :
     FieldAccessor [
-      Variable [ Name=o ]
+      Variable [ Name=$o ]
       Field=o_comment
     ]
   )
@@ -42,16 +42,16 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Order]
   ]
   AS
-  Variable [ Name=o ]
+  Variable [ Name=$o ]
 ]
 Orderby
   FieldAccessor [
-    Variable [ Name=o ]
+    Variable [ Name=$o ]
     Field=o_custkey
   ]
   ASC
   FieldAccessor [
-    Variable [ Name=o ]
+    Variable [ Name=$o ]
     Field=o_orderkey
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/equal_join/equal_join.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/equal_join/equal_join.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/equal_join/equal_join.3.ast
index 717a2f9..dab21a7 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/equal_join/equal_join.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/equal_join/equal_join.3.ast
@@ -6,7 +6,7 @@ RecordConstructor [
     LiteralExpr [STRING] [cid]
     :
     FieldAccessor [
-      Variable [ Name=c ]
+      Variable [ Name=$c ]
       Field=id
     ]
   )
@@ -14,7 +14,7 @@ RecordConstructor [
     LiteralExpr [STRING] [oid]
     :
     FieldAccessor [
-      Variable [ Name=o ]
+      Variable [ Name=$o ]
       Field=id
     ]
   )
@@ -24,29 +24,29 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [User]
   ]
   AS
-  Variable [ Name=c ]
+  Variable [ Name=$c ]
 ,
   FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [UserCopy]
   ]
   AS
-  Variable [ Name=o ]
+  Variable [ Name=$o ]
 ]
 Where
   OperatorExpr [
     FieldAccessor [
-      Variable [ Name=c ]
+      Variable [ Name=$c ]
       Field=md5
     ]
     =
     FieldAccessor [
-      Variable [ Name=o ]
+      Variable [ Name=$o ]
       Field=md5
     ]
   ]
 Orderby
   FieldAccessor [
-    Variable [ Name=c ]
+    Variable [ Name=$c ]
     Field=id
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/index_join/index_join.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/index_join/index_join.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/index_join/index_join.3.ast
index 717a2f9..dab21a7 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/index_join/index_join.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/index_join/index_join.3.ast
@@ -6,7 +6,7 @@ RecordConstructor [
     LiteralExpr [STRING] [cid]
     :
     FieldAccessor [
-      Variable [ Name=c ]
+      Variable [ Name=$c ]
       Field=id
     ]
   )
@@ -14,7 +14,7 @@ RecordConstructor [
     LiteralExpr [STRING] [oid]
     :
     FieldAccessor [
-      Variable [ Name=o ]
+      Variable [ Name=$o ]
       Field=id
     ]
   )
@@ -24,29 +24,29 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [User]
   ]
   AS
-  Variable [ Name=c ]
+  Variable [ Name=$c ]
 ,
   FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [UserCopy]
   ]
   AS
-  Variable [ Name=o ]
+  Variable [ Name=$o ]
 ]
 Where
   OperatorExpr [
     FieldAccessor [
-      Variable [ Name=c ]
+      Variable [ Name=$c ]
       Field=md5
     ]
     =
     FieldAccessor [
-      Variable [ Name=o ]
+      Variable [ Name=$o ]
       Field=md5
     ]
   ]
 Orderby
   FieldAccessor [
-    Variable [ Name=c ]
+    Variable [ Name=$c ]
     Field=id
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/insert/insert.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/insert/insert.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/insert/insert.3.ast
index 20ea1c6..a1aa5bd 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/insert/insert.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/insert/insert.3.ast
@@ -1,22 +1,22 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-Variable [ Name=c ]
+Variable [ Name=$c ]
 ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [UserOpen]
   ]
   AS
-  Variable [ Name=c ]
+  Variable [ Name=$c ]
 ]
 Orderby
   FieldAccessor [
-    Variable [ Name=c ]
+    Variable [ Name=$c ]
     Field=id
   ]
   ASC
   FieldAccessor [
-    Variable [ Name=c ]
+    Variable [ Name=$c ]
     Field=md5
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/print/print.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/print/print.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/print/print.3.ast
index 1b58b54..7ef8419 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/print/print.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/print/print.3.ast
@@ -9,13 +9,13 @@ RecordConstructor [
       OperatorExpr [
         FunctionCall test.print-binary@2[
           FunctionCall test.parse-binary@2[
-            Variable [ Name=i ]
+            Variable [ Name=$i ]
             LiteralExpr [STRING] [hex]
           ]
           LiteralExpr [STRING] [hex]
         ]
         =
-        Variable [ Name=i ]
+        Variable [ Name=$i ]
       ]
       ]
       FROM [        OrderedListConstructor [
@@ -25,7 +25,7 @@ RecordConstructor [
           LiteralExpr [STRING] []
         ]
         AS
-        Variable [ Name=i ]
+        Variable [ Name=$i ]
       ]
     )
   )
@@ -37,13 +37,13 @@ RecordConstructor [
       OperatorExpr [
         FunctionCall test.print-binary@2[
           FunctionCall test.parse-binary@2[
-            Variable [ Name=j ]
+            Variable [ Name=$j ]
             LiteralExpr [STRING] [base64]
           ]
           LiteralExpr [STRING] [base64]
         ]
         =
-        Variable [ Name=j ]
+        Variable [ Name=$j ]
       ]
       ]
       FROM [        OrderedListConstructor [
@@ -53,7 +53,7 @@ RecordConstructor [
           LiteralExpr [STRING] [QXN0ZXJpeAE8]
         ]
         AS
-        Variable [ Name=j ]
+        Variable [ Name=$j ]
       ]
     )
   )

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/datetime_order/datetime_order.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/datetime_order/datetime_order.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/datetime_order/datetime_order.3.ast
index e9ab49f..7fe9bf7 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/datetime_order/datetime_order.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/datetime_order/datetime_order.3.ast
@@ -1,80 +1,80 @@
 DataverseUse test
 Query:
-LetVariable [ Name=dt1 ]
+Let Variable [ Name=$dt1 ]
   :=
   FunctionCall test.datetime@1[
     LiteralExpr [STRING] [2011-12-31T14:00:00-10:00]
   ]
-LetVariable [ Name=dt2 ]
+Let Variable [ Name=$dt2 ]
   :=
   FunctionCall test.datetime@1[
     LiteralExpr [STRING] [2012-01-01T00:00:00Z]
   ]
-LetVariable [ Name=dt3 ]
+Let Variable [ Name=$dt3 ]
   :=
   FunctionCall test.datetime@1[
     LiteralExpr [STRING] [2005-01-01T00:00:00+04:00]
   ]
-LetVariable [ Name=dt4 ]
+Let Variable [ Name=$dt4 ]
   :=
   FunctionCall test.datetime@1[
     LiteralExpr [STRING] [2011-12-31T13:00:00-11:00]
   ]
-LetVariable [ Name=dt5 ]
+Let Variable [ Name=$dt5 ]
   :=
   FunctionCall test.datetime@1[
     LiteralExpr [STRING] [2012-04-06T00:00:00Z]
   ]
-LetVariable [ Name=dt6 ]
+Let Variable [ Name=$dt6 ]
   :=
   FunctionCall test.datetime@1[
     LiteralExpr [STRING] [-1937-07-07T23:00:00+08:00]
   ]
-LetVariable [ Name=dt7 ]
+Let Variable [ Name=$dt7 ]
   :=
   FunctionCall test.datetime@1[
     LiteralExpr [STRING] [-1600-03-01T00:00:00.384+06:00]
   ]
-LetVariable [ Name=dt8 ]
+Let Variable [ Name=$dt8 ]
   :=
   FunctionCall test.datetime@1[
     LiteralExpr [STRING] [-1600-02-29T23:59:59.999Z]
   ]
-LetVariable [ Name=dt9 ]
+Let Variable [ Name=$dt9 ]
   :=
   FunctionCall test.datetime@1[
     LiteralExpr [STRING] [2000-02-29T23:59:59.999Z]
   ]
-LetVariable [ Name=dt10 ]
+Let Variable [ Name=$dt10 ]
   :=
   FunctionCall test.datetime@1[
     LiteralExpr [STRING] [2000-03-01T01:59:59.999+07:00]
   ]
-LetVariable [ Name=dt11 ]
+Let Variable [ Name=$dt11 ]
   :=
   FunctionCall test.datetime@1[
     LiteralExpr [STRING] [-1600-03-01T00:00:00.384-06:00]
   ]
 SELECT ELEMENT [
-Variable [ Name=dt ]
+Variable [ Name=$dt ]
 ]
 FROM [  OrderedListConstructor [
-    Variable [ Name=dt1 ]
-    Variable [ Name=dt2 ]
-    Variable [ Name=dt3 ]
-    Variable [ Name=dt4 ]
-    Variable [ Name=dt5 ]
-    Variable [ Name=dt6 ]
-    Variable [ Name=dt7 ]
-    Variable [ Name=dt8 ]
-    Variable [ Name=dt9 ]
-    Variable [ Name=dt10 ]
-    Variable [ Name=dt11 ]
+    Variable [ Name=$dt1 ]
+    Variable [ Name=$dt2 ]
+    Variable [ Name=$dt3 ]
+    Variable [ Name=$dt4 ]
+    Variable [ Name=$dt5 ]
+    Variable [ Name=$dt6 ]
+    Variable [ Name=$dt7 ]
+    Variable [ Name=$dt8 ]
+    Variable [ Name=$dt9 ]
+    Variable [ Name=$dt10 ]
+    Variable [ Name=$dt11 ]
   ]
   AS
-  Variable [ Name=dt ]
+  Variable [ Name=$dt ]
 ]
 Orderby
-  Variable [ Name=dt ]
+  Variable [ Name=$dt ]
   ASC
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/datetime_range/datetime_range.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/datetime_range/datetime_range.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/datetime_range/datetime_range.3.ast
index 246b7dd..ce1f738 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/datetime_range/datetime_range.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/datetime_range/datetime_range.3.ast
@@ -6,7 +6,7 @@ RecordConstructor [
     LiteralExpr [STRING] [id]
     :
     FieldAccessor [
-      Variable [ Name=t ]
+      Variable [ Name=$t ]
       Field=id
     ]
   )
@@ -16,13 +16,13 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [TwitterData]
   ]
   AS
-  Variable [ Name=t ]
+  Variable [ Name=$t ]
 ]
 Where
   OperatorExpr [
     OperatorExpr [
       FieldAccessor [
-        Variable [ Name=t ]
+        Variable [ Name=$t ]
         Field=time
       ]
       >
@@ -33,7 +33,7 @@ Where
     and
     OperatorExpr [
       FieldAccessor [
-        Variable [ Name=t ]
+        Variable [ Name=$t ]
         Field=time
       ]
       <
@@ -44,7 +44,7 @@ Where
   ]
 Orderby
   FieldAccessor [
-    Variable [ Name=t ]
+    Variable [ Name=$t ]
     Field=id
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/double_gte_01/double_gte_01.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/double_gte_01/double_gte_01.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/double_gte_01/double_gte_01.3.ast
index 37e5558..2663a8c 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/double_gte_01/double_gte_01.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/double_gte_01/double_gte_01.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-Variable [ Name=i ]
+Variable [ Name=$i ]
 ]
 FROM [  OrderedListConstructor [
     LiteralExpr [DOUBLE] [0.8]
@@ -10,11 +10,11 @@ FROM [  OrderedListConstructor [
     LiteralExpr [DOUBLE] [0.901]
   ]
   AS
-  Variable [ Name=i ]
+  Variable [ Name=$i ]
 ]
 Where
   OperatorExpr [
-    Variable [ Name=i ]
+    Variable [ Name=$i ]
     >=
     LiteralExpr [DOUBLE] [0.9]
   ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/eq_01/eq_01.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/eq_01/eq_01.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/eq_01/eq_01.3.ast
index 6220330..241fdf7 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/eq_01/eq_01.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/eq_01/eq_01.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-Variable [ Name=x ]
+Variable [ Name=$x ]
 ]
 FROM [  OrderedListConstructor [
     LiteralExpr [LONG] [1]
@@ -9,11 +9,11 @@ FROM [  OrderedListConstructor [
     LiteralExpr [LONG] [2]
   ]
   AS
-  Variable [ Name=x ]
+  Variable [ Name=$x ]
 ]
 Where
   OperatorExpr [
-    Variable [ Name=x ]
+    Variable [ Name=$x ]
     =
     LiteralExpr [LONG] [2]
   ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/gt_01/gt_01.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/gt_01/gt_01.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/gt_01/gt_01.3.ast
index 1dfc291..2d7cd6f 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/gt_01/gt_01.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/gt_01/gt_01.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-Variable [ Name=x ]
+Variable [ Name=$x ]
 ]
 FROM [  OrderedListConstructor [
     LiteralExpr [LONG] [1]
@@ -9,11 +9,11 @@ FROM [  OrderedListConstructor [
     LiteralExpr [LONG] [2]
   ]
   AS
-  Variable [ Name=x ]
+  Variable [ Name=$x ]
 ]
 Where
   OperatorExpr [
-    Variable [ Name=x ]
+    Variable [ Name=$x ]
     >
     LiteralExpr [LONG] [1]
   ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/gte_01/gte_01.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/gte_01/gte_01.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/gte_01/gte_01.3.ast
index 141f1b2..9396639 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/gte_01/gte_01.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/gte_01/gte_01.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-Variable [ Name=x ]
+Variable [ Name=$x ]
 ]
 FROM [  OrderedListConstructor [
     LiteralExpr [LONG] [1]
@@ -9,11 +9,11 @@ FROM [  OrderedListConstructor [
     LiteralExpr [LONG] [2]
   ]
   AS
-  Variable [ Name=x ]
+  Variable [ Name=$x ]
 ]
 Where
   OperatorExpr [
-    Variable [ Name=x ]
+    Variable [ Name=$x ]
     >=
     LiteralExpr [LONG] [2]
   ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/lt_01/lt_01.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/lt_01/lt_01.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/lt_01/lt_01.3.ast
index 9b13c70..76a06d6 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/lt_01/lt_01.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/lt_01/lt_01.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-Variable [ Name=x ]
+Variable [ Name=$x ]
 ]
 FROM [  OrderedListConstructor [
     LiteralExpr [LONG] [1]
@@ -9,11 +9,11 @@ FROM [  OrderedListConstructor [
     LiteralExpr [LONG] [2]
   ]
   AS
-  Variable [ Name=x ]
+  Variable [ Name=$x ]
 ]
 Where
   OperatorExpr [
-    Variable [ Name=x ]
+    Variable [ Name=$x ]
     <
     LiteralExpr [LONG] [3]
   ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/lte_01/lte_01.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/lte_01/lte_01.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/lte_01/lte_01.3.ast
index 37ea949..e01bc50 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/lte_01/lte_01.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/lte_01/lte_01.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-Variable [ Name=x ]
+Variable [ Name=$x ]
 ]
 FROM [  OrderedListConstructor [
     LiteralExpr [LONG] [1]
@@ -9,11 +9,11 @@ FROM [  OrderedListConstructor [
     LiteralExpr [LONG] [2]
   ]
   AS
-  Variable [ Name=x ]
+  Variable [ Name=$x ]
 ]
 Where
   OperatorExpr [
-    Variable [ Name=x ]
+    Variable [ Name=$x ]
     <=
     LiteralExpr [LONG] [2]
   ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/neq_01/neq_01.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/neq_01/neq_01.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/neq_01/neq_01.3.ast
index ebfd090..a02d844 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/neq_01/neq_01.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/neq_01/neq_01.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-Variable [ Name=x ]
+Variable [ Name=$x ]
 ]
 FROM [  OrderedListConstructor [
     LiteralExpr [LONG] [1]
@@ -9,11 +9,11 @@ FROM [  OrderedListConstructor [
     LiteralExpr [LONG] [2]
   ]
   AS
-  Variable [ Name=x ]
+  Variable [ Name=$x ]
 ]
 Where
   OperatorExpr [
-    Variable [ Name=x ]
+    Variable [ Name=$x ]
     !=
     LiteralExpr [LONG] [2]
   ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/year_month_duration_order/year_month_duration_order.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/year_month_duration_order/year_month_duration_order.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/year_month_duration_order/year_month_duration_order.3.ast
index b04a755..4829893 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/year_month_duration_order/year_month_duration_order.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/year_month_duration_order/year_month_duration_order.3.ast
@@ -1,38 +1,38 @@
 DataverseUse test
 Query:
-LetVariable [ Name=dr1 ]
+Let Variable [ Name=$dr1 ]
   :=
   FunctionCall test.year-month-duration@1[
     LiteralExpr [STRING] [P439Y]
   ]
-LetVariable [ Name=dr2 ]
+Let Variable [ Name=$dr2 ]
   :=
   FunctionCall test.year-month-duration@1[
     LiteralExpr [STRING] [-P328M]
   ]
-LetVariable [ Name=dr3 ]
+Let Variable [ Name=$dr3 ]
   :=
   FunctionCall test.year-month-duration@1[
     LiteralExpr [STRING] [-P48Y12M]
   ]
-LetVariable [ Name=dr4 ]
+Let Variable [ Name=$dr4 ]
   :=
   FunctionCall test.year-month-duration@1[
     LiteralExpr [STRING] [P12M]
   ]
 SELECT ELEMENT [
-Variable [ Name=dr ]
+Variable [ Name=$dr ]
 ]
 FROM [  OrderedListConstructor [
-    Variable [ Name=dr1 ]
-    Variable [ Name=dr2 ]
-    Variable [ Name=dr3 ]
-    Variable [ Name=dr4 ]
+    Variable [ Name=$dr1 ]
+    Variable [ Name=$dr2 ]
+    Variable [ Name=$dr3 ]
+    Variable [ Name=$dr4 ]
   ]
   AS
-  Variable [ Name=dr ]
+  Variable [ Name=$dr ]
 ]
 Orderby
-  Variable [ Name=dr ]
+  Variable [ Name=$dr ]
   ASC
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/interval/interval.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/interval/interval.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/interval/interval.3.ast
index 0382c4f..c993fe1 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/interval/interval.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/interval/interval.3.ast
@@ -277,4 +277,4 @@ RecordConstructor [
       LiteralExpr [NULL]
     ]
   )
-]
\ No newline at end of file
+]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv01/cross-dv01.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv01/cross-dv01.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv01/cross-dv01.3.ast
index ee08b06..7ef8a6f 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv01/cross-dv01.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv01/cross-dv01.3.ast
@@ -4,22 +4,22 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [ug-student]
     :
-    Variable [ Name=s ]
+    Variable [ Name=$s ]
   )
   (
     LiteralExpr [STRING] [prof]
     :
-    Variable [ Name=p ]
+    Variable [ Name=$p ]
   )
   (
     LiteralExpr [STRING] [grd-student]
     :
-    Variable [ Name=a ]
+    Variable [ Name=$a ]
   )
   (
     LiteralExpr [STRING] [postdoc]
     :
-    Variable [ Name=b ]
+    Variable [ Name=$b ]
   )
 ]
 ]
@@ -27,23 +27,23 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [student.ugdstd]
   ]
   AS
-  Variable [ Name=s ]
+  Variable [ Name=$s ]
 ,
   FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [teacher.prof]
   ]
   AS
-  Variable [ Name=p ]
+  Variable [ Name=$p ]
 ,
   FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [student.gdstd]
   ]
   AS
-  Variable [ Name=a ]
+  Variable [ Name=$a ]
 ,
   FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [teacher.pstdoc]
   ]
   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/cross-dataverse/cross-dv02/cross-dv02.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv02/cross-dv02.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv02/cross-dv02.3.ast
index 3b61362..33161dd 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv02/cross-dv02.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv02/cross-dv02.3.ast
@@ -1,18 +1,18 @@
 Query:
 SELECT ELEMENT [
-Variable [ Name=l ]
+Variable [ Name=$l ]
 ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Metadata.Dataset]
   ]
   AS
-  Variable [ Name=l ]
+  Variable [ Name=$l ]
 ]
 Where
   OperatorExpr [
     OperatorExpr [
       FieldAccessor [
-        Variable [ Name=l ]
+        Variable [ Name=$l ]
         Field=DataverseName
       ]
       =
@@ -21,7 +21,7 @@ Where
     or
     OperatorExpr [
       FieldAccessor [
-        Variable [ Name=l ]
+        Variable [ Name=$l ]
         Field=DataverseName
       ]
       =
@@ -30,7 +30,7 @@ Where
   ]
 Orderby
   FieldAccessor [
-    Variable [ Name=l ]
+    Variable [ Name=$l ]
     Field=DatasetName
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv03/cross-dv03.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv03/cross-dv03.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv03/cross-dv03.3.ast
index 6d01c46..5c0d413 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv03/cross-dv03.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv03/cross-dv03.3.ast
@@ -3,19 +3,19 @@ SELECT ELEMENT [
 FunctionCall null.count@1[
   (
     SELECT ELEMENT [
-    Variable [ Name=l ]
+    Variable [ Name=$l ]
     ]
     FROM [      FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [Metadata.Dataset]
       ]
       AS
-      Variable [ Name=l ]
+      Variable [ Name=$l ]
     ]
     Where
       OperatorExpr [
         OperatorExpr [
           FieldAccessor [
-            Variable [ Name=l ]
+            Variable [ Name=$l ]
             Field=DataverseName
           ]
           =
@@ -24,7 +24,7 @@ FunctionCall null.count@1[
         or
         OperatorExpr [
           FieldAccessor [
-            Variable [ Name=l ]
+            Variable [ Name=$l ]
             Field=DataverseName
           ]
           =

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv04/cross-dv04.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv04/cross-dv04.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv04/cross-dv04.3.ast
index 3b61362..33161dd 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv04/cross-dv04.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv04/cross-dv04.3.ast
@@ -1,18 +1,18 @@
 Query:
 SELECT ELEMENT [
-Variable [ Name=l ]
+Variable [ Name=$l ]
 ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Metadata.Dataset]
   ]
   AS
-  Variable [ Name=l ]
+  Variable [ Name=$l ]
 ]
 Where
   OperatorExpr [
     OperatorExpr [
       FieldAccessor [
-        Variable [ Name=l ]
+        Variable [ Name=$l ]
         Field=DataverseName
       ]
       =
@@ -21,7 +21,7 @@ Where
     or
     OperatorExpr [
       FieldAccessor [
-        Variable [ Name=l ]
+        Variable [ Name=$l ]
         Field=DataverseName
       ]
       =
@@ -30,7 +30,7 @@ Where
   ]
 Orderby
   FieldAccessor [
-    Variable [ Name=l ]
+    Variable [ Name=$l ]
     Field=DatasetName
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv07/cross-dv07.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv07/cross-dv07.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv07/cross-dv07.3.ast
index c20010f..cd41f99 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv07/cross-dv07.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv07/cross-dv07.3.ast
@@ -1,18 +1,18 @@
 Query:
 SELECT ELEMENT [
-Variable [ Name=l ]
+Variable [ Name=$l ]
 ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [test.employee]
   ]
   AS
-  Variable [ Name=l ]
+  Variable [ Name=$l ]
 ]
 Where
   OperatorExpr [
     OperatorExpr [
       FieldAccessor [
-        Variable [ Name=l ]
+        Variable [ Name=$l ]
         Field=fname
       ]
       =
@@ -21,7 +21,7 @@ Where
     and
     OperatorExpr [
       FieldAccessor [
-        Variable [ Name=l ]
+        Variable [ Name=$l ]
         Field=lname
       ]
       =

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv15/cross-dv15.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv15/cross-dv15.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv15/cross-dv15.3.ast
index 6732c8a..9395e60 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv15/cross-dv15.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv15/cross-dv15.3.ast
@@ -5,7 +5,7 @@ RecordConstructor [
     LiteralExpr [STRING] [DataverseName]
     :
     FieldAccessor [
-      Variable [ Name=l ]
+      Variable [ Name=$l ]
       Field=DataverseName
     ]
   )
@@ -13,7 +13,7 @@ RecordConstructor [
     LiteralExpr [STRING] [Name]
     :
     FieldAccessor [
-      Variable [ Name=l ]
+      Variable [ Name=$l ]
       Field=Name
     ]
   )
@@ -21,7 +21,7 @@ RecordConstructor [
     LiteralExpr [STRING] [Arity]
     :
     FieldAccessor [
-      Variable [ Name=l ]
+      Variable [ Name=$l ]
       Field=Arity
     ]
   )
@@ -29,7 +29,7 @@ RecordConstructor [
     LiteralExpr [STRING] [ReturnType]
     :
     FieldAccessor [
-      Variable [ Name=l ]
+      Variable [ Name=$l ]
       Field=ReturnType
     ]
   )
@@ -37,7 +37,7 @@ RecordConstructor [
     LiteralExpr [STRING] [Language]
     :
     FieldAccessor [
-      Variable [ Name=l ]
+      Variable [ Name=$l ]
       Field=Language
     ]
   )
@@ -47,12 +47,12 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Metadata.Function]
   ]
   AS
-  Variable [ Name=l ]
+  Variable [ Name=$l ]
 ]
 Where
   OperatorExpr [
     FieldAccessor [
-      Variable [ Name=l ]
+      Variable [ Name=$l ]
       Field=DataverseName
     ]
     =

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv19/cross-dv19.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv19/cross-dv19.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv19/cross-dv19.3.ast
index 1ed46b8..f12fad9 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv19/cross-dv19.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv19/cross-dv19.3.ast
@@ -1,18 +1,18 @@
 Query:
 SELECT ELEMENT [
-Variable [ Name=l ]
+Variable [ Name=$l ]
 ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Metadata.Dataset]
   ]
   AS
-  Variable [ Name=l ]
+  Variable [ Name=$l ]
 ]
 Where
   OperatorExpr [
     OperatorExpr [
       FieldAccessor [
-        Variable [ Name=l ]
+        Variable [ Name=$l ]
         Field=DataverseName
       ]
       =
@@ -21,7 +21,7 @@ Where
     or
     OperatorExpr [
       FieldAccessor [
-        Variable [ Name=l ]
+        Variable [ Name=$l ]
         Field=DataverseName
       ]
       =
@@ -30,7 +30,7 @@ Where
     or
     OperatorExpr [
       FieldAccessor [
-        Variable [ Name=l ]
+        Variable [ Name=$l ]
         Field=DataverseName
       ]
       =

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv20/cross-dv20.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv20/cross-dv20.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv20/cross-dv20.3.ast
index ee08b06..7ef8a6f 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv20/cross-dv20.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv20/cross-dv20.3.ast
@@ -4,22 +4,22 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [ug-student]
     :
-    Variable [ Name=s ]
+    Variable [ Name=$s ]
   )
   (
     LiteralExpr [STRING] [prof]
     :
-    Variable [ Name=p ]
+    Variable [ Name=$p ]
   )
   (
     LiteralExpr [STRING] [grd-student]
     :
-    Variable [ Name=a ]
+    Variable [ Name=$a ]
   )
   (
     LiteralExpr [STRING] [postdoc]
     :
-    Variable [ Name=b ]
+    Variable [ Name=$b ]
   )
 ]
 ]
@@ -27,23 +27,23 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [student.ugdstd]
   ]
   AS
-  Variable [ Name=s ]
+  Variable [ Name=$s ]
 ,
   FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [teacher.prof]
   ]
   AS
-  Variable [ Name=p ]
+  Variable [ Name=$p ]
 ,
   FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [student.gdstd]
   ]
   AS
-  Variable [ Name=a ]
+  Variable [ Name=$a ]
 ,
   FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [teacher.pstdoc]
   ]
   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/cross-dataverse/insert_across_dataverses/insert_across_dataverses.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/insert_across_dataverses/insert_across_dataverses.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/insert_across_dataverses/insert_across_dataverses.3.ast
index 3d27ea4..dc5937b 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/insert_across_dataverses/insert_across_dataverses.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/insert_across_dataverses/insert_across_dataverses.3.ast
@@ -1,17 +1,17 @@
 DataverseUse test2
 Query:
 SELECT ELEMENT [
-Variable [ Name=c ]
+Variable [ Name=$c ]
 ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [test2.Customers]
   ]
   AS
-  Variable [ Name=c ]
+  Variable [ Name=$c ]
 ]
 Orderby
   FieldAccessor [
-    Variable [ Name=c ]
+    Variable [ Name=$c ]
     Field=cid
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/join_across_dataverses/join_across_dataverses.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/join_across_dataverses/join_across_dataverses.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/join_across_dataverses/join_across_dataverses.3.ast
index 4e21492..15df5c4 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/join_across_dataverses/join_across_dataverses.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/join_across_dataverses/join_across_dataverses.3.ast
@@ -7,7 +7,7 @@ RecordConstructor [
     LiteralExpr [STRING] [cust_name]
     :
     FieldAccessor [
-      Variable [ Name=c ]
+      Variable [ Name=$c ]
       Field=name
     ]
   )
@@ -15,7 +15,7 @@ RecordConstructor [
     LiteralExpr [STRING] [cust_age]
     :
     FieldAccessor [
-      Variable [ Name=c ]
+      Variable [ Name=$c ]
       Field=age
     ]
   )
@@ -23,7 +23,7 @@ RecordConstructor [
     LiteralExpr [STRING] [order_total]
     :
     FieldAccessor [
-      Variable [ Name=o ]
+      Variable [ Name=$o ]
       Field=total
     ]
   )
@@ -32,11 +32,11 @@ RecordConstructor [
     :
     OrderedListConstructor [
       FieldAccessor [
-        Variable [ Name=o ]
+        Variable [ Name=$o ]
         Field=oid
       ]
       FieldAccessor [
-        Variable [ Name=o ]
+        Variable [ Name=$o ]
         Field=cid
       ]
     ]
@@ -47,34 +47,34 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [test1.Customers]
   ]
   AS
-  Variable [ Name=c ]
+  Variable [ Name=$c ]
 ,
   FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [test2.Orders]
   ]
   AS
-  Variable [ Name=o ]
+  Variable [ Name=$o ]
 ]
 Where
   OperatorExpr [
     FieldAccessor [
-      Variable [ Name=c ]
+      Variable [ Name=$c ]
       Field=cid
     ]
     =
     FieldAccessor [
-      Variable [ Name=o ]
+      Variable [ Name=$o ]
       Field=cid
     ]
   ]
 Orderby
   FieldAccessor [
-    Variable [ Name=c ]
+    Variable [ Name=$c ]
     Field=name
   ]
   ASC
   FieldAccessor [
-    Variable [ Name=o ]
+    Variable [ Name=$o ]
     Field=total
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_01/customer_q_01.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_01/customer_q_01.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_01/customer_q_01.3.ast
index bc6dd44..7fd2caf 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_01/customer_q_01.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_01/customer_q_01.3.ast
@@ -1,11 +1,11 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-Variable [ Name=c ]
+Variable [ Name=$c ]
 ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Customers]
   ]
   AS
-  Variable [ Name=c ]
+  Variable [ Name=$c ]
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_02/customer_q_02.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_02/customer_q_02.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_02/customer_q_02.3.ast
index e2ed544..5e940f2 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_02/customer_q_02.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_02/customer_q_02.3.ast
@@ -6,20 +6,20 @@ RecordConstructor [
     LiteralExpr [STRING] [id]
     :
     FieldAccessor [
-      Variable [ Name=c ]
+      Variable [ Name=$c ]
       Field=cid
     ]
   )
   (
     LiteralExpr [STRING] [nestedRecord]
     :
-    Variable [ Name=nestedRec ]
+    Variable [ Name=$nestedRec ]
   )
   (
     LiteralExpr [STRING] [order_id]
     :
     FieldAccessor [
-      Variable [ Name=nestedRec ]
+      Variable [ Name=$nestedRec ]
       Field=oid
     ]
   )
@@ -29,11 +29,11 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Customers]
   ]
   AS
-  Variable [ Name=c ]
+  Variable [ Name=$c ]
 ]
-LetVariable [ Name=nestedRec ]
+Let Variable [ Name=$nestedRec ]
   :=
   FieldAccessor [
-    Variable [ Name=c ]
+    Variable [ Name=$c ]
     Field=lastorder
   ]



Mime
View raw message