asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From buyin...@apache.org
Subject [17/28] incubator-asterixdb git commit: ASTERIXDB-1383: reduce the number of lines for "AS".
Date Mon, 18 Apr 2016 15:48:42 GMT
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-secondary-btree-index.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-secondary-btree-index.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-secondary-btree-index.ast
index c534506..ccc8afc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-secondary-btree-index.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-secondary-btree-index.ast
@@ -15,8 +15,7 @@ Variable [ Name=$emp ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [testdst]
   ]
-  AS
-  Variable [ Name=$emp ]
+  AS Variable [ Name=$emp ]
 ]
 Where
   OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-word-index.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-word-index.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-word-index.ast
index 1212e22..1acf737 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-word-index.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-word-index.ast
@@ -17,8 +17,7 @@ Variable [ Name=$o ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$o ]
+  AS Variable [ Name=$o ]
 ]
 Let Variable [ Name=$jacc ]
   :=

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/sort-cust.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/sort-cust.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/sort-cust.ast
index b9baf55..0925bfd 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/sort-cust.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/sort-cust.ast
@@ -45,8 +45,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Customers]
   ]
-  AS
-  Variable [ Name=$c ]
+  AS Variable [ Name=$c ]
 ]
 Orderby
   FieldAccessor [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization-above-join.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization-above-join.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization-above-join.ast
index 80a8ba9..61f1678 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization-above-join.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization-above-join.ast
@@ -36,14 +36,12 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$paperLeft ]
+  AS Variable [ Name=$paperLeft ]
 ,
   FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$paperRight ]
