asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From buyin...@apache.org
Subject [02/28] incubator-asterixdb git commit: ASTERIXDB-1383: reduce the number of lines for "AS".
Date Mon, 18 Apr 2016 15:48:27 GMT
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q02_minimum_cost_supplier/q02_minimum_cost_supplier.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q02_minimum_cost_supplier/q02_minimum_cost_supplier.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q02_minimum_cost_supplier/q02_minimum_cost_supplier.3.ast
index bcdbaa0..0fa04eb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q02_minimum_cost_supplier/q02_minimum_cost_supplier.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q02_minimum_cost_supplier/q02_minimum_cost_supplier.3.ast
@@ -78,8 +78,7 @@ FunctionDecl tmp1([]) {
     ]
     ]
     FROM [      Variable [ Name=$Part ]
-      AS
-      Variable [ Name=$p ]
+      AS Variable [ Name=$p ]
 ,
       (
         SELECT ELEMENT [
@@ -151,8 +150,7 @@ FunctionDecl tmp1([]) {
         ]
         ]
         FROM [          Variable [ Name=$Partsupp ]
-          AS
-          Variable [ Name=$ps ]
+          AS Variable [ Name=$ps ]
 ,
           (
             SELECT ELEMENT [
@@ -216,8 +214,7 @@ FunctionDecl tmp1([]) {
             ]
             ]
             FROM [              Variable [ Name=$Supplier ]
-              AS
-              Variable [ Name=$s ]
+              AS Variable [ Name=$s ]
 ,
               (
                 SELECT ELEMENT [
@@ -241,12 +238,10 @@ FunctionDecl tmp1([]) {
                 ]
                 ]
                 FROM [                  Variable [ Name=$Region ]
-                  AS
-                  Variable [ Name=$r ]
+                  AS Variable [ Name=$r ]
 ,
                   Variable [ Name=$Nation ]
-                  AS
-                  Variable [ Name=$n ]
+                  AS Variable [ Name=$n ]
                 ]
                 Where
                   OperatorExpr [
@@ -272,8 +267,7 @@ FunctionDecl tmp1([]) {
                     ]
                   ]
               )
-              AS
-              Variable [ Name=$rn ]
+              AS Variable [ Name=$rn ]
             ]
             Where
               OperatorExpr [
@@ -288,8 +282,7 @@ FunctionDecl tmp1([]) {
                 ]
               ]
           )
-          AS
-          Variable [ Name=$srn ]
+          AS Variable [ Name=$srn ]
         ]
         Where
           OperatorExpr [
@@ -304,8 +297,7 @@ FunctionDecl tmp1([]) {
             ]
           ]
       )
-      AS
-      Variable [ Name=$pssrn ]
+      AS Variable [ Name=$pssrn ]
     ]
     Where
       OperatorExpr [
@@ -353,8 +345,7 @@ FunctionDecl tmp2([]) {
             ]
             ]
             FROM [              Variable [ Name=$pssrn ]
-              AS
-              Variable [ Name=$i ]
+              AS Variable [ Name=$i ]
             ]
           )
         ]
@@ -362,8 +353,7 @@ FunctionDecl tmp2([]) {
     ]
     ]
     FROM [      Variable [ Name=$Part ]
-      AS
-      Variable [ Name=$p ]
+      AS Variable [ Name=$p ]
 ,
       (
         SELECT ELEMENT [
@@ -435,8 +425,7 @@ FunctionDecl tmp2([]) {
         ]
         ]
         FROM [          Variable [ Name=$Partsupp ]
-          AS
-          Variable [ Name=$ps ]
+          AS Variable [ Name=$ps ]
 ,
           (
             SELECT ELEMENT [
@@ -500,8 +489,7 @@ FunctionDecl tmp2([]) {
             ]
             ]
             FROM [              Variable [ Name=$Supplier ]
-              AS
-              Variable [ Name=$s ]
+              AS Variable [ Name=$s ]
 ,
               (
                 SELECT ELEMENT [
@@ -525,12 +513,10 @@ FunctionDecl tmp2([]) {
                 ]
                 ]
                 FROM [                  Variable [ Name=$Region ]
-                  AS
-                  Variable [ Name=$r ]
+                  AS Variable [ Name=$r ]
 ,
                   Variable [ Name=$Nation ]
-                  AS
-                  Variable [ Name=$n ]
+                  AS Variable [ Name=$n ]
                 ]
                 Where
                   OperatorExpr [
@@ -556,8 +542,7 @@ FunctionDecl tmp2([]) {
                     ]
                   ]
               )
-              AS
-              Variable [ Name=$rn ]
+              AS Variable [ Name=$rn ]
             ]
             Where
               OperatorExpr [
@@ -572,8 +557,7 @@ FunctionDecl tmp2([]) {
                 ]
               ]
           )
-          AS
-          Variable [ Name=$srn ]
+          AS Variable [ Name=$srn ]
         ]
         Where
           OperatorExpr [
@@ -588,8 +572,7 @@ FunctionDecl tmp2([]) {
             ]
           ]
       )
-      AS
-      Variable [ Name=$pssrn ]
+      AS Variable [ Name=$pssrn ]
     ]
     Where
       OperatorExpr [
@@ -695,13 +678,11 @@ RecordConstructor [
 ]
 FROM [  FunctionCall tpch.tmp2@0[
   ]
-  AS
-  Variable [ Name=$t2 ]
+  AS Variable [ Name=$t2 ]
 ,
   FunctionCall tpch.tmp1@0[
   ]
-  AS
-  Variable [ Name=$t1 ]
+  AS Variable [ Name=$t1 ]
 ]
 Where
   OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q03_shipping_priority_nt/q03_shipping_priority_nt.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q03_shipping_priority_nt/q03_shipping_priority_nt.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q03_shipping_priority_nt/q03_shipping_priority_nt.3.ast
index 5bb4ef8..4b04e3a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q03_shipping_priority_nt/q03_shipping_priority_nt.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q03_shipping_priority_nt/q03_shipping_priority_nt.3.ast
@@ -27,20 +27,17 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Customer]
   ]
-  AS
-  Variable [ Name=$c ]
+  AS Variable [ Name=$c ]
 ,
   FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Orders]
   ]
-  AS
-  Variable [ Name=$o ]
+  AS Variable [ Name=$o ]
 ,
   FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [LineItem]
   ]
-  AS
-  Variable [ Name=$l ]
+  AS Variable [ Name=$l ]
 ]
 Where
   OperatorExpr [
@@ -118,15 +115,11 @@ Groupby
     Variable [ Name=$o ]
     Field=o_shippriority
   ]
-  GROUP AS
-  Variable [ Name=#1 ]
+  GROUP AS Variable [ Name=#1 ]
   (
-  Variable [ Name=$l ]
-   AS l
-  Variable [ Name=$o ]
-   AS o
-  Variable [ Name=$c ]
-   AS c
+    l:=Variable [ Name=$l ]
+    o:=Variable [ Name=$o ]
+    c:=Variable [ Name=$c ]
   )
 
 Let Variable [ Name=$revenue ]
@@ -151,8 +144,7 @@ Let Variable [ Name=$revenue ]
       ]
       ]
       FROM [        Variable [ Name=$l ]
-        AS
-        Variable [ Name=$i ]
+        AS Variable [ Name=$i ]
       ]
     )
   ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q04_order_priority/q04_order_priority.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q04_order_priority/q04_order_priority.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q04_order_priority/q04_order_priority.3.ast
index b9aa68f..9c0d26d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q04_order_priority/q04_order_priority.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q04_order_priority/q04_order_priority.3.ast
@@ -14,8 +14,7 @@ FunctionDecl tmp([]) {
     ]
     ]
     FROM [      Variable [ Name=$LineItem ]
-      AS
-      Variable [ Name=$l ]
+      AS Variable [ Name=$l ]
     ]
     Where
       OperatorExpr [
@@ -52,8 +51,7 @@ RecordConstructor [
         ]
         ]
         FROM [          Variable [ Name=#1 ]
-          AS
-          Variable [ Name=#2 ]
+          AS Variable [ Name=#2 ]
         ]
       )
     ]
@@ -63,13 +61,11 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Orders]
   ]
-  AS
-  Variable [ Name=$o ]
+  AS Variable [ Name=$o ]
   INNER JOIN
     FunctionCall tpch.tmp@0[
     ]
