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

[25/51] [partial] incubator-asterixdb git commit: ASTERIXDB-1226: implement SQL++ core group-by semantics and syntatic sugars.

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_avg_null/scalar_avg_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_avg_null/scalar_avg_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_avg_null/scalar_avg_null.3.ast
index 557f08b..d1c0cbf 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_avg_null/scalar_avg_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_avg_null/scalar_avg_null.3.ast
@@ -1,6 +1,6 @@
 DataverseUse test
 Query:
-LetVariable [ Name=i8 ]
+Let Variable [ Name=$i8 ]
   :=
   FunctionCall test.sql-avg@1[
     OrderedListConstructor [
@@ -16,7 +16,7 @@ LetVariable [ Name=i8 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=i16 ]
+Let Variable [ Name=$i16 ]
   :=
   FunctionCall test.sql-avg@1[
     OrderedListConstructor [
@@ -32,7 +32,7 @@ LetVariable [ Name=i16 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=i32 ]
+Let Variable [ Name=$i32 ]
   :=
   FunctionCall test.sql-avg@1[
     OrderedListConstructor [
@@ -48,7 +48,7 @@ LetVariable [ Name=i32 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=i64 ]
+Let Variable [ Name=$i64 ]
   :=
   FunctionCall test.sql-avg@1[
     OrderedListConstructor [
@@ -64,7 +64,7 @@ LetVariable [ Name=i64 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=f ]
+Let Variable [ Name=$f ]
   :=
   FunctionCall test.sql-avg@1[
     OrderedListConstructor [
@@ -80,7 +80,7 @@ LetVariable [ Name=f ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=d ]
+Let Variable [ Name=$d ]
   :=
   FunctionCall test.sql-avg@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-sql/scalar_count/scalar_count.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_count/scalar_count.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_count/scalar_count.3.ast
index 0511e9f..5e10637 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_count/scalar_count.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_count/scalar_count.3.ast
@@ -1,6 +1,6 @@
 DataverseUse test
 Query:
-LetVariable [ Name=i8 ]
+Let Variable [ Name=$i8 ]
   :=
   FunctionCall test.sql-count@1[
     OrderedListConstructor [
@@ -15,7 +15,7 @@ LetVariable [ Name=i8 ]
       ]
     ]
   ]
-LetVariable [ Name=i16 ]
+Let Variable [ Name=$i16 ]
   :=
   FunctionCall test.sql-count@1[
     OrderedListConstructor [
@@ -30,7 +30,7 @@ LetVariable [ Name=i16 ]
       ]
     ]
   ]
-LetVariable [ Name=i32 ]
+Let Variable [ Name=$i32 ]
   :=
   FunctionCall test.sql-count@1[
     OrderedListConstructor [
@@ -45,7 +45,7 @@ LetVariable [ Name=i32 ]
       ]
     ]
   ]
-LetVariable [ Name=i64 ]
+Let Variable [ Name=$i64 ]
   :=
   FunctionCall test.sql-count@1[
     OrderedListConstructor [
@@ -60,7 +60,7 @@ LetVariable [ Name=i64 ]
       ]
     ]
   ]
-LetVariable [ Name=f ]
+Let Variable [ Name=$f ]
   :=
   FunctionCall test.sql-count@1[
     OrderedListConstructor [
@@ -75,7 +75,7 @@ LetVariable [ Name=f ]
       ]
     ]
   ]
-LetVariable [ Name=d ]
+Let Variable [ Name=$d ]
   :=
   FunctionCall test.sql-count@1[
     OrderedListConstructor [
@@ -90,7 +90,7 @@ LetVariable [ Name=d ]
       ]
     ]
   ]
-LetVariable [ Name=s ]
+Let Variable [ Name=$s ]
   :=
   FunctionCall test.sql-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-sql/scalar_count_null/scalar_count_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_count_null/scalar_count_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_count_null/scalar_count_null.3.ast
index 90369f6..5213a15 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_count_null/scalar_count_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_count_null/scalar_count_null.3.ast
@@ -1,6 +1,6 @@
 DataverseUse test
 Query:
-LetVariable [ Name=i8 ]
+Let Variable [ Name=$i8 ]
   :=
   FunctionCall test.sql-count@1[
     OrderedListConstructor [
@@ -16,7 +16,7 @@ LetVariable [ Name=i8 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=i16 ]
+Let Variable [ Name=$i16 ]
   :=
   FunctionCall test.sql-count@1[
     OrderedListConstructor [
@@ -32,7 +32,7 @@ LetVariable [ Name=i16 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=i32 ]
+Let Variable [ Name=$i32 ]
   :=
   FunctionCall test.sql-count@1[
     OrderedListConstructor [
@@ -48,7 +48,7 @@ LetVariable [ Name=i32 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=i64 ]
+Let Variable [ Name=$i64 ]
   :=
   FunctionCall test.sql-count@1[
     OrderedListConstructor [
@@ -64,7 +64,7 @@ LetVariable [ Name=i64 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=f ]
+Let Variable [ Name=$f ]
   :=
   FunctionCall test.sql-count@1[
     OrderedListConstructor [
@@ -80,7 +80,7 @@ LetVariable [ Name=f ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=d ]
+Let Variable [ Name=$d ]
   :=
   FunctionCall test.sql-count@1[
     OrderedListConstructor [
@@ -96,7 +96,7 @@ LetVariable [ Name=d ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=s ]
+Let Variable [ Name=$s ]
   :=
   FunctionCall test.sql-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-sql/scalar_max/scalar_max.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_max/scalar_max.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_max/scalar_max.3.ast
index 0d96f9c..62a81b9 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_max/scalar_max.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_max/scalar_max.3.ast
@@ -1,6 +1,6 @@
 DataverseUse test
 Query:
-LetVariable [ Name=i8 ]
+Let Variable [ Name=$i8 ]
   :=
   FunctionCall test.sql-max@1[
     OrderedListConstructor [
@@ -15,7 +15,7 @@ LetVariable [ Name=i8 ]
       ]
     ]
   ]
-LetVariable [ Name=i16 ]
+Let Variable [ Name=$i16 ]
   :=
   FunctionCall test.sql-max@1[
     OrderedListConstructor [
@@ -30,7 +30,7 @@ LetVariable [ Name=i16 ]
       ]
     ]
   ]
-LetVariable [ Name=i32 ]
+Let Variable [ Name=$i32 ]
   :=
   FunctionCall test.sql-max@1[
     OrderedListConstructor [
@@ -45,7 +45,7 @@ LetVariable [ Name=i32 ]
       ]
     ]
   ]
-LetVariable [ Name=i64 ]
+Let Variable [ Name=$i64 ]
   :=
   FunctionCall test.sql-max@1[
     OrderedListConstructor [
@@ -60,7 +60,7 @@ LetVariable [ Name=i64 ]
       ]
     ]
   ]
-LetVariable [ Name=f ]
+Let Variable [ Name=$f ]
   :=
   FunctionCall test.sql-max@1[
     OrderedListConstructor [
@@ -75,7 +75,7 @@ LetVariable [ Name=f ]
       ]
     ]
   ]
-LetVariable [ Name=d ]
+Let Variable [ Name=$d ]
   :=
   FunctionCall test.sql-max@1[
     OrderedListConstructor [
@@ -90,7 +90,7 @@ LetVariable [ Name=d ]
       ]
     ]
   ]
-LetVariable [ Name=s ]
+Let Variable [ Name=$s ]
   :=
   FunctionCall test.sql-max@1[
     OrderedListConstructor [
@@ -99,7 +99,7 @@ LetVariable [ Name=s ]
       LiteralExpr [STRING] [world]
     ]
   ]
-LetVariable [ Name=dt ]
+Let Variable [ Name=$dt ]
   :=
   FunctionCall test.sql-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-sql/scalar_max_null/scalar_max_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_max_null/scalar_max_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_max_null/scalar_max_null.3.ast
index c108525..5781f80 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_max_null/scalar_max_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_max_null/scalar_max_null.3.ast
@@ -1,6 +1,6 @@
 DataverseUse test
 Query:
-LetVariable [ Name=i8 ]
+Let Variable [ Name=$i8 ]
   :=
   FunctionCall test.sql-max@1[
     OrderedListConstructor [
@@ -16,7 +16,7 @@ LetVariable [ Name=i8 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=i16 ]
+Let Variable [ Name=$i16 ]
   :=
   FunctionCall test.sql-max@1[
     OrderedListConstructor [
@@ -32,7 +32,7 @@ LetVariable [ Name=i16 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=i32 ]
+Let Variable [ Name=$i32 ]
   :=
   FunctionCall test.sql-max@1[
     OrderedListConstructor [
@@ -48,7 +48,7 @@ LetVariable [ Name=i32 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=i64 ]
+Let Variable [ Name=$i64 ]
   :=
   FunctionCall test.sql-max@1[
     OrderedListConstructor [
@@ -64,7 +64,7 @@ LetVariable [ Name=i64 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=f ]
+Let Variable [ Name=$f ]
   :=
   FunctionCall test.sql-max@1[
     OrderedListConstructor [
@@ -80,7 +80,7 @@ LetVariable [ Name=f ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=d ]
+Let Variable [ Name=$d ]
   :=
   FunctionCall test.sql-max@1[
     OrderedListConstructor [
@@ -96,7 +96,7 @@ LetVariable [ Name=d ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=s ]
+Let Variable [ Name=$s ]
   :=
   FunctionCall test.sql-max@1[
     OrderedListConstructor [
@@ -106,7 +106,7 @@ LetVariable [ Name=s ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=dt ]
+Let Variable [ Name=$dt ]
   :=
   FunctionCall test.sql-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-sql/scalar_min/scalar_min.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_min/scalar_min.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_min/scalar_min.3.ast
index d817b6b..aef2332 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_min/scalar_min.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_min/scalar_min.3.ast
@@ -1,6 +1,6 @@
 DataverseUse test
 Query:
-LetVariable [ Name=i8 ]
+Let Variable [ Name=$i8 ]
   :=
   FunctionCall test.sql-min@1[
     OrderedListConstructor [
@@ -15,7 +15,7 @@ LetVariable [ Name=i8 ]
       ]
     ]
   ]
-LetVariable [ Name=i16 ]
+Let Variable [ Name=$i16 ]
   :=
   FunctionCall test.sql-min@1[
     OrderedListConstructor [
@@ -30,7 +30,7 @@ LetVariable [ Name=i16 ]
       ]
     ]
   ]
-LetVariable [ Name=i32 ]
+Let Variable [ Name=$i32 ]
   :=
   FunctionCall test.sql-min@1[
     OrderedListConstructor [
@@ -45,7 +45,7 @@ LetVariable [ Name=i32 ]
       ]
     ]
   ]
-LetVariable [ Name=i64 ]
+Let Variable [ Name=$i64 ]
   :=
   FunctionCall test.sql-min@1[
     OrderedListConstructor [
@@ -60,7 +60,7 @@ LetVariable [ Name=i64 ]
       ]
     ]
   ]
-LetVariable [ Name=f ]
+Let Variable [ Name=$f ]
   :=
   FunctionCall test.sql-min@1[
     OrderedListConstructor [
@@ -75,7 +75,7 @@ LetVariable [ Name=f ]
       ]
     ]
   ]
-LetVariable [ Name=d ]
+Let Variable [ Name=$d ]
   :=
   FunctionCall test.sql-min@1[
     OrderedListConstructor [
@@ -90,7 +90,7 @@ LetVariable [ Name=d ]
       ]
     ]
   ]
-LetVariable [ Name=s ]
+Let Variable [ Name=$s ]
   :=
   FunctionCall test.sql-min@1[
     OrderedListConstructor [
@@ -99,7 +99,7 @@ LetVariable [ Name=s ]
       LiteralExpr [STRING] [world]
     ]
   ]
-LetVariable [ Name=dt ]
+Let Variable [ Name=$dt ]
   :=
   FunctionCall test.sql-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-sql/scalar_min_null/scalar_min_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_min_null/scalar_min_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_min_null/scalar_min_null.3.ast
index 9eaae70..e406615 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_min_null/scalar_min_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_min_null/scalar_min_null.3.ast
@@ -1,6 +1,6 @@
 DataverseUse test
 Query:
-LetVariable [ Name=i8 ]
+Let Variable [ Name=$i8 ]
   :=
   FunctionCall test.sql-min@1[
     OrderedListConstructor [
@@ -16,7 +16,7 @@ LetVariable [ Name=i8 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=i16 ]
+Let Variable [ Name=$i16 ]
   :=
   FunctionCall test.sql-min@1[
     OrderedListConstructor [
@@ -32,7 +32,7 @@ LetVariable [ Name=i16 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=i32 ]
+Let Variable [ Name=$i32 ]
   :=
   FunctionCall test.sql-min@1[
     OrderedListConstructor [
@@ -48,7 +48,7 @@ LetVariable [ Name=i32 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=i64 ]
+Let Variable [ Name=$i64 ]
   :=
   FunctionCall test.sql-min@1[
     OrderedListConstructor [
@@ -64,7 +64,7 @@ LetVariable [ Name=i64 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=f ]
+Let Variable [ Name=$f ]
   :=
   FunctionCall test.sql-min@1[
     OrderedListConstructor [
@@ -80,7 +80,7 @@ LetVariable [ Name=f ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=d ]
+Let Variable [ Name=$d ]
   :=
   FunctionCall test.sql-min@1[
     OrderedListConstructor [
@@ -96,7 +96,7 @@ LetVariable [ Name=d ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=s ]
+Let Variable [ Name=$s ]
   :=
   FunctionCall test.sql-min@1[
     OrderedListConstructor [
@@ -106,7 +106,7 @@ LetVariable [ Name=s ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=dt ]
+Let Variable [ Name=$dt ]
   :=
   FunctionCall test.sql-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-sql/scalar_sum/scalar_sum.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_sum/scalar_sum.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_sum/scalar_sum.3.ast
index 27bd715..b568d92 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_sum/scalar_sum.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_sum/scalar_sum.3.ast
@@ -1,6 +1,6 @@
 DataverseUse test
 Query:
-LetVariable [ Name=i8 ]
+Let Variable [ Name=$i8 ]
   :=
   FunctionCall test.sql-sum@1[
     OrderedListConstructor [
@@ -15,7 +15,7 @@ LetVariable [ Name=i8 ]
       ]
     ]
   ]
-LetVariable [ Name=i16 ]
+Let Variable [ Name=$i16 ]
   :=
   FunctionCall test.sql-sum@1[
     OrderedListConstructor [
@@ -30,7 +30,7 @@ LetVariable [ Name=i16 ]
       ]
     ]
   ]
-LetVariable [ Name=i32 ]
+Let Variable [ Name=$i32 ]
   :=
   FunctionCall test.sql-sum@1[
     OrderedListConstructor [
@@ -45,7 +45,7 @@ LetVariable [ Name=i32 ]
       ]
     ]
   ]
-LetVariable [ Name=i64 ]
+Let Variable [ Name=$i64 ]
   :=
   FunctionCall test.sql-sum@1[
     OrderedListConstructor [
@@ -60,7 +60,7 @@ LetVariable [ Name=i64 ]
       ]
     ]
   ]
-LetVariable [ Name=f ]
+Let Variable [ Name=$f ]
   :=
   FunctionCall test.sql-sum@1[
     OrderedListConstructor [
@@ -75,7 +75,7 @@ LetVariable [ Name=f ]
       ]
     ]
   ]
-LetVariable [ Name=d ]
+Let Variable [ Name=$d ]
   :=
   FunctionCall test.sql-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-sql/scalar_sum_null/scalar_sum_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.3.ast
index 94d8dd9..ce265b8 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.3.ast
@@ -1,6 +1,6 @@
 DataverseUse test
 Query:
-LetVariable [ Name=i8 ]
+Let Variable [ Name=$i8 ]
   :=
   FunctionCall test.sql-sum@1[
     OrderedListConstructor [
@@ -16,7 +16,7 @@ LetVariable [ Name=i8 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=i16 ]
+Let Variable [ Name=$i16 ]
   :=
   FunctionCall test.sql-sum@1[
     OrderedListConstructor [
@@ -32,7 +32,7 @@ LetVariable [ Name=i16 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=i32 ]
+Let Variable [ Name=$i32 ]
   :=
   FunctionCall test.sql-sum@1[
     OrderedListConstructor [
@@ -48,7 +48,7 @@ LetVariable [ Name=i32 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=i64 ]
+Let Variable [ Name=$i64 ]
   :=
   FunctionCall test.sql-sum@1[
     OrderedListConstructor [
@@ -64,7 +64,7 @@ LetVariable [ Name=i64 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=f ]
+Let Variable [ Name=$f ]
   :=
   FunctionCall test.sql-sum@1[
     OrderedListConstructor [
@@ -80,7 +80,7 @@ LetVariable [ Name=f ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=d ]
+Let Variable [ Name=$d ]
   :=
   FunctionCall test.sql-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-sql/sum_double/sum_double.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_double/sum_double.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_double/sum_double.3.ast
index 3b0400a..9132133 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_double/sum_double.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_double/sum_double.3.ast
@@ -4,7 +4,7 @@ SELECT ELEMENT [
 FunctionCall test.sql-sum@1[
   (
     SELECT ELEMENT [
-    Variable [ Name=x ]
+    Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
         LiteralExpr [DOUBLE] [1.0]
@@ -12,7 +12,7 @@ FunctionCall test.sql-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-sql/sum_double_null/sum_double_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_double_null/sum_double_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_double_null/sum_double_null.3.ast
index eb881ad..ce4271d 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_double_null/sum_double_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_double_null/sum_double_null.3.ast
@@ -5,7 +5,7 @@ FunctionCall test.sql-sum@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
-      Variable [ Name=x ]
+      Variable [ Name=$x ]
       Field=doubleField
     ]
     ]
@@ -13,7 +13,7 @@ FunctionCall test.sql-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-sql/sum_empty_01/sum_empty_01.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_empty_01/sum_empty_01.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_empty_01/sum_empty_01.3.ast
index 4262dd6..06a668c 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_empty_01/sum_empty_01.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_empty_01/sum_empty_01.3.ast
@@ -4,7 +4,7 @@ SELECT ELEMENT [
 FunctionCall test.sql-sum@1[
   (
     SELECT ELEMENT [
-    Variable [ Name=x ]
+    Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
         LiteralExpr [LONG] [1]
@@ -12,11 +12,11 @@ FunctionCall test.sql-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-sql/sum_empty_02/sum_empty_02.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.3.ast
index d0b8323..86aa8d1 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.3.ast
@@ -5,7 +5,7 @@ FunctionCall test.sql-sum@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
-      Variable [ Name=x ]
+      Variable [ Name=$x ]
       Field=val
     ]
     ]
@@ -13,7 +13,7 @@ FunctionCall test.sql-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-sql/sum_float/sum_float.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_float/sum_float.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_float/sum_float.3.ast
index 9b38f1f..c456ba6 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_float/sum_float.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_float/sum_float.3.ast
@@ -4,7 +4,7 @@ SELECT ELEMENT [
 FunctionCall test.sql-sum@1[
   (
     SELECT ELEMENT [
-    Variable [ Name=x ]
+    Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
         FunctionCall test.float@1[
@@ -18,7 +18,7 @@ FunctionCall test.sql-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-sql/sum_float_null/sum_float_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_float_null/sum_float_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_float_null/sum_float_null.3.ast
index a97f1bd..baa9b91 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_float_null/sum_float_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_float_null/sum_float_null.3.ast
@@ -5,7 +5,7 @@ FunctionCall test.sql-sum@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
-      Variable [ Name=x ]
+      Variable [ Name=$x ]
       Field=floatField
     ]
     ]
@@ -13,7 +13,7 @@ FunctionCall test.sql-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-sql/sum_int16/sum_int16.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int16/sum_int16.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int16/sum_int16.3.ast
index 1acd1e9..a9176a8 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int16/sum_int16.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int16/sum_int16.3.ast
@@ -4,7 +4,7 @@ SELECT ELEMENT [
 FunctionCall test.sql-sum@1[
   (
     SELECT ELEMENT [
-    Variable [ Name=x ]
+    Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
         FunctionCall test.int16@1[
@@ -18,7 +18,7 @@ FunctionCall test.sql-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-sql/sum_int16_null/sum_int16_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int16_null/sum_int16_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int16_null/sum_int16_null.3.ast
index 13000a7..2d49797 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int16_null/sum_int16_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int16_null/sum_int16_null.3.ast
@@ -5,7 +5,7 @@ FunctionCall test.sql-sum@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
-      Variable [ Name=x ]
+      Variable [ Name=$x ]
       Field=int16Field
     ]
     ]
@@ -13,7 +13,7 @@ FunctionCall test.sql-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-sql/sum_int32/sum_int32.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int32/sum_int32.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int32/sum_int32.3.ast
index 06d76c3..70a818a 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int32/sum_int32.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int32/sum_int32.3.ast
@@ -4,7 +4,7 @@ SELECT ELEMENT [
 FunctionCall test.sql-sum@1[
   (
     SELECT ELEMENT [
-    Variable [ Name=x ]
+    Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
         FunctionCall test.int32@1[
@@ -18,7 +18,7 @@ FunctionCall test.sql-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-sql/sum_int32_null/sum_int32_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int32_null/sum_int32_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int32_null/sum_int32_null.3.ast
index 2d57c5f..0f6079a 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int32_null/sum_int32_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int32_null/sum_int32_null.3.ast
@@ -5,7 +5,7 @@ FunctionCall test.sql-sum@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
-      Variable [ Name=x ]
+      Variable [ Name=$x ]
       Field=int32Field
     ]
     ]
@@ -13,7 +13,7 @@ FunctionCall test.sql-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-sql/sum_int64/sum_int64.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int64/sum_int64.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int64/sum_int64.3.ast
index 7c91476..54dc886 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int64/sum_int64.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int64/sum_int64.3.ast
@@ -4,7 +4,7 @@ SELECT ELEMENT [
 FunctionCall test.sql-sum@1[
   (
     SELECT ELEMENT [
-    Variable [ Name=x ]
+    Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
         FunctionCall test.int64@1[
@@ -18,7 +18,7 @@ FunctionCall test.sql-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-sql/sum_int64_null/sum_int64_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int64_null/sum_int64_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int64_null/sum_int64_null.3.ast
index 6bb78c1..4f2524a 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int64_null/sum_int64_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int64_null/sum_int64_null.3.ast
@@ -5,7 +5,7 @@ FunctionCall test.sql-sum@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
-      Variable [ Name=x ]
+      Variable [ Name=$x ]
       Field=int64Field
     ]
     ]
@@ -13,7 +13,7 @@ FunctionCall test.sql-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-sql/sum_int8/sum_int8.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int8/sum_int8.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int8/sum_int8.3.ast
index 14025b8..dcffbf2 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int8/sum_int8.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int8/sum_int8.3.ast
@@ -4,7 +4,7 @@ SELECT ELEMENT [
 FunctionCall test.sql-sum@1[
   (
     SELECT ELEMENT [
-    Variable [ Name=x ]
+    Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
         FunctionCall test.int8@1[
@@ -18,7 +18,7 @@ FunctionCall test.sql-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-sql/sum_int8_null/sum_int8_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int8_null/sum_int8_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int8_null/sum_int8_null.3.ast
index 6bb0066..3bdfe85 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int8_null/sum_int8_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int8_null/sum_int8_null.3.ast
@@ -5,7 +5,7 @@ FunctionCall test.sql-sum@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
-      Variable [ Name=x ]
+      Variable [ Name=$x ]
       Field=int8Field
     ]
     ]
@@ -13,7 +13,7 @@ FunctionCall test.sql-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-sql/sum_mixed/sum_mixed.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_mixed/sum_mixed.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_mixed/sum_mixed.3.ast
index 3f8aff5..1d0d5be 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_mixed/sum_mixed.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_mixed/sum_mixed.3.ast
@@ -3,7 +3,7 @@ SELECT ELEMENT [
 FunctionCall null.sql-sum@1[
   (
     SELECT ELEMENT [
-    Variable [ Name=x ]
+    Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
         FunctionCall null.float@1[
@@ -16,7 +16,7 @@ FunctionCall null.sql-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-sql/sum_null-with-pred/sum_null-with-pred.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.3.ast
index 0bfc9d8..40ba26b 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.3.ast
@@ -6,7 +6,7 @@ FunctionCall test.sql-sum@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
-      Variable [ Name=l ]
+      Variable [ Name=$l ]
       Field=sal
     ]
     ]
@@ -14,13 +14,13 @@ FunctionCall test.sql-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-sql/sum_numeric_null/sum_numeric_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_numeric_null/sum_numeric_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_numeric_null/sum_numeric_null.3.ast
index becfad0..a59827a 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_numeric_null/sum_numeric_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_numeric_null/sum_numeric_null.3.ast
@@ -5,7 +5,7 @@ FunctionCall test.sql-sum@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
-      Variable [ Name=l ]
+      Variable [ Name=$l ]
       Field=sal
     ]
     ]
@@ -13,7 +13,7 @@ FunctionCall test.sql-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/aggregate/agg_null_rec/agg_null_rec.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_null_rec/agg_null_rec.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_null_rec/agg_null_rec.3.ast
index 4976f97..d73dacf 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_null_rec/agg_null_rec.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_null_rec/agg_null_rec.3.ast
@@ -8,7 +8,7 @@ RecordConstructor [
       (
         SELECT ELEMENT [
         FieldAccessor [
-          Variable [ Name=t ]
+          Variable [ Name=$t ]
           Field=valplus
         ]
         ]
@@ -16,7 +16,7 @@ RecordConstructor [
             LiteralExpr [STRING] [Test]
           ]
           AS
-          Variable [ Name=t ]
+          Variable [ Name=$t ]
         ]
       )
     ]
@@ -28,7 +28,7 @@ RecordConstructor [
       (
         SELECT ELEMENT [
         FieldAccessor [
-          Variable [ Name=t ]
+          Variable [ Name=$t ]
           Field=valplus
         ]
         ]
@@ -36,7 +36,7 @@ RecordConstructor [
             LiteralExpr [STRING] [Test]
           ]
           AS
-          Variable [ Name=t ]
+          Variable [ Name=$t ]
         ]
       )
     ]
@@ -48,7 +48,7 @@ RecordConstructor [
       (
         SELECT ELEMENT [
         FieldAccessor [
-          Variable [ Name=t ]
+          Variable [ Name=$t ]
           Field=valplus
         ]
         ]
@@ -56,7 +56,7 @@ RecordConstructor [
             LiteralExpr [STRING] [Test]
           ]
           AS
-          Variable [ Name=t ]
+          Variable [ Name=$t ]
         ]
       )
     ]
@@ -68,7 +68,7 @@ RecordConstructor [
       (
         SELECT ELEMENT [
         FieldAccessor [
-          Variable [ Name=t ]
+          Variable [ Name=$t ]
           Field=valplus
         ]
         ]
@@ -76,7 +76,7 @@ RecordConstructor [
             LiteralExpr [STRING] [Test]
           ]
           AS
-          Variable [ Name=t ]
+          Variable [ Name=$t ]
         ]
       )
     ]
@@ -88,7 +88,7 @@ RecordConstructor [
       (
         SELECT ELEMENT [
         FieldAccessor [
-          Variable [ Name=t ]
+          Variable [ Name=$t ]
           Field=valplus
         ]
         ]
@@ -96,7 +96,7 @@ RecordConstructor [
             LiteralExpr [STRING] [Test]
           ]
           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/aggregate/agg_null_rec_1/agg_null_rec_1.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_null_rec_1/agg_null_rec_1.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_null_rec_1/agg_null_rec_1.3.ast
index cae68d8..f7bad79 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_null_rec_1/agg_null_rec_1.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_null_rec_1/agg_null_rec_1.3.ast
@@ -7,13 +7,13 @@ RecordConstructor [
     FunctionCall test.count@1[
       (
         SELECT ELEMENT [
-        Variable [ Name=t ]
+        Variable [ Name=$t ]
         ]
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [Test]
           ]
           AS
-          Variable [ Name=t ]
+          Variable [ Name=$t ]
         ]
       )
     ]
@@ -25,23 +25,23 @@ RecordConstructor [
       (
         SELECT ELEMENT [
         FieldAccessor [
-          Variable [ Name=i ]
+          Variable [ Name=$i ]
           Field=val
         ]
         ]
         FROM [          (
             SELECT ELEMENT [
-            Variable [ Name=t ]
+            Variable [ Name=$t ]
             ]
             FROM [              FunctionCall Metadata.dataset@1[
                 LiteralExpr [STRING] [Test]
               ]
               AS
-              Variable [ Name=t ]
+              Variable [ Name=$t ]
             ]
           )
           AS
-          Variable [ Name=i ]
+          Variable [ Name=$i ]
         ]
       )
     ]
@@ -53,23 +53,23 @@ RecordConstructor [
       (
         SELECT ELEMENT [
         FieldAccessor [
-          Variable [ Name=i ]
+          Variable [ Name=$i ]
           Field=val
         ]
         ]
         FROM [          (
             SELECT ELEMENT [
-            Variable [ Name=t ]
+            Variable [ Name=$t ]
             ]
             FROM [              FunctionCall Metadata.dataset@1[
                 LiteralExpr [STRING] [Test]
               ]
               AS
-              Variable [ Name=t ]
+              Variable [ Name=$t ]
             ]
           )
           AS
-          Variable [ Name=i ]
+          Variable [ Name=$i ]
         ]
       )
     ]
@@ -81,23 +81,23 @@ RecordConstructor [
       (
         SELECT ELEMENT [
         FieldAccessor [
-          Variable [ Name=i ]
+          Variable [ Name=$i ]
           Field=valplus
         ]
         ]
         FROM [          (
             SELECT ELEMENT [
-            Variable [ Name=t ]
+            Variable [ Name=$t ]
             ]
             FROM [              FunctionCall Metadata.dataset@1[
                 LiteralExpr [STRING] [Test]
               ]
               AS
-              Variable [ Name=t ]
+              Variable [ Name=$t ]
             ]
           )
           AS
-          Variable [ Name=i ]
+          Variable [ Name=$i ]
         ]
       )
     ]
@@ -109,23 +109,23 @@ RecordConstructor [
       (
         SELECT ELEMENT [
         FieldAccessor [
-          Variable [ Name=i ]
+          Variable [ Name=$i ]
           Field=valplus
         ]
         ]
         FROM [          (
             SELECT ELEMENT [
-            Variable [ Name=t ]
+            Variable [ Name=$t ]
             ]
             FROM [              FunctionCall Metadata.dataset@1[
                 LiteralExpr [STRING] [Test]
               ]
               AS
-              Variable [ Name=t ]
+              Variable [ Name=$t ]
             ]
           )
           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/agg_number_rec/agg_number_rec.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_number_rec/agg_number_rec.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_number_rec/agg_number_rec.3.ast
index 4976f97..d73dacf 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_number_rec/agg_number_rec.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_number_rec/agg_number_rec.3.ast
@@ -8,7 +8,7 @@ RecordConstructor [
       (
         SELECT ELEMENT [
         FieldAccessor [
-          Variable [ Name=t ]
+          Variable [ Name=$t ]
           Field=valplus
         ]
         ]
@@ -16,7 +16,7 @@ RecordConstructor [
             LiteralExpr [STRING] [Test]
           ]
           AS
-          Variable [ Name=t ]
+          Variable [ Name=$t ]
         ]
       )
     ]
@@ -28,7 +28,7 @@ RecordConstructor [
       (
         SELECT ELEMENT [
         FieldAccessor [
-          Variable [ Name=t ]
+          Variable [ Name=$t ]
           Field=valplus
         ]
         ]
@@ -36,7 +36,7 @@ RecordConstructor [
             LiteralExpr [STRING] [Test]
           ]
           AS
-          Variable [ Name=t ]
+          Variable [ Name=$t ]
         ]
       )
     ]
@@ -48,7 +48,7 @@ RecordConstructor [
       (
         SELECT ELEMENT [
         FieldAccessor [
-          Variable [ Name=t ]
+          Variable [ Name=$t ]
           Field=valplus
         ]
         ]
@@ -56,7 +56,7 @@ RecordConstructor [
             LiteralExpr [STRING] [Test]
           ]
           AS
-          Variable [ Name=t ]
+          Variable [ Name=$t ]
         ]
       )
     ]
@@ -68,7 +68,7 @@ RecordConstructor [
       (
         SELECT ELEMENT [
         FieldAccessor [
-          Variable [ Name=t ]
+          Variable [ Name=$t ]
           Field=valplus
         ]
         ]
@@ -76,7 +76,7 @@ RecordConstructor [
             LiteralExpr [STRING] [Test]
           ]
           AS
-          Variable [ Name=t ]
+          Variable [ Name=$t ]
         ]
       )
     ]
@@ -88,7 +88,7 @@ RecordConstructor [
       (
         SELECT ELEMENT [
         FieldAccessor [
-          Variable [ Name=t ]
+          Variable [ Name=$t ]
           Field=valplus
         ]
         ]
@@ -96,7 +96,7 @@ RecordConstructor [
             LiteralExpr [STRING] [Test]
           ]
           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/aggregate/avg_double/avg_double.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_double/avg_double.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_double/avg_double.3.ast
index d979a6e..ea15957 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_double/avg_double.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_double/avg_double.3.ast
@@ -3,7 +3,7 @@ SELECT ELEMENT [
 FunctionCall null.avg@1[
   (
     SELECT ELEMENT [
-    Variable [ Name=x ]
+    Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
         LiteralExpr [DOUBLE] [1.0]
@@ -13,7 +13,7 @@ FunctionCall null.avg@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/avg_double_null/avg_double_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_double_null/avg_double_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_double_null/avg_double_null.3.ast
index b946881..70a1738 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_double_null/avg_double_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_double_null/avg_double_null.3.ast
@@ -8,7 +8,7 @@ RecordConstructor [
       (
         SELECT ELEMENT [
         FieldAccessor [
-          Variable [ Name=x ]
+          Variable [ Name=$x ]
           Field=doubleField
         ]
         ]
@@ -16,7 +16,7 @@ RecordConstructor [
             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/avg_empty_01/avg_empty_01.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_empty_01/avg_empty_01.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_empty_01/avg_empty_01.3.ast
index 236a7de..441ca62 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_empty_01/avg_empty_01.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_empty_01/avg_empty_01.3.ast
@@ -4,7 +4,7 @@ SELECT ELEMENT [
 FunctionCall test.avg@1[
   (
     SELECT ELEMENT [
-    Variable [ Name=x ]
+    Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
         LiteralExpr [LONG] [1]
@@ -12,11 +12,11 @@ FunctionCall test.avg@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/avg_empty_02/avg_empty_02.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_empty_02/avg_empty_02.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_empty_02/avg_empty_02.3.ast
index 18cf26c..2fe644b 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_empty_02/avg_empty_02.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_empty_02/avg_empty_02.3.ast
@@ -5,7 +5,7 @@ FunctionCall test.avg@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
-      Variable [ Name=x ]
+      Variable [ Name=$x ]
       Field=val
     ]
     ]
@@ -13,7 +13,7 @@ FunctionCall test.avg@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/avg_float/avg_float.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_float/avg_float.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_float/avg_float.3.ast
index 7d9e49d..927f646 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_float/avg_float.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_float/avg_float.3.ast
@@ -4,7 +4,7 @@ SELECT ELEMENT [
 FunctionCall test.avg@1[
   (
     SELECT ELEMENT [
-    Variable [ Name=x ]
+    Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
         FunctionCall test.float@1[
@@ -18,7 +18,7 @@ FunctionCall test.avg@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/avg_float_null/avg_float_nu.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_float_null/avg_float_nu.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_float_null/avg_float_nu.3.ast
index 5cd105d..ce9cbf2 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_float_null/avg_float_nu.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_float_null/avg_float_nu.3.ast
@@ -8,7 +8,7 @@ RecordConstructor [
       (
         SELECT ELEMENT [
         FieldAccessor [
-          Variable [ Name=x ]
+          Variable [ Name=$x ]
           Field=floatField
         ]
         ]
@@ -16,7 +16,7 @@ RecordConstructor [
             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/avg_int16/avg_int16.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int16/avg_int16.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int16/avg_int16.3.ast
index 3421856..88332e3 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int16/avg_int16.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int16/avg_int16.3.ast
@@ -4,7 +4,7 @@ SELECT ELEMENT [
 FunctionCall test.avg@1[
   (
     SELECT ELEMENT [
-    Variable [ Name=x ]
+    Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
         FunctionCall test.int16@1[
@@ -18,7 +18,7 @@ FunctionCall test.avg@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/avg_int16_null/avg_int16_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int16_null/avg_int16_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int16_null/avg_int16_null.3.ast
index 37e709a..4f5daa5 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int16_null/avg_int16_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int16_null/avg_int16_null.3.ast
@@ -8,7 +8,7 @@ RecordConstructor [
       (
         SELECT ELEMENT [
         FieldAccessor [
-          Variable [ Name=x ]
+          Variable [ Name=$x ]
           Field=int16Field
         ]
         ]
@@ -16,7 +16,7 @@ RecordConstructor [
             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/avg_int32/avg_int32.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int32/avg_int32.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int32/avg_int32.3.ast
index 514e8ff..fe7ef21 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int32/avg_int32.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int32/avg_int32.3.ast
@@ -4,7 +4,7 @@ SELECT ELEMENT [
 FunctionCall test.avg@1[
   (
     SELECT ELEMENT [
-    Variable [ Name=x ]
+    Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
         LiteralExpr [LONG] [1]
@@ -12,7 +12,7 @@ FunctionCall test.avg@1[
         LiteralExpr [LONG] [3]
       ]
       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/avg_int32_null/avg_int32_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int32_null/avg_int32_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int32_null/avg_int32_null.3.ast
index 7b84875..286d2bd 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int32_null/avg_int32_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int32_null/avg_int32_null.3.ast
@@ -8,7 +8,7 @@ RecordConstructor [
       (
         SELECT ELEMENT [
         FieldAccessor [
-          Variable [ Name=x ]
+          Variable [ Name=$x ]
           Field=int32Field
         ]
         ]
@@ -16,7 +16,7 @@ RecordConstructor [
             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/avg_int64/avg_int64.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int64/avg_int64.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int64/avg_int64.3.ast
index 31c9432..047d806 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int64/avg_int64.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int64/avg_int64.3.ast
@@ -4,7 +4,7 @@ SELECT ELEMENT [
 FunctionCall test.avg@1[
   (
     SELECT ELEMENT [
-    Variable [ Name=x ]
+    Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
         FunctionCall test.int64@1[
@@ -18,7 +18,7 @@ FunctionCall test.avg@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/avg_int64_null/avg_int64_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int64_null/avg_int64_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int64_null/avg_int64_null.3.ast
index a2e73ec..bad056d 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int64_null/avg_int64_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int64_null/avg_int64_null.3.ast
@@ -8,7 +8,7 @@ RecordConstructor [
       (
         SELECT ELEMENT [
         FieldAccessor [
-          Variable [ Name=x ]
+          Variable [ Name=$x ]
           Field=int64Field
         ]
         ]
@@ -16,7 +16,7 @@ RecordConstructor [
             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/avg_int8/avg_int8.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int8/avg_int8.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int8/avg_int8.3.ast
index ad6ccba..e6b1c11 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int8/avg_int8.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int8/avg_int8.3.ast
@@ -4,7 +4,7 @@ SELECT ELEMENT [
 FunctionCall test.avg@1[
   (
     SELECT ELEMENT [
-    Variable [ Name=x ]
+    Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
         FunctionCall test.int8@1[
@@ -18,7 +18,7 @@ FunctionCall test.avg@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/avg_int8_null/avg_int8_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int8_null/avg_int8_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int8_null/avg_int8_null.3.ast
index 7a932c8..399f61b 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int8_null/avg_int8_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int8_null/avg_int8_null.3.ast
@@ -8,7 +8,7 @@ RecordConstructor [
       (
         SELECT ELEMENT [
         FieldAccessor [
-          Variable [ Name=x ]
+          Variable [ Name=$x ]
           Field=int8Field
         ]
         ]
@@ -16,7 +16,7 @@ RecordConstructor [
             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/avg_mixed/avg_mixed.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_mixed/avg_mixed.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_mixed/avg_mixed.3.ast
index 23fb1f6..5d36b1a 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_mixed/avg_mixed.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_mixed/avg_mixed.3.ast
@@ -3,7 +3,7 @@ SELECT ELEMENT [
 FunctionCall null.avg@1[
   (
     SELECT ELEMENT [
-    Variable [ Name=x ]
+    Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
         FunctionCall null.float@1[
@@ -16,7 +16,7 @@ FunctionCall null.avg@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/count_01/count_01.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_01/count_01.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_01/count_01.3.ast
index ec31659..e58e38a 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_01/count_01.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_01/count_01.3.ast
@@ -4,7 +4,7 @@ SELECT ELEMENT [
 FunctionCall test.count@1[
   (
     SELECT ELEMENT [
-    Variable [ Name=x ]
+    Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
         LiteralExpr [LONG] [1]
@@ -12,7 +12,7 @@ FunctionCall test.count@1[
         LiteralExpr [LONG] [3]
       ]
       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/count_empty_01/count_empty_01.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_empty_01/count_empty_01.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_empty_01/count_empty_01.3.ast
index db67870..1d06a82 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_empty_01/count_empty_01.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_empty_01/count_empty_01.3.ast
@@ -3,7 +3,7 @@ SELECT ELEMENT [
 FunctionCall null.count@1[
   (
     SELECT ELEMENT [
-    Variable [ Name=x ]
+    Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
         LiteralExpr [LONG] [1]
@@ -11,11 +11,11 @@ FunctionCall null.count@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/count_empty_02/count_empty_02.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_empty_02/count_empty_02.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_empty_02/count_empty_02.3.ast
index 3cd5b5d..9ed1050 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_empty_02/count_empty_02.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_empty_02/count_empty_02.3.ast
@@ -5,7 +5,7 @@ FunctionCall test.count@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
-      Variable [ Name=x ]
+      Variable [ Name=$x ]
       Field=val
     ]
     ]
@@ -13,7 +13,7 @@ FunctionCall test.count@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/count_null/count_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_null/count_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_null/count_null.3.ast
index 08cf114..b46d1b3 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_null/count_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_null/count_null.3.ast
@@ -8,7 +8,7 @@ RecordConstructor [
       (
         SELECT ELEMENT [
         FieldAccessor [
-          Variable [ Name=x ]
+          Variable [ Name=$x ]
           Field=doubleField
         ]
         ]
@@ -16,7 +16,7 @@ RecordConstructor [
             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/issue395/issue395.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue395/issue395.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue395/issue395.3.ast
index 2801aed..983cc6d 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue395/issue395.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue395/issue395.3.ast
@@ -5,7 +5,7 @@ FunctionCall test.count@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
-      Variable [ Name=l ]
+      Variable [ Name=$l ]
       Field=name
     ]
     ]
@@ -13,7 +13,7 @@ FunctionCall test.count@1[
         LiteralExpr [STRING] [Employee]
       ]
       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/aggregate/issue531_string_min_max/issue531_string_min_max.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue531_string_min_max/issue531_string_min_max.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue531_string_min_max/issue531_string_min_max.3.ast
index 9dec63d..e37c5a4 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue531_string_min_max/issue531_string_min_max.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue531_string_min_max/issue531_string_min_max.3.ast
@@ -9,7 +9,7 @@ RecordConstructor [
       (
         SELECT ELEMENT [
         FieldAccessor [
-          Variable [ Name=l ]
+          Variable [ Name=$l ]
           Field=name
         ]
         ]
@@ -17,7 +17,7 @@ RecordConstructor [
             LiteralExpr [STRING] [t1]
           ]
           AS
-          Variable [ Name=l ]
+          Variable [ Name=$l ]
         ]
       )
     ]
@@ -29,7 +29,7 @@ RecordConstructor [
       (
         SELECT ELEMENT [
         FieldAccessor [
-          Variable [ Name=l ]
+          Variable [ Name=$l ]
           Field=name
         ]
         ]
@@ -37,7 +37,7 @@ RecordConstructor [
             LiteralExpr [STRING] [t1]
           ]
           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/aggregate/max_empty_01/max_empty_01.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/max_empty_01/max_empty_01.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/max_empty_01/max_empty_01.3.ast
index b9f1f79..b5c9a3e 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/max_empty_01/max_empty_01.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/max_empty_01/max_empty_01.3.ast
@@ -4,7 +4,7 @@ SELECT ELEMENT [
 FunctionCall test.max@1[
   (
     SELECT ELEMENT [
-    Variable [ Name=x ]
+    Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
         LiteralExpr [LONG] [1]
@@ -12,11 +12,11 @@ FunctionCall test.max@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/max_empty_02/max_empty_02.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/max_empty_02/max_empty_02.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/max_empty_02/max_empty_02.3.ast
index 1aa6529..4e6b888 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/max_empty_02/max_empty_02.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/max_empty_02/max_empty_02.3.ast
@@ -5,7 +5,7 @@ FunctionCall test.max@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
-      Variable [ Name=x ]
+      Variable [ Name=$x ]
       Field=val
     ]
     ]
@@ -13,7 +13,7 @@ FunctionCall test.max@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/min_empty_01/min_empty_01.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/min_empty_01/min_empty_01.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/min_empty_01/min_empty_01.3.ast
index f6a660a..1ea9d4d 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/min_empty_01/min_empty_01.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/min_empty_01/min_empty_01.3.ast
@@ -4,7 +4,7 @@ SELECT ELEMENT [
 FunctionCall test.min@1[
   (
     SELECT ELEMENT [
-    Variable [ Name=x ]
+    Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
         LiteralExpr [LONG] [1]
@@ -12,11 +12,11 @@ FunctionCall test.min@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/min_empty_02/min_empty_02.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/min_empty_02/min_empty_02.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/min_empty_02/min_empty_02.3.ast
index 5a1f7c9..cc240fa 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/min_empty_02/min_empty_02.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/min_empty_02/min_empty_02.3.ast
@@ -5,7 +5,7 @@ FunctionCall test.min@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
-      Variable [ Name=x ]
+      Variable [ Name=$x ]
       Field=val
     ]
     ]
@@ -13,7 +13,7 @@ FunctionCall test.min@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/min_mixed/min_mixed.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/min_mixed/min_mixed.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/min_mixed/min_mixed.3.ast
index 8cce23d..27ab397 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/min_mixed/min_mixed.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/min_mixed/min_mixed.3.ast
@@ -3,7 +3,7 @@ SELECT ELEMENT [
 FunctionCall null.min@1[
   (
     SELECT ELEMENT [
-    Variable [ Name=x ]
+    Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
         FunctionCall null.float@1[
@@ -16,7 +16,7 @@ FunctionCall null.min@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/query-issue400/query-issue400.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/query-issue400/query-issue400.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/query-issue400/query-issue400.3.ast
index 3ab430c..33aa6f6 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/query-issue400/query-issue400.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/query-issue400/query-issue400.3.ast
@@ -2,7 +2,7 @@ Query:
 FunctionCall null.count@1[
   (
     SELECT ELEMENT [
-    Variable [ Name=i ]
+    Variable [ Name=$i ]
     ]
     FROM [      OrderedListConstructor [
         OrderedListConstructor [
@@ -20,7 +20,7 @@ FunctionCall null.count@1[
         ]
       ]
       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_avg/scalar_avg.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_avg/scalar_avg.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_avg/scalar_avg.3.ast
index 21159c1..bde3209 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_avg/scalar_avg.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_avg/scalar_avg.3.ast
@@ -1,6 +1,6 @@
 DataverseUse test
 Query:
-LetVariable [ Name=i8 ]
+Let Variable [ Name=$i8 ]
   :=
   FunctionCall test.avg@1[
     OrderedListConstructor [
@@ -15,7 +15,7 @@ LetVariable [ Name=i8 ]
       ]
     ]
   ]
-LetVariable [ Name=i16 ]
+Let Variable [ Name=$i16 ]
   :=
   FunctionCall test.avg@1[
     OrderedListConstructor [
@@ -30,7 +30,7 @@ LetVariable [ Name=i16 ]
       ]
     ]
   ]
-LetVariable [ Name=i32 ]
+Let Variable [ Name=$i32 ]
   :=
   FunctionCall test.avg@1[
     OrderedListConstructor [
@@ -45,7 +45,7 @@ LetVariable [ Name=i32 ]
       ]
     ]
   ]
-LetVariable [ Name=i64 ]
+Let Variable [ Name=$i64 ]
   :=
   FunctionCall test.avg@1[
     OrderedListConstructor [
@@ -60,7 +60,7 @@ LetVariable [ Name=i64 ]
       ]
     ]
   ]
-LetVariable [ Name=f ]
+Let Variable [ Name=$f ]
   :=
   FunctionCall test.avg@1[
     OrderedListConstructor [
@@ -75,7 +75,7 @@ LetVariable [ Name=f ]
       ]
     ]
   ]
-LetVariable [ Name=d ]
+Let Variable [ Name=$d ]
   :=
   FunctionCall test.avg@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_avg_null/scalar_avg_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_avg_null/scalar_avg_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_avg_null/scalar_avg_null.3.ast
index ac89e95..1d9e4df 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_avg_null/scalar_avg_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_avg_null/scalar_avg_null.3.ast
@@ -1,6 +1,6 @@
 DataverseUse test
 Query:
-LetVariable [ Name=i8 ]
+Let Variable [ Name=$i8 ]
   :=
   FunctionCall test.avg@1[
     OrderedListConstructor [
@@ -16,7 +16,7 @@ LetVariable [ Name=i8 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=i16 ]
+Let Variable [ Name=$i16 ]
   :=
   FunctionCall test.avg@1[
     OrderedListConstructor [
@@ -32,7 +32,7 @@ LetVariable [ Name=i16 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=i32 ]
+Let Variable [ Name=$i32 ]
   :=
   FunctionCall test.avg@1[
     OrderedListConstructor [
@@ -48,7 +48,7 @@ LetVariable [ Name=i32 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=i64 ]
+Let Variable [ Name=$i64 ]
   :=
   FunctionCall test.avg@1[
     OrderedListConstructor [
@@ -64,7 +64,7 @@ LetVariable [ Name=i64 ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=f ]
+Let Variable [ Name=$f ]
   :=
   FunctionCall test.avg@1[
     OrderedListConstructor [
@@ -80,7 +80,7 @@ LetVariable [ Name=f ]
       LiteralExpr [NULL]
     ]
   ]
-LetVariable [ Name=d ]
+Let Variable [ Name=$d ]
   :=
   FunctionCall test.avg@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 ]
 ]