+  AS Variable [ Name=$paperRight ]
 ,
   (
     SELECT ELEMENT [
@@ -71,8 +69,7 @@ FROM [  FunctionCall Metadata.dataset@1[
     FROM [      FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [DBLP]
       ]
-      AS
-      Variable [ Name=$paperLeft ]
+      AS Variable [ Name=$paperLeft ]
 ,
       FunctionCall fuzzyjoin.subset-collection@3[
         FunctionCall Metadata.dataset@1[
@@ -86,14 +83,12 @@ FROM [  FunctionCall Metadata.dataset@1[
           LiteralExpr [FLOAT] [0.5]
         ]
       ]
-      AS
-      Variable [ Name=$prefixTokenLeft ]
+      AS Variable [ Name=$prefixTokenLeft ]
 ,
       FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [DBLP]
       ]
-      AS
-      Variable [ Name=$paperRight ]
+      AS Variable [ Name=$paperRight ]
 ,
       FunctionCall fuzzyjoin.subset-collection@3[
         FunctionCall Metadata.dataset@1[
@@ -107,8 +102,7 @@ FROM [  FunctionCall Metadata.dataset@1[
           LiteralExpr [FLOAT] [0.5]
         ]
       ]
-      AS
-      Variable [ Name=$prefixTokenRight ]
+      AS Variable [ Name=$prefixTokenRight ]
     ]
     Let Variable [ Name=$lenLeft ]
       :=
@@ -132,8 +126,7 @@ FROM [  FunctionCall Metadata.dataset@1[
               Field=title
             ]
           ]
-          AS
-          Variable [ Name=$tokenUnranked ]
+          AS Variable [ Name=$tokenUnranked ]
 ,
           (
             SELECT ELEMENT [
@@ -142,8 +135,7 @@ FROM [  FunctionCall Metadata.dataset@1[
             FROM [              FunctionCall Metadata.dataset@1[
                 LiteralExpr [STRING] [DBLP]
               ]
-              AS
-              Variable [ Name=$paper ]
+              AS Variable [ Name=$paper ]
 ,
               FunctionCall fuzzyjoin.counthashed-word-tokens@1[
                 FieldAccessor [
@@ -151,32 +143,22 @@ FROM [  FunctionCall Metadata.dataset@1[
                   Field=title
                 ]
               ]
-              AS
-              Variable [ Name=$token ]
+              AS Variable [ Name=$token ]
             ]
             Groupby
               Variable [ Name=$tokenGroupped ]
               :=
               Variable [ Name=$token ]
-              GROUP AS
-              Variable [ Name=#1 ]
+              GROUP AS Variable [ Name=#1 ]
               (
-              Variable [ Name=$token ]
-               AS token
-              Variable [ Name=$paper ]
-               AS paper
-              Variable [ Name=$tokenUnranked ]
-               AS tokenUnranked
-              Variable [ Name=$lenLeft ]
-               AS lenLeft
-              Variable [ Name=$prefixTokenRight ]
-               AS prefixTokenRight
-              Variable [ Name=$paperRight ]
-               AS paperRight
-              Variable [ Name=$prefixTokenLeft ]
-               AS prefixTokenLeft
-              Variable [ Name=$paperLeft ]
-               AS paperLeft
+                token:=Variable [ Name=$token ]
+                paper:=Variable [ Name=$paper ]
+                tokenUnranked:=Variable [ Name=$tokenUnranked ]
+                lenLeft:=Variable [ Name=$lenLeft ]
+                prefixTokenRight:=Variable [ Name=$prefixTokenRight ]
+                paperRight:=Variable [ Name=$paperRight ]
+                prefixTokenLeft:=Variable [ Name=$prefixTokenLeft ]
+                paperLeft:=Variable [ Name=$paperLeft ]
               )
 
             Orderby
@@ -189,8 +171,7 @@ FROM [  FunctionCall Metadata.dataset@1[
                   ]
                   ]
                   FROM [                    Variable [ Name=#1 ]
-                    AS
-                    Variable [ Name=#2 ]
+                    AS Variable [ Name=#2 ]
                   ]
                 )
               ]
@@ -199,10 +180,9 @@ FROM [  FunctionCall Metadata.dataset@1[
               ASC
 
           )
-          AS
-          Variable [ Name=$tokenRanked ]
-          AT
-          Variable [ Name=$i ]
+          AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
         ]
         Where
           OperatorExpr [
@@ -237,8 +217,7 @@ FROM [  FunctionCall Metadata.dataset@1[
               Field=title
             ]
           ]
-          AS
-          Variable [ Name=$tokenUnranked ]
+          AS Variable [ Name=$tokenUnranked ]
 ,
           (
             SELECT ELEMENT [
@@ -247,8 +226,7 @@ FROM [  FunctionCall Metadata.dataset@1[
             FROM [              FunctionCall Metadata.dataset@1[
                 LiteralExpr [STRING] [DBLP]
               ]
-              AS
-              Variable [ Name=$paper ]
+              AS Variable [ Name=$paper ]
 ,
               FunctionCall fuzzyjoin.counthashed-word-tokens@1[
                 FieldAccessor [
@@ -256,36 +234,24 @@ FROM [  FunctionCall Metadata.dataset@1[
                   Field=title
                 ]
               ]
-              AS
-              Variable [ Name=$token ]
+              AS Variable [ Name=$token ]
             ]
             Groupby
               Variable [ Name=$tokenGroupped ]
               :=
               Variable [ Name=$token ]
-              GROUP AS
-              Variable [ Name=#3 ]
+              GROUP AS Variable [ Name=#3 ]
               (
-              Variable [ Name=$token ]
-               AS token
-              Variable [ Name=$paper ]
-               AS paper
-              Variable [ Name=$tokenUnranked ]
-               AS tokenUnranked
-              Variable [ Name=$lenRight ]
-               AS lenRight
-              Variable [ Name=$tokensLeft ]
-               AS tokensLeft
-              Variable [ Name=$lenLeft ]
-               AS lenLeft
-              Variable [ Name=$prefixTokenRight ]
-               AS prefixTokenRight
-              Variable [ Name=$paperRight ]
-               AS paperRight
-              Variable [ Name=$prefixTokenLeft ]
-               AS prefixTokenLeft
-              Variable [ Name=$paperLeft ]
-               AS paperLeft
+                token:=Variable [ Name=$token ]
+                paper:=Variable [ Name=$paper ]
+                tokenUnranked:=Variable [ Name=$tokenUnranked ]
+                lenRight:=Variable [ Name=$lenRight ]
+                tokensLeft:=Variable [ Name=$tokensLeft ]
+                lenLeft:=Variable [ Name=$lenLeft ]
+                prefixTokenRight:=Variable [ Name=$prefixTokenRight ]
+                paperRight:=Variable [ Name=$paperRight ]
+                prefixTokenLeft:=Variable [ Name=$prefixTokenLeft ]
+                paperLeft:=Variable [ Name=$paperLeft ]
               )
 
             Orderby
@@ -298,8 +264,7 @@ FROM [  FunctionCall Metadata.dataset@1[
                   ]
                   ]
                   FROM [                    Variable [ Name=#3 ]
-                    AS
-                    Variable [ Name=#4 ]
+                    AS Variable [ Name=#4 ]
                   ]
                 )
               ]
@@ -308,10 +273,9 @@ FROM [  FunctionCall Metadata.dataset@1[
               ASC
 
           )
-          AS
-          Variable [ Name=$tokenRanked ]
-          AT
-          Variable [ Name=$i ]
+          AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
         ]
         Where
           OperatorExpr [
@@ -375,32 +339,21 @@ FROM [  FunctionCall Metadata.dataset@1[
         Variable [ Name=$paperRight ]
         Field=id
       ]
-      GROUP AS
-      Variable [ Name=#5 ]
+      GROUP AS Variable [ Name=#5 ]
       (
-      Variable [ Name=$sim ]
-       AS sim
-      Variable [ Name=$tokensRight ]
-       AS tokensRight
-      Variable [ Name=$lenRight ]
-       AS lenRight
-      Variable [ Name=$tokensLeft ]
-       AS tokensLeft
-      Variable [ Name=$lenLeft ]
-       AS lenLeft
-      Variable [ Name=$prefixTokenRight ]
-       AS prefixTokenRight
-      Variable [ Name=$paperRight ]
-       AS paperRight
-      Variable [ Name=$prefixTokenLeft ]
-       AS prefixTokenLeft
-      Variable [ Name=$paperLeft ]
-       AS paperLeft
+        sim:=Variable [ Name=$sim ]
+        tokensRight:=Variable [ Name=$tokensRight ]
+        lenRight:=Variable [ Name=$lenRight ]
+        tokensLeft:=Variable [ Name=$tokensLeft ]
+        lenLeft:=Variable [ Name=$lenLeft ]
+        prefixTokenRight:=Variable [ Name=$prefixTokenRight ]
+        paperRight:=Variable [ Name=$paperRight ]
+        prefixTokenLeft:=Variable [ Name=$prefixTokenLeft ]
+        paperLeft:=Variable [ Name=$paperLeft ]
       )
 
   )
-  AS
-  Variable [ Name=$ridpair ]
+  AS Variable [ Name=$ridpair ]
 ]
 Where
   OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization.ast
index 1704a22..8ab0020 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization.ast
@@ -29,8 +29,7 @@ Let Variable [ Name=$lonelyusers ]
     FROM [      FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [FacebookUsers]
       ]
-      AS
-      Variable [ Name=$d ]
+      AS Variable [ Name=$d ]
     ]
     Where
       OperatorExpr [
@@ -53,8 +52,7 @@ Let Variable [ Name=$lonelyusers2 ]
     FROM [      FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [FacebookUsers]
       ]
-      AS
-      Variable [ Name=$d ]
+      AS Variable [ Name=$d ]
     ]
     Where
       OperatorExpr [
@@ -117,12 +115,10 @@ RecordConstructor [
 ]
 ]
 FROM [  Variable [ Name=$lonelyusers ]
-  AS
-  Variable [ Name=$l1 ]
+  AS Variable [ Name=$l1 ]
 ,
   Variable [ Name=$lonelyusers2 ]
-  AS
-  Variable [ Name=$l2 ]
+  AS Variable [ Name=$l2 ]
 ]
 Where
   OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/unnest-to-join_01.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/unnest-to-join_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/unnest-to-join_01.ast
index adb3de6..d37b88e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/unnest-to-join_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/unnest-to-join_01.ast
@@ -12,8 +12,7 @@ FROM [  OrderedListConstructor [
     LiteralExpr [LONG] [5]
     LiteralExpr [LONG] [6]
   ]
-  AS
-  Variable [ Name=$x ]
+  AS Variable [ Name=$x ]
 ,
   OrderedListConstructor [
     LiteralExpr [LONG] [4]
@@ -23,8 +22,7 @@ FROM [  OrderedListConstructor [
     LiteralExpr [LONG] [8]
     LiteralExpr [LONG] [9]
   ]
-  AS
-  Variable [ Name=$y ]
+  AS Variable [ Name=$y ]
 ]
 Where
   OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/unnest_list_in_subplan.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/unnest_list_in_subplan.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/unnest_list_in_subplan.ast
index c037665..9cdb149 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/unnest_list_in_subplan.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/unnest_list_in_subplan.ast
@@ -35,8 +35,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$paperDBLP ]
+  AS Variable [ Name=$paperDBLP ]
 ]
 Let Variable [ Name=$idDBLP ]
   :=
@@ -62,14 +61,12 @@ Let Variable [ Name=$tokensDBLP ]
     ]
     ]
     FROM [      Variable [ Name=$tokensUnrankedDBLP ]
-      AS
-      Variable [ Name=$tokenUnranked ]
+      AS Variable [ Name=$tokenUnranked ]
 ,
       FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [TOKENSRANKEDADM]
       ]
-      AS
-      Variable [ Name=$tokenRanked ]
+      AS Variable [ Name=$tokenRanked ]
     ]
     Where
       OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/1.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/1.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/1.ast
index 4cd023d..807e7a7 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/1.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/1.ast
@@ -14,8 +14,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [User]
   ]
-  AS
-  Variable [ Name=$user ]
+  AS Variable [ Name=$user ]
 ]
 Where
   QuantifiedExpression SOME [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/2.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/2.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/2.ast
index fbf13fc..3bd944f 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/2.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/2.ast
@@ -21,15 +21,13 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Event]
   ]
-  AS
-  Variable [ Name=$event ]
+  AS Variable [ Name=$event ]
 ,
   FieldAccessor [
     Variable [ Name=$event ]
     Field=sponsoring_sigs
   ]
-  AS
-  Variable [ Name=$sponsor ]
+  AS Variable [ Name=$sponsor ]
 ]
 Let Variable [ Name=$es ]
   :=
@@ -52,15 +50,11 @@ Groupby
     Variable [ Name=$sponsor ]
     Field=sig_name
   ]
-  GROUP AS
-  Variable [ Name=#1 ]
+  GROUP AS Variable [ Name=#1 ]
   (
-  Variable [ Name=$es ]
-   AS es
-  Variable [ Name=$sponsor ]
-   AS sponsor
-  Variable [ Name=$event ]
-   AS event
+    es:=Variable [ Name=$es ]
+    sponsor:=Variable [ Name=$sponsor ]
+    event:=Variable [ Name=$event ]
   )
 
 Let Variable [ Name=$sig_sponsorship_count ]
@@ -74,8 +68,7 @@ Let Variable [ Name=$sig_sponsorship_count ]
       ]
       ]
       FROM [        Variable [ Name=#1 ]
-        AS
-        Variable [ Name=#2 ]
+        AS Variable [ Name=#2 ]
       ]
     )
   ]
@@ -101,8 +94,7 @@ Let Variable [ Name=$by_chapter ]
             ]
             ]
             FROM [              Variable [ Name=#1 ]
-              AS
-              Variable [ Name=#3 ]
+              AS Variable [ Name=#3 ]
             ]
           )
         ]
@@ -110,8 +102,7 @@ Let Variable [ Name=$by_chapter ]
     ]
     ]
     FROM [      Variable [ Name=$es ]
-      AS
-      Variable [ Name=$e ]
+      AS Variable [ Name=$e ]
     ]
     Groupby
       Variable [ Name=$chapter_name ]
@@ -123,23 +114,15 @@ Let Variable [ Name=$by_chapter ]
         ]
         Field=chapter_name
       ]
-      GROUP AS
-      Variable [ Name=#4 ]
+      GROUP AS Variable [ Name=#4 ]
       (
-      Variable [ Name=$e ]
-       AS e
-      Variable [ Name=$sig_sponsorship_count ]
-       AS sig_sponsorship_count
-      Variable [ Name=$es ]
-       AS es
-      Variable [ Name=$event ]
-       AS event
-      Variable [ Name=$sponsor ]
-       AS sponsor
-      Variable [ Name=$sig_name ]
-       AS sig_name
-      Variable [ Name=#1 ]
-       AS #1
+        e:=Variable [ Name=$e ]
+        sig_sponsorship_count:=Variable [ Name=$sig_sponsorship_count ]
+        es:=Variable [ Name=$es ]
+        event:=Variable [ Name=$event ]
+        sponsor:=Variable [ Name=$sponsor ]
+        sig_name:=Variable [ Name=$sig_name ]
+        #1:=Variable [ Name=#1 ]
       )
 
   )

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/4.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/4.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/4.ast
index 1aad304..f7272c5 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/4.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/4.ast
@@ -11,8 +11,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [SIGroup]
   ]
-  AS
-  Variable [ Name=$sig ]
+  AS Variable [ Name=$sig ]
 ]
 Let Variable [ Name=$similar_sigs ]
   :=
@@ -32,8 +31,7 @@ Let Variable [ Name=$similar_sigs ]
     FROM [      FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [SIGroup]
       ]
-      AS
-      Variable [ Name=$similar_sig ]
+      AS Variable [ Name=$similar_sig ]
     ]
     Where
       OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/5.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/5.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/5.ast
index dfb6f09..0fd42ae 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/5.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/5.ast
@@ -11,8 +11,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Event]
   ]
-  AS
-  Variable [ Name=$event ]
+  AS Variable [ Name=$event ]
 ]
 Let Variable [ Name=$collocated_events ]
   :=
@@ -32,8 +31,7 @@ Let Variable [ Name=$collocated_events ]
     FROM [      FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [Events]
       ]
-      AS
-      Variable [ Name=$collocated_event ]
+      AS Variable [ Name=$collocated_event ]
     ]
     Where
       OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/6.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/6.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/6.ast
index effebf2..0fb00ff 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/6.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/6.ast
@@ -19,8 +19,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Users]
   ]
-  AS
-  Variable [ Name=$user ]
+  AS Variable [ Name=$user ]
 ]
 Let Variable [ Name=$similar_users ]
   :=
@@ -45,8 +44,7 @@ Let Variable [ Name=$similar_users ]
     FROM [      FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [Users]
       ]
-      AS
-      Variable [ Name=$similar_user ]
+      AS Variable [ Name=$similar_user ]
     ]
     Let Variable [ Name=$similarity ]
       :=

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/ANYInFieldAccessor.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/ANYInFieldAccessor.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/ANYInFieldAccessor.ast
index 619350b..063e698 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/ANYInFieldAccessor.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/ANYInFieldAccessor.ast
@@ -22,14 +22,12 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [User]
   ]
-  AS
-  Variable [ Name=$user ]
+  AS Variable [ Name=$user ]
 ,
   FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Movie]
   ]
-  AS
-  Variable [ Name=$mv ]
+  AS Variable [ Name=$mv ]
 ]
 Where
   QuantifiedExpression SOME [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/IfInFLOWGR.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/IfInFLOWGR.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/IfInFLOWGR.ast
index a8b54c1..947c2d4 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/IfInFLOWGR.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/IfInFLOWGR.ast
@@ -19,14 +19,12 @@ FROM [  OrderedListConstructor [
     LiteralExpr [LONG] [30]
     LiteralExpr [LONG] [40]
   ]
-  AS
-  Variable [ Name=$i ]
+  AS Variable [ Name=$i ]
 ,
   UnorderedListConstructor [
     LiteralExpr [LONG] [4]
     LiteralExpr [LONG] [5]
     LiteralExpr [LONG] [6]
   ]
-  AS
-  Variable [ Name=$j ]
+  AS Variable [ Name=$j ]
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/LetFor.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/LetFor.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/LetFor.ast
index a46d1c9..68d47d8 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/LetFor.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/LetFor.ast
@@ -17,8 +17,7 @@ RecordConstructor [
 ]
 ]
 FROM [  Variable [ Name=$users ]
-  AS
-  Variable [ Name=$user ]
+  AS Variable [ Name=$user ]
 ]
 Where
   QuantifiedExpression SOME [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/ListConstructor.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/ListConstructor.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/ListConstructor.ast
index f769a0d..475cd07 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/ListConstructor.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/ListConstructor.ast
@@ -11,14 +11,12 @@ FROM [  OrderedListConstructor [
     LiteralExpr [LONG] [2]
     LiteralExpr [LONG] [3]
   ]
-  AS
-  Variable [ Name=$i ]
+  AS Variable [ Name=$i ]
 ,
   UnorderedListConstructor [
     LiteralExpr [LONG] [4]
     LiteralExpr [LONG] [5]
     LiteralExpr [LONG] [6]
   ]
-  AS
-  Variable [ Name=$j ]
+  AS Variable [ Name=$j ]
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias.ast
index cb03fe8..62b84d8 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias.ast
@@ -6,8 +6,7 @@ root
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [tbl_name]
   ]
-  AS
-  Variable [ Name=$t ]
+  AS Variable [ Name=$t ]
 ]
 Groupby
   Variable [ Name=#1 ]
@@ -25,11 +24,9 @@ Groupby
       ]
     ]
   ]