-    AS
-    Variable [ Name=$t ]
+    AS Variable [ Name=$t ]
     ON
     OperatorExpr [
       FieldAccessor [
@@ -110,13 +106,10 @@ Groupby
     Variable [ Name=$o ]
     Field=o_orderpriority
   ]
-  GROUP AS
-  Variable [ Name=#1 ]
+  GROUP AS Variable [ Name=#1 ]
   (
-  Variable [ Name=$t ]
-   AS t
-  Variable [ Name=$o ]
-   AS o
+    t:=Variable [ Name=$t ]
+    o:=Variable [ Name=$o ]
   )
 
 Orderby

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q05_local_supplier_volume/q05_local_supplier_volume.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q05_local_supplier_volume/q05_local_supplier_volume.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q05_local_supplier_volume/q05_local_supplier_volume.3.ast
index 92d992a..fefccd1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q05_local_supplier_volume/q05_local_supplier_volume.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q05_local_supplier_volume/q05_local_supplier_volume.3.ast
@@ -17,8 +17,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Customer]
   ]
-  AS
-  Variable [ Name=$c ]
+  AS Variable [ Name=$c ]
 ,
   (
     SELECT ELEMENT [
@@ -68,8 +67,7 @@ FROM [  FunctionCall Metadata.dataset@1[
     FROM [      FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [Orders]
       ]
-      AS
-      Variable [ Name=$o ]
+      AS Variable [ Name=$o ]
 ,
       (
         SELECT ELEMENT [
@@ -119,8 +117,7 @@ FROM [  FunctionCall Metadata.dataset@1[
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [LineItem]
           ]
-          AS
-          Variable [ Name=$l ]
+          AS Variable [ Name=$l ]
 ,
           (
             SELECT ELEMENT [
@@ -154,8 +151,7 @@ FROM [  FunctionCall Metadata.dataset@1[
             FROM [              FunctionCall Metadata.dataset@1[
                 LiteralExpr [STRING] [Supplier]
               ]
-              AS
-              Variable [ Name=$s ]
+              AS Variable [ Name=$s ]
 ,
               (
                 SELECT ELEMENT [
@@ -181,14 +177,12 @@ FROM [  FunctionCall Metadata.dataset@1[
                 FROM [                  FunctionCall Metadata.dataset@1[
                     LiteralExpr [STRING] [Nation]
                   ]
-                  AS
-                  Variable [ Name=$n ]
+                  AS Variable [ Name=$n ]
 ,
                   FunctionCall Metadata.dataset@1[
                     LiteralExpr [STRING] [Region]
                   ]
-                  AS
-                  Variable [ Name=$r ]
+                  AS Variable [ Name=$r ]
                 ]
                 Where
                   OperatorExpr [
@@ -203,8 +197,7 @@ FROM [  FunctionCall Metadata.dataset@1[
                     ]
                   ]
               )
-              AS
-              Variable [ Name=$n1 ]
+              AS Variable [ Name=$n1 ]
             ]
             Where
               OperatorExpr [
@@ -219,8 +212,7 @@ FROM [  FunctionCall Metadata.dataset@1[
                 ]
               ]
           )
-          AS
-          Variable [ Name=$s1 ]
+          AS Variable [ Name=$s1 ]
         ]
         Where
           OperatorExpr [
@@ -235,8 +227,7 @@ FROM [  FunctionCall Metadata.dataset@1[
             ]
           ]
       )
-      AS
-      Variable [ Name=$l1 ]
+      AS Variable [ Name=$l1 ]
     ]
     Where
       OperatorExpr [
@@ -271,8 +262,7 @@ FROM [  FunctionCall Metadata.dataset@1[
         ]
       ]
   )
-  AS
-  Variable [ Name=$o1 ]
+  AS Variable [ Name=$o1 ]
 ]
 Where
   OperatorExpr [
@@ -307,13 +297,10 @@ Groupby
     Variable [ Name=$o1 ]
     Field=n_name
   ]
-  GROUP AS
-  Variable [ Name=#1 ]
+  GROUP AS Variable [ Name=#1 ]
   (
-  Variable [ Name=$o1 ]
-   AS o1
-  Variable [ Name=$c ]
-   AS c
+    o1:=Variable [ Name=$o1 ]
+    c:=Variable [ Name=$c ]
   )
 
 Let Variable [ Name=$revenue ]
@@ -338,8 +325,7 @@ Let Variable [ Name=$revenue ]
       ]
       ]
       FROM [        Variable [ Name=$o1 ]
-        AS
-        Variable [ Name=$i ]
+        AS Variable [ Name=$i ]
       ]
     )
   ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.3.ast
index 592238f..63304d9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.3.ast
@@ -22,8 +22,7 @@ RecordConstructor [
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [LineItem]
           ]
-          AS
-          Variable [ Name=$l ]
+          AS Variable [ Name=$l ]
         ]
         Where
           OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.4.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.4.ast
index 420bd44..653e7eb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.4.ast
@@ -10,8 +10,7 @@ FunctionCall tpch.count@1[
     ]
     ]
     FROM [      Variable [ Name=#1 ]
-      AS
-      Variable [ Name=#2 ]
+      AS Variable [ Name=#2 ]
     ]
   )
 ]
@@ -20,8 +19,7 @@ count
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [LineItem]
   ]
-  AS
-  Variable [ Name=$l ]
+  AS Variable [ Name=$l ]
 ]
 Where
   OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q07_volume_shipping/q07_volume_shipping.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q07_volume_shipping/q07_volume_shipping.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q07_volume_shipping/q07_volume_shipping.3.ast
index ac8fbda..f7aeb0f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q07_volume_shipping/q07_volume_shipping.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q07_volume_shipping/q07_volume_shipping.3.ast
@@ -38,12 +38,10 @@ FunctionDecl q7_volume_shipping_tmp([]) {
     ]
     ]
     FROM [      Variable [ Name=$Nation ]
-      AS
-      Variable [ Name=$n1 ]
+      AS Variable [ Name=$n1 ]
 ,
       Variable [ Name=$Nation ]
-      AS
-      Variable [ Name=$n2 ]
+      AS Variable [ Name=$n2 ]
     ]
     Where
       OperatorExpr [
@@ -231,14 +229,12 @@ FROM [  (
             FROM [              FunctionCall Metadata.dataset@1[
                 LiteralExpr [STRING] [LineItem]
               ]
-              AS
-              Variable [ Name=$l ]
+              AS Variable [ Name=$l ]
 ,
               FunctionCall Metadata.dataset@1[
                 LiteralExpr [STRING] [Orders]
               ]
-              AS
-              Variable [ Name=$o ]
+              AS Variable [ Name=$o ]
             ]
             Where
               OperatorExpr [
@@ -273,14 +269,12 @@ FROM [  (
                 ]
               ]
           )
-          AS
-          Variable [ Name=$lo ]
+          AS Variable [ Name=$lo ]
 ,
           FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [Customer]
           ]
-          AS
-          Variable [ Name=$c ]
+          AS Variable [ Name=$c ]
         ]
         Where
           OperatorExpr [
@@ -295,14 +289,12 @@ FROM [  (
             ]
           ]
       )
-      AS
-      Variable [ Name=$loc ]
+      AS Variable [ Name=$loc ]
 ,
       FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [Supplier]
       ]
-      AS
-      Variable [ Name=$s ]
+      AS Variable [ Name=$s ]
     ]
     Where
       OperatorExpr [
@@ -317,13 +309,11 @@ FROM [  (
         ]
       ]
   )
-  AS
-  Variable [ Name=$locs ]
+  AS Variable [ Name=$locs ]
 ,
   FunctionCall tpch.q7_volume_shipping_tmp@0[
   ]
-  AS
-  Variable [ Name=$t ]
+  AS Variable [ Name=$t ]
 ]
 Let Variable [ Name=$l_year0 ]
   :=
@@ -375,15 +365,11 @@ Groupby
   Variable [ Name=$l_year ]
   :=
   Variable [ Name=$l_year0 ]
-  GROUP AS
-  Variable [ Name=#1 ]
+  GROUP AS Variable [ Name=#1 ]
   (
-  Variable [ Name=$l_year0 ]
-   AS l_year0
-  Variable [ Name=$t ]
-   AS t
-  Variable [ Name=$locs ]
-   AS locs
+    l_year0:=Variable [ Name=$l_year0 ]
+    t:=Variable [ Name=$t ]
+    locs:=Variable [ Name=$locs ]
   )
 
 Let Variable [ Name=$revenue ]
@@ -408,8 +394,7 @@ Let Variable [ Name=$revenue ]
       ]
       ]
       FROM [        Variable [ Name=$locs ]
-        AS
-        Variable [ Name=$i ]
+        AS Variable [ Name=$i ]
       ]
     )
   ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q08_national_market_share/q08_national_market_share.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q08_national_market_share/q08_national_market_share.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q08_national_market_share/q08_national_market_share.3.ast
index eca3549..279175b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q08_national_market_share/q08_national_market_share.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q08_national_market_share/q08_national_market_share.3.ast
@@ -33,8 +33,7 @@ RecordConstructor [
           ]
           ]
           FROM [            Variable [ Name=$t ]
-            AS
-            Variable [ Name=$i ]
+            AS Variable [ Name=$i ]
           ]
         )
       ]
@@ -48,8 +47,7 @@ RecordConstructor [
           ]
           ]
           FROM [            Variable [ Name=$t ]
-            AS
-            Variable [ Name=$i ]
+            AS Variable [ Name=$i ]
           ]
         )
       ]
