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:30 UTC

[03/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/tpch-sql-like/q15_top_supplier/q15_top_supplier.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q15_top_supplier/q15_top_supplier.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q15_top_supplier/q15_top_supplier.3.ast
index b19616d..8e0bd84 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q15_top_supplier/q15_top_supplier.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q15_top_supplier/q15_top_supplier.3.ast
@@ -6,7 +6,7 @@ FunctionDecl revenue([]) {
       (
         LiteralExpr [STRING] [supplier_no]
         :
-        Variable [ Name=l_suppkey ]
+        Variable [ Name=$l_suppkey ]
       )
       (
         LiteralExpr [STRING] [total_revenue]
@@ -16,7 +16,7 @@ FunctionDecl revenue([]) {
             SELECT ELEMENT [
             OperatorExpr [
               FieldAccessor [
-                Variable [ Name=i ]
+                Variable [ Name=$i ]
                 Field=l_extendedprice
               ]
               *
@@ -24,30 +24,30 @@ FunctionDecl revenue([]) {
                 LiteralExpr [LONG] [1]
                 -
                 FieldAccessor [
-                  Variable [ Name=i ]
+                  Variable [ Name=$i ]
                   Field=l_discount
                 ]
               ]
             ]
             ]
-            FROM [              Variable [ Name=l ]
+            FROM [              Variable [ Name=$l ]
               AS
-              Variable [ Name=i ]
+              Variable [ Name=$i ]
             ]
           )
         ]
       )
     ]
     ]