-  GROUP AS
-  Variable [ Name=#2 ]
+  GROUP AS Variable [ Name=#2 ]
   (
-  Variable [ Name=$t ]
-   AS t
+    t:=Variable [ Name=$t ]
   )
 
 Let Variable [ Name=$u ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias2.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias2.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias2.ast
index 6142478..c82e1da 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias2.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias2.ast
@@ -22,8 +22,7 @@ root
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [tbl_name]
   ]
-  AS
-  Variable [ Name=$root ]
+  AS Variable [ Name=$root ]
 ]
 Groupby
   Variable [ Name=#1 ]
@@ -32,11 +31,9 @@ Groupby
     Variable [ Name=$root ]
     Field=id
   ]
-  GROUP AS
-  Variable [ Name=#2 ]
+  GROUP AS Variable [ Name=#2 ]
   (
-  Variable [ Name=$root ]
-   AS root
+    root:=Variable [ Name=$root ]
   )
 
 Let Variable [ Name=$u ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias3.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias3.ast
index a7ae7ca..fd269aa 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias3.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias3.ast
@@ -11,8 +11,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [tbl_name]
   ]
-  AS
-  Variable [ Name=$t ]
+  AS Variable [ Name=$t ]
 ]
 Groupby
   Variable [ Name=#1 ]
@@ -30,11 +29,9 @@ Groupby
       ]
     ]
   ]