@@ -142,8 +140,7 @@ FROM [  (
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [Supplier]
           ]
-          AS
-          Variable [ Name=$s ]
+          AS Variable [ Name=$s ]
 ,
           (
             SELECT ELEMENT [
@@ -230,8 +227,7 @@ FROM [  (
                 FROM [                  FunctionCall Metadata.dataset@1[
                     LiteralExpr [STRING] [LineItem]
                   ]
-                  AS
-                  Variable [ Name=$l ]
+                  AS Variable [ Name=$l ]
 ,
                   (
                     SELECT ELEMENT [
@@ -257,8 +253,7 @@ FROM [  (
                     FROM [                      FunctionCall Metadata.dataset@1[
                         LiteralExpr [STRING] [Orders]
                       ]
-                      AS
-                      Variable [ Name=$o ]
+                      AS Variable [ Name=$o ]
 ,
                       (
                         SELECT ELEMENT [
@@ -276,8 +271,7 @@ FROM [  (
                         FROM [                          FunctionCall Metadata.dataset@1[
                             LiteralExpr [STRING] [Customer]
                           ]
-                          AS
-                          Variable [ Name=$c ]
+                          AS Variable [ Name=$c ]
 ,
                           (
                             SELECT ELEMENT [
@@ -295,14 +289,12 @@ FROM [  (
                             FROM [                              FunctionCall Metadata.dataset@1[
                                 LiteralExpr [STRING] [Nation]
                               ]
-                              AS
-                              Variable [ Name=$n1 ]
+                              AS Variable [ Name=$n1 ]
 ,
                               FunctionCall Metadata.dataset@1[
                                 LiteralExpr [STRING] [Region]
                               ]
-                              AS
-                              Variable [ Name=$r1 ]
+                              AS Variable [ Name=$r1 ]
                             ]
                             Where
                               OperatorExpr [
@@ -328,8 +320,7 @@ FROM [  (
                                 ]
                               ]
                           )
-                          AS
-                          Variable [ Name=$nr ]
+                          AS Variable [ Name=$nr ]
                         ]
                         Where
                           OperatorExpr [
@@ -344,8 +335,7 @@ FROM [  (
                             ]
                           ]
                       )
-                      AS
-                      Variable [ Name=$nrc ]
+                      AS Variable [ Name=$nrc ]
                     ]
                     Where
                       OperatorExpr [
@@ -360,8 +350,7 @@ FROM [  (
                         ]
                       ]
                   )
-                  AS
-                  Variable [ Name=$nrco ]
+                  AS Variable [ Name=$nrco ]
                 ]
                 Where
                   OperatorExpr [
@@ -396,14 +385,12 @@ FROM [  (
                     ]
                   ]
               )
-              AS
-              Variable [ Name=$lnrco ]
+              AS Variable [ Name=$lnrco ]
 ,
               FunctionCall Metadata.dataset@1[
                 LiteralExpr [STRING] [Part]
               ]
-              AS
-              Variable [ Name=$p ]
+              AS Variable [ Name=$p ]
             ]
             Where
               OperatorExpr [
@@ -429,8 +416,7 @@ FROM [  (
                 ]
               ]
           )
-          AS
-          Variable [ Name=$lnrcop ]
+          AS Variable [ Name=$lnrcop ]
         ]
         Where
           OperatorExpr [
@@ -445,14 +431,12 @@ FROM [  (
             ]
           ]
       )
-      AS
-      Variable [ Name=$slnrcop ]
+      AS Variable [ Name=$slnrcop ]
 ,
       FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [Nation]
       ]
-      AS
-      Variable [ Name=$n2 ]
+      AS Variable [ Name=$n2 ]
     ]
     Let Variable [ Name=$o_year ]
       :=
@@ -475,8 +459,7 @@ FROM [  (
         ]
       ]
   )
-  AS
-  Variable [ Name=$t ]
+  AS Variable [ Name=$t ]
 ]
 Groupby
   Variable [ Name=$year ]
@@ -485,11 +468,9 @@ Groupby
     Variable [ Name=$t ]
     Field=year
   ]
-  GROUP AS
-  Variable [ Name=#1 ]
+  GROUP AS Variable [ Name=#1 ]
   (
-  Variable [ Name=$t ]
-   AS t
+    t:=Variable [ Name=$t ]
   )
 
 Orderby

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q09_product_type_profit_nt/q09_product_type_profit_nt.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q09_product_type_profit_nt/q09_product_type_profit_nt.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q09_product_type_profit_nt/q09_product_type_profit_nt.3.ast
index f0b946e..3ee115a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q09_product_type_profit_nt/q09_product_type_profit_nt.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q09_product_type_profit_nt/q09_product_type_profit_nt.3.ast
@@ -24,8 +24,7 @@ RecordConstructor [
         ]
         ]
         FROM [          Variable [ Name=$profit ]
-          AS
-          Variable [ Name=$pr ]
+          AS Variable [ Name=$pr ]
         ]
       )
     ]
@@ -58,8 +57,7 @@ FROM [  (
     FROM [      FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [Orders]
       ]
-      AS
-      Variable [ Name=$o ]
+      AS Variable [ Name=$o ]
 ,
       (
         SELECT ELEMENT [
@@ -117,8 +115,7 @@ FROM [  (
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [Part]
           ]
-          AS
-          Variable [ Name=$p ]
+          AS Variable [ Name=$p ]
           INNER JOIN
             (
               SELECT ELEMENT [
@@ -184,8 +181,7 @@ FROM [  (
               FROM [                FunctionCall Metadata.dataset@1[
                   LiteralExpr [STRING] [Partsupp]
                 ]
-                AS
-                Variable [ Name=$ps ]
+                AS Variable [ Name=$ps ]
                 INNER JOIN
                   (
                     SELECT ELEMENT [
@@ -272,14 +268,12 @@ FROM [  (
                         FROM [                          FunctionCall Metadata.dataset@1[
                             LiteralExpr [STRING] [Supplier]
                           ]
-                          AS
-                          Variable [ Name=$s ]
+                          AS Variable [ Name=$s ]
 ,
                           FunctionCall Metadata.dataset@1[
                             LiteralExpr [STRING] [Nation]
                           ]
-                          AS
-                          Variable [ Name=$n ]
+                          AS Variable [ Name=$n ]
                         ]
                         Where
                           OperatorExpr [
@@ -294,14 +288,12 @@ FROM [  (
                             ]
                           ]
                       )
-                      AS
-                      Variable [ Name=$s1 ]
+                      AS Variable [ Name=$s1 ]
                       INNER JOIN
                         FunctionCall Metadata.dataset@1[
                           LiteralExpr [STRING] [LineItem]
                         ]
-                        AS
-                        Variable [ Name=$l ]
+                        AS Variable [ Name=$l ]
                         ON
                         OperatorExpr [
                           FieldAccessor [
@@ -316,8 +308,7 @@ FROM [  (
                         ]
                     ]
                   )
-                  AS
-                  Variable [ Name=$l1 ]
+                  AS Variable [ Name=$l1 ]
                   ON
                   OperatorExpr [
                     OperatorExpr [
@@ -346,8 +337,7 @@ FROM [  (
                   ]
               ]
             )
-            AS
-            Variable [ Name=$l2 ]
+            AS Variable [ Name=$l2 ]
             ON
             OperatorExpr [
               FunctionCall tpch.contains@2[
@@ -372,8 +362,7 @@ FROM [  (
             ]
         ]
       )
-      AS
-      Variable [ Name=$l3 ]
+      AS Variable [ Name=$l3 ]
     ]
     Let Variable [ Name=$amount ]
       :=
@@ -427,8 +416,7 @@ FROM [  (
         ]
       ]
   )
-  AS
-  Variable [ Name=$profit ]
+  AS Variable [ Name=$profit ]
 ]
 Groupby
   Variable [ Name=$nation ]
@@ -443,11 +431,9 @@ Groupby
     Variable [ Name=$profit ]
     Field=o_year
   ]
-  GROUP AS
-  Variable [ Name=#1 ]
+  GROUP AS Variable [ Name=#1 ]
   (
-  Variable [ Name=$profit ]
-   AS profit
+    profit:=Variable [ Name=$profit ]
   )
 
 Orderby

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q10_returned_item/q10_returned_item.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q10_returned_item/q10_returned_item.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q10_returned_item/q10_returned_item.3.ast
index 794ca6a..d755261 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q10_returned_item/q10_returned_item.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q10_returned_item/q10_returned_item.3.ast
@@ -124,8 +124,7 @@ FROM [  (
     FROM [      FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [LineItem]
       ]
-      AS
-      Variable [ Name=$l ]
+      AS Variable [ Name=$l ]
 ,
       (
         SELECT ELEMENT [
@@ -199,20 +198,17 @@ FROM [  (
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [Orders]
           ]
-          AS
-          Variable [ Name=$o ]
+          AS Variable [ Name=$o ]
 ,
           FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [Customer]
           ]
-          AS
-          Variable [ Name=$c ]
+          AS Variable [ Name=$c ]
 ,
           FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [Nation]
           ]
-          AS
-          Variable [ Name=$n ]
+          AS Variable [ Name=$n ]
         ]
         Where
           OperatorExpr [
@@ -261,8 +257,7 @@ FROM [  (
             ]
           ]
       )
-      AS
-      Variable [ Name=$ocn ]
+      AS Variable [ Name=$ocn ]
     ]
     Where
       OperatorExpr [
@@ -288,8 +283,7 @@ FROM [  (
         ]
       ]
   )
-  AS
-  Variable [ Name=$locn ]
+  AS Variable [ Name=$locn ]
 ]
 Groupby
   Variable [ Name=$c_custkey ]
@@ -334,11 +328,9 @@ Groupby
     Variable [ Name=$locn ]
     Field=c_comment
   ]
-  GROUP AS
-  Variable [ Name=#1 ]
+  GROUP AS Variable [ Name=#1 ]
   (
-  Variable [ Name=$locn ]
-   AS locn
+    locn:=Variable [ Name=$locn ]
   )
 
 Let Variable [ Name=$revenue ]
@@ -363,8 +355,7 @@ Let Variable [ Name=$revenue ]
       ]
       ]
       FROM [        Variable [ Name=$locn ]
-        AS
-        Variable [ Name=$i ]
+        AS Variable [ Name=$i ]
       ]
     )
   ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q10_returned_item_int64/q10_returned_item_int64.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q10_returned_item_int64/q10_returned_item_int64.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q10_returned_item_int64/q10_returned_item_int64.3.ast
index 794ca6a..d755261 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q10_returned_item_int64/q10_returned_item_int64.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q10_returned_item_int64/q10_returned_item_int64.3.ast
@@ -124,8 +124,7 @@ FROM [  (
     FROM [      FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [LineItem]
       ]
-      AS
-      Variable [ Name=$l ]
+      AS Variable [ Name=$l ]
 ,
       (
         SELECT ELEMENT [
@@ -199,20 +198,17 @@ FROM [  (
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [Orders]
           ]
-          AS
-          Variable [ Name=$o ]
+          AS Variable [ Name=$o ]
 ,
           FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [Customer]
           ]
-          AS
-          Variable [ Name=$c ]
+          AS Variable [ Name=$c ]
 ,
           FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [Nation]
           ]
-          AS
-          Variable [ Name=$n ]
+          AS Variable [ Name=$n ]
         ]
         Where
           OperatorExpr [
@@ -261,8 +257,7 @@ FROM [  (
             ]
           ]
       )
-      AS
-      Variable [ Name=$ocn ]
+      AS Variable [ Name=$ocn ]
     ]
     Where
       OperatorExpr [
@@ -288,8 +283,7 @@ FROM [  (
         ]
       ]
   )
-  AS
-  Variable [ Name=$locn ]
+  AS Variable [ Name=$locn ]
 ]
 Groupby
   Variable [ Name=$c_custkey ]
@@ -334,11 +328,9 @@ Groupby
     Variable [ Name=$locn ]
     Field=c_comment
   ]
-  GROUP AS
-  Variable [ Name=#1 ]
+  GROUP AS Variable [ Name=#1 ]
   (
-  Variable [ Name=$locn ]
-   AS locn
+    locn:=Variable [ Name=$locn ]
   )
 
 Let Variable [ Name=$revenue ]
@@ -363,8 +355,7 @@ Let Variable [ Name=$revenue ]
       ]
       ]
       FROM [        Variable [ Name=$locn ]
-        AS
-        Variable [ Name=$i ]
+        AS Variable [ Name=$i ]
       ]
     )
   ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q11_important_stock/q11_important_stock.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q11_important_stock/q11_important_stock.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q11_important_stock/q11_important_stock.3.ast
index a3e3830..14caa44 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q11_important_stock/q11_important_stock.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q11_important_stock/q11_important_stock.3.ast
@@ -20,8 +20,7 @@ Let Variable [ Name=$sum ]
       FROM [        FunctionCall Metadata.dataset@1[
           LiteralExpr [STRING] [Partsupp]
         ]
-        AS
-        Variable [ Name=$ps ]
+        AS Variable [ Name=$ps ]
 ,
         (
           SELECT ELEMENT [
@@ -39,14 +38,12 @@ Let Variable [ Name=$sum ]
           FROM [            FunctionCall Metadata.dataset@1[
               LiteralExpr [STRING] [Supplier]
             ]
-            AS
-            Variable [ Name=$s ]
+            AS Variable [ Name=$s ]
 ,
             FunctionCall Metadata.dataset@1[
               LiteralExpr [STRING] [Nation]
             ]
-            AS
-            Variable [ Name=$n ]
+            AS Variable [ Name=$n ]
           ]
           Where
             OperatorExpr [
@@ -61,8 +58,7 @@ Let Variable [ Name=$sum ]
               ]
             ]
         )
-        AS
-        Variable [ Name=$sn ]
+        AS Variable [ Name=$sn ]
       ]
       Where
         OperatorExpr [
@@ -125,8 +121,7 @@ FROM [  (
             ]
             ]
             FROM [              Variable [ Name=$ps ]
-              AS
-              Variable [ Name=$i ]
+              AS Variable [ Name=$i ]
             ]
           )
         ]
@@ -136,8 +131,7 @@ FROM [  (
     FROM [      FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [Partsupp]
       ]
-      AS
-      Variable [ Name=$ps ]
+      AS Variable [ Name=$ps ]
 ,
       (
         SELECT ELEMENT [
@@ -155,14 +149,12 @@ FROM [  (
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [Supplier]
           ]
-          AS
-          Variable [ Name=$s ]
+          AS Variable [ Name=$s ]
 ,
           FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [Nation]
           ]
-          AS
-          Variable [ Name=$n ]
+          AS Variable [ Name=$n ]
         ]
         Where
           OperatorExpr [
@@ -177,8 +169,7 @@ FROM [  (
             ]
           ]
       )
-      AS
-      Variable [ Name=$sn ]
+      AS Variable [ Name=$sn ]
     ]
     Where
       OperatorExpr [
@@ -199,20 +190,15 @@ FROM [  (
         Variable [ Name=$ps ]
         Field=ps_partkey
       ]
-      GROUP AS
-      Variable [ Name=#1 ]
+      GROUP AS Variable [ Name=#1 ]
       (
-      Variable [ Name=$sn ]
-       AS sn
-      Variable [ Name=$ps ]
-       AS ps
-      Variable [ Name=$sum ]
-       AS sum
+        sn:=Variable [ Name=$sn ]
+        ps:=Variable [ Name=$ps ]
+        sum:=Variable [ Name=$sum ]
       )
 
   )
-  AS
-  Variable [ Name=$t1 ]
+  AS Variable [ Name=$t1 ]
 ]
 Where
   OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q12_shipping/q12_shipping.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q12_shipping/q12_shipping.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q12_shipping/q12_shipping.3.ast
index 6150bd4..b1fee8a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q12_shipping/q12_shipping.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q12_shipping/q12_shipping.3.ast
@@ -40,8 +40,7 @@ RecordConstructor [
         ]
         ]
         FROM [          Variable [ Name=$o ]
-          AS
-          Variable [ Name=$i ]
+          AS Variable [ Name=$i ]
         ]
       )
     ]
@@ -79,8 +78,7 @@ RecordConstructor [
         ]
         ]
         FROM [          Variable [ Name=$o ]
-          AS
-          Variable [ Name=$i ]
+          AS Variable [ Name=$i ]
         ]
       )
     ]
@@ -90,14 +88,12 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [LineItem]
   ]
-  AS
-  Variable [ Name=$l ]
+  AS Variable [ Name=$l ]
 ,
   FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Orders]
   ]
-  AS
-  Variable [ Name=$o ]
+  AS Variable [ Name=$o ]
 ]
 Where
   OperatorExpr [
@@ -182,13 +178,10 @@ Groupby
     Variable [ Name=$l ]
     Field=l_shipmode
   ]
-  GROUP AS
-  Variable [ Name=#1 ]
+  GROUP AS Variable [ Name=#1 ]
   (
-  Variable [ Name=$o ]
-   AS o
-  Variable [ Name=$l ]
-   AS l
+    o:=Variable [ Name=$o ]
+    l:=Variable [ Name=$l ]
   )
 
 Orderby

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q13_customer_distribution/q13_customer_distribution.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q13_customer_distribution/q13_customer_distribution.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q13_customer_distribution/q13_customer_distribution.3.ast
index 040038c..648a33b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q13_customer_distribution/q13_customer_distribution.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q13_customer_distribution/q13_customer_distribution.3.ast
@@ -35,8 +35,7 @@ FROM [  (
             ]
             ]
             FROM [              Variable [ Name=$co ]
-              AS
-              Variable [ Name=$i ]
+              AS Variable [ Name=$i ]
             ]
           )
         ]
@@ -68,8 +67,7 @@ FROM [  (
                 FROM [                  FunctionCall Metadata.dataset@1[
                     LiteralExpr [STRING] [Orders]
                   ]
-                  AS
-                  Variable [ Name=$o ]
+                  AS Variable [ Name=$o ]
                 ]
                 Where
                   OperatorExpr [
@@ -103,12 +101,10 @@ FROM [  (
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [Customer]
           ]
-          AS
-          Variable [ Name=$c ]
+          AS Variable [ Name=$c ]
         ]
       )
-      AS
-      Variable [ Name=$co ]
+      AS Variable [ Name=$co ]
     ]
     Groupby
       Variable [ Name=$c_custkey ]
@@ -117,16 +113,13 @@ FROM [  (
         Variable [ Name=$co ]
         Field=c_custkey
       ]
-      GROUP AS
-      Variable [ Name=#1 ]
+      GROUP AS Variable [ Name=#1 ]
       (
-      Variable [ Name=$co ]
-       AS co
+        co:=Variable [ Name=$co ]
       )
 
   )
-  AS
-  Variable [ Name=$gco ]
+  AS Variable [ Name=$gco ]
 ]
 Groupby
   Variable [ Name=$c_count ]
@@ -135,11 +128,9 @@ Groupby
     Variable [ Name=$gco ]
     Field=c_count
   ]
-  GROUP AS
-  Variable [ Name=#2 ]
+  GROUP AS Variable [ Name=#2 ]
   (
-  Variable [ Name=$gco ]
-   AS gco
+    gco:=Variable [ Name=$gco ]
   )
 
 Let Variable [ Name=$custdist ]
@@ -153,8 +144,7 @@ Let Variable [ Name=$custdist ]
       ]
       ]
       FROM [        Variable [ Name=#2 ]
-        AS
-        Variable [ Name=#3 ]
+        AS Variable [ Name=#3 ]
       ]
     )
   ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q14_promotion_effect/q14_promotion_effect.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q14_promotion_effect/q14_promotion_effect.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q14_promotion_effect/q14_promotion_effect.3.ast
index 86eb727..1f8c630 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q14_promotion_effect/q14_promotion_effect.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q14_promotion_effect/q14_promotion_effect.3.ast
@@ -36,8 +36,7 @@ OperatorExpr [
       ]
       ]
       FROM [        Variable [ Name=$lp ]
-        AS
-        Variable [ Name=$i ]
+        AS Variable [ Name=$i ]
       ]
     )
   ]
@@ -62,8 +61,7 @@ OperatorExpr [
       ]
       ]
       FROM [        Variable [ Name=$lp ]
-        AS
-        Variable [ Name=$i ]
+        AS Variable [ Name=$i ]
       ]
     )
   ]
@@ -72,14 +70,12 @@ OperatorExpr [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [LineItem]
   ]
-  AS
-  Variable [ Name=$l ]
+  AS Variable [ Name=$l ]
 ,
   FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Part]
   ]
-  AS
-  Variable [ Name=$p ]
+  AS Variable [ Name=$p ]
 ]
 Let Variable [ Name=$lp ]
   :=
@@ -145,14 +141,10 @@ Groupby
   Variable [ Name=$t ]
   :=
   LiteralExpr [LONG] [1]
-  GROUP AS
-  Variable [ Name=#1 ]
+  GROUP AS Variable [ Name=#1 ]
   (
-  Variable [ Name=$lp ]
-   AS lp
-  Variable [ Name=$p ]
-   AS p
-  Variable [ Name=$l ]
-   AS l
+    lp:=Variable [ Name=$lp ]
+    p:=Variable [ Name=$p ]
+    l:=Variable [ Name=$l ]
   )
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q15_top_supplier/q15_top_supplier.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q15_top_supplier/q15_top_supplier.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q15_top_supplier/q15_top_supplier.3.ast
index 8e0bd84..0645c36 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q15_top_supplier/q15_top_supplier.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q15_top_supplier/q15_top_supplier.3.ast
@@ -31,8 +31,7 @@ FunctionDecl revenue([]) {
             ]
             ]
             FROM [              Variable [ Name=$l ]
-              AS
-              Variable [ Name=$i ]
+              AS Variable [ Name=$i ]
             ]
           )
         ]
@@ -40,8 +39,7 @@ FunctionDecl revenue([]) {
     ]
     ]
     FROM [      Variable [ Name=$LineItem ]
-      AS
-      Variable [ Name=$l ]
+      AS Variable [ Name=$l ]
     ]
     Where
       OperatorExpr [
@@ -87,8 +85,7 @@ Let Variable [ Name=$m ]
       ]
       FROM [        FunctionCall tpch.revenue@0[
         ]
-        AS
-        Variable [ Name=$r2 ]
+        AS Variable [ Name=$r2 ]
       ]
     )
   ]
@@ -139,13 +136,11 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Supplier]
   ]
-  AS
-  Variable [ Name=$s ]
+  AS Variable [ Name=$s ]
 ,
   FunctionCall tpch.revenue@0[
   ]
-  AS
-  Variable [ Name=$r ]
+  AS Variable [ Name=$r ]
 ]
 Where
   OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q16_parts_supplier_relationship/q16_parts_supplier_relationship.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q16_parts_supplier_relationship/q16_parts_supplier_relationship.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q16_parts_supplier_relationship/q16_parts_supplier_relationship.3.ast