-    FROM [      Variable [ Name=LineItem ]
+    FROM [      Variable [ Name=$LineItem ]
       AS
-      Variable [ Name=l ]
+      Variable [ Name=$l ]
     ]
     Where
       OperatorExpr [
         OperatorExpr [
           FieldAccessor [
-            Variable [ Name=l ]
+            Variable [ Name=$l ]
             Field=l_shipdate
           ]
           >=
@@ -56,7 +56,7 @@ FunctionDecl revenue([]) {
         and
         OperatorExpr [
           FieldAccessor [
-            Variable [ Name=l ]
+            Variable [ Name=$l ]
             Field=l_shipdate
           ]
           <
@@ -64,10 +64,10 @@ FunctionDecl revenue([]) {
         ]
       ]
     Groupby
-      Variable [ Name=l_suppkey ]
+      Variable [ Name=$l_suppkey ]
       :=
       FieldAccessor [
-        Variable [ Name=l ]
+        Variable [ Name=$l ]
         Field=l_suppkey
       ]
 
@@ -75,20 +75,20 @@ FunctionDecl revenue([]) {
 }
 
 Query:
-LetVariable [ Name=m ]
+Let Variable [ Name=$m ]
   :=
   FunctionCall tpch.max@1[
     (
       SELECT ELEMENT [
       FieldAccessor [
-        Variable [ Name=r2 ]
+        Variable [ Name=$r2 ]
         Field=total_revenue
       ]
       ]
       FROM [        FunctionCall tpch.revenue@0[
         ]
         AS
-        Variable [ Name=r2 ]
+        Variable [ Name=$r2 ]
       ]
     )
   ]
@@ -98,7 +98,7 @@ RecordConstructor [
     LiteralExpr [STRING] [s_suppkey]
     :
     FieldAccessor [
-      Variable [ Name=s ]
+      Variable [ Name=$s ]
       Field=s_suppkey
     ]
   )
@@ -106,7 +106,7 @@ RecordConstructor [
     LiteralExpr [STRING] [s_name]
     :
     FieldAccessor [
-      Variable [ Name=s ]
+      Variable [ Name=$s ]
       Field=s_name
     ]
   )
@@ -114,7 +114,7 @@ RecordConstructor [
     LiteralExpr [STRING] [s_address]
     :
     FieldAccessor [
-      Variable [ Name=s ]
+      Variable [ Name=$s ]
       Field=s_address
     ]
   )
@@ -122,7 +122,7 @@ RecordConstructor [
     LiteralExpr [STRING] [s_phone]
     :
     FieldAccessor [
-      Variable [ Name=s ]
+      Variable [ Name=$s ]
       Field=s_phone
     ]
   )
@@ -130,7 +130,7 @@ RecordConstructor [
     LiteralExpr [STRING] [total_revenue]
     :
     FieldAccessor [
-      Variable [ Name=r ]
+      Variable [ Name=$r ]
       Field=total_revenue
     ]
   )
@@ -140,35 +140,35 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Supplier]
   ]
   AS
-  Variable [ Name=s ]
+  Variable [ Name=$s ]
 ,
   FunctionCall tpch.revenue@0[
   ]
   AS
-  Variable [ Name=r ]
+  Variable [ Name=$r ]
 ]
 Where
   OperatorExpr [
     OperatorExpr [
       FieldAccessor [
-        Variable [ Name=s ]
+        Variable [ Name=$s ]
         Field=s_suppkey
       ]
       =
       FieldAccessor [
-        Variable [ Name=r ]
+        Variable [ Name=$r ]
         Field=supplier_no
       ]
     ]
     and
     OperatorExpr [
       FieldAccessor [
-        Variable [ Name=r ]
+        Variable [ Name=$r ]
         Field=total_revenue
       ]
       <
       OperatorExpr [
-        Variable [ Name=m ]
+        Variable [ Name=$m ]
         +
         LiteralExpr [DOUBLE] [1.0E-9]
       ]
@@ -176,12 +176,12 @@ Where
     and
     OperatorExpr [
       FieldAccessor [
-        Variable [ Name=r ]
+        Variable [ Name=$r ]
         Field=total_revenue
       ]
       >
       OperatorExpr [
-        Variable [ Name=m ]
+        Variable [ Name=$m ]
         -
         LiteralExpr [DOUBLE] [1.0E-9]
       ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q16_parts_supplier_relationship/q16_parts_supplier_relationship.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q16_parts_supplier_relationship/q16_parts_supplier_relationship.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q16_parts_supplier_relationship/q16_parts_supplier_relationship.3.ast
index dc55293..9fb5785 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q16_parts_supplier_relationship/q16_parts_supplier_relationship.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q16_parts_supplier_relationship/q16_parts_supplier_relationship.3.ast
@@ -7,7 +7,7 @@ FunctionDecl tmp([]) {
         LiteralExpr [STRING] [p_brand]
         :
         FieldAccessor [
-          Variable [ Name=psp ]
+          Variable [ Name=$psp ]
           Field=p_brand
         ]
       )
@@ -15,7 +15,7 @@ FunctionDecl tmp([]) {
         LiteralExpr [STRING] [p_type]
         :
         FieldAccessor [
-          Variable [ Name=psp ]
+          Variable [ Name=$psp ]
           Field=p_type
         ]
       )
@@ -23,7 +23,7 @@ FunctionDecl tmp([]) {
         LiteralExpr [STRING] [p_size]
         :
         FieldAccessor [
-          Variable [ Name=psp ]
+          Variable [ Name=$psp ]
           Field=p_size
         ]
       )
@@ -31,7 +31,7 @@ FunctionDecl tmp([]) {
         LiteralExpr [STRING] [ps_suppkey]
         :
         FieldAccessor [
-          Variable [ Name=psp ]
+          Variable [ Name=$psp ]
           Field=ps_suppkey
         ]
       )
@@ -44,7 +44,7 @@ FunctionDecl tmp([]) {
             LiteralExpr [STRING] [p_brand]
             :
             FieldAccessor [
-              Variable [ Name=p ]
+              Variable [ Name=$p ]
               Field=p_brand
             ]
           )
@@ -52,7 +52,7 @@ FunctionDecl tmp([]) {
             LiteralExpr [STRING] [p_type]
             :
             FieldAccessor [
-              Variable [ Name=p ]
+              Variable [ Name=$p ]
               Field=p_type
             ]
           )
@@ -60,7 +60,7 @@ FunctionDecl tmp([]) {
             LiteralExpr [STRING] [p_size]
             :
             FieldAccessor [
-              Variable [ Name=p ]
+              Variable [ Name=$p ]
               Field=p_size
             ]
           )
@@ -68,37 +68,37 @@ FunctionDecl tmp([]) {
             LiteralExpr [STRING] [ps_suppkey]
             :
             FieldAccessor [
-              Variable [ Name=ps ]
+              Variable [ Name=$ps ]
               Field=ps_suppkey
             ]
           )
         ]
         ]
-        FROM [          Variable [ Name=Partsupp ]
+        FROM [          Variable [ Name=$Partsupp ]
           AS
-          Variable [ Name=ps ]
+          Variable [ Name=$ps ]
 ,
-          Variable [ Name=Part ]
+          Variable [ Name=$Part ]
           AS
-          Variable [ Name=p ]
+          Variable [ Name=$p ]
         ]
         Where
           OperatorExpr [
             OperatorExpr [
               FieldAccessor [
-                Variable [ Name=p ]
+                Variable [ Name=$p ]
                 Field=p_partkey
               ]
               =
               FieldAccessor [
-                Variable [ Name=ps ]
+                Variable [ Name=$ps ]
                 Field=ps_partkey
               ]
             ]
             and
             OperatorExpr [
               FieldAccessor [
-                Variable [ Name=p ]
+                Variable [ Name=$p ]
                 Field=p_brand
               ]
               !=
@@ -108,7 +108,7 @@ FunctionDecl tmp([]) {
             FunctionCall tpch.not@1[
               FunctionCall tpch.like@2[
                 FieldAccessor [
-                  Variable [ Name=p ]
+                  Variable [ Name=$p ]
                   Field=p_type
                 ]
                 LiteralExpr [STRING] [MEDIUM POLISHED%]
@@ -117,22 +117,22 @@ FunctionDecl tmp([]) {
           ]
       )
       AS
-      Variable [ Name=psp ]
+      Variable [ Name=$psp ]
 ,
-      Variable [ Name=Supplier ]
+      Variable [ Name=$Supplier ]
       AS
-      Variable [ Name=s ]
+      Variable [ Name=$s ]
     ]
     Where
       OperatorExpr [
         OperatorExpr [
           FieldAccessor [
-            Variable [ Name=psp ]
+            Variable [ Name=$psp ]
             Field=ps_suppkey
           ]
           =
           FieldAccessor [
-            Variable [ Name=s ]
+            Variable [ Name=$s ]
             Field=s_suppkey
           ]
         ]
@@ -140,7 +140,7 @@ FunctionDecl tmp([]) {
         FunctionCall tpch.not@1[
           FunctionCall tpch.like@2[
             FieldAccessor [
-              Variable [ Name=s ]
+              Variable [ Name=$s ]
               Field=s_comment
             ]
             LiteralExpr [STRING] [%Customer%Complaints%]
@@ -156,22 +156,22 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [p_brand]
     :
-    Variable [ Name=p_brand ]
+    Variable [ Name=$p_brand ]
   )
   (
     LiteralExpr [STRING] [p_type]
     :
-    Variable [ Name=p_type ]
+    Variable [ Name=$p_type ]
   )
   (
     LiteralExpr [STRING] [p_size]
     :
-    Variable [ Name=p_size ]
+    Variable [ Name=$p_size ]
   )
   (
     LiteralExpr [STRING] [supplier_cnt]
     :
-    Variable [ Name=supplier_cnt ]
+    Variable [ Name=$supplier_cnt ]
   )
 ]
 ]
@@ -181,35 +181,35 @@ FROM [  (
       (
         LiteralExpr [STRING] [p_brand]
         :
-        Variable [ Name=p_brand1 ]
+        Variable [ Name=$p_brand1 ]
       )
       (
         LiteralExpr [STRING] [p_type]
         :
-        Variable [ Name=p_type1 ]
+        Variable [ Name=$p_type1 ]
       )
       (
         LiteralExpr [STRING] [p_size]
         :
-        Variable [ Name=p_size1 ]
+        Variable [ Name=$p_size1 ]
       )
       (
         LiteralExpr [STRING] [ps_suppkey]
         :
-        Variable [ Name=ps_suppkey1 ]
+        Variable [ Name=$ps_suppkey1 ]
       )
     ]
     ]
     FROM [      FunctionCall tpch.tmp@0[
       ]
       AS
-      Variable [ Name=t ]
+      Variable [ Name=$t ]
     ]
     Where
       OperatorExpr [
         OperatorExpr [
           FieldAccessor [
-            Variable [ Name=t ]
+            Variable [ Name=$t ]
             Field=p_size
           ]
           =
@@ -218,7 +218,7 @@ FROM [  (
         or
         OperatorExpr [
           FieldAccessor [
-            Variable [ Name=t ]
+            Variable [ Name=$t ]
             Field=p_size
           ]
           =
@@ -227,7 +227,7 @@ FROM [  (
         or
         OperatorExpr [
           FieldAccessor [
-            Variable [ Name=t ]
+            Variable [ Name=$t ]
             Field=p_size
           ]
           =
@@ -236,7 +236,7 @@ FROM [  (
         or
         OperatorExpr [
           FieldAccessor [
-            Variable [ Name=t ]
+            Variable [ Name=$t ]
             Field=p_size
           ]
           =
@@ -245,7 +245,7 @@ FROM [  (
         or
         OperatorExpr [
           FieldAccessor [
-            Variable [ Name=t ]
+            Variable [ Name=$t ]
             Field=p_size
           ]
           =
@@ -254,7 +254,7 @@ FROM [  (
         or
         OperatorExpr [
           FieldAccessor [
-            Variable [ Name=t ]
+            Variable [ Name=$t ]
             Field=p_size
           ]
           =
@@ -263,7 +263,7 @@ FROM [  (
         or
         OperatorExpr [
           FieldAccessor [
-            Variable [ Name=t ]
+            Variable [ Name=$t ]
             Field=p_size
           ]
           =
@@ -272,7 +272,7 @@ FROM [  (
         or
         OperatorExpr [
           FieldAccessor [
-            Variable [ Name=t ]
+            Variable [ Name=$t ]
             Field=p_size
           ]
           =
@@ -280,82 +280,90 @@ FROM [  (
         ]
       ]
     Groupby
-      Variable [ Name=p_brand1 ]
+      Variable [ Name=$p_brand1 ]
       :=
       FieldAccessor [
-        Variable [ Name=t ]
+        Variable [ Name=$t ]
         Field=p_brand
       ]
-      Variable [ Name=p_type1 ]
+      Variable [ Name=$p_type1 ]
       :=
       FieldAccessor [
-        Variable [ Name=t ]
+        Variable [ Name=$t ]
         Field=p_type
       ]
-      Variable [ Name=p_size1 ]
+      Variable [ Name=$p_size1 ]
       :=
       FieldAccessor [
-        Variable [ Name=t ]
+        Variable [ Name=$t ]
         Field=p_size
       ]
-      Variable [ Name=ps_suppkey1 ]
+      Variable [ Name=$ps_suppkey1 ]
       :=
       FieldAccessor [
-        Variable [ Name=t ]
+        Variable [ Name=$t ]
         Field=ps_suppkey
       ]
-      With
-      Variable [ Name=t ]
+      GROUP AS
+      Variable [ Name=#1 ]
+      (
+      Variable [ Name=$t ]
+       AS t
+      )
 
   )
   AS
-  Variable [ Name=t2 ]
+  Variable [ Name=$t2 ]
 ]
 Groupby
-  Variable [ Name=p_brand ]
+  Variable [ Name=$p_brand ]
   :=
   FieldAccessor [
-    Variable [ Name=t2 ]
+    Variable [ Name=$t2 ]
     Field=p_brand
   ]
-  Variable [ Name=p_type ]
+  Variable [ Name=$p_type ]
   :=
   FieldAccessor [
-    Variable [ Name=t2 ]
+    Variable [ Name=$t2 ]
     Field=p_type
   ]
-  Variable [ Name=p_size ]
+  Variable [ Name=$p_size ]
   :=
   FieldAccessor [
-    Variable [ Name=t2 ]
+    Variable [ Name=$t2 ]
     Field=p_size
   ]
-  With
-  Variable [ Name=t2 ]
+  GROUP AS
+  Variable [ Name=#2 ]
+  (
+  Variable [ Name=$t2 ]
+   AS t2
+  )
 
-LetVariable [ Name=supplier_cnt ]
+Let Variable [ Name=$supplier_cnt ]
   :=
   FunctionCall tpch.count@1[
     (
       SELECT ELEMENT [
       FieldAccessor [
-        Variable [ Name=i ]
+        Variable [ Name=$i ]
         Field=ps_suppkey
       ]
       ]
-      FROM [        Variable [ Name=t2 ]
+      FROM [        Variable [ Name=$t2 ]
         AS
-        Variable [ Name=i ]
+        Variable [ Name=$i ]
       ]
     )
   ]
 Orderby
-  Variable [ Name=supplier_cnt ]
+  Variable [ Name=$supplier_cnt ]
   DESC
-  Variable [ Name=p_brand ]
+  Variable [ Name=$p_brand ]
   ASC
-  Variable [ Name=p_type ]
+  Variable [ Name=$p_type ]
   ASC
-  Variable [ Name=p_size ]
+  Variable [ Name=$p_size ]
   ASC
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q17_large_gby_variant/q17_large_gby_variant.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q17_large_gby_variant/q17_large_gby_variant.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q17_large_gby_variant/q17_large_gby_variant.3.ast
index 19e5d78..fb8f2cd 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q17_large_gby_variant/q17_large_gby_variant.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q17_large_gby_variant/q17_large_gby_variant.3.ast
@@ -5,13 +5,24 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [t_partkey]
     :
-    Variable [ Name=l_partkey ]
+    Variable [ Name=$l_partkey ]
   )
   (
     LiteralExpr [STRING] [t_count]
     :
     FunctionCall tpch.count@1[
-      Variable [ Name=l ]
+      (
+        SELECT ELEMENT [
+        FieldAccessor [
+          Variable [ Name=#2 ]
+          Field=l
+        ]
+        ]
+        FROM [          Variable [ Name=#1 ]
+          AS
+          Variable [ Name=#2 ]
+        ]
+      )
     ]
   )
   (
@@ -24,13 +35,13 @@ RecordConstructor [
         (
           SELECT ELEMENT [
           FieldAccessor [
-            Variable [ Name=i ]
+            Variable [ Name=$i ]
             Field=l_quantity
           ]
           ]
-          FROM [            Variable [ Name=l ]
+          FROM [            Variable [ Name=$l ]
             AS
-            Variable [ Name=i ]
+            Variable [ Name=$i ]
           ]
         )
       ]
@@ -43,13 +54,13 @@ RecordConstructor [
       (
         SELECT ELEMENT [
         FieldAccessor [
-          Variable [ Name=i ]
+          Variable [ Name=$i ]
           Field=l_suppkey
         ]
         ]
-        FROM [          Variable [ Name=l ]
+        FROM [          Variable [ Name=$l ]
           AS
-          Variable [ Name=i ]
+          Variable [ Name=$i ]
         ]
       )
     ]
@@ -61,13 +72,13 @@ RecordConstructor [
       (
         SELECT ELEMENT [
         FieldAccessor [
-          Variable [ Name=i ]
+          Variable [ Name=$i ]
           Field=l_linenumber
         ]
         ]
-        FROM [          Variable [ Name=l ]
+        FROM [          Variable [ Name=$l ]
           AS
-          Variable [ Name=i ]
+          Variable [ Name=$i ]
         ]
       )
     ]
@@ -79,13 +90,13 @@ RecordConstructor [
       (
         SELECT ELEMENT [
         FieldAccessor [
-          Variable [ Name=i ]
+          Variable [ Name=$i ]
           Field=l_extendedprice
         ]
         ]
-        FROM [          Variable [ Name=l ]
+        FROM [          Variable [ Name=$l ]
           AS
-          Variable [ Name=i ]
+          Variable [ Name=$i ]
         ]
       )
     ]
@@ -97,13 +108,13 @@ RecordConstructor [
       (
         SELECT ELEMENT [
         FieldAccessor [
-          Variable [ Name=i ]
+          Variable [ Name=$i ]
           Field=l_discount
         ]
         ]
-        FROM [          Variable [ Name=l ]
+        FROM [          Variable [ Name=$l ]
           AS
-          Variable [ Name=i ]
+          Variable [ Name=$i ]
         ]
       )
     ]
@@ -115,13 +126,13 @@ RecordConstructor [
       (
         SELECT ELEMENT [
         FieldAccessor [
-          Variable [ Name=i ]
+          Variable [ Name=$i ]
           Field=l_tax
         ]
         ]
-        FROM [          Variable [ Name=l ]
+        FROM [          Variable [ Name=$l ]
           AS
-          Variable [ Name=i ]
+          Variable [ Name=$i ]
         ]
       )
     ]
@@ -133,13 +144,13 @@ RecordConstructor [
       (
         SELECT ELEMENT [
         FieldAccessor [
-          Variable [ Name=i ]
+          Variable [ Name=$i ]
           Field=l_shipdate
         ]
         ]
-        FROM [          Variable [ Name=l ]
+        FROM [          Variable [ Name=$l ]
           AS
-          Variable [ Name=i ]
+          Variable [ Name=$i ]
         ]
       )
     ]
@@ -151,13 +162,13 @@ RecordConstructor [
       (
         SELECT ELEMENT [
         FieldAccessor [
-          Variable [ Name=i ]
+          Variable [ Name=$i ]
           Field=l_commitdate
         ]
         ]
-        FROM [          Variable [ Name=l ]
+        FROM [          Variable [ Name=$l ]
           AS
-          Variable [ Name=i ]
+          Variable [ Name=$i ]
         ]
       )
     ]
@@ -169,13 +180,13 @@ RecordConstructor [
       (
         SELECT ELEMENT [
         FieldAccessor [
-          Variable [ Name=i ]
+          Variable [ Name=$i ]
           Field=l_receiptdate
         ]
         ]
-        FROM [          Variable [ Name=l ]
+        FROM [          Variable [ Name=$l ]
           AS
-          Variable [ Name=i ]
+          Variable [ Name=$i ]
         ]
       )
     ]
@@ -187,13 +198,13 @@ RecordConstructor [
       (
         SELECT ELEMENT [
         FieldAccessor [
-          Variable [ Name=i ]
+          Variable [ Name=$i ]
           Field=l_comment
         ]
         ]
-        FROM [          Variable [ Name=l ]
+        FROM [          Variable [ Name=$l ]
           AS
-          Variable [ Name=i ]
+          Variable [ Name=$i ]
         ]
       )
     ]
@@ -204,19 +215,23 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [LineItem]
   ]
   AS
-  Variable [ Name=l ]
+  Variable [ Name=$l ]
 ]
 Groupby
-  Variable [ Name=l_partkey ]
+  Variable [ Name=$l_partkey ]
   :=
   FieldAccessor [
-    Variable [ Name=l ]
+    Variable [ Name=$l ]
     Field=l_partkey
   ]
-  With
-  Variable [ Name=l ]
+  GROUP AS
+  Variable [ Name=#1 ]
+  (
+  Variable [ Name=$l ]
+   AS l
+  )
 
 Orderby
-  Variable [ Name=l_partkey ]
+  Variable [ Name=$l_partkey ]
   ASC
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.3.ast
index 845240a..cffd853 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.3.ast
@@ -6,7 +6,7 @@ FunctionDecl tmp([]) {
       (
         LiteralExpr [STRING] [t_partkey]
         :
-        Variable [ Name=l_partkey ]
+        Variable [ Name=$l_partkey ]
       )
       (
         LiteralExpr [STRING] [t_avg_quantity]
@@ -18,13 +18,13 @@ FunctionDecl tmp([]) {
             (
               SELECT ELEMENT [
               FieldAccessor [
-                Variable [ Name=i ]
+                Variable [ Name=$i ]
                 Field=l_quantity
               ]
               ]
-              FROM [                Variable [ Name=l ]
+              FROM [                Variable [ Name=$l ]
                 AS
-                Variable [ Name=i ]
+                Variable [ Name=$i ]
               ]
             )
           ]
@@ -32,15 +32,15 @@ FunctionDecl tmp([]) {
       )
     ]
     ]
-    FROM [      Variable [ Name=LineItem ]
+    FROM [      Variable [ Name=$LineItem ]
       AS
-      Variable [ Name=l ]
+      Variable [ Name=$l ]
     ]
     Groupby
-      Variable [ Name=l_partkey ]
+      Variable [ Name=$l_partkey ]
       :=
       FieldAccessor [
-        Variable [ Name=l ]
+        Variable [ Name=$l ]
         Field=l_partkey
       ]
 
@@ -54,7 +54,7 @@ OperatorExpr [
     (
       SELECT ELEMENT [
       FieldAccessor [
-        Variable [ Name=l ]
+        Variable [ Name=$l ]
         Field=l_extendedprice
       ]
       ]
@@ -62,37 +62,37 @@ OperatorExpr [
           LiteralExpr [STRING] [LineItem]
         ]
         AS
-        Variable [ Name=l ]
+        Variable [ Name=$l ]
 ,
         FunctionCall Metadata.dataset@1[
           LiteralExpr [STRING] [Part]
         ]
         AS
-        Variable [ Name=p ]
+        Variable [ Name=$p ]
 ,
         FunctionCall tpch.tmp@0[
         ]
         AS
-        Variable [ Name=t ]
+        Variable [ Name=$t ]
       ]
       Where
         OperatorExpr [
           OperatorExpr [
             OperatorExpr [
               FieldAccessor [
-                Variable [ Name=p ]
+                Variable [ Name=$p ]
                 Field=p_partkey
               ]
               =
               FieldAccessor [
-                Variable [ Name=l ]
+                Variable [ Name=$l ]
                 Field=l_partkey
               ]
             ]
             and
             OperatorExpr [
               FieldAccessor [
-                Variable [ Name=p ]
+                Variable [ Name=$p ]
                 Field=p_container
               ]
               =
@@ -103,24 +103,24 @@ OperatorExpr [
           OperatorExpr [
             OperatorExpr [
               FieldAccessor [
-                Variable [ Name=l ]
+                Variable [ Name=$l ]
                 Field=l_partkey
               ]
               =
               FieldAccessor [
-                Variable [ Name=t ]
+                Variable [ Name=$t ]
                 Field=t_partkey
               ]
             ]
             and
             OperatorExpr [
               FieldAccessor [
-                Variable [ Name=l ]
+                Variable [ Name=$l ]
                 Field=l_quantity
               ]
               <
               FieldAccessor [
-                Variable [ Name=t ]
+                Variable [ Name=$t ]
                 Field=t_avg_quantity
               ]
             ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q18_large_volume_customer/q18_large_volume_customer.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q18_large_volume_customer/q18_large_volume_customer.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q18_large_volume_customer/q18_large_volume_customer.3.ast
index edf6190..f8e71b5 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q18_large_volume_customer/q18_large_volume_customer.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q18_large_volume_customer/q18_large_volume_customer.3.ast
@@ -5,27 +5,27 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [c_name]
     :
-    Variable [ Name=c_name ]
+    Variable [ Name=$c_name ]
   )
   (
     LiteralExpr [STRING] [c_custkey]
     :
-    Variable [ Name=c_custkey ]
+    Variable [ Name=$c_custkey ]
   )
   (
     LiteralExpr [STRING] [o_orderkey]
     :
-    Variable [ Name=o_orderkey ]
+    Variable [ Name=$o_orderkey ]
   )
   (
     LiteralExpr [STRING] [o_orderdate]
     :
-    Variable [ Name=o_orderdate ]
+    Variable [ Name=$o_orderdate ]
   )
   (
     LiteralExpr [STRING] [o_totalprice]
     :
-    Variable [ Name=o_totalprice ]
+    Variable [ Name=$o_totalprice ]
   )
   (
     LiteralExpr [STRING] [sum_quantity]
@@ -34,13 +34,13 @@ RecordConstructor [
       (
         SELECT ELEMENT [
         FieldAccessor [
-          Variable [ Name=j ]
+          Variable [ Name=$j ]
           Field=l_quantity
         ]
         ]
-        FROM [          Variable [ Name=l ]
+        FROM [          Variable [ Name=$l ]
           AS
-          Variable [ Name=j ]
+          Variable [ Name=$j ]
         ]
       )
     ]
@@ -51,13 +51,13 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Customer]
   ]
   AS
-  Variable [ Name=c ]
+  Variable [ Name=$c ]
 ,
   FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Orders]
   ]
   AS
-  Variable [ Name=o ]
+  Variable [ Name=$o ]
 ,
   (
     SELECT ELEMENT [
@@ -65,7 +65,7 @@ FROM [  FunctionCall Metadata.dataset@1[
       (
         LiteralExpr [STRING] [l_orderkey]
         :
-        Variable [ Name=l_orderkey ]
+        Variable [ Name=$l_orderkey ]
       )
       (
         LiteralExpr [STRING] [t_sum_quantity]
@@ -74,13 +74,13 @@ FROM [  FunctionCall Metadata.dataset@1[
           (
             SELECT ELEMENT [
             FieldAccessor [
-              Variable [ Name=i ]
+              Variable [ Name=$i ]
               Field=l_quantity
             ]
             ]
-            FROM [              Variable [ Name=l ]
+            FROM [              Variable [ Name=$l ]
               AS
-              Variable [ Name=i ]
+              Variable [ Name=$i ]
             ]
           )
         ]
@@ -91,40 +91,46 @@ FROM [  FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [LineItem]
       ]
       AS
-      Variable [ Name=l ]
+      Variable [ Name=$l ]
     ]
     Groupby
-      Variable [ Name=l_orderkey ]
+      Variable [ Name=$l_orderkey ]
       :=
       FieldAccessor [
-        Variable [ Name=l ]
+        Variable [ Name=$l ]
         Field=l_orderkey
       ]
-      With
-      Variable [ Name=l ]
-      Variable [ Name=c ]
-      Variable [ Name=o ]
+      GROUP AS
+      Variable [ Name=#1 ]
+      (
+      Variable [ Name=$l ]
+       AS l
+      Variable [ Name=$o ]
+       AS o
+      Variable [ Name=$c ]
+       AS c
+      )
 
   )
   AS
-  Variable [ Name=t ]
+  Variable [ Name=$t ]
 ,
   FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [LineItem]
   ]
   AS
-  Variable [ Name=l ]
+  Variable [ Name=$l ]
 ]
 Where
   OperatorExpr [
     OperatorExpr [
       FieldAccessor [
-        Variable [ Name=c ]
+        Variable [ Name=$c ]
         Field=c_custkey
       ]
       =
       FieldAccessor [
-        Variable [ Name=o ]
+        Variable [ Name=$o ]
         Field=o_custkey
       ]
     ]
@@ -132,19 +138,19 @@ Where
     OperatorExpr [
       OperatorExpr [
         FieldAccessor [
-          Variable [ Name=o ]
+          Variable [ Name=$o ]
           Field=o_orderkey
         ]
         =
         FieldAccessor [
-          Variable [ Name=t ]
+          Variable [ Name=$t ]
           Field=l_orderkey
         ]
       ]
       and
       OperatorExpr [
         FieldAccessor [
-          Variable [ Name=t ]
+          Variable [ Name=$t ]
           Field=t_sum_quantity
         ]
         >
@@ -154,57 +160,64 @@ Where
     and
     OperatorExpr [
       FieldAccessor [
-        Variable [ Name=l ]
+        Variable [ Name=$l ]
         Field=l_orderkey
       ]
       =
       FieldAccessor [
-        Variable [ Name=o ]
+        Variable [ Name=$o ]
         Field=o_orderkey
       ]
     ]
   ]
 Groupby
-  Variable [ Name=c_name ]
+  Variable [ Name=$c_name ]
   :=
   FieldAccessor [
-    Variable [ Name=c ]
+    Variable [ Name=$c ]
     Field=c_name
   ]
-  Variable [ Name=c_custkey ]
+  Variable [ Name=$c_custkey ]
   :=
   FieldAccessor [
-    Variable [ Name=c ]
+    Variable [ Name=$c ]
     Field=c_custkey
   ]
-  Variable [ Name=o_orderkey ]
+  Variable [ Name=$o_orderkey ]
   :=
   FieldAccessor [
-    Variable [ Name=o ]
+    Variable [ Name=$o ]
     Field=o_orderkey
   ]
-  Variable [ Name=o_orderdate ]
+  Variable [ Name=$o_orderdate ]
   :=
   FieldAccessor [
-    Variable [ Name=o ]
+    Variable [ Name=$o ]
     Field=o_orderdate
   ]
-  Variable [ Name=o_totalprice ]
+  Variable [ Name=$o_totalprice ]
   :=
   FieldAccessor [
-    Variable [ Name=o ]
+    Variable [ Name=$o ]
     Field=o_totalprice
   ]
-  With
-  Variable [ Name=c ]
-  Variable [ Name=t ]
-  Variable [ Name=l ]
-  Variable [ Name=o ]
+  GROUP AS
+  Variable [ Name=#2 ]
+  (
+  Variable [ Name=$l ]
+   AS l
+  Variable [ Name=$t ]
+   AS t
+  Variable [ Name=$o ]
+   AS o
+  Variable [ Name=$c ]
+   AS c
+  )
 
 Orderby
-  Variable [ Name=o_totalprice ]
+  Variable [ Name=$o_totalprice ]
   DESC
-  Variable [ Name=o_orderdate ]
+  Variable [ Name=$o_orderdate ]
   ASC
 
 Limit

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q19_discounted_revenue/q19_discounted_revenue.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q19_discounted_revenue/q19_discounted_revenue.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q19_discounted_revenue/q19_discounted_revenue.3.ast
index 46e01a7..1de3822 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q19_discounted_revenue/q19_discounted_revenue.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q19_discounted_revenue/q19_discounted_revenue.3.ast
@@ -7,7 +7,7 @@ FunctionCall tpch.sum@1[
     SELECT ELEMENT [
     OperatorExpr [
       FieldAccessor [
-        Variable [ Name=l ]
+        Variable [ Name=$l ]
         Field=l_extendedprice
       ]
       *
@@ -15,7 +15,7 @@ FunctionCall tpch.sum@1[
         LiteralExpr [LONG] [1]
         -
         FieldAccessor [
-          Variable [ Name=l ]
+          Variable [ Name=$l ]
           Field=l_discount
         ]
       ]
@@ -25,24 +25,24 @@ FunctionCall tpch.sum@1[
         LiteralExpr [STRING] [LineItem]
       ]
       AS
-      Variable [ Name=l ]
+      Variable [ Name=$l ]
 ,
       FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [Part]
       ]
       AS
-      Variable [ Name=p ]
+      Variable [ Name=$p ]
     ]
     Where
       OperatorExpr [
         OperatorExpr [
           FieldAccessor [
-            Variable [ Name=p ]
+            Variable [ Name=$p ]
             Field=p_partkey
           ]
           =
           FieldAccessor [
-            Variable [ Name=l ]
+            Variable [ Name=$l ]
             Field=l_partkey
           ]
         ]
@@ -51,7 +51,7 @@ FunctionCall tpch.sum@1[
           OperatorExpr [
             OperatorExpr [
               FieldAccessor [
-                Variable [ Name=p ]
+                Variable [ Name=$p ]
                 Field=p_brand
               ]
               =
@@ -60,7 +60,7 @@ FunctionCall tpch.sum@1[
             and
             FunctionCall tpch.reg-exp@2[
               FieldAccessor [
-                Variable [ Name=p ]
+                Variable [ Name=$p ]
                 Field=p_container
               ]
               LiteralExpr [STRING] [SM CASE||SM BOX||SM PACK||SM PKG]
@@ -68,7 +68,7 @@ FunctionCall tpch.sum@1[
             and
             OperatorExpr [
               FieldAccessor [
-                Variable [ Name=l ]
+                Variable [ Name=$l ]
                 Field=l_quantity
               ]
               >=
@@ -77,7 +77,7 @@ FunctionCall tpch.sum@1[
             and
             OperatorExpr [
               FieldAccessor [
-                Variable [ Name=l ]
+                Variable [ Name=$l ]
                 Field=l_quantity
               ]
               <=
@@ -86,7 +86,7 @@ FunctionCall tpch.sum@1[
             and
             OperatorExpr [
               FieldAccessor [
-                Variable [ Name=p ]
+                Variable [ Name=$p ]
                 Field=p_size
               ]
               >=
@@ -95,7 +95,7 @@ FunctionCall tpch.sum@1[
             and
             OperatorExpr [
               FieldAccessor [
-                Variable [ Name=p ]
+                Variable [ Name=$p ]
                 Field=p_size
               ]
               <=
@@ -104,7 +104,7 @@ FunctionCall tpch.sum@1[
             and
             FunctionCall tpch.reg-exp@2[
               FieldAccessor [
-                Variable [ Name=l ]
+                Variable [ Name=$l ]
                 Field=l_shipmode
               ]
               LiteralExpr [STRING] [AIR||AIR REG]
@@ -112,7 +112,7 @@ FunctionCall tpch.sum@1[
             and
             OperatorExpr [
               FieldAccessor [
-                Variable [ Name=l ]
+                Variable [ Name=$l ]
                 Field=l_shipinstruct
               ]
               =
@@ -123,7 +123,7 @@ FunctionCall tpch.sum@1[
           OperatorExpr [
             OperatorExpr [
               FieldAccessor [
-                Variable [ Name=p ]
+                Variable [ Name=$p ]
                 Field=p_brand
               ]
               =
@@ -132,7 +132,7 @@ FunctionCall tpch.sum@1[
             and
             FunctionCall tpch.reg-exp@2[
               FieldAccessor [
-                Variable [ Name=p ]
+                Variable [ Name=$p ]
                 Field=p_container
               ]
               LiteralExpr [STRING] [MED BAG||MED BOX||MED PKG||MED PACK]
@@ -140,7 +140,7 @@ FunctionCall tpch.sum@1[
             and
             OperatorExpr [
               FieldAccessor [
-                Variable [ Name=l ]
+                Variable [ Name=$l ]
                 Field=l_quantity
               ]
               >=
@@ -149,7 +149,7 @@ FunctionCall tpch.sum@1[
             and
             OperatorExpr [
               FieldAccessor [
-                Variable [ Name=l ]
+                Variable [ Name=$l ]
                 Field=l_quantity
               ]
               <=
@@ -158,7 +158,7 @@ FunctionCall tpch.sum@1[
             and
             OperatorExpr [
               FieldAccessor [
-                Variable [ Name=p ]
+                Variable [ Name=$p ]
                 Field=p_size
               ]
               >=
@@ -167,7 +167,7 @@ FunctionCall tpch.sum@1[
             and
             OperatorExpr [
               FieldAccessor [
-                Variable [ Name=p ]
+                Variable [ Name=$p ]
                 Field=p_size
               ]
               <=
@@ -176,7 +176,7 @@ FunctionCall tpch.sum@1[
             and
             FunctionCall tpch.reg-exp@2[
               FieldAccessor [
-                Variable [ Name=l ]
+                Variable [ Name=$l ]
                 Field=l_shipmode
               ]
               LiteralExpr [STRING] [AIR||AIR REG]
@@ -184,7 +184,7 @@ FunctionCall tpch.sum@1[
             and
             OperatorExpr [
               FieldAccessor [
-                Variable [ Name=l ]
+                Variable [ Name=$l ]
                 Field=l_shipinstruct
               ]
               =
@@ -195,7 +195,7 @@ FunctionCall tpch.sum@1[
           OperatorExpr [
             OperatorExpr [
               FieldAccessor [
-                Variable [ Name=p ]
+                Variable [ Name=$p ]
                 Field=p_brand
               ]
               =
@@ -204,7 +204,7 @@ FunctionCall tpch.sum@1[
             and
             FunctionCall tpch.reg-exp@2[
               FieldAccessor [
-                Variable [ Name=p ]
+                Variable [ Name=$p ]
                 Field=p_container
               ]
               LiteralExpr [STRING] [LG CASE||LG BOX||LG PACK||LG PKG]
@@ -212,7 +212,7 @@ FunctionCall tpch.sum@1[
             and
             OperatorExpr [
               FieldAccessor [
-                Variable [ Name=l ]
+                Variable [ Name=$l ]
                 Field=l_quantity
               ]
               >=
@@ -221,7 +221,7 @@ FunctionCall tpch.sum@1[
             and
             OperatorExpr [
               FieldAccessor [
-                Variable [ Name=l ]
+                Variable [ Name=$l ]
                 Field=l_quantity
               ]
               <=
@@ -230,7 +230,7 @@ FunctionCall tpch.sum@1[
             and
             OperatorExpr [
               FieldAccessor [
-                Variable [ Name=p ]
+                Variable [ Name=$p ]
                 Field=p_size
               ]
               >=
@@ -239,7 +239,7 @@ FunctionCall tpch.sum@1[
             and
             OperatorExpr [
               FieldAccessor [
-                Variable [ Name=p ]
+                Variable [ Name=$p ]
                 Field=p_size
               ]
               <=
@@ -248,7 +248,7 @@ FunctionCall tpch.sum@1[
             and
             FunctionCall tpch.reg-exp@2[
               FieldAccessor [
-                Variable [ Name=l ]
+                Variable [ Name=$l ]
                 Field=l_shipmode
               ]
               LiteralExpr [STRING] [AIR||AIR REG]
@@ -256,7 +256,7 @@ FunctionCall tpch.sum@1[
             and
             OperatorExpr [
               FieldAccessor [
-                Variable [ Name=l ]
+                Variable [ Name=$l ]
                 Field=l_shipinstruct
               ]
               =

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q20_potential_part_promotion/q20_potential_part_promotion.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q20_potential_part_promotion/q20_potential_part_promotion.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q20_potential_part_promotion/q20_potential_part_promotion.3.ast
index fda99ec..6029e08 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q20_potential_part_promotion/q20_potential_part_promotion.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q20_potential_part_promotion/q20_potential_part_promotion.3.ast
@@ -6,7 +6,7 @@ RecordConstructor [
     LiteralExpr [STRING] [s_name]
     :
     FieldAccessor [
-      Variable [ Name=t4 ]
+      Variable [ Name=$t4 ]
       Field=s_name
     ]
   )
@@ -14,7 +14,7 @@ RecordConstructor [
     LiteralExpr [STRING] [s_address]
     :
     FieldAccessor [
-      Variable [ Name=t4 ]
+      Variable [ Name=$t4 ]
       Field=s_address
     ]
   )
@@ -27,7 +27,7 @@ FROM [  (
         LiteralExpr [STRING] [ps_suppkey]
         :
         FieldAccessor [
-          Variable [ Name=pst1 ]
+          Variable [ Name=$pst1 ]
           Field=ps_suppkey
         ]
       )
@@ -39,12 +39,12 @@ FROM [  (
           (
             LiteralExpr [STRING] [l_partkey]
             :
-            Variable [ Name=l_partkey ]
+            Variable [ Name=$l_partkey ]
           )
           (
             LiteralExpr [STRING] [l_suppkey]
             :
-            Variable [ Name=l_suppkey ]
+            Variable [ Name=$l_suppkey ]
           )
           (
             LiteralExpr [STRING] [sum_quantity]
@@ -56,13 +56,13 @@ FROM [  (
                 (
                   SELECT ELEMENT [
                   FieldAccessor [
-                    Variable [ Name=i ]
+                    Variable [ Name=$i ]
                     Field=l_quantity
                   ]
                   ]
-                  FROM [                    Variable [ Name=l ]
+                  FROM [                    Variable [ Name=$l ]
                     AS
-                    Variable [ Name=i ]
+                    Variable [ Name=$i ]
                   ]
                 )
               ]
@@ -74,27 +74,31 @@ FROM [  (
             LiteralExpr [STRING] [LineItem]
           ]
           AS
-          Variable [ Name=l ]
+          Variable [ Name=$l ]
         ]
         Groupby
-          Variable [ Name=l_partkey ]
+          Variable [ Name=$l_partkey ]
           :=
           FieldAccessor [
-            Variable [ Name=l ]
+            Variable [ Name=$l ]
             Field=l_partkey
           ]
-          Variable [ Name=l_suppkey ]
+          Variable [ Name=$l_suppkey ]
           :=
           FieldAccessor [
-            Variable [ Name=l ]
+            Variable [ Name=$l ]
             Field=l_suppkey
           ]
-          With
-          Variable [ Name=l ]
+          GROUP AS
+          Variable [ Name=#1 ]
+          (
+          Variable [ Name=$l ]
+           AS l
+          )
 
       )
       AS
-      Variable [ Name=t2 ]
+      Variable [ Name=$t2 ]
 ,
       (
         SELECT ELEMENT [
@@ -103,7 +107,7 @@ FROM [  (
             LiteralExpr [STRING] [ps_suppkey]
             :
             FieldAccessor [
-              Variable [ Name=ps ]
+              Variable [ Name=$ps ]
               Field=ps_suppkey
             ]
           )
@@ -111,7 +115,7 @@ FROM [  (
             LiteralExpr [STRING] [ps_partkey]
             :
             FieldAccessor [
-              Variable [ Name=ps ]
+              Variable [ Name=$ps ]
               Field=ps_partkey
             ]
           )
@@ -119,7 +123,7 @@ FROM [  (
             LiteralExpr [STRING] [ps_availqty]
             :
             FieldAccessor [
-              Variable [ Name=ps ]
+              Variable [ Name=$ps ]
               Field=ps_availqty
             ]
           )
@@ -129,7 +133,7 @@ FROM [  (
             LiteralExpr [STRING] [Partsupp]
           ]
           AS
-          Variable [ Name=ps ]
+          Variable [ Name=$ps ]
 ,
           (
             SELECT ELEMENT [
@@ -138,7 +142,7 @@ FROM [  (
                 LiteralExpr [STRING] [p_partkey]
                 :
                 FieldAccessor [
-                  Variable [ Name=p ]
+                  Variable [ Name=$p ]
                   Field=p_partkey
                 ]
               )
@@ -148,69 +152,69 @@ FROM [  (
                 LiteralExpr [STRING] [Part]
               ]
               AS
-              Variable [ Name=p ]
+              Variable [ Name=$p ]
             ]
           )
           AS
-          Variable [ Name=t1 ]
+          Variable [ Name=$t1 ]
         ]
         Where
           OperatorExpr [
             FieldAccessor [
-              Variable [ Name=ps ]
+              Variable [ Name=$ps ]
               Field=ps_partkey
             ]
             =
             FieldAccessor [
-              Variable [ Name=t1 ]
+              Variable [ Name=$t1 ]
               Field=p_partkey
             ]
           ]
       )
       AS
-      Variable [ Name=pst1 ]
+      Variable [ Name=$pst1 ]
     ]
     Where
       OperatorExpr [
         OperatorExpr [
           FieldAccessor [
-            Variable [ Name=pst1 ]
+            Variable [ Name=$pst1 ]
             Field=ps_partkey
           ]
           =
           FieldAccessor [
-            Variable [ Name=t2 ]
+            Variable [ Name=$t2 ]
             Field=l_partkey
           ]
         ]
         and
         OperatorExpr [
           FieldAccessor [
-            Variable [ Name=pst1 ]
+            Variable [ Name=$pst1 ]
             Field=ps_suppkey
           ]
           =
           FieldAccessor [
-            Variable [ Name=t2 ]
+            Variable [ Name=$t2 ]
             Field=l_suppkey
           ]
         ]
         and
         OperatorExpr [
           FieldAccessor [
-            Variable [ Name=pst1 ]
+            Variable [ Name=$pst1 ]
             Field=ps_availqty
           ]
           >
           FieldAccessor [
-            Variable [ Name=t2 ]
+            Variable [ Name=$t2 ]
             Field=sum_quantity
           ]
         ]
       ]
   )
   AS
-  Variable [ Name=t3 ]
+  Variable [ Name=$t3 ]
 ,
   (
     SELECT ELEMENT [
@@ -219,7 +223,7 @@ FROM [  (
         LiteralExpr [STRING] [s_name]
         :
         FieldAccessor [
-          Variable [ Name=s ]
+          Variable [ Name=$s ]
           Field=s_name
         ]
       )
@@ -227,7 +231,7 @@ FROM [  (
         LiteralExpr [STRING] [s_address]
         :
         FieldAccessor [
-          Variable [ Name=s ]
+          Variable [ Name=$s ]
           Field=s_address
         ]
       )
@@ -235,7 +239,7 @@ FROM [  (
         LiteralExpr [STRING] [s_suppkey]
         :
         FieldAccessor [
-          Variable [ Name=s ]
+          Variable [ Name=$s ]
           Field=s_suppkey
         ]
       )
@@ -245,45 +249,45 @@ FROM [  (
         LiteralExpr [STRING] [Nation]
       ]
       AS
-      Variable [ Name=n ]
+      Variable [ Name=$n ]
 ,
       FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [Supplier]
       ]
       AS
-      Variable [ Name=s ]
+      Variable [ Name=$s ]
     ]
     Where
       OperatorExpr [
         FieldAccessor [
-          Variable [ Name=s ]
+          Variable [ Name=$s ]
           Field=s_nationkey
         ]
         =
         FieldAccessor [
-          Variable [ Name=n ]
+          Variable [ Name=$n ]
           Field=n_nationkey
         ]
       ]
   )
   AS
-  Variable [ Name=t4 ]
+  Variable [ Name=$t4 ]
 ]
 Where
   OperatorExpr [
     FieldAccessor [
-      Variable [ Name=t3 ]
+      Variable [ Name=$t3 ]
       Field=ps_suppkey
     ]
     =
     FieldAccessor [
-      Variable [ Name=t4 ]
+      Variable [ Name=$t4 ]
       Field=s_suppkey
     ]
   ]
 Orderby
   FieldAccessor [
-    Variable [ Name=t4 ]
+    Variable [ Name=$t4 ]
     Field=s_name
   ]
   ASC

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.ast
index c471683..c756a58 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.ast
@@ -6,7 +6,7 @@ FunctionDecl tmp1([]) {
       (
         LiteralExpr [STRING] [l_orderkey]
         :
-        Variable [ Name=l_orderkey ]
+        Variable [ Name=$l_orderkey ]
       )
       (
         LiteralExpr [STRING] [count_suppkey]
@@ -15,13 +15,13 @@ FunctionDecl tmp1([]) {
           (
             SELECT ELEMENT [
             FieldAccessor [
-              Variable [ Name=i ]
+              Variable [ Name=$i ]
               Field=l_suppkey
             ]
             ]
-            FROM [              Variable [ Name=l2 ]
+            FROM [              Variable [ Name=$l2 ]
               AS
-              Variable [ Name=i ]
+              Variable [ Name=$i ]
             ]
           )
         ]
@@ -33,13 +33,13 @@ FunctionDecl tmp1([]) {
           (
             SELECT ELEMENT [
             FieldAccessor [
-              Variable [ Name=i ]
+              Variable [ Name=$i ]
               Field=l_suppkey
             ]
             ]
-            FROM [              Variable [ Name=l2 ]
+            FROM [              Variable [ Name=$l2 ]
               AS
-              Variable [ Name=i ]
+              Variable [ Name=$i ]
             ]
           )
         ]
@@ -52,42 +52,42 @@ FunctionDecl tmp1([]) {
           (
             LiteralExpr [STRING] [l_orderkey]
             :
-            Variable [ Name=l_orderkey1 ]
+            Variable [ Name=$l_orderkey1 ]
           )
           (
             LiteralExpr [STRING] [l_suppkey]
             :
-            Variable [ Name=l_suppkey1 ]
+            Variable [ Name=$l_suppkey1 ]
           )
         ]
         ]
-        FROM [          Variable [ Name=LineItem ]
+        FROM [          Variable [ Name=$LineItem ]
           AS
-          Variable [ Name=l ]
+          Variable [ Name=$l ]
         ]
         Groupby
-          Variable [ Name=l_orderkey1 ]
+          Variable [ Name=$l_orderkey1 ]
           :=
           FieldAccessor [
-            Variable [ Name=l ]
+            Variable [ Name=$l ]
             Field=l_orderkey
           ]
-          Variable [ Name=l_suppkey1 ]
+          Variable [ Name=$l_suppkey1 ]
           :=
           FieldAccessor [
-            Variable [ Name=l ]
+            Variable [ Name=$l ]
             Field=l_suppkey
           ]
 
       )
       AS
-      Variable [ Name=l2 ]
+      Variable [ Name=$l2 ]
     ]
     Groupby
-      Variable [ Name=l_orderkey ]
+      Variable [ Name=$l_orderkey ]
       :=
       FieldAccessor [
-        Variable [ Name=l2 ]
+        Variable [ Name=$l2 ]
         Field=l_orderkey
       ]
 
@@ -101,7 +101,7 @@ FunctionDecl tmp2([]) {
       (
         LiteralExpr [STRING] [l_orderkey]
         :
-        Variable [ Name=l_orderkey ]
+        Variable [ Name=$l_orderkey ]
       )
       (
         LiteralExpr [STRING] [count_suppkey]
@@ -110,13 +110,13 @@ FunctionDecl tmp2([]) {
           (
             SELECT ELEMENT [
             FieldAccessor [
-              Variable [ Name=i ]
+              Variable [ Name=$i ]
               Field=l_suppkey
             ]
             ]
-            FROM [              Variable [ Name=l2 ]
+            FROM [              Variable [ Name=$l2 ]
               AS
-              Variable [ Name=i ]
+              Variable [ Name=$i ]
             ]
           )
         ]
@@ -128,13 +128,13 @@ FunctionDecl tmp2([]) {
           (
             SELECT ELEMENT [
             FieldAccessor [
-              Variable [ Name=i ]
+              Variable [ Name=$i ]
               Field=l_suppkey
             ]
             ]
-            FROM [              Variable [ Name=l2 ]
+            FROM [              Variable [ Name=$l2 ]
               AS
-              Variable [ Name=i ]
+              Variable [ Name=$i ]
             ]
           )
         ]
@@ -147,54 +147,54 @@ FunctionDecl tmp2([]) {
           (
             LiteralExpr [STRING] [l_orderkey]
             :
-            Variable [ Name=l_orderkey1 ]
+            Variable [ Name=$l_orderkey1 ]
           )
           (
             LiteralExpr [STRING] [l_suppkey]
             :
-            Variable [ Name=l_suppkey1 ]
+            Variable [ Name=$l_suppkey1 ]
           )
         ]
         ]
-        FROM [          Variable [ Name=LineItem ]
+        FROM [          Variable [ Name=$LineItem ]
           AS
-          Variable [ Name=l ]
+          Variable [ Name=$l ]
         ]
         Where
           OperatorExpr [
             FieldAccessor [
-              Variable [ Name=l ]
+              Variable [ Name=$l ]
               Field=l_receiptdate
             ]
             >
             FieldAccessor [
-              Variable [ Name=l ]
+              Variable [ Name=$l ]
               Field=l_commitdate
             ]
           ]
         Groupby
-          Variable [ Name=l_orderkey1 ]
+          Variable [ Name=$l_orderkey1 ]
           :=
           FieldAccessor [
-            Variable [ Name=l ]
+            Variable [ Name=$l ]
             Field=l_orderkey
           ]
-          Variable [ Name=l_suppkey1 ]
+          Variable [ Name=$l_suppkey1 ]
           :=
           FieldAccessor [
-            Variable [ Name=l ]
+            Variable [ Name=$l ]
             Field=l_suppkey
           ]
 
       )
       AS
-      Variable [ Name=l2 ]
+      Variable [ Name=$l2 ]
     ]
     Groupby
-      Variable [ Name=l_orderkey ]
+      Variable [ Name=$l_orderkey ]
       :=
       FieldAccessor [
-        Variable [ Name=l2 ]
+        Variable [ Name=$l2 ]
         Field=l_orderkey
       ]
 
@@ -207,12 +207,12 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [s_name]
     :
-    Variable [ Name=s_name ]
+    Variable [ Name=$s_name ]
   )
   (
     LiteralExpr [STRING] [numwait]
     :
-    Variable [ Name=numwait ]
+    Variable [ Name=$numwait ]
   )
 ]
 ]
@@ -223,7 +223,7 @@ FROM [  (
         LiteralExpr [STRING] [s_name]
         :
         FieldAccessor [
-          Variable [ Name=t3 ]
+          Variable [ Name=$t3 ]
           Field=s_name
         ]
       )
@@ -231,7 +231,7 @@ FROM [  (
         LiteralExpr [STRING] [l_suppkey]
         :
         FieldAccessor [
-          Variable [ Name=t3 ]
+          Variable [ Name=$t3 ]
           Field=l_suppkey
         ]
       )
@@ -239,7 +239,7 @@ FROM [  (
         LiteralExpr [STRING] [l_orderkey]
         :
         FieldAccessor [
-          Variable [ Name=t2 ]
+          Variable [ Name=$t2 ]
           Field=l_orderkey
         ]
       )
@@ -247,7 +247,7 @@ FROM [  (
         LiteralExpr [STRING] [count_suppkey]
         :
         FieldAccessor [
-          Variable [ Name=t2 ]
+          Variable [ Name=$t2 ]
           Field=count_suppkey
         ]
       )
@@ -255,7 +255,7 @@ FROM [  (
         LiteralExpr [STRING] [max_suppkey]
         :
         FieldAccessor [
-          Variable [ Name=t2 ]
+          Variable [ Name=$t2 ]
           Field=max_suppkey
         ]
       )
@@ -268,7 +268,7 @@ FROM [  (
             LiteralExpr [STRING] [s_name]
             :
             FieldAccessor [
-              Variable [ Name=ns ]
+              Variable [ Name=$ns ]
               Field=s_name
             ]
           )
@@ -276,7 +276,7 @@ FROM [  (
             LiteralExpr [STRING] [l_orderkey]
             :
             FieldAccessor [
-              Variable [ Name=t1 ]
+              Variable [ Name=$t1 ]
               Field=l_orderkey
             ]
           )
@@ -284,7 +284,7 @@ FROM [  (
             LiteralExpr [STRING] [l_suppkey]
             :
             FieldAccessor [
-              Variable [ Name=l ]
+              Variable [ Name=$l ]
               Field=l_suppkey
             ]
           )
@@ -294,7 +294,7 @@ FROM [  (
             LiteralExpr [STRING] [LineItem]
           ]
           AS
-          Variable [ Name=l ]
+          Variable [ Name=$l ]
 ,
           (
             SELECT ELEMENT [
@@ -303,7 +303,7 @@ FROM [  (
                 LiteralExpr [STRING] [s_name]
                 :
                 FieldAccessor [
-                  Variable [ Name=s ]
+                  Variable [ Name=$s ]
                   Field=s_name
                 ]
               )
@@ -311,7 +311,7 @@ FROM [  (
                 LiteralExpr [STRING] [s_suppkey]
                 :
                 FieldAccessor [
-                  Variable [ Name=s ]
+                  Variable [ Name=$s ]
                   Field=s_suppkey
                 ]
               )
@@ -321,64 +321,64 @@ FROM [  (
                 LiteralExpr [STRING] [Nation]
               ]
               AS
-              Variable [ Name=n ]
+              Variable [ Name=$n ]
 ,
               FunctionCall Metadata.dataset@1[
                 LiteralExpr [STRING] [Supplier]
               ]
               AS
-              Variable [ Name=s ]
+              Variable [ Name=$s ]
             ]
             Where
               OperatorExpr [
                 FieldAccessor [
-                  Variable [ Name=s ]
+                  Variable [ Name=$s ]
                   Field=s_nationkey
                 ]
                 =
                 FieldAccessor [
-                  Variable [ Name=n ]
+                  Variable [ Name=$n ]
                   Field=n_nationkey
                 ]
               ]
           )
           AS
-          Variable [ Name=ns ]
+          Variable [ Name=$ns ]
 ,
           FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [Orders]
           ]
           AS
-          Variable [ Name=o ]
+          Variable [ Name=$o ]
 ,
           FunctionCall tpch.tmp1@0[
           ]
           AS
-          Variable [ Name=t1 ]
+          Variable [ Name=$t1 ]
         ]
         Where
           OperatorExpr [
             OperatorExpr [
               OperatorExpr [
                 FieldAccessor [
-                  Variable [ Name=ns ]
+                  Variable [ Name=$ns ]
                   Field=s_suppkey
                 ]
                 =
                 FieldAccessor [
-                  Variable [ Name=l ]
+                  Variable [ Name=$l ]
                   Field=l_suppkey
                 ]
               ]
               and
               OperatorExpr [
                 FieldAccessor [
-                  Variable [ Name=l ]
+                  Variable [ Name=$l ]
                   Field=l_receiptdate
                 ]
                 >
                 FieldAccessor [
-                  Variable [ Name=l ]
+                  Variable [ Name=$l ]
                   Field=l_commitdate
                 ]
               ]
@@ -386,42 +386,42 @@ FROM [  (
             and
             OperatorExpr [
               FieldAccessor [
-                Variable [ Name=o ]
+                Variable [ Name=$o ]
                 Field=o_orderkey
               ]
               =
               FieldAccessor [
-                Variable [ Name=l ]
+                Variable [ Name=$l ]
                 Field=l_orderkey
               ]
             ]
             and
             OperatorExpr [
               FieldAccessor [
-                Variable [ Name=l ]
+                Variable [ Name=$l ]
                 Field=l_orderkey
               ]
               =
               FieldAccessor [
-                Variable [ Name=t1 ]
+                Variable [ Name=$t1 ]
                 Field=l_orderkey
               ]
             ]
           ]
       )
       AS
-      Variable [ Name=t3 ]
+      Variable [ Name=$t3 ]
 ,
       FunctionCall tpch.tmp2@0[
       ]
       AS
-      Variable [ Name=t2 ]
+      Variable [ Name=$t2 ]
     ]
     Where
       OperatorExpr [
         OperatorExpr [
           FieldAccessor [
-            Variable [ Name=t2 ]
+            Variable [ Name=$t2 ]
             Field=count_suppkey
           ]
           >=
@@ -430,38 +430,53 @@ FROM [  (
         and
         OperatorExpr [
           FieldAccessor [
-            Variable [ Name=t3 ]
+            Variable [ Name=$t3 ]
             Field=l_orderkey
           ]
           =
           FieldAccessor [
-            Variable [ Name=t2 ]
+            Variable [ Name=$t2 ]
             Field=l_orderkey
           ]
         ]
       ]
   )
   AS
-  Variable [ Name=t4 ]
+  Variable [ Name=$t4 ]
 ]
 Groupby
-  Variable [ Name=s_name ]
+  Variable [ Name=$s_name ]
   :=
   FieldAccessor [
-    Variable [ Name=t4 ]
+    Variable [ Name=$t4 ]
     Field=s_name
   ]
-  With
-  Variable [ Name=t4 ]
+  GROUP AS
+  Variable [ Name=#1 ]
+  (
+  Variable [ Name=$t4 ]
+   AS t4
+  )
 
-LetVariable [ Name=numwait ]
+Let Variable [ Name=$numwait ]
   :=
   FunctionCall tpch.count@1[
-    Variable [ Name=t4 ]
+    (
+      SELECT ELEMENT [
+      FieldAccessor [
+        Variable [ Name=#2 ]
+        Field=t4
+      ]
+      ]
+      FROM [        Variable [ Name=#1 ]
+        AS
+        Variable [ Name=#2 ]
+      ]
+    )
   ]
 Orderby
-  Variable [ Name=numwait ]
+  Variable [ Name=$numwait ]
   DESC
-  Variable [ Name=s_name ]
+  Variable [ Name=$s_name ]
   ASC
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q22_global_sales_opportunity/q22_global_sales_opportunity.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q22_global_sales_opportunity/q22_global_sales_opportunity.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q22_global_sales_opportunity/q22_global_sales_opportunity.3.ast
index 8efbfe5..063914d 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q22_global_sales_opportunity/q22_global_sales_opportunity.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q22_global_sales_opportunity/q22_global_sales_opportunity.3.ast
@@ -7,7 +7,7 @@ FunctionDecl q22_customer_tmp([]) {
         LiteralExpr [STRING] [c_acctbal]
         :
         FieldAccessor [
-          Variable [ Name=c ]
+          Variable [ Name=$c ]
           Field=c_acctbal
         ]
       )
@@ -15,7 +15,7 @@ FunctionDecl q22_customer_tmp([]) {
         LiteralExpr [STRING] [c_custkey]
         :
         FieldAccessor [
-          Variable [ Name=c ]
+          Variable [ Name=$c ]
           Field=c_custkey
         ]
       )
@@ -24,7 +24,7 @@ FunctionDecl q22_customer_tmp([]) {
         :
         FunctionCall tpch.substring@3[
           FieldAccessor [
-            Variable [ Name=c ]
+            Variable [ Name=$c ]
             Field=c_phone
           ]
           LiteralExpr [LONG] [1]
@@ -33,21 +33,21 @@ FunctionDecl q22_customer_tmp([]) {
       )
     ]
     ]
-    FROM [      Variable [ Name=Customer ]
+    FROM [      Variable [ Name=$Customer ]
       AS
-      Variable [ Name=c ]
+      Variable [ Name=$c ]
     ]
   )
 }
 
 Query:
-LetVariable [ Name=avg ]
+Let Variable [ Name=$avg ]
   :=
   FunctionCall tpch.avg@1[
     (
       SELECT ELEMENT [
       FieldAccessor [
-        Variable [ Name=c ]
+        Variable [ Name=$c ]
         Field=c_acctbal
       ]
       ]
@@ -55,12 +55,12 @@ LetVariable [ Name=avg ]
           LiteralExpr [STRING] [Customer]
         ]
         AS
-        Variable [ Name=c ]
+        Variable [ Name=$c ]
       ]
       Where
         OperatorExpr [
           FieldAccessor [
-            Variable [ Name=c ]
+            Variable [ Name=$c ]
             Field=c_acctbal
           ]
           >
@@ -73,13 +73,24 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [cntrycode]
     :
-    Variable [ Name=cntrycode ]
+    Variable [ Name=$cntrycode ]
   )
   (
     LiteralExpr [STRING] [numcust]
     :
     FunctionCall tpch.count@1[
-      Variable [ Name=ct ]
+      (
+        SELECT ELEMENT [
+        FieldAccessor [
+          Variable [ Name=#2 ]
+          Field=ct
+        ]
+        ]
+        FROM [          Variable [ Name=#1 ]
+          AS
+          Variable [ Name=#2 ]
+        ]
+      )
     ]
   )
   (
@@ -89,13 +100,13 @@ RecordConstructor [
       (
         SELECT ELEMENT [
         FieldAccessor [
-          Variable [ Name=i ]
+          Variable [ Name=$i ]
           Field=c_acctbal
         ]
         ]
-        FROM [          Variable [ Name=ct ]
+        FROM [          Variable [ Name=$ct ]
           AS
-          Variable [ Name=i ]
+          Variable [ Name=$i ]
         ]
       )
     ]
@@ -105,29 +116,34 @@ RecordConstructor [
 FROM [  FunctionCall tpch.q22_customer_tmp@0[
   ]
   AS
-  Variable [ Name=ct ]
+  Variable [ Name=$ct ]
 ]
 Where
   OperatorExpr [
     FieldAccessor [
-      Variable [ Name=ct ]
+      Variable [ Name=$ct ]
       Field=c_acctbal
     ]
     >
-    Variable [ Name=avg ]
+    Variable [ Name=$avg ]
   ]
 Groupby
-  Variable [ Name=cntrycode ]
+  Variable [ Name=$cntrycode ]
   :=
   FieldAccessor [
-    Variable [ Name=ct ]
+    Variable [ Name=$ct ]
     Field=cntrycode
   ]
-  With
-  Variable [ Name=ct ]
-  Variable [ Name=avg ]
+  GROUP AS
+  Variable [ Name=#1 ]
+  (
+  Variable [ Name=$ct ]
+   AS ct
+  Variable [ Name=$avg ]
+   AS avg
+  )
 
 Orderby
-  Variable [ Name=cntrycode ]
+  Variable [ Name=$cntrycode ]
   ASC
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue601/query-issue601.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue601/query-issue601.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue601/query-issue601.3.ast
index 3776535..85c3c0d 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue601/query-issue601.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue601/query-issue601.3.ast
@@ -5,13 +5,24 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [l_linenumber]
     :
-    Variable [ Name=l_linenumber ]
+    Variable [ Name=$l_linenumber ]
   )
   (
     LiteralExpr [STRING] [count_order]
     :
     FunctionCall tpch.count@1[
-      Variable [ Name=l ]
+      (
+        SELECT ELEMENT [
+        FieldAccessor [
+          Variable [ Name=#2 ]
+          Field=l
+        ]
+        ]
+        FROM [          Variable [ Name=#1 ]
+          AS
+          Variable [ Name=#2 ]
+        ]
+      )
     ]
   )
 ]
@@ -20,15 +31,19 @@ FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [LineItem]
   ]
   AS
-  Variable [ Name=l ]
+  Variable [ Name=$l ]
 ]
 Groupby
-  Variable [ Name=l_linenumber ]
+  Variable [ Name=$l_linenumber ]
   :=
   FieldAccessor [
-    Variable [ Name=l ]
+    Variable [ Name=$l ]
     Field=l_linenumber
   ]
-  With
-  Variable [ Name=l ]
+  GROUP AS
+  Variable [ Name=#1 ]
+  (
+  Variable [ Name=$l ]
+   AS l
+  )
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue638/query-issue638.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue638/query-issue638.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue638/query-issue638.3.ast
index 8052433..e455c20 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue638/query-issue638.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue638/query-issue638.3.ast
@@ -5,12 +5,12 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [nation]
     :
-    Variable [ Name=nation ]
+    Variable [ Name=$nation ]
   )
   (
     LiteralExpr [STRING] [o_year]
     :
-    Variable [ Name=o_year ]
+    Variable [ Name=$o_year ]
   )
   (
     LiteralExpr [STRING] [sum_profit]
@@ -19,13 +19,13 @@ RecordConstructor [
       (
         SELECT ELEMENT [
         FieldAccessor [
-          Variable [ Name=pr ]
+          Variable [ Name=$pr ]
           Field=amount
         ]
         ]
-        FROM [          Variable [ Name=profit ]
+        FROM [          Variable [ Name=$profit ]
           AS
-          Variable [ Name=pr ]
+          Variable [ Name=$pr ]
         ]
       )
     ]
@@ -39,19 +39,19 @@ FROM [  (
         LiteralExpr [STRING] [nation]
         :
         FieldAccessor [
-          Variable [ Name=l3 ]
+          Variable [ Name=$l3 ]
           Field=n_name
         ]
       )
       (
         LiteralExpr [STRING] [o_year]
         :
-        Variable [ Name=o_year ]
+        Variable [ Name=$o_year ]
       )
       (
         LiteralExpr [STRING] [amount]
         :
-        Variable [ Name=amount ]
+        Variable [ Name=$amount ]
       )
     ]
     ]
@@ -59,7 +59,7 @@ FROM [  (
         LiteralExpr [STRING] [Orders]
       ]
       AS
-      Variable [ Name=o ]
+      Variable [ Name=$o ]
 ,
       (
         SELECT ELEMENT [
@@ -68,7 +68,7 @@ FROM [  (
             LiteralExpr [STRING] [l_extendedprice]
             :
             FieldAccessor [
-              Variable [ Name=l2 ]
+              Variable [ Name=$l2 ]
               Field=l_extendedprice
             ]
           )
@@ -76,7 +76,7 @@ FROM [  (
             LiteralExpr [STRING] [l_discount]
             :
             FieldAccessor [
-              Variable [ Name=l2 ]
+              Variable [ Name=$l2 ]
               Field=l_discount
             ]
           )
@@ -84,7 +84,7 @@ FROM [  (
             LiteralExpr [STRING] [l_quantity]
             :
             FieldAccessor [
-              Variable [ Name=l2 ]
+              Variable [ Name=$l2 ]
               Field=l_quantity
             ]
           )
@@ -92,7 +92,7 @@ FROM [  (
             LiteralExpr [STRING] [l_orderkey]
             :
             FieldAccessor [
-              Variable [ Name=l2 ]
+              Variable [ Name=$l2 ]
               Field=l_orderkey
             ]
           )
@@ -100,7 +100,7 @@ FROM [  (
             LiteralExpr [STRING] [n_name]
             :
             FieldAccessor [
-              Variable [ Name=l2 ]
+              Variable [ Name=$l2 ]
               Field=n_name
             ]
           )
@@ -108,7 +108,7 @@ FROM [  (
             LiteralExpr [STRING] [ps_supplycost]
             :
             FieldAccessor [
-              Variable [ Name=l2 ]
+              Variable [ Name=$l2 ]
               Field=ps_supplycost
             ]
           )
@@ -118,7 +118,7 @@ FROM [  (
             LiteralExpr [STRING] [Part]
           ]
           AS
-          Variable [ Name=p ]
+          Variable [ Name=$p ]
 ,
           (
             SELECT ELEMENT [
@@ -127,7 +127,7 @@ FROM [  (
                 LiteralExpr [STRING] [l_extendedprice]
                 :
                 FieldAccessor [
-                  Variable [ Name=l1 ]
+                  Variable [ Name=$l1 ]
                   Field=l_extendedprice
                 ]
               )
@@ -135,7 +135,7 @@ FROM [  (
                 LiteralExpr [STRING] [l_discount]
                 :
                 FieldAccessor [
-                  Variable [ Name=l1 ]
+                  Variable [ Name=$l1 ]
                   Field=l_discount
                 ]
               )
@@ -143,7 +143,7 @@ FROM [  (
                 LiteralExpr [STRING] [l_quantity]
                 :
                 FieldAccessor [
-                  Variable [ Name=l1 ]
+                  Variable [ Name=$l1 ]
                   Field=l_quantity
                 ]
               )
@@ -151,7 +151,7 @@ FROM [  (
                 LiteralExpr [STRING] [l_partkey]
                 :
                 FieldAccessor [
-                  Variable [ Name=l1 ]
+                  Variable [ Name=$l1 ]
                   Field=l_partkey
                 ]
               )
@@ -159,7 +159,7 @@ FROM [  (
                 LiteralExpr [STRING] [l_orderkey]
                 :
                 FieldAccessor [
-                  Variable [ Name=l1 ]
+                  Variable [ Name=$l1 ]
                   Field=l_orderkey
                 ]
               )
@@ -167,7 +167,7 @@ FROM [  (
                 LiteralExpr [STRING] [n_name]
                 :
                 FieldAccessor [
-                  Variable [ Name=l1 ]
+                  Variable [ Name=$l1 ]
                   Field=n_name
                 ]
               )
@@ -175,7 +175,7 @@ FROM [  (
                 LiteralExpr [STRING] [ps_supplycost]
                 :
                 FieldAccessor [
-                  Variable [ Name=ps ]
+                  Variable [ Name=$ps ]
                   Field=ps_supplycost
                 ]
               )
@@ -185,7 +185,7 @@ FROM [  (
                 LiteralExpr [STRING] [Partsupp]
               ]
               AS
-              Variable [ Name=ps ]
+              Variable [ Name=$ps ]
 ,
               (
                 SELECT ELEMENT [
@@ -194,7 +194,7 @@ FROM [  (
                     LiteralExpr [STRING] [l_suppkey]
                     :
                     FieldAccessor [
-                      Variable [ Name=l ]
+                      Variable [ Name=$l ]
                       Field=l_suppkey
                     ]
                   )
@@ -202,7 +202,7 @@ FROM [  (
                     LiteralExpr [STRING] [l_extendedprice]
                     :
                     FieldAccessor [
-                      Variable [ Name=l ]
+                      Variable [ Name=$l ]
                       Field=l_extendedprice
                     ]
                   )
@@ -210,7 +210,7 @@ FROM [  (
                     LiteralExpr [STRING] [l_discount]
                     :
                     FieldAccessor [
-                      Variable [ Name=l ]
+                      Variable [ Name=$l ]
                       Field=l_discount
                     ]
                   )
@@ -218,7 +218,7 @@ FROM [  (
                     LiteralExpr [STRING] [l_quantity]
                     :
                     FieldAccessor [
-                      Variable [ Name=l ]
+                      Variable [ Name=$l ]
                       Field=l_quantity
                     ]
                   )
@@ -226,7 +226,7 @@ FROM [  (
                     LiteralExpr [STRING] [l_partkey]
                     :
                     FieldAccessor [
-                      Variable [ Name=l ]
+                      Variable [ Name=$l ]
                       Field=l_partkey
                     ]
                   )
@@ -234,7 +234,7 @@ FROM [  (
                     LiteralExpr [STRING] [l_orderkey]
                     :
                     FieldAccessor [
-                      Variable [ Name=l ]
+                      Variable [ Name=$l ]
                       Field=l_orderkey
                     ]
                   )
@@ -242,7 +242,7 @@ FROM [  (
                     LiteralExpr [STRING] [n_name]
                     :
                     FieldAccessor [
-                      Variable [ Name=s1 ]
+                      Variable [ Name=$s1 ]
                       Field=n_name
                     ]
                   )
@@ -255,7 +255,7 @@ FROM [  (
                         LiteralExpr [STRING] [s_suppkey]
                         :
                         FieldAccessor [
-                          Variable [ Name=s ]
+                          Variable [ Name=$s ]
                           Field=s_suppkey
                         ]
                       )
@@ -263,7 +263,7 @@ FROM [  (
                         LiteralExpr [STRING] [n_name]
                         :
                         FieldAccessor [
-                          Variable [ Name=n ]
+                          Variable [ Name=$n ]
                           Field=n_name
                         ]
                       )
@@ -273,87 +273,87 @@ FROM [  (
                         LiteralExpr [STRING] [Supplier]
                       ]
                       AS
-                      Variable [ Name=s ]
+                      Variable [ Name=$s ]
 ,
                       FunctionCall Metadata.dataset@1[
                         LiteralExpr [STRING] [Nation]
                       ]
                       AS
-                      Variable [ Name=n ]
+                      Variable [ Name=$n ]
                     ]
                     Where
                       OperatorExpr [
                         FieldAccessor [
-                          Variable [ Name=n ]
+                          Variable [ Name=$n ]
                           Field=n_nationkey
                         ]
                         =
                         FieldAccessor [
-                          Variable [ Name=s ]
+                          Variable [ Name=$s ]
                           Field=s_nationkey
                         ]
                       ]
                   )
                   AS
-                  Variable [ Name=s1 ]
+                  Variable [ Name=$s1 ]
 ,
                   FunctionCall Metadata.dataset@1[
                     LiteralExpr [STRING] [LineItem]
                   ]
                   AS
-                  Variable [ Name=l ]
+                  Variable [ Name=$l ]
                 ]
                 Where
                   OperatorExpr [
                     FieldAccessor [
-                      Variable [ Name=s1 ]
+                      Variable [ Name=$s1 ]
                       Field=s_suppkey
                     ]
                     =
                     FieldAccessor [
-                      Variable [ Name=l ]
+                      Variable [ Name=$l ]
                       Field=l_suppkey
                     ]
                   ]
               )
               AS
-              Variable [ Name=l1 ]
+              Variable [ Name=$l1 ]
             ]
             Where
               OperatorExpr [
                 OperatorExpr [
                   FieldAccessor [
-                    Variable [ Name=ps ]
+                    Variable [ Name=$ps ]
                     Field=ps_suppkey
                   ]
                   =
                   FieldAccessor [
-                    Variable [ Name=l1 ]
+                    Variable [ Name=$l1 ]
                     Field=l_suppkey
                   ]
                 ]
                 and
                 OperatorExpr [
                   FieldAccessor [
-                    Variable [ Name=ps ]
+                    Variable [ Name=$ps ]
                     Field=ps_partkey
                   ]
                   =
                   FieldAccessor [
-                    Variable [ Name=l1 ]
+                    Variable [ Name=$l1 ]
                     Field=l_partkey
                   ]
                 ]
               ]
           )
           AS
-          Variable [ Name=l2 ]
+          Variable [ Name=$l2 ]
         ]
         Where
           OperatorExpr [
             FunctionCall tpch.contains@2[
               FieldAccessor [
-                Variable [ Name=p ]
+                Variable [ Name=$p ]
                 Field=p_name
               ]
               LiteralExpr [STRING] [green]
@@ -361,26 +361,26 @@ FROM [  (
             and
             OperatorExpr [
               FieldAccessor [
-                Variable [ Name=p ]
+                Variable [ Name=$p ]
                 Field=p_partkey
               ]
               =
               FieldAccessor [
-                Variable [ Name=l2 ]
+                Variable [ Name=$l2 ]
                 Field=l_partkey
               ]
             ]
           ]
       )
       AS
-      Variable [ Name=l3 ]
+      Variable [ Name=$l3 ]
     ]
-    LetVariable [ Name=amount ]
+    Let Variable [ Name=$amount ]
       :=
       OperatorExpr [
         OperatorExpr [
           FieldAccessor [
-            Variable [ Name=l3 ]
+            Variable [ Name=$l3 ]
             Field=l_extendedprice
           ]
           *
@@ -388,7 +388,7 @@ FROM [  (
             LiteralExpr [LONG] [1]
             -
             FieldAccessor [
-              Variable [ Name=l3 ]
+              Variable [ Name=$l3 ]
               Field=l_discount
             ]
           ]
@@ -396,59 +396,63 @@ FROM [  (
         -
         OperatorExpr [
           FieldAccessor [
-            Variable [ Name=l3 ]
+            Variable [ Name=$l3 ]
             Field=ps_supplycost
           ]
           *
           FieldAccessor [
-            Variable [ Name=l3 ]
+            Variable [ Name=$l3 ]
             Field=l_quantity
           ]
         ]
       ]
-    LetVariable [ Name=o_year ]
+    Let Variable [ Name=$o_year ]
       :=
       FunctionCall tpch.get-year@1[
         FieldAccessor [
-          Variable [ Name=o ]
+          Variable [ Name=$o ]
           Field=o_orderdate
         ]
       ]
     Where
       OperatorExpr [
         FieldAccessor [
-          Variable [ Name=o ]
+          Variable [ Name=$o ]
           Field=o_orderkey
         ]
         =
         FieldAccessor [
-          Variable [ Name=l3 ]
+          Variable [ Name=$l3 ]
           Field=l_orderkey
         ]
       ]
   )
   AS
-  Variable [ Name=profit ]
+  Variable [ Name=$profit ]
 ]
 Groupby
-  Variable [ Name=nation ]
+  Variable [ Name=$nation ]
   :=
   FieldAccessor [
-    Variable [ Name=profit ]
+    Variable [ Name=$profit ]
     Field=nation
   ]
-  Variable [ Name=o_year ]
+  Variable [ Name=$o_year ]
   :=
   FieldAccessor [
-    Variable [ Name=profit ]
+    Variable [ Name=$profit ]
     Field=o_year
   ]
-  With
-  Variable [ Name=profit ]
+  GROUP AS
+  Variable [ Name=#1 ]
+  (
+  Variable [ Name=$profit ]
+   AS profit
+  )
 
 Orderby
-  Variable [ Name=nation ]
+  Variable [ Name=$nation ]
   ASC
-  Variable [ Name=o_year ]
+  Variable [ Name=$o_year ]
   DESC