-  GROUP AS
-  Variable [ Name=#2 ]
+  GROUP AS Variable [ Name=#2 ]
   (
-  Variable [ Name=$t ]
-   AS t
+    t:=Variable [ Name=$t ]
   )
 
 Let Variable [ Name=$u ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_collection_array.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_collection_array.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_collection_array.ast
index 43c56e7..84a0a8a 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_collection_array.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_collection_array.ast
@@ -7,6 +7,5 @@ FROM [  OrderedListConstructor [
     LiteralExpr [LONG] [20]
     LiteralExpr [LONG] [30]
   ]
-  AS
-  Variable [ Name=$x ]
+  AS Variable [ Name=$x ]
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_collection_bag.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_collection_bag.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_collection_bag.ast
index 79cb01d..c1923cd 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_collection_bag.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_collection_bag.ast
@@ -7,6 +7,5 @@ FROM [  UnorderedListConstructor [
     LiteralExpr [LONG] [20]
     LiteralExpr [LONG] [30]
   ]
-  AS
-  Variable [ Name=$x ]
+  AS Variable [ Name=$x ]
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_inner_correlate.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_inner_correlate.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_inner_correlate.ast
index 701d997..26a623b 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_inner_correlate.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_inner_correlate.ast
@@ -6,13 +6,11 @@ Variable [ Name=$r ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [sensors]
   ]
-  AS
-  Variable [ Name=$s ]
+  AS Variable [ Name=$s ]
   INNER UNNEST
     FieldAccessor [
       Variable [ Name=$s ]
       Field=readings
     ]
-     AS
-    Variable [ Name=$r ]
+     AS Variable [ Name=$r ]
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_inner_flatten.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_inner_flatten.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_inner_flatten.ast
index f3c8a42..5f5e37f 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_inner_flatten.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_inner_flatten.ast
@@ -12,13 +12,11 @@ reading
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [sensors]
   ]
-  AS
-  Variable [ Name=$s ]
+  AS Variable [ Name=$s ]
 ,
   FieldAccessor [
     Variable [ Name=$s ]
     Field=readings
   ]
-  AS
-  Variable [ Name=$r ]
+  AS Variable [ Name=$r ]
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_inner_join.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_inner_join.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_inner_join.ast
index d82b43d..9d28bd0 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_inner_join.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_inner_join.ast
@@ -20,14 +20,12 @@ location
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [sensors]
   ]
-  AS
-  Variable [ Name=$s ]
+  AS Variable [ Name=$s ]
   INNER JOIN
     FunctionCall Metadata.dataset@1[
       LiteralExpr [STRING] [sensorMeta]
     ]
-    AS
-    Variable [ Name=$m ]
+    AS Variable [ Name=$m ]
     ON
     OperatorExpr [
       FieldAccessor [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_left_correlate.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_left_correlate.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_left_correlate.ast
index f11ecaf..5098fbd 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_left_correlate.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_left_correlate.ast
@@ -61,8 +61,7 @@ FROM [  UnorderedListConstructor [
       )
     ]
   ]
-  AS
-  Variable [ Name=$sl ]
+  AS Variable [ Name=$sl ]
   LEFTOUTER UNNEST
     UnorderedListConstructor [
       RecordConstructor [
@@ -140,8 +139,7 @@ FROM [  UnorderedListConstructor [
         )
       ]
     ]
-     AS
-    Variable [ Name=$sr ]
+     AS Variable [ Name=$sr ]
 ]
 Where
   OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_left_correlate2.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_left_correlate2.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_left_correlate2.ast
index 6036b55..c8d695a 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_left_correlate2.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_left_correlate2.ast
@@ -47,13 +47,11 @@ FROM [  UnorderedListConstructor [
       )
     ]
   ]
-  AS
-  Variable [ Name=$s ]
+  AS Variable [ Name=$s ]
   LEFTOUTER UNNEST
     FieldAccessor [
       Variable [ Name=$s ]
       Field=readings
     ]
-     AS
-    Variable [ Name=$r ]
+     AS Variable [ Name=$r ]
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_left_outer_join.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_left_outer_join.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_left_outer_join.ast
index 998fc6f..cb25a66 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_left_outer_join.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_left_outer_join.ast
@@ -61,8 +61,7 @@ FROM [  UnorderedListConstructor [
       )
     ]
   ]
-  AS
-  Variable [ Name=$sl ]
+  AS Variable [ Name=$sl ]
   LEFTOUTER JOIN
     UnorderedListConstructor [
       RecordConstructor [
@@ -140,8 +139,7 @@ FROM [  UnorderedListConstructor [
         )
       ]
     ]
-    AS
-    Variable [ Name=$sr ]
+    AS Variable [ Name=$sr ]
     ON
     OperatorExpr [
       FieldAccessor [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_where_select_clause.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_where_select_clause.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_where_select_clause.ast
index b978b56..3f4caf6 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_where_select_clause.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_where_select_clause.ast
@@ -9,8 +9,7 @@ FROM [  OrderedListConstructor [
     LiteralExpr [LONG] [10]
     LiteralExpr [LONG] [10]
   ]
-  AS
-  Variable [ Name=$x ]
+  AS Variable [ Name=$x ]
 ]
 Where
   OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/functionDecl1.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/functionDecl1.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/functionDecl1.ast
index 5983067..435d2f0 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/functionDecl1.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/functionDecl1.ast
@@ -20,15 +20,13 @@ FunctionDecl calculate([$events]) {
     ]
     ]
     FROM [      Variable [ Name=$events ]
-      AS
-      Variable [ Name=$event ]
+      AS Variable [ Name=$event ]
 ,
       FieldAccessor [
         Variable [ Name=$event ]
         Field=sponsoring_sigs
       ]
-      AS
-      Variable [ Name=$sponsor ]
+      AS Variable [ Name=$sponsor ]
     ]
     Let Variable [ Name=$es ]
       :=
@@ -77,8 +75,7 @@ FunctionDecl calculate([$events]) {
         ]
         ]
         FROM [          Variable [ Name=$es ]
-          AS
-          Variable [ Name=$e ]
+          AS Variable [ Name=$e ]
         ]
         Groupby
           Variable [ Name=$chapter_name ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/groupby_clause_count.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/groupby_clause_count.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/groupby_clause_count.ast
index feeed6e..584c736 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/groupby_clause_count.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/groupby_clause_count.ast
@@ -9,8 +9,7 @@ FunctionCall null.count@1[
     ]
     ]
     FROM [      Variable [ Name=#1 ]
-      AS
-      Variable [ Name=#2 ]
+      AS Variable [ Name=#2 ]
     ]
   )
 ]
@@ -89,8 +88,7 @@ FROM [  UnorderedListConstructor [
       )
     ]
   ]
-  AS
-  Variable [ Name=$r ]
+  AS Variable [ Name=$r ]
 ]
 Groupby
   Variable [ Name=$g ]
@@ -99,10 +97,8 @@ Groupby
     Variable [ Name=$r ]
     Field=gas
   ]
-  GROUP AS
-  Variable [ Name=#1 ]
+  GROUP AS Variable [ Name=#1 ]
   (
-  Variable [ Name=$r ]
-   AS r
+    r:=Variable [ Name=$r ]
   )
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR.ast
index da4a74f..2f246e1 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR.ast
@@ -21,8 +21,7 @@ FROM [  (
     Variable [ Name=$data ]
     ]
   )
-  AS
-  Variable [ Name=$user ]
+  AS Variable [ Name=$user ]
 ]
 Where
   QuantifiedExpression SOME [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR1.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR1.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR1.ast
index ea08249..2af8be1 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR1.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR1.ast
@@ -16,8 +16,7 @@ SELECT ELEMENT [
       Else:
         Variable [ Name=$j ]
     ]
-    AS
-    Variable [ Name=$k ]
+    AS Variable [ Name=$k ]
   ]
   Where
     OperatorExpr [
@@ -33,14 +32,12 @@ FROM [  OrderedListConstructor [
     LiteralExpr [LONG] [30]
     LiteralExpr [LONG] [40]
   ]
-  AS
-  Variable [ Name=$i ]
+  AS Variable [ Name=$i ]
 ,
   UnorderedListConstructor [
     LiteralExpr [LONG] [4]
     LiteralExpr [LONG] [5]
     LiteralExpr [LONG] [6]
   ]
-  AS
-  Variable [ Name=$j ]
+  AS Variable [ Name=$j ]
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR2.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR2.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR2.ast
index 84e2550..5e5ac9a 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR2.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR2.ast
@@ -16,8 +16,7 @@ SELECT ELEMENT [
       Else:
         Variable [ Name=$j ]
     ]
-    AS
-    Variable [ Name=$k ]
+    AS Variable [ Name=$k ]
   ]
   Where
     OperatorExpr [
@@ -38,19 +37,16 @@ FROM [  OrderedListConstructor [
       FROM [        FunctionCall Metadata.dataset@1[
           LiteralExpr [STRING] [number]
         ]
-        AS
-        Variable [ Name=$tmp ]
+        AS Variable [ Name=$tmp ]
       ]
     )
   ]
-  AS
-  Variable [ Name=$i ]
+  AS Variable [ Name=$i ]
 ,
   UnorderedListConstructor [
     LiteralExpr [LONG] [4]
     LiteralExpr [LONG] [5]
     LiteralExpr [LONG] [6]
   ]
-  AS
-  Variable [ Name=$j ]
+  AS Variable [ Name=$j ]
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR3.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR3.ast
index a636e0d..b43aca8 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR3.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR3.ast
@@ -21,15 +21,13 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Event]
   ]
-  AS
-  Variable [ Name=$event ]
+  AS Variable [ Name=$event ]
 ,
   FieldAccessor [
     Variable [ Name=$event ]
     Field=sponsoring_sigs
   ]
-  AS
-  Variable [ Name=$sponsor ]
+  AS Variable [ Name=$sponsor ]
 ]
 Let Variable [ Name=$es ]
   :=
@@ -52,15 +50,11 @@ Groupby
     Variable [ Name=$sponsor ]
     Field=sig_name
   ]