index 9fb5785..44b1f8d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q16_parts_supplier_relationship/q16_parts_supplier_relationship.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q16_parts_supplier_relationship/q16_parts_supplier_relationship.3.ast
@@ -75,12 +75,10 @@ FunctionDecl tmp([]) {
         ]
         ]
         FROM [          Variable [ Name=$Partsupp ]
-          AS
-          Variable [ Name=$ps ]
+          AS Variable [ Name=$ps ]
 ,
           Variable [ Name=$Part ]
-          AS
-          Variable [ Name=$p ]
+          AS Variable [ Name=$p ]
         ]
         Where
           OperatorExpr [
@@ -116,12 +114,10 @@ FunctionDecl tmp([]) {
             ]
           ]
       )
-      AS
-      Variable [ Name=$psp ]
+      AS Variable [ Name=$psp ]
 ,
       Variable [ Name=$Supplier ]
-      AS
-      Variable [ Name=$s ]
+      AS Variable [ Name=$s ]
     ]
     Where
       OperatorExpr [
@@ -202,8 +198,7 @@ FROM [  (
     ]
     FROM [      FunctionCall tpch.tmp@0[
       ]
-      AS
-      Variable [ Name=$t ]
+      AS Variable [ Name=$t ]
     ]
     Where
       OperatorExpr [
@@ -304,16 +299,13 @@ FROM [  (
         Variable [ Name=$t ]
         Field=ps_suppkey
       ]
-      GROUP AS
-      Variable [ Name=#1 ]
+      GROUP AS Variable [ Name=#1 ]
       (
-      Variable [ Name=$t ]
-       AS t
+        t:=Variable [ Name=$t ]
       )
 
   )
-  AS
-  Variable [ Name=$t2 ]
+  AS Variable [ Name=$t2 ]
 ]
 Groupby
   Variable [ Name=$p_brand ]
@@ -334,11 +326,9 @@ Groupby
     Variable [ Name=$t2 ]
     Field=p_size
   ]
-  GROUP AS
-  Variable [ Name=#2 ]
+  GROUP AS Variable [ Name=#2 ]
   (
-  Variable [ Name=$t2 ]
-   AS t2
+    t2:=Variable [ Name=$t2 ]
   )
 
 Let Variable [ Name=$supplier_cnt ]
@@ -352,8 +342,7 @@ Let Variable [ Name=$supplier_cnt ]
       ]
       ]
       FROM [        Variable [ Name=$t2 ]
-        AS
-        Variable [ Name=$i ]
+        AS Variable [ Name=$i ]
       ]
     )
   ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q17_large_gby_variant/q17_large_gby_variant.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q17_large_gby_variant/q17_large_gby_variant.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q17_large_gby_variant/q17_large_gby_variant.3.ast
index fb8f2cd..4c84266 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q17_large_gby_variant/q17_large_gby_variant.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q17_large_gby_variant/q17_large_gby_variant.3.ast
@@ -19,8 +19,7 @@ RecordConstructor [
         ]
         ]
         FROM [          Variable [ Name=#1 ]
-          AS
-          Variable [ Name=#2 ]
+          AS Variable [ Name=#2 ]
         ]
       )
     ]
@@ -40,8 +39,7 @@ RecordConstructor [
           ]
           ]
           FROM [            Variable [ Name=$l ]
-            AS
-            Variable [ Name=$i ]
+            AS Variable [ Name=$i ]
           ]
         )
       ]
@@ -59,8 +57,7 @@ RecordConstructor [
         ]
         ]
         FROM [          Variable [ Name=$l ]
-          AS
-          Variable [ Name=$i ]
+          AS Variable [ Name=$i ]
         ]
       )
     ]
@@ -77,8 +74,7 @@ RecordConstructor [
         ]
         ]
         FROM [          Variable [ Name=$l ]
-          AS
-          Variable [ Name=$i ]
+          AS Variable [ Name=$i ]
         ]
       )
     ]
@@ -95,8 +91,7 @@ RecordConstructor [
         ]
         ]
         FROM [          Variable [ Name=$l ]
-          AS
-          Variable [ Name=$i ]
+          AS Variable [ Name=$i ]
         ]
       )
     ]
@@ -113,8 +108,7 @@ RecordConstructor [
         ]
         ]
         FROM [          Variable [ Name=$l ]
-          AS
-          Variable [ Name=$i ]
+          AS Variable [ Name=$i ]
         ]
       )
     ]
@@ -131,8 +125,7 @@ RecordConstructor [
         ]
         ]
         FROM [          Variable [ Name=$l ]
-          AS
-          Variable [ Name=$i ]
+          AS Variable [ Name=$i ]
         ]
       )
     ]
@@ -149,8 +142,7 @@ RecordConstructor [
         ]
         ]
         FROM [          Variable [ Name=$l ]
-          AS
-          Variable [ Name=$i ]
+          AS Variable [ Name=$i ]
         ]
       )
     ]
@@ -167,8 +159,7 @@ RecordConstructor [
         ]
         ]
         FROM [          Variable [ Name=$l ]
-          AS
-          Variable [ Name=$i ]
+          AS Variable [ Name=$i ]
         ]
       )
     ]
@@ -185,8 +176,7 @@ RecordConstructor [
         ]
         ]
         FROM [          Variable [ Name=$l ]
-          AS
-          Variable [ Name=$i ]
+          AS Variable [ Name=$i ]
         ]
       )
     ]
@@ -203,8 +193,7 @@ RecordConstructor [
         ]
         ]
         FROM [          Variable [ Name=$l ]
-          AS
-          Variable [ Name=$i ]
+          AS Variable [ Name=$i ]
         ]
       )
     ]
@@ -214,8 +203,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [LineItem]
   ]
-  AS
-  Variable [ Name=$l ]
+  AS Variable [ Name=$l ]
 ]
 Groupby
   Variable [ Name=$l_partkey ]
@@ -224,11 +212,9 @@ Groupby
     Variable [ Name=$l ]
     Field=l_partkey
   ]
-  GROUP AS
-  Variable [ Name=#1 ]
+  GROUP AS Variable [ Name=#1 ]
   (
-  Variable [ Name=$l ]
-   AS l
+    l:=Variable [ Name=$l ]
   )
 
 Orderby

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q18_large_volume_customer/q18_large_volume_customer.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q18_large_volume_customer/q18_large_volume_customer.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q18_large_volume_customer/q18_large_volume_customer.3.ast
index ea93017..d220f48 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q18_large_volume_customer/q18_large_volume_customer.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q18_large_volume_customer/q18_large_volume_customer.3.ast
@@ -39,8 +39,7 @@ RecordConstructor [
         ]
         ]
         FROM [          Variable [ Name=$l ]
-          AS
-          Variable [ Name=$j ]
+          AS Variable [ Name=$j ]
         ]
       )
     ]
@@ -50,14 +49,12 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Customer]
   ]
-  AS
-  Variable [ Name=$c ]
+  AS Variable [ Name=$c ]
 ,
   FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Orders]
   ]
-  AS
-  Variable [ Name=$o ]
+  AS Variable [ Name=$o ]
 ,
   (
     SELECT ELEMENT [
@@ -79,8 +76,7 @@ FROM [  FunctionCall Metadata.dataset@1[
             ]
             ]
             FROM [              Variable [ Name=$l ]
-              AS
-              Variable [ Name=$i ]
+              AS Variable [ Name=$i ]
             ]
           )
         ]
@@ -90,8 +86,7 @@ FROM [  FunctionCall Metadata.dataset@1[
     FROM [      FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [LineItem]
       ]
-      AS
-      Variable [ Name=$l ]
+      AS Variable [ Name=$l ]
     ]
     Groupby
       Variable [ Name=$l_orderkey ]
@@ -100,26 +95,20 @@ FROM [  FunctionCall Metadata.dataset@1[
         Variable [ Name=$l ]
         Field=l_orderkey
       ]
-      GROUP AS
-      Variable [ Name=#1 ]
+      GROUP AS Variable [ Name=#1 ]
       (
-      Variable [ Name=$l ]
-       AS l
-      Variable [ Name=$o ]
-       AS o
-      Variable [ Name=$c ]
-       AS c
+        l:=Variable [ Name=$l ]
+        o:=Variable [ Name=$o ]
+        c:=Variable [ Name=$c ]
       )
 
   )
-  AS
-  Variable [ Name=$t ]
+  AS Variable [ Name=$t ]
 ,
   FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [LineItem]
   ]
-  AS
-  Variable [ Name=$l ]
+  AS Variable [ Name=$l ]
 ]
 Where
   OperatorExpr [
@@ -199,17 +188,12 @@ Groupby
     Variable [ Name=$o ]
     Field=o_totalprice
   ]
-  GROUP AS
-  Variable [ Name=#2 ]
+  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
+    l:=Variable [ Name=$l ]
+    t:=Variable [ Name=$t ]
+    o:=Variable [ Name=$o ]
+    c:=Variable [ Name=$c ]
   )
 
 Orderby

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q19_discounted_revenue/q19_discounted_revenue.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q19_discounted_revenue/q19_discounted_revenue.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q19_discounted_revenue/q19_discounted_revenue.3.ast
index 1de3822..156754d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q19_discounted_revenue/q19_discounted_revenue.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q19_discounted_revenue/q19_discounted_revenue.3.ast
@@ -24,14 +24,12 @@ FunctionCall tpch.sum@1[
     FROM [      FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [LineItem]
       ]
-      AS
-      Variable [ Name=$l ]
+      AS Variable [ Name=$l ]
 ,
       FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [Part]
       ]
-      AS
-      Variable [ Name=$p ]
+      AS Variable [ Name=$p ]
     ]
     Where
       OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q20_potential_part_promotion/q20_potential_part_promotion.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q20_potential_part_promotion/q20_potential_part_promotion.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q20_potential_part_promotion/q20_potential_part_promotion.3.ast