-  GROUP AS
-  Variable [ Name=#1 ]
+  GROUP AS Variable [ Name=#1 ]
   (
-  Variable [ Name=$es ]
-   AS es
-  Variable [ Name=$sponsor ]
-   AS sponsor
-  Variable [ Name=$event ]
-   AS event
+    es:=Variable [ Name=$es ]
+    sponsor:=Variable [ Name=$sponsor ]
+    event:=Variable [ Name=$event ]
   )
 
 Let Variable [ Name=$sig_sponsorship_count ]
@@ -74,8 +68,7 @@ Let Variable [ Name=$sig_sponsorship_count ]
       ]
       ]
       FROM [        Variable [ Name=#1 ]
-        AS
-        Variable [ Name=#2 ]
+        AS Variable [ Name=#2 ]
       ]
     )
   ]
@@ -101,8 +94,7 @@ Let Variable [ Name=$by_chapter ]
             ]
             ]
             FROM [              Variable [ Name=#1 ]
-              AS
-              Variable [ Name=#3 ]
+              AS Variable [ Name=#3 ]
             ]
           )
         ]
@@ -110,8 +102,7 @@ Let Variable [ Name=$by_chapter ]
     ]
     ]
     FROM [      Variable [ Name=$es ]
-      AS
-      Variable [ Name=$e ]
+      AS Variable [ Name=$e ]
     ]
     Groupby
       Variable [ Name=$chapter_name ]