index 6029e08..9993401 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q20_potential_part_promotion/q20_potential_part_promotion.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q20_potential_part_promotion/q20_potential_part_promotion.3.ast
@@ -61,8 +61,7 @@ FROM [  (
                   ]
                   ]
                   FROM [                    Variable [ Name=$l ]
-                    AS
-                    Variable [ Name=$i ]
+                    AS Variable [ Name=$i ]
                   ]
                 )
               ]
@@ -73,8 +72,7 @@ FROM [  (
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [LineItem]
           ]
-          AS
-          Variable [ Name=$l ]
+          AS Variable [ Name=$l ]
         ]
         Groupby
           Variable [ Name=$l_partkey ]
@@ -89,16 +87,13 @@ FROM [  (
             Variable [ Name=$l ]
             Field=l_suppkey
           ]
-          GROUP AS
-          Variable [ Name=#1 ]
+          GROUP AS Variable [ Name=#1 ]
           (
-          Variable [ Name=$l ]
-           AS l
+            l:=Variable [ Name=$l ]
           )
 
       )
-      AS
-      Variable [ Name=$t2 ]
+      AS Variable [ Name=$t2 ]
 ,
       (
         SELECT ELEMENT [
@@ -132,8 +127,7 @@ FROM [  (
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [Partsupp]
           ]
-          AS
-          Variable [ Name=$ps ]
+          AS Variable [ Name=$ps ]
 ,
           (
             SELECT ELEMENT [
@@ -151,12 +145,10 @@ FROM [  (
             FROM [              FunctionCall Metadata.dataset@1[
                 LiteralExpr [STRING] [Part]
               ]
-              AS
-              Variable [ Name=$p ]
+              AS Variable [ Name=$p ]
             ]
           )
-          AS
-          Variable [ Name=$t1 ]
+          AS Variable [ Name=$t1 ]
         ]
         Where
           OperatorExpr [
@@ -171,8 +163,7 @@ FROM [  (
             ]
           ]
       )
-      AS
-      Variable [ Name=$pst1 ]
+      AS Variable [ Name=$pst1 ]
     ]
     Where
       OperatorExpr [
@@ -213,8 +204,7 @@ FROM [  (
         ]
       ]
   )
-  AS
-  Variable [ Name=$t3 ]
+  AS Variable [ Name=$t3 ]
 ,
   (
     SELECT ELEMENT [
@@ -248,14 +238,12 @@ FROM [  (
     FROM [      FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [Nation]
       ]
-      AS
-      Variable [ Name=$n ]
+      AS Variable [ Name=$n ]
 ,
       FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [Supplier]
       ]
-      AS
-      Variable [ Name=$s ]
+      AS Variable [ Name=$s ]
     ]
     Where
       OperatorExpr [
@@ -270,8 +258,7 @@ FROM [  (
         ]
       ]
   )
-  AS
-  Variable [ Name=$t4 ]
+  AS Variable [ Name=$t4 ]
 ]
 Where
   OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.ast
index 1d055ab..8da949a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.ast
@@ -20,8 +20,7 @@ FunctionDecl tmp1([]) {
             ]
             ]
             FROM [              Variable [ Name=$l2 ]
-              AS
-              Variable [ Name=$i ]
+              AS Variable [ Name=$i ]
             ]
           )
         ]
@@ -38,8 +37,7 @@ FunctionDecl tmp1([]) {
             ]
             ]
             FROM [              Variable [ Name=$l2 ]
-              AS
-              Variable [ Name=$i ]
+              AS Variable [ Name=$i ]
             ]
           )
         ]
@@ -62,8 +60,7 @@ FunctionDecl tmp1([]) {
         ]
         ]
         FROM [          Variable [ Name=$LineItem ]
-          AS
-          Variable [ Name=$l ]
+          AS Variable [ Name=$l ]
         ]
         Groupby
           Variable [ Name=$l_orderkey1 ]
@@ -80,8 +77,7 @@ FunctionDecl tmp1([]) {
           ]
 
       )
-      AS
-      Variable [ Name=$l2 ]
+      AS Variable [ Name=$l2 ]
     ]
     Groupby
       Variable [ Name=$l_orderkey ]
@@ -115,8 +111,7 @@ FunctionDecl tmp2([]) {
             ]
             ]
             FROM [              Variable [ Name=$l2 ]
-              AS
-              Variable [ Name=$i ]
+              AS Variable [ Name=$i ]
             ]
           )
         ]
@@ -133,8 +128,7 @@ FunctionDecl tmp2([]) {
             ]
             ]
             FROM [              Variable [ Name=$l2 ]
-              AS
-              Variable [ Name=$i ]
+              AS Variable [ Name=$i ]
             ]
           )
         ]
@@ -157,8 +151,7 @@ FunctionDecl tmp2([]) {
         ]
         ]
         FROM [          Variable [ Name=$LineItem ]
-          AS
-          Variable [ Name=$l ]
+          AS Variable [ Name=$l ]
         ]
         Where
           OperatorExpr [
@@ -187,8 +180,7 @@ FunctionDecl tmp2([]) {
           ]
 
       )
-      AS
-      Variable [ Name=$l2 ]
+      AS Variable [ Name=$l2 ]
     ]
     Groupby
       Variable [ Name=$l_orderkey ]
@@ -293,8 +285,7 @@ FROM [  (
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [LineItem]
           ]
-          AS
-          Variable [ Name=$l ]
+          AS Variable [ Name=$l ]
 ,
           (
             SELECT ELEMENT [
@@ -320,14 +311,12 @@ FROM [  (
             FROM [              FunctionCall Metadata.dataset@1[
                 LiteralExpr [STRING] [Nation]
               ]
-              AS
-              Variable [ Name=$n ]
+              AS Variable [ Name=$n ]
 ,
               FunctionCall Metadata.dataset@1[
                 LiteralExpr [STRING] [Supplier]
               ]
-              AS
-              Variable [ Name=$s ]
+              AS Variable [ Name=$s ]
             ]
             Where
               OperatorExpr [
@@ -342,19 +331,16 @@ FROM [  (
                 ]
               ]
           )
-          AS
-          Variable [ Name=$ns ]
+          AS Variable [ Name=$ns ]
 ,
           FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [Orders]
           ]
-          AS
-          Variable [ Name=$o ]
+          AS Variable [ Name=$o ]
 ,
           FunctionCall tpch.tmp1@0[
           ]
-          AS
-          Variable [ Name=$t1 ]
+          AS Variable [ Name=$t1 ]
         ]
         Where
           OperatorExpr [
@@ -407,13 +393,11 @@ FROM [  (
             ]
           ]
       )
-      AS
-      Variable [ Name=$t3 ]
+      AS Variable [ Name=$t3 ]
 ,
       FunctionCall tpch.tmp2@0[
       ]
-      AS
-      Variable [ Name=$t2 ]
+      AS Variable [ Name=$t2 ]
     ]
     Where
       OperatorExpr [
@@ -439,8 +423,7 @@ FROM [  (
         ]
       ]
   )
-  AS
-  Variable [ Name=$t4 ]
+  AS Variable [ Name=$t4 ]
 ]
 Groupby
   Variable [ Name=$s_name ]
@@ -449,11 +432,9 @@ Groupby
     Variable [ Name=$t4 ]
     Field=s_name
   ]
-  GROUP AS
-  Variable [ Name=#1 ]
+  GROUP AS Variable [ Name=#1 ]
   (
-  Variable [ Name=$t4 ]
-   AS t4
+    t4:=Variable [ Name=$t4 ]
   )
 
 Let Variable [ Name=$numwait ]
@@ -467,8 +448,7 @@ Let Variable [ Name=$numwait ]
       ]
       ]
       FROM [        Variable [ Name=#1 ]
-        AS
-        Variable [ Name=#2 ]
+        AS Variable [ Name=#2 ]
       ]
     )
   ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q22_global_sales_opportunity/q22_global_sales_opportunity.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q22_global_sales_opportunity/q22_global_sales_opportunity.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q22_global_sales_opportunity/q22_global_sales_opportunity.3.ast
index 063914d..5032a49 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q22_global_sales_opportunity/q22_global_sales_opportunity.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q22_global_sales_opportunity/q22_global_sales_opportunity.3.ast
@@ -34,8 +34,7 @@ FunctionDecl q22_customer_tmp([]) {
     ]
     ]
     FROM [      Variable [ Name=$Customer ]
-      AS
-      Variable [ Name=$c ]
+      AS Variable [ Name=$c ]
     ]
   )
 }
@@ -54,8 +53,7 @@ Let Variable [ Name=$avg ]
       FROM [        FunctionCall Metadata.dataset@1[
           LiteralExpr [STRING] [Customer]
         ]
-        AS
-        Variable [ Name=$c ]
+        AS Variable [ Name=$c ]
       ]
       Where
         OperatorExpr [
@@ -87,8 +85,7 @@ RecordConstructor [
         ]
         ]
         FROM [          Variable [ Name=#1 ]
-          AS
-          Variable [ Name=#2 ]
+          AS Variable [ Name=#2 ]
         ]
       )
     ]
@@ -105,8 +102,7 @@ RecordConstructor [
         ]
         ]
         FROM [          Variable [ Name=$ct ]
-          AS
-          Variable [ Name=$i ]
+          AS Variable [ Name=$i ]
         ]
       )
     ]