@@ -123,23 +114,15 @@ Let Variable [ Name=$by_chapter ]
         ]
         Field=chapter_name
       ]
-      GROUP AS
-      Variable [ Name=#4 ]
+      GROUP AS Variable [ Name=#4 ]
       (
-      Variable [ Name=$e ]
-       AS e
-      Variable [ Name=$sig_sponsorship_count ]
-       AS sig_sponsorship_count
-      Variable [ Name=$es ]
-       AS es
-      Variable [ Name=$event ]
-       AS event
-      Variable [ Name=$sponsor ]
-       AS sponsor
-      Variable [ Name=$sig_name ]
-       AS sig_name
-      Variable [ Name=#1 ]
-       AS #1
+        e:=Variable [ Name=$e ]
+        sig_sponsorship_count:=Variable [ Name=$sig_sponsorship_count ]
+        es:=Variable [ Name=$es ]
+        event:=Variable [ Name=$event ]
+        sponsor:=Variable [ Name=$sponsor ]
+        sig_name:=Variable [ Name=$sig_name ]
+        #1:=Variable [ Name=#1 ]
       )
 
   )

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFor.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFor.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFor.ast
index d94617e..da1252e 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFor.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFor.ast
@@ -22,14 +22,12 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [User]
   ]
-  AS
-  Variable [ Name=$user ]
+  AS Variable [ Name=$user ]
 ,
   FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Movie]
   ]
-  AS
-  Variable [ Name=$mv ]
+  AS Variable [ Name=$mv ]
 ]
 Where
   QuantifiedExpression SOME [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/numberInFieldAccessor.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/numberInFieldAccessor.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/numberInFieldAccessor.ast
index c9ad9d6..ef6707f 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/numberInFieldAccessor.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/numberInFieldAccessor.ast
@@ -22,14 +22,12 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [User]
   ]
-  AS
-  Variable [ Name=$user ]
+  AS Variable [ Name=$user ]
 ,
   FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Movie]
   ]
-  AS
-  Variable [ Name=$mv ]
+  AS Variable [ Name=$mv ]
 ]
 Where
   QuantifiedExpression SOME [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/select_clause_sugar.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/select_clause_sugar.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/select_clause_sugar.ast
index 3049374..f985205 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/select_clause_sugar.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/select_clause_sugar.ast
@@ -10,8 +10,7 @@ FROM [  OrderedListConstructor [
     LiteralExpr [LONG] [10]
     LiteralExpr [LONG] [10]
   ]
-  AS
-  Variable [ Name=$x ]
+  AS Variable [ Name=$x ]
 ]
 Where
   OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/select_from_where_sugar.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/select_from_where_sugar.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/select_from_where_sugar.ast
index b978b56..3f4caf6 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/select_from_where_sugar.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/select_from_where_sugar.ast
@@ -9,8 +9,7 @@ FROM [  OrderedListConstructor [
     LiteralExpr [LONG] [10]
     LiteralExpr [LONG] [10]
   ]
-  AS
-  Variable [ Name=$x ]
+  AS Variable [ Name=$x ]
 ]
 Where
   OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/union.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/union.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/union.ast
index fdc8591..0b0ec68 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/union.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/union.ast
@@ -4,8 +4,7 @@ Variable [ Name=$l ]
 ]
 FROM [  FunctionCall null.foo1@0[
   ]
-  AS
-  Variable [ Name=$l ]
+  AS Variable [ Name=$l ]
 ]
 UNION ALL 
   SELECT ELEMENT [
@@ -13,8 +12,7 @@ UNION ALL
   ]
   FROM [    FunctionCall null.foo2@0[
     ]
-    AS
-    Variable [ Name=$l ]
+    AS Variable [ Name=$l ]
   ]
 UNION ALL 
   SELECT ELEMENT [
@@ -22,6 +20,5 @@ UNION ALL
   ]
   FROM [    FunctionCall null.foo3@0[
     ]
-    AS
-    Variable [ Name=$l ]
+    AS Variable [ Name=$l ]
   ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/where_clause.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/where_clause.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/where_clause.ast
index 7a32a1f..4ada26d 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/where_clause.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/where_clause.ast
@@ -9,8 +9,7 @@ FieldAccessor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [sensors]
   ]
-  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/aggregate-sql/agg_null_rec/agg_null_rec.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_null_rec/agg_null_rec.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_null_rec/agg_null_rec.3.ast
index 3c4f5f4..89d8623 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_null_rec/agg_null_rec.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_null_rec/agg_null_rec.3.ast
@@ -15,8 +15,7 @@ RecordConstructor [
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [Test]
           ]
-          AS
-          Variable [ Name=$t ]
+          AS Variable [ Name=$t ]
         ]
       )
     ]
@@ -35,8 +34,7 @@ RecordConstructor [
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [Test]
           ]
-          AS
-          Variable [ Name=$t ]
+          AS Variable [ Name=$t ]
         ]
       )
     ]
@@ -55,8 +53,7 @@ RecordConstructor [
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [Test]
           ]
-          AS
-          Variable [ Name=$t ]
+          AS Variable [ Name=$t ]
         ]
       )
     ]
@@ -75,8 +72,7 @@ RecordConstructor [
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [Test]
           ]
-          AS
-          Variable [ Name=$t ]
+          AS Variable [ Name=$t ]
         ]
       )
     ]
@@ -95,8 +91,7 @@ RecordConstructor [
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [Test]
           ]
-          AS
-          Variable [ Name=$t ]
+          AS 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/aggregate-sql/agg_null_rec_1/agg_null_rec_1.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_null_rec_1/agg_null_rec_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_null_rec_1/agg_null_rec_1.3.ast
index 5a12496..61d7014 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_null_rec_1/agg_null_rec_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_null_rec_1/agg_null_rec_1.3.ast
@@ -12,8 +12,7 @@ RecordConstructor [
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [Test]
           ]
-          AS
-          Variable [ Name=$t ]
+          AS Variable [ Name=$t ]
         ]
       )
     ]
@@ -36,12 +35,10 @@ RecordConstructor [
             FROM [              FunctionCall Metadata.dataset@1[
                 LiteralExpr [STRING] [Test]
               ]
-              AS
-              Variable [ Name=$t ]
+              AS Variable [ Name=$t ]
             ]
           )
-          AS
-          Variable [ Name=$i ]
+          AS Variable [ Name=$i ]
         ]
       )
     ]
@@ -64,12 +61,10 @@ RecordConstructor [
             FROM [              FunctionCall Metadata.dataset@1[
                 LiteralExpr [STRING] [Test]
               ]
-              AS
-              Variable [ Name=$t ]
+              AS Variable [ Name=$t ]
             ]
           )
-          AS
-          Variable [ Name=$i ]
+          AS Variable [ Name=$i ]
         ]
       )
     ]
@@ -92,12 +87,10 @@ RecordConstructor [
             FROM [              FunctionCall Metadata.dataset@1[
                 LiteralExpr [STRING] [Test]
               ]
-              AS
-              Variable [ Name=$t ]
+              AS Variable [ Name=$t ]
             ]
           )