@@ -115,8 +111,7 @@ RecordConstructor [
 ]
 FROM [  FunctionCall tpch.q22_customer_tmp@0[
   ]
-  AS
-  Variable [ Name=$ct ]
+  AS Variable [ Name=$ct ]
 ]
 Where
   OperatorExpr [
@@ -134,13 +129,10 @@ Groupby
     Variable [ Name=$ct ]
     Field=cntrycode
   ]
-  GROUP AS
-  Variable [ Name=#1 ]
+  GROUP AS Variable [ Name=#1 ]
   (
-  Variable [ Name=$ct ]
-   AS ct
-  Variable [ Name=$avg ]
-   AS avg
+    ct:=Variable [ Name=$ct ]
+    avg:=Variable [ Name=$avg ]
   )
 
 Orderby

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue562/query-issue562.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue562/query-issue562.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue562/query-issue562.3.ast
index a2adf67..d53884c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue562/query-issue562.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue562/query-issue562.3.ast
@@ -27,8 +27,7 @@ FunctionDecl q22_customer_tmp([]) {
     ]
     ]
     FROM [      Variable [ Name=$Customer ]
-      AS
-      Variable [ Name=$c ]
+      AS Variable [ Name=$c ]
     ]
     Let Variable [ Name=$phone_substr ]
       :=
@@ -101,8 +100,7 @@ Let Variable [ Name=$avg ]
       FROM [        FunctionCall Metadata.dataset@1[
           LiteralExpr [STRING] [Customer]
         ]
-        AS
-        Variable [ Name=$c ]
+        AS Variable [ Name=$c ]
       ]
       Let Variable [ Name=$phone_substr ]
         :=
@@ -190,8 +188,7 @@ RecordConstructor [
         ]
         ]
         FROM [          Variable [ Name=#1 ]
-          AS
-          Variable [ Name=#2 ]
+          AS Variable [ Name=#2 ]
         ]
       )
     ]
@@ -208,8 +205,7 @@ RecordConstructor [
         ]
         ]
         FROM [          Variable [ Name=$ct ]
-          AS
-          Variable [ Name=$i ]
+          AS Variable [ Name=$i ]
         ]
       )
     ]
@@ -218,8 +214,7 @@ RecordConstructor [
 ]
 FROM [  FunctionCall tpch.q22_customer_tmp@0[
   ]
-  AS
-  Variable [ Name=$ct ]
+  AS Variable [ Name=$ct ]
 ]
 Where
   OperatorExpr [
@@ -231,8 +226,7 @@ Where
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [Orders]
           ]
-          AS
-          Variable [ Name=$o ]
+          AS Variable [ Name=$o ]
         ]
         Where
           OperatorExpr [
@@ -258,13 +252,10 @@ Groupby
     Variable [ Name=$ct ]
     Field=cntrycode
   ]
-  GROUP AS
-  Variable [ Name=#1 ]
+  GROUP AS Variable [ Name=#1 ]
   (
-  Variable [ Name=$ct ]
-   AS ct
-  Variable [ Name=$avg ]
-   AS avg
+    ct:=Variable [ Name=$ct ]
+    avg:=Variable [ Name=$avg ]
   )
 
 Orderby

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue601/query-issue601.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue601/query-issue601.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue601/query-issue601.3.ast
index 85c3c0d..b0c1038 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue601/query-issue601.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue601/query-issue601.3.ast
@@ -19,8 +19,7 @@ RecordConstructor [
         ]
         ]
         FROM [          Variable [ Name=#1 ]
-          AS
-          Variable [ Name=#2 ]
+          AS Variable [ Name=#2 ]
         ]
       )
     ]
@@ -30,8 +29,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [LineItem]
   ]
-  AS
-  Variable [ Name=$l ]
+  AS Variable [ Name=$l ]
 ]
 Groupby
   Variable [ Name=$l_linenumber ]
@@ -40,10 +38,8 @@ Groupby
     Variable [ Name=$l ]
     Field=l_linenumber
   ]
-  GROUP AS
-  Variable [ Name=#1 ]
+  GROUP AS Variable [ Name=#1 ]
   (
-  Variable [ Name=$l ]
-   AS l
+    l:=Variable [ Name=$l ]
   )
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue638/query-issue638.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue638/query-issue638.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue638/query-issue638.3.ast
index e455c20..bce73f5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue638/query-issue638.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue638/query-issue638.3.ast
@@ -24,8 +24,7 @@ RecordConstructor [
         ]
         ]
         FROM [          Variable [ Name=$profit ]
-          AS
-          Variable [ Name=$pr ]
+          AS Variable [ Name=$pr ]
         ]
       )
     ]
@@ -58,8 +57,7 @@ FROM [  (
     FROM [      FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [Orders]
       ]
-      AS
-      Variable [ Name=$o ]
+      AS Variable [ Name=$o ]
 ,
       (
         SELECT ELEMENT [
@@ -117,8 +115,7 @@ FROM [  (
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [Part]
           ]
-          AS
-          Variable [ Name=$p ]
+          AS Variable [ Name=$p ]
 ,
           (
             SELECT ELEMENT [
@@ -184,8 +181,7 @@ FROM [  (
             FROM [              FunctionCall Metadata.dataset@1[
                 LiteralExpr [STRING] [Partsupp]
               ]
-              AS
-              Variable [ Name=$ps ]
+              AS Variable [ Name=$ps ]
 ,
               (
                 SELECT ELEMENT [
@@ -272,14 +268,12 @@ FROM [  (
                     FROM [                      FunctionCall Metadata.dataset@1[
                         LiteralExpr [STRING] [Supplier]
                       ]
-                      AS
-                      Variable [ Name=$s ]
+                      AS Variable [ Name=$s ]
 ,
                       FunctionCall Metadata.dataset@1[
                         LiteralExpr [STRING] [Nation]
                       ]
-                      AS
-                      Variable [ Name=$n ]
+                      AS Variable [ Name=$n ]
                     ]
                     Where
                       OperatorExpr [
@@ -294,14 +288,12 @@ FROM [  (
                         ]
                       ]
                   )
-                  AS
-                  Variable [ Name=$s1 ]
+                  AS Variable [ Name=$s1 ]
 ,
                   FunctionCall Metadata.dataset@1[
                     LiteralExpr [STRING] [LineItem]
                   ]
-                  AS
-                  Variable [ Name=$l ]
+                  AS Variable [ Name=$l ]
                 ]
                 Where
                   OperatorExpr [
@@ -316,8 +308,7 @@ FROM [  (
                     ]
                   ]
               )
-              AS
-              Variable [ Name=$l1 ]
+              AS Variable [ Name=$l1 ]
             ]
             Where
               OperatorExpr [
@@ -346,8 +337,7 @@ FROM [  (
                 ]
               ]
           )
-          AS
-          Variable [ Name=$l2 ]
+          AS Variable [ Name=$l2 ]
         ]
         Where
           OperatorExpr [
@@ -372,8 +362,7 @@ FROM [  (
             ]
           ]
       )
-      AS
-      Variable [ Name=$l3 ]
+      AS Variable [ Name=$l3 ]
     ]
     Let Variable [ Name=$amount ]
       :=
@@ -427,8 +416,7 @@ FROM [  (
         ]
       ]
   )
-  AS
-  Variable [ Name=$profit ]
+  AS Variable [ Name=$profit ]
 ]
 Groupby
   Variable [ Name=$nation ]
@@ -443,11 +431,9 @@ Groupby
     Variable [ Name=$profit ]
     Field=o_year
   ]
-  GROUP AS
-  Variable [ Name=#1 ]
+  GROUP AS Variable [ Name=#1 ]
   (
-  Variable [ Name=$profit ]
-   AS profit
+    profit:=Variable [ Name=$profit ]
   )
 
 Orderby

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785-2/query-issue785-2.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785-2/query-issue785-2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785-2/query-issue785-2.3.ast
index 3b22218..97006bf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785-2/query-issue785-2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785-2/query-issue785-2.3.ast
@@ -26,14 +26,12 @@ Let Variable [ Name=$t ]
     FROM [      FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [Nation]
       ]
-      AS
-      Variable [ Name=$nation ]
+      AS Variable [ Name=$nation ]
 ,
       FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [SelectedNation]
       ]
-      AS
-      Variable [ Name=$sn ]
+      AS Variable [ Name=$sn ]
     ]
     Where
       OperatorExpr [
@@ -71,20 +69,17 @@ Let Variable [ Name=$X ]
     ]
     ]
     FROM [      Variable [ Name=$t ]
-      AS
-      Variable [ Name=$n ]
+      AS Variable [ Name=$n ]
 ,
       FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [Customer]
       ]
-      AS
-      Variable [ Name=$customer ]
+      AS Variable [ Name=$customer ]
 ,
       FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [Orders]
       ]
-      AS
-      Variable [ Name=$orders ]
+      AS Variable [ Name=$orders ]
     ]
     Where
       OperatorExpr [
@@ -125,17 +120,12 @@ Let Variable [ Name=$X ]
         Variable [ Name=$n ]
         Field=n_nationkey
       ]
-      GROUP AS
-      Variable [ Name=#1 ]
+      GROUP AS Variable [ Name=#1 ]
       (
-      Variable [ Name=$orders ]
-       AS orders
-      Variable [ Name=$customer ]
-       AS customer
-      Variable [ Name=$n ]
-       AS n
-      Variable [ Name=$t ]
-       AS t
+        orders:=Variable [ Name=$orders ]
+        customer:=Variable [ Name=$customer ]
+        n:=Variable [ Name=$n ]
+        t:=Variable [ Name=$t ]
       )
 
     Let Variable [ Name=$sum ]
@@ -149,8 +139,7 @@ Let Variable [ Name=$X ]
           ]
           ]
           FROM [            Variable [ Name=$orders ]
-            AS
-            Variable [ Name=$o ]
+            AS Variable [ Name=$o ]
           ]
         )
       ]
@@ -187,8 +176,7 @@ RecordConstructor [
       ]
       ]
       FROM [        Variable [ Name=$x ]
-        AS
-        Variable [ Name=$y ]
+        AS Variable [ Name=$y ]
       ]
       Orderby
         FieldAccessor [
@@ -204,8 +192,7 @@ RecordConstructor [
 ]
 ]
 FROM [  Variable [ Name=$X ]
-  AS
-  Variable [ Name=$x ]
+  AS Variable [ Name=$x ]
 ]
 Groupby
   Variable [ Name=$nation_key ]
@@ -214,14 +201,10 @@ Groupby
     Variable [ Name=$x ]
     Field=nation_key
   ]