-          AS
-          Variable [ Name=$i ]
+          AS Variable [ Name=$i ]
         ]
       )
     ]
@@ -120,12 +113,10 @@ RecordConstructor [
             FROM [              FunctionCall Metadata.dataset@1[
                 LiteralExpr [STRING] [Test]
               ]
-              AS
-              Variable [ Name=$t ]
+              AS Variable [ Name=$t ]
             ]
           )
-          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/aggregate-sql/agg_number_rec/agg_number_rec.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_number_rec/agg_number_rec.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_number_rec/agg_number_rec.3.ast
index 3c4f5f4..89d8623 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_number_rec/agg_number_rec.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_number_rec/agg_number_rec.3.ast
@@ -15,8 +15,7 @@ RecordConstructor [
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [Test]
           ]
-          AS
-          Variable [ Name=$t ]
+          AS Variable [ Name=$t ]
         ]
       )
     ]
@@ -35,8 +34,7 @@ RecordConstructor [
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [Test]
           ]
-          AS
-          Variable [ Name=$t ]
+          AS Variable [ Name=$t ]
         ]
       )
     ]
@@ -55,8 +53,7 @@ RecordConstructor [
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [Test]
           ]
-          AS
-          Variable [ Name=$t ]
+          AS Variable [ Name=$t ]
         ]
       )
     ]
@@ -75,8 +72,7 @@ RecordConstructor [
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [Test]
           ]
-          AS
-          Variable [ Name=$t ]
+          AS Variable [ Name=$t ]
         ]
       )
     ]
@@ -95,8 +91,7 @@ RecordConstructor [
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [Test]
           ]
-          AS
-          Variable [ Name=$t ]
+          AS 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/aggregate-sql/avg_double/avg_double.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_double/avg_double.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_double/avg_double.3.ast
index 772844d..f369b18 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_double/avg_double.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_double/avg_double.3.ast
@@ -12,8 +12,7 @@ FunctionCall null.sql-avg@1[
           LiteralExpr [STRING] [3.0]
         ]
       ]
-      AS
-      Variable [ Name=$x ]
+      AS 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/aggregate-sql/avg_double_null/avg_double_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_double_null/avg_double_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_double_null/avg_double_null.3.ast
index ddec4ab..83cf6ef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_double_null/avg_double_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_double_null/avg_double_null.3.ast
@@ -15,8 +15,7 @@ RecordConstructor [
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [Numeric]
           ]
-          AS
-          Variable [ Name=$x ]
+          AS 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/aggregate-sql/avg_empty_01/avg_empty_01.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.3.ast
index c142f72..c8a2795 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.3.ast
@@ -11,8 +11,7 @@ FunctionCall test.sql-avg@1[
         LiteralExpr [LONG] [2]
         LiteralExpr [LONG] [3]
       ]
-      AS
-      Variable [ Name=$x ]
+      AS Variable [ Name=$x ]
     ]
     Where
       OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.3.ast
index 21b366e..2f96b47 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.3.ast
@@ -12,8 +12,7 @@ FunctionCall test.sql-avg@1[
     FROM [      FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [Test]
       ]
-      AS
-      Variable [ Name=$x ]
+      AS 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/aggregate-sql/avg_float/avg_float.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_float/avg_float.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_float/avg_float.3.ast
index b7ac2aa..a9f805f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_float/avg_float.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_float/avg_float.3.ast
@@ -17,8 +17,7 @@ FunctionCall test.sql-avg@1[
           LiteralExpr [STRING] [3]
         ]
       ]
-      AS
-      Variable [ Name=$x ]
+      AS 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/aggregate-sql/avg_float_null/avg_float_nu.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_float_null/avg_float_nu.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_float_null/avg_float_nu.3.ast
index 68c122f..bf526f8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_float_null/avg_float_nu.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_float_null/avg_float_nu.3.ast
@@ -15,8 +15,7 @@ RecordConstructor [
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [Numeric]
           ]
-          AS
-          Variable [ Name=$x ]
+          AS 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/aggregate-sql/avg_int16/avg_int16.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int16/avg_int16.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int16/avg_int16.3.ast
index 9a37e98..9d6f304 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int16/avg_int16.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int16/avg_int16.3.ast
@@ -17,8 +17,7 @@ FunctionCall test.sql-avg@1[
           LiteralExpr [STRING] [3]
         ]
       ]
-      AS
-      Variable [ Name=$x ]
+      AS 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/aggregate-sql/avg_int16_null/avg_int16_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int16_null/avg_int16_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int16_null/avg_int16_null.3.ast
index 1c48f72..7fe4c90 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int16_null/avg_int16_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int16_null/avg_int16_null.3.ast
@@ -15,8 +15,7 @@ RecordConstructor [
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [Numeric]
           ]
-          AS
-          Variable [ Name=$x ]
+          AS 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/aggregate-sql/avg_int32/avg_int32.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int32/avg_int32.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int32/avg_int32.3.ast
index a9e95b9..6f0431d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int32/avg_int32.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int32/avg_int32.3.ast
@@ -17,8 +17,7 @@ FunctionCall test.sql-avg@1[
           LiteralExpr [STRING] [3]
         ]
       ]
-      AS
-      Variable [ Name=$x ]
+      AS 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/aggregate-sql/avg_int32_null/avg_int32_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int32_null/avg_int32_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int32_null/avg_int32_null.3.ast
index 57e755c..114973d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int32_null/avg_int32_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int32_null/avg_int32_null.3.ast
@@ -15,8 +15,7 @@ RecordConstructor [
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [Numeric]
           ]
-          AS
-          Variable [ Name=$x ]
+          AS 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/aggregate-sql/avg_int64/avg_int64.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int64/avg_int64.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int64/avg_int64.3.ast
index bba67d1..dc8d43c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int64/avg_int64.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int64/avg_int64.3.ast
@@ -17,8 +17,7 @@ FunctionCall test.sql-avg@1[
           LiteralExpr [STRING] [3]
         ]
       ]
-      AS
-      Variable [ Name=$x ]
+      AS 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/aggregate-sql/avg_int64_null/avg_int64_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int64_null/avg_int64_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int64_null/avg_int64_null.3.ast
index a622e36..4edcfa4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int64_null/avg_int64_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int64_null/avg_int64_null.3.ast
@@ -15,8 +15,7 @@ RecordConstructor [
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [Numeric]
           ]
-          AS
-          Variable [ Name=$x ]
+          AS 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/aggregate-sql/avg_int8/avg_int8.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int8/avg_int8.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int8/avg_int8.3.ast
index e80871c..122ead6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int8/avg_int8.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int8/avg_int8.3.ast
@@ -17,8 +17,7 @@ FunctionCall test.sql-avg@1[
           LiteralExpr [STRING] [3]
         ]
       ]