-  GROUP AS
-  Variable [ Name=#2 ]
+  GROUP AS Variable [ Name=#2 ]
   (
-  Variable [ Name=$x ]
-   AS x
-  Variable [ Name=$X ]
-   AS X
-  Variable [ Name=$t ]
-   AS t
+    x:=Variable [ Name=$x ]
+    X:=Variable [ Name=$X ]
+    t:=Variable [ Name=$t ]
   )
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785/query-issue785.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785/query-issue785.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785/query-issue785.3.ast
index e59376e..602feb1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785/query-issue785.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785/query-issue785.3.ast
@@ -26,8 +26,7 @@ RecordConstructor [
       ]
       ]
       FROM [        Variable [ Name=$x ]
-        AS
-        Variable [ Name=$i ]
+        AS Variable [ Name=$i ]
       ]
       Groupby
         Variable [ Name=$od ]
@@ -36,17 +35,12 @@ RecordConstructor [
           Variable [ Name=$i ]
           Field=order_date
         ]
-        GROUP AS
-        Variable [ Name=#3 ]
+        GROUP AS Variable [ Name=#3 ]
         (
-        Variable [ Name=$i ]
-         AS i
-        Variable [ Name=$x ]
-         AS x
-        Variable [ Name=$nation_key ]
-         AS nation_key
-        Variable [ Name=#2 ]
-         AS #2
+          i:=Variable [ Name=$i ]
+          x:=Variable [ Name=$x ]
+          nation_key:=Variable [ Name=$nation_key ]
+          #2:=Variable [ Name=#2 ]
         )
 
       Let Variable [ Name=$sum ]
@@ -60,8 +54,7 @@ RecordConstructor [
             ]
             ]
             FROM [              Variable [ Name=$i ]
-              AS
-              Variable [ Name=$s ]
+              AS Variable [ Name=$s ]
             ]
           )
         ]
@@ -100,8 +93,7 @@ FROM [  (
             ]
             ]
             FROM [              Variable [ Name=$orders ]
-              AS
-              Variable [ Name=$o ]
+              AS Variable [ Name=$o ]
             ]
           )
         ]
@@ -111,20 +103,17 @@ FROM [  (
     FROM [      FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [Nation]
       ]
-      AS
-      Variable [ Name=$n ]
+      AS Variable [ Name=$n ]
 ,
       FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [Customer]
       ]
-      AS
-      Variable [ Name=$customer ]
+      AS Variable [ Name=$customer ]
 ,
       FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [Orders]
       ]
-      AS
-      Variable [ Name=$orders ]
+      AS Variable [ Name=$orders ]
     ]
     Where
       OperatorExpr [
@@ -165,20 +154,15 @@ FROM [  (
         Variable [ Name=$n ]
         Field=n_nationkey
       ]
-      GROUP AS
-      Variable [ Name=#1 ]
+      GROUP AS Variable [ Name=#1 ]
       (
-      Variable [ Name=$orders ]
-       AS orders
-      Variable [ Name=$customer ]
-       AS customer
-      Variable [ Name=$n ]
-       AS n
+        orders:=Variable [ Name=$orders ]
+        customer:=Variable [ Name=$customer ]
+        n:=Variable [ Name=$n ]
       )
 
   )
-  AS
-  Variable [ Name=$x ]
+  AS Variable [ Name=$x ]
 ]
 Groupby
   Variable [ Name=$nation_key ]
@@ -187,10 +171,8 @@ Groupby
     Variable [ Name=$x ]
     Field=nation_key
   ]
-  GROUP AS
-  Variable [ Name=#2 ]
+  GROUP AS Variable [ Name=#2 ]
   (
-  Variable [ Name=$x ]
-   AS x
+    x:=Variable [ Name=$x ]
   )
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue786/query-issue786.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue786/query-issue786.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue786/query-issue786.3.ast
index 4cd1b1f..2c51fb4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue786/query-issue786.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue786/query-issue786.3.ast
@@ -39,14 +39,12 @@ RecordConstructor [
       FROM [        FunctionCall Metadata.dataset@1[
           LiteralExpr [STRING] [Orders]
         ]
-        AS
-        Variable [ Name=$orders ]
+        AS Variable [ Name=$orders ]
 ,
         FunctionCall Metadata.dataset@1[
           LiteralExpr [STRING] [Customer]
         ]
-        AS
-        Variable [ Name=$customer ]
+        AS Variable [ Name=$customer ]
       ]
       Where
         OperatorExpr [
@@ -81,17 +79,12 @@ RecordConstructor [
           Variable [ Name=$orders ]
           Field=o_orderdate
         ]
-        GROUP AS
-        Variable [ Name=#1 ]
+        GROUP AS Variable [ Name=#1 ]
         (
-        Variable [ Name=$customer ]
-         AS customer
-        Variable [ Name=$orders ]
-         AS orders
-        Variable [ Name=$sn ]
-         AS sn
-        Variable [ Name=$nation ]
-         AS nation
+          customer:=Variable [ Name=$customer ]
+          orders:=Variable [ Name=$orders ]
+          sn:=Variable [ Name=$sn ]
+          nation:=Variable [ Name=$nation ]
         )
 
       Let Variable [ Name=$sum ]
@@ -105,8 +98,7 @@ RecordConstructor [
             ]
             ]
             FROM [              Variable [ Name=$orders ]
-              AS
-              Variable [ Name=$o ]
+              AS Variable [ Name=$o ]
             ]
           )
         ]
@@ -123,14 +115,12 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Nation]
   ]
-  AS
-  Variable [ Name=$nation ]
+  AS Variable [ Name=$nation ]
 ,
   FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [SelectedNation]
   ]
-  AS
-  Variable [ Name=$sn ]
+  AS Variable [ Name=$sn ]
 ]
 Where
   OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810-2/query-issue810-2.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810-2/query-issue810-2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810-2/query-issue810-2.3.ast
index 09ab092..91bebe6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810-2/query-issue810-2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810-2/query-issue810-2.3.ast
@@ -31,8 +31,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [LineItem]
   ]
-  AS
-  Variable [ Name=$l ]
+  AS Variable [ Name=$l ]
 ]
 Where
   OperatorExpr [
@@ -56,11 +55,9 @@ Groupby
     Variable [ Name=$l ]
     Field=l_linestatus
   ]
-  GROUP AS
-  Variable [ Name=#1 ]
+  GROUP AS Variable [ Name=#1 ]
   (
-  Variable [ Name=$l ]
-   AS l
+    l:=Variable [ Name=$l ]
   )
 
 Let Variable [ Name=$cheaps ]
@@ -70,8 +67,7 @@ Let Variable [ Name=$cheaps ]
     Variable [ Name=$m ]
     ]
     FROM [      Variable [ Name=$l ]
-      AS
-      Variable [ Name=$m ]
+      AS Variable [ Name=$m ]
     ]
     Where
       OperatorExpr [
@@ -113,8 +109,7 @@ Let Variable [ Name=$charges ]
     ]
     ]
     FROM [      Variable [ Name=$l ]
-      AS
-      Variable [ Name=$a ]
+      AS Variable [ Name=$a ]
     ]
   )
 Orderby

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810-3/query-issue810-3.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810-3/query-issue810-3.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810-3/query-issue810-3.3.ast
index 2e01301..1657bd5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810-3/query-issue810-3.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810-3/query-issue810-3.3.ast
@@ -45,8 +45,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [LineItem]
   ]
-  AS
-  Variable [ Name=$l ]
+  AS Variable [ Name=$l ]
 ]
 Where
   OperatorExpr [
@@ -70,11 +69,9 @@ Groupby
     Variable [ Name=$l ]
     Field=l_linestatus
   ]
-  GROUP AS
-  Variable [ Name=#1 ]
+  GROUP AS Variable [ Name=#1 ]
   (
-  Variable [ Name=$l ]
-   AS l
+    l:=Variable [ Name=$l ]
   )
 
 Let Variable [ Name=$expensives ]
@@ -87,8 +84,7 @@ Let Variable [ Name=$expensives ]
     ]
     ]
     FROM [      Variable [ Name=$l ]
-      AS
-      Variable [ Name=$i ]
+      AS Variable [ Name=$i ]
     ]
     Where
       OperatorExpr [
@@ -107,8 +103,7 @@ Let Variable [ Name=$cheaps ]
     Variable [ Name=$i ]
     ]
     FROM [      Variable [ Name=$l ]
-      AS
-      Variable [ Name=$i ]
+      AS Variable [ Name=$i ]
     ]
     Where
       OperatorExpr [
@@ -150,8 +145,7 @@ Let Variable [ Name=$charges ]
     ]
     ]
     FROM [      Variable [ Name=$l ]
-      AS
-      Variable [ Name=$i ]
+      AS Variable [ Name=$i ]
     ]
   )
 Let Variable [ Name=$disc_prices ]
@@ -175,8 +169,7 @@ Let Variable [ Name=$disc_prices ]
     ]
     ]
     FROM [      Variable [ Name=$l ]
-      AS
-      Variable [ Name=$i ]
+      AS Variable [ Name=$i ]
     ]
   )
 Orderby



Mime
View raw message