-      AS
-      Variable [ Name=$x ]
+      AS 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/aggregate-sql/avg_int8_null/avg_int8_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int8_null/avg_int8_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int8_null/avg_int8_null.3.ast
index d0e1a63..6a7beba 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int8_null/avg_int8_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int8_null/avg_int8_null.3.ast
@@ -15,8 +15,7 @@ RecordConstructor [
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [Numeric]
           ]
-          AS
-          Variable [ Name=$x ]
+          AS 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/aggregate-sql/avg_mixed/avg_mixed.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_mixed/avg_mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_mixed/avg_mixed.3.ast
index 2d5c692..27e8113 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_mixed/avg_mixed.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_mixed/avg_mixed.3.ast
@@ -15,8 +15,7 @@ FunctionCall null.sql-avg@1[
           LiteralExpr [STRING] [2013-01-01]
         ]
       ]
-      AS
-      Variable [ Name=$x ]
+      AS 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/aggregate-sql/count_01/count_01.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_01/count_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_01/count_01.3.ast
index 13dd2e2..603ea9b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_01/count_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_01/count_01.3.ast
@@ -11,8 +11,7 @@ FunctionCall test.sql-count@1[
         LiteralExpr [LONG] [2]
         LiteralExpr [LONG] [3]
       ]
-      AS
-      Variable [ Name=$x ]
+      AS 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/aggregate-sql/count_empty_01/count_empty_01.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_empty_01/count_empty_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_empty_01/count_empty_01.3.ast
index a83ec17..6482820 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_empty_01/count_empty_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_empty_01/count_empty_01.3.ast
@@ -10,8 +10,7 @@ FunctionCall null.sql-count@1[
         LiteralExpr [LONG] [2]
         LiteralExpr [LONG] [3]
       ]
-      AS
-      Variable [ Name=$x ]
+      AS Variable [ Name=$x ]
     ]
     Where
       OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_empty_02/count_empty_02.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_empty_02/count_empty_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_empty_02/count_empty_02.3.ast
index 36a38a9..e4fb920 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_empty_02/count_empty_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_empty_02/count_empty_02.3.ast
@@ -12,8 +12,7 @@ FunctionCall test.sql-count@1[
     FROM [      FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [Test]
       ]
-      AS
-      Variable [ Name=$x ]
+      AS 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/aggregate-sql/count_null/count_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_null/count_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_null/count_null.3.ast
index 6c274cf..3990ca7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_null/count_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_null/count_null.3.ast
@@ -15,8 +15,7 @@ RecordConstructor [
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [Numeric]
           ]
-          AS
-          Variable [ Name=$x ]
+          AS 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/aggregate-sql/issue395/issue395.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue395/issue395.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue395/issue395.3.ast
index cbd0a79..4d546cf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue395/issue395.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue395/issue395.3.ast
@@ -12,8 +12,7 @@ FunctionCall test.sql-count@1[
     FROM [      FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [Employee]
       ]
-      AS
-      Variable [ Name=$l ]
+      AS 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/aggregate-sql/issue531_string_min_max/issue531_string_min_max.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue531_string_min_max/issue531_string_min_max.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue531_string_min_max/issue531_string_min_max.3.ast
index 6ffb156..29240da 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue531_string_min_max/issue531_string_min_max.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue531_string_min_max/issue531_string_min_max.3.ast
@@ -16,8 +16,7 @@ RecordConstructor [
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [t1]
           ]
-          AS
-          Variable [ Name=$l ]
+          AS Variable [ Name=$l ]
         ]
       )
     ]
@@ -36,8 +35,7 @@ RecordConstructor [
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [t1]
           ]
-          AS
-          Variable [ Name=$l ]
+          AS 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/aggregate-sql/max_empty_01/max_empty_01.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/max_empty_01/max_empty_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/max_empty_01/max_empty_01.3.ast
index 9f66425..d3c89c9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/max_empty_01/max_empty_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/max_empty_01/max_empty_01.3.ast
@@ -11,8 +11,7 @@ FunctionCall test.sql-max@1[
         LiteralExpr [LONG] [2]
         LiteralExpr [LONG] [3]
       ]
-      AS
-      Variable [ Name=$x ]
+      AS Variable [ Name=$x ]
     ]
     Where
       OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/max_empty_02/max_empty_02.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/max_empty_02/max_empty_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/max_empty_02/max_empty_02.3.ast
index 85912ef..d7bf8ab 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/max_empty_02/max_empty_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/max_empty_02/max_empty_02.3.ast
@@ -12,8 +12,7 @@ FunctionCall test.sql-max@1[
     FROM [      FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [Test]
       ]
-      AS
-      Variable [ Name=$x ]
+      AS 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/aggregate-sql/min_empty_01/min_empty_01.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/min_empty_01/min_empty_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/min_empty_01/min_empty_01.3.ast
index b62f1d5..825bbf4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/min_empty_01/min_empty_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/min_empty_01/min_empty_01.3.ast
@@ -11,8 +11,7 @@ FunctionCall test.sql-min@1[
         LiteralExpr [LONG] [2]
         LiteralExpr [LONG] [3]
       ]
-      AS
-      Variable [ Name=$x ]
+      AS Variable [ Name=$x ]
     ]
     Where
       OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/min_empty_02/min_empty_02.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/min_empty_02/min_empty_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/min_empty_02/min_empty_02.3.ast
index 6aecde0..799e5e1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/min_empty_02/min_empty_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/min_empty_02/min_empty_02.3.ast
@@ -12,8 +12,7 @@ FunctionCall test.sql-min@1[
     FROM [      FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [Test]
       ]
-      AS
-      Variable [ Name=$x ]
+      AS 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/aggregate-sql/min_mixed/min_mixed.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/min_mixed/min_mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/min_mixed/min_mixed.3.ast
index d92bce5..0bbf1c4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/min_mixed/min_mixed.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/min_mixed/min_mixed.3.ast
@@ -15,8 +15,7 @@ FunctionCall null.sql-min@1[
           LiteralExpr [STRING] [2013-01-01]
         ]
       ]
-      AS
-      Variable [ Name=$x ]
+      AS 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/aggregate-sql/query-issue400/query-issue400.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/query-issue400/query-issue400.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/query-issue400/query-issue400.3.ast
index 008601e..bc444a9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/query-issue400/query-issue400.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/query-issue400/query-issue400.3.ast
@@ -19,8 +19,7 @@ FunctionCall null.sql-count@1[
           LiteralExpr [LONG] [9]
         ]
       ]
-      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/aggregate-sql/scalar_avg/scalar_avg.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_avg/scalar_avg.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_avg/scalar_avg.3.ast
index 3f3652f..c8b53ac 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_avg/scalar_avg.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_avg/scalar_avg.3.ast
@@ -101,6 +101,5 @@ FROM [  OrderedListConstructor [
     Variable [ Name=$f ]
     Variable [ Name=$d ]
   ]
-  AS
-  Variable [ Name=$i ]
+  AS Variable [ Name=$i ]
 ]



Mime
View raw message