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

[18/28] incubator-asterixdb git commit: ASTERIXDB-1383: reduce the number of lines for "AS".

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q03_shipping_priority.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q03_shipping_priority.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q03_shipping_priority.ast
index ed3f76e..2a34cb7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q03_shipping_priority.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q03_shipping_priority.ast
@@ -76,20 +76,17 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Customers]
   ]
-  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] [LineItems]
   ]
-  AS
-  Variable [ Name=$l ]
+  AS Variable [ Name=$l ]
 ]
 Where
   OperatorExpr [
@@ -167,15 +164,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 ]
@@ -200,8 +193,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/optimizerts/results_parser_sqlpp/q05_local_supplier_volume.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q05_local_supplier_volume.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q05_local_supplier_volume.ast
index 2b8e44b..f913928 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q05_local_supplier_volume.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q05_local_supplier_volume.ast
@@ -95,8 +95,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Customers]
   ]
-  AS
-  Variable [ Name=$c ]
+  AS Variable [ Name=$c ]
 ,
   (
     SELECT ELEMENT [
@@ -146,8 +145,7 @@ FROM [  FunctionCall Metadata.dataset@1[
     FROM [      FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [Orders]
       ]
-      AS
-      Variable [ Name=$o ]
+      AS Variable [ Name=$o ]
 ,
       (
         SELECT ELEMENT [
@@ -197,8 +195,7 @@ FROM [  FunctionCall Metadata.dataset@1[
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [LineItems]
           ]
-          AS
-          Variable [ Name=$l ]
+          AS Variable [ Name=$l ]
 ,
           (
             SELECT ELEMENT [
@@ -232,8 +229,7 @@ FROM [  FunctionCall Metadata.dataset@1[
             FROM [              FunctionCall Metadata.dataset@1[
                 LiteralExpr [STRING] [Suppliers]
               ]
-              AS
-              Variable [ Name=$s ]
+              AS Variable [ Name=$s ]
 ,
               (
                 SELECT ELEMENT [
@@ -259,14 +255,12 @@ FROM [  FunctionCall Metadata.dataset@1[
                 FROM [                  FunctionCall Metadata.dataset@1[
                     LiteralExpr [STRING] [Nations]
                   ]
-                  AS
-                  Variable [ Name=$n ]
+                  AS Variable [ Name=$n ]
 ,
                   FunctionCall Metadata.dataset@1[
                     LiteralExpr [STRING] [Regions]
                   ]
-                  AS
-                  Variable [ Name=$r ]
+                  AS Variable [ Name=$r ]
                 ]
                 Where
                   OperatorExpr [
@@ -292,8 +286,7 @@ FROM [  FunctionCall Metadata.dataset@1[
                     ]
                   ]
               )
-              AS
-              Variable [ Name=$n1 ]
+              AS Variable [ Name=$n1 ]
             ]
             Where
               OperatorExpr [
@@ -308,8 +301,7 @@ FROM [  FunctionCall Metadata.dataset@1[
                 ]
               ]
           )
-          AS
-          Variable [ Name=$s1 ]
+          AS Variable [ Name=$s1 ]
         ]
         Where
           OperatorExpr [
@@ -324,8 +316,7 @@ FROM [  FunctionCall Metadata.dataset@1[
             ]
           ]
       )
-      AS
-      Variable [ Name=$l1 ]
+      AS Variable [ Name=$l1 ]
     ]
     Where
       OperatorExpr [
@@ -360,8 +351,7 @@ FROM [  FunctionCall Metadata.dataset@1[
         ]
       ]
   )
-  AS
-  Variable [ Name=$o1 ]
+  AS Variable [ Name=$o1 ]
 ]
 Where
   OperatorExpr [
@@ -396,13 +386,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 ]
@@ -427,8 +414,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/optimizerts/results_parser_sqlpp/q08_group_by.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q08_group_by.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q08_group_by.ast
index 0045b3e..38a3add 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q08_group_by.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q08_group_by.ast
@@ -138,8 +138,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Supplier]
   ]
-  AS
-  Variable [ Name=$s ]
+  AS Variable [ Name=$s ]
 ,
   (
     SELECT ELEMENT [
@@ -226,8 +225,7 @@ FROM [  FunctionCall Metadata.dataset@1[
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [LineItem]
           ]
-          AS
-          Variable [ Name=$l ]
+          AS Variable [ Name=$l ]
 ,
           (
             SELECT ELEMENT [
@@ -253,8 +251,7 @@ FROM [  FunctionCall Metadata.dataset@1[
             FROM [              FunctionCall Metadata.dataset@1[
                 LiteralExpr [STRING] [Orders]
               ]
-              AS
-              Variable [ Name=$o ]
+              AS Variable [ Name=$o ]
 ,
               (
                 SELECT ELEMENT [
@@ -272,8 +269,7 @@ FROM [  FunctionCall Metadata.dataset@1[
                 FROM [                  FunctionCall Metadata.dataset@1[
                     LiteralExpr [STRING] [Customer]
                   ]
-                  AS
-                  Variable [ Name=$c ]
+                  AS Variable [ Name=$c ]
 ,
                   (
                     SELECT ELEMENT [
@@ -291,14 +287,12 @@ FROM [  FunctionCall Metadata.dataset@1[
                     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 [
@@ -324,8 +318,7 @@ FROM [  FunctionCall Metadata.dataset@1[
                         ]
                       ]
                   )
-                  AS
-                  Variable [ Name=$nr ]
+                  AS Variable [ Name=$nr ]
                 ]
                 Where
                   OperatorExpr [
@@ -340,8 +333,7 @@ FROM [  FunctionCall Metadata.dataset@1[
                     ]
                   ]
               )
-              AS
-              Variable [ Name=$nrc ]
+              AS Variable [ Name=$nrc ]
             ]
             Where
               OperatorExpr [
@@ -356,8 +348,7 @@ FROM [  FunctionCall Metadata.dataset@1[
                 ]
               ]
           )
-          AS
-          Variable [ Name=$nrco ]
+          AS Variable [ Name=$nrco ]
         ]
         Where
           OperatorExpr [
@@ -392,14 +383,12 @@ FROM [  FunctionCall Metadata.dataset@1[
             ]
           ]
       )
-      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 [
@@ -425,8 +414,7 @@ FROM [  FunctionCall Metadata.dataset@1[
         ]
       ]
   )
-  AS
-  Variable [ Name=$lnrcop ]
+  AS Variable [ Name=$lnrcop ]
 ]
 Where
   OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q09_group_by.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q09_group_by.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q09_group_by.ast
index 7e19e44..4c3349b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q09_group_by.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q09_group_by.ast
@@ -156,8 +156,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Part]
   ]
-  AS
-  Variable [ Name=$p ]
+  AS Variable [ Name=$p ]
 ,
   (
     SELECT ELEMENT [
@@ -223,8 +222,7 @@ FROM [  FunctionCall Metadata.dataset@1[
     FROM [      FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [Partsupp]
       ]
-      AS
-      Variable [ Name=$ps ]
+      AS Variable [ Name=$ps ]
 ,
       (
         SELECT ELEMENT [
@@ -311,14 +309,12 @@ FROM [  FunctionCall Metadata.dataset@1[
             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 [
@@ -333,14 +329,12 @@ FROM [  FunctionCall Metadata.dataset@1[
                 ]
               ]
           )
-          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 [
@@ -355,8 +349,7 @@ FROM [  FunctionCall Metadata.dataset@1[
             ]
           ]
       )
-      AS
-      Variable [ Name=$l1 ]
+      AS Variable [ Name=$l1 ]
     ]
     Where
       OperatorExpr [
@@ -385,8 +378,7 @@ FROM [  FunctionCall Metadata.dataset@1[
         ]
       ]
   )
-  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/q1.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q1.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q1.ast
index 9a32c3d..899be1a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q1.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q1.ast
@@ -41,8 +41,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/optimizerts/results_parser_sqlpp/q2.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q2.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q2.ast
index 6f4cf7a..6a4815e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q2.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q2.ast
@@ -54,15 +54,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 ]
   :=
@@ -85,15 +83,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 ]
@@ -107,8 +101,7 @@ Let Variable [ Name=$sig_sponsorship_count ]
       ]
       ]
       FROM [        Variable [ Name=#1 ]
-        AS
-        Variable [ Name=#2 ]
+        AS Variable [ Name=#2 ]
       ]
     )
   ]
@@ -134,8 +127,7 @@ Let Variable [ Name=$by_chapter ]
             ]
             ]
             FROM [              Variable [ Name=#3 ]
-              AS
-              Variable [ Name=#4 ]
+              AS Variable [ Name=#4 ]
             ]
           )
         ]
@@ -143,8 +135,7 @@ Let Variable [ Name=$by_chapter ]
     ]
     ]
     FROM [      Variable [ Name=$es ]
-      AS
-      Variable [ Name=$e ]
+      AS Variable [ Name=$e ]
     ]
     Groupby
       Variable [ Name=$chapter_name ]
@@ -156,23 +147,15 @@ Let Variable [ Name=$by_chapter ]
         ]
         Field=chapter_name
       ]
-      GROUP AS
-      Variable [ Name=#3 ]
+      GROUP AS Variable [ Name=#3 ]
       (
-      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/optimizerts/results_parser_sqlpp/query-issue550.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue550.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue550.ast
index 7cf52e9..f8988ad 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue550.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue550.ast
@@ -162,16 +162,14 @@ RecordConstructor [
       Variable [ Name=$srec ]
       ]
       FROM [        Variable [ Name=$s ]
-        AS
-        Variable [ Name=$srec ]
+        AS Variable [ Name=$srec ]
       ]
     )
   )
 ]
 ]
 FROM [  Variable [ Name=$sample ]
-  AS
-  Variable [ Name=$s ]
+  AS Variable [ Name=$s ]
 ]
 Groupby
   Variable [ Name=$u ]
@@ -180,12 +178,9 @@ Groupby
     Variable [ Name=$s ]
     Field=uid
   ]
-  GROUP AS
-  Variable [ Name=#1 ]
+  GROUP AS Variable [ Name=#1 ]
   (
-  Variable [ Name=$s ]
-   AS s
-  Variable [ Name=$sample ]
-   AS sample
+    s:=Variable [ Name=$s ]
+    sample:=Variable [ Name=$sample ]
   )
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue562.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue562.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue562.ast
index 65d7c96..4025ed0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue562.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue562.ast
@@ -74,8 +74,7 @@ FunctionDecl q22_customer_tmp([]) {
     ]
     ]
     FROM [      Variable [ Name=$Customer ]
-      AS
-      Variable [ Name=$c ]
+      AS Variable [ Name=$c ]
     ]
     Let Variable [ Name=$phone_substr ]
       :=
@@ -148,8 +147,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 ]
         :=
@@ -237,8 +235,7 @@ RecordConstructor [
         ]
         ]
         FROM [          Variable [ Name=#1 ]
-          AS
-          Variable [ Name=#2 ]
+          AS Variable [ Name=#2 ]
         ]
       )
     ]
@@ -255,8 +252,7 @@ RecordConstructor [
         ]
         ]
         FROM [          Variable [ Name=$ct ]
-          AS
-          Variable [ Name=$i ]
+          AS Variable [ Name=$i ]
         ]
       )
     ]
@@ -265,8 +261,7 @@ RecordConstructor [
 ]
 FROM [  FunctionCall tpch.q22_customer_tmp@0[
   ]
-  AS
-  Variable [ Name=$ct ]
+  AS Variable [ Name=$ct ]
 ]
 Where
   OperatorExpr [
@@ -278,8 +273,7 @@ Where
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [Orders]
           ]
-          AS
-          Variable [ Name=$o ]
+          AS Variable [ Name=$o ]
         ]
         Where
           OperatorExpr [
@@ -305,13 +299,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/optimizerts/results_parser_sqlpp/query-issue601.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue601.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue601.ast
index 92954c3..7a0ad61 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue601.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue601.ast
@@ -40,8 +40,7 @@ RecordConstructor [
         ]
         ]
         FROM [          Variable [ Name=#1 ]
-          AS
-          Variable [ Name=#2 ]
+          AS Variable [ Name=#2 ]
         ]
       )
     ]
@@ -51,8 +50,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [LineItem]
   ]
-  AS
-  Variable [ Name=$l ]
+  AS Variable [ Name=$l ]
 ]
 Groupby
   Variable [ Name=$l_linenumber ]
@@ -61,10 +59,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/optimizerts/results_parser_sqlpp/query-issue697.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue697.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue697.ast
index 6d9ed62..4826e62 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue697.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue697.ast
@@ -26,8 +26,7 @@ RecordConstructor [
         ]
         ]
         FROM [          Variable [ Name=$i ]
-          AS
-          Variable [ Name=$j ]
+          AS Variable [ Name=$j ]
         ]
         Where
           FunctionCall test.not@1[
@@ -46,8 +45,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [test]
   ]
-  AS
-  Variable [ Name=$i ]
+  AS Variable [ Name=$i ]
 ]
 Groupby
   Variable [ Name=$aid ]
@@ -56,10 +54,8 @@ Groupby
     Variable [ Name=$i ]
     Field=key1
   ]
-  GROUP AS
-  Variable [ Name=#1 ]
+  GROUP AS Variable [ Name=#1 ]
   (
-  Variable [ Name=$i ]
-   AS i
+    i:=Variable [ Name=$i ]
   )
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue785.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue785.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue785.ast
index b639cfa..31d5bbc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue785.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue785.ast
@@ -83,14 +83,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 [
@@ -128,20 +126,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 [
@@ -182,17 +177,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 ]
@@ -206,8 +196,7 @@ Let Variable [ Name=$X ]
           ]
           ]
           FROM [            Variable [ Name=$orders ]
-            AS
-            Variable [ Name=$o ]
+            AS Variable [ Name=$o ]
           ]
         )
       ]
@@ -244,8 +233,7 @@ RecordConstructor [
       ]
       ]
       FROM [        Variable [ Name=$x ]
-        AS
-        Variable [ Name=$y ]
+        AS Variable [ Name=$y ]
       ]
       Orderby
         FieldAccessor [
@@ -261,8 +249,7 @@ RecordConstructor [
 ]
 ]
 FROM [  Variable [ Name=$X ]
-  AS
-  Variable [ Name=$x ]
+  AS Variable [ Name=$x ]
 ]
 Groupby
   Variable [ Name=$nation_key ]
@@ -271,14 +258,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/optimizerts/results_parser_sqlpp/query-issue810-2.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue810-2.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue810-2.ast
index 743546b..ec8955d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue810-2.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue810-2.ast
@@ -66,8 +66,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [LineItem]
   ]
-  AS
-  Variable [ Name=$l ]
+  AS Variable [ Name=$l ]
 ]
 Where
   OperatorExpr [
@@ -91,11 +90,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 ]
@@ -108,8 +105,7 @@ Let Variable [ Name=$expensives ]
     ]
     ]
     FROM [      Variable [ Name=$l ]
-      AS
-      Variable [ Name=$i ]
+      AS Variable [ Name=$i ]
     ]
     Where
       OperatorExpr [
@@ -128,8 +124,7 @@ Let Variable [ Name=$cheaps ]
     Variable [ Name=$i ]
     ]
     FROM [      Variable [ Name=$l ]
-      AS
-      Variable [ Name=$i ]
+      AS Variable [ Name=$i ]
     ]
     Where
       OperatorExpr [
@@ -171,8 +166,7 @@ Let Variable [ Name=$charges ]
     ]
     ]
     FROM [      Variable [ Name=$l ]
-      AS
-      Variable [ Name=$i ]
+      AS Variable [ Name=$i ]
     ]
   )
 Let Variable [ Name=$disc_prices ]
@@ -196,8 +190,7 @@ Let Variable [ Name=$disc_prices ]
     ]
     ]
     FROM [      Variable [ Name=$l ]
-      AS
-      Variable [ Name=$i ]
+      AS Variable [ Name=$i ]
     ]
   )
 Orderby

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue810.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue810.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue810.ast
index c6e9030..04e6b63 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue810.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue810.ast
@@ -52,8 +52,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [LineItem]
   ]
-  AS
-  Variable [ Name=$l ]
+  AS Variable [ Name=$l ]
 ]
 Where
   OperatorExpr [
@@ -77,11 +76,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=$cheap ]
@@ -91,8 +88,7 @@ Let Variable [ Name=$cheap ]
     Variable [ Name=$m ]
     ]
     FROM [      Variable [ Name=$l ]
-      AS
-      Variable [ Name=$m ]
+      AS Variable [ Name=$m ]
     ]
     Where
       OperatorExpr [
@@ -111,8 +107,7 @@ Let Variable [ Name=$expensive ]
     Variable [ Name=$a ]
     ]
     FROM [      Variable [ Name=$l ]
-      AS
-      Variable [ Name=$a ]
+      AS Variable [ Name=$a ]
     ]
     Where
       OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue827-2.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue827-2.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue827-2.ast
index 6263b32..23e2076 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue827-2.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue827-2.ast
@@ -36,8 +36,7 @@ RecordConstructor [
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [LineItem]
           ]
-          AS
-          Variable [ Name=$i ]
+          AS Variable [ Name=$i ]
         ]
         Where
           OperatorExpr [
@@ -65,8 +64,7 @@ RecordConstructor [
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [LineItem]
           ]
-          AS
-          Variable [ Name=$i ]
+          AS Variable [ Name=$i ]
         ]
       )
     ]
@@ -96,8 +94,7 @@ RecordConstructor [
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [LineItem]
           ]
-          AS
-          Variable [ Name=$i ]
+          AS Variable [ Name=$i ]
         ]
       )
     ]
@@ -136,8 +133,7 @@ RecordConstructor [
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [LineItem]
           ]
-          AS
-          Variable [ Name=$i ]
+          AS Variable [ Name=$i ]
         ]
       )
     ]
@@ -156,8 +152,7 @@ RecordConstructor [
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [LineItem]
           ]
-          AS
-          Variable [ Name=$i ]
+          AS Variable [ Name=$i ]
         ]
         Where
           OperatorExpr [
@@ -185,8 +180,7 @@ RecordConstructor [
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [LineItem]
           ]
-          AS
-          Variable [ Name=$i ]
+          AS Variable [ Name=$i ]
         ]
       )
     ]
@@ -205,8 +199,7 @@ RecordConstructor [
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [LineItem]
           ]
-          AS
-          Variable [ Name=$i ]
+          AS Variable [ Name=$i ]
         ]
       )
     ]
@@ -222,8 +215,7 @@ RecordConstructor [
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [LineItem]
           ]
-          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/optimizerts/results_parser_sqlpp/query_issue849-2.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query_issue849-2.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query_issue849-2.ast
index 68be626..99cc6fa 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query_issue849-2.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query_issue849-2.ast
@@ -23,8 +23,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [s]
   ]
-  AS
-  Variable [ Name=$x ]
+  AS Variable [ Name=$x ]
 ,
   (
     SELECT ELEMENT [
@@ -71,8 +70,7 @@ FROM [  FunctionCall Metadata.dataset@1[
           )
         ]
       ]
-      AS
-      Variable [ Name=$z ]
+      AS Variable [ Name=$z ]
     ]
     Where
       OperatorExpr [
@@ -87,6 +85,5 @@ FROM [  FunctionCall Metadata.dataset@1[
         ]
       ]
   )
-  AS
-  Variable [ Name=$y ]
+  AS Variable [ Name=$y ]
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query_issue849.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query_issue849.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query_issue849.ast
index 3ee03e6..d0c967b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query_issue849.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query_issue849.ast
@@ -36,8 +36,7 @@ FROM [  UnorderedListConstructor [
       )
     ]
   ]
-  AS
-  Variable [ Name=$x ]
+  AS Variable [ Name=$x ]
 ,
   (
     SELECT ELEMENT [
@@ -49,8 +48,7 @@ FROM [  UnorderedListConstructor [
     FROM [      FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [s]
       ]
-      AS
-      Variable [ Name=$z ]
+      AS Variable [ Name=$z ]
     ]
     Where
       OperatorExpr [
@@ -65,6 +63,5 @@ FROM [  UnorderedListConstructor [
         ]
       ]
   )
-  AS
-  Variable [ Name=$y ]
+  AS Variable [ Name=$y ]
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-numeric-desc.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-numeric-desc.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-numeric-desc.ast
index 94772a1..faa79c1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-numeric-desc.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-numeric-desc.ast
@@ -17,8 +17,7 @@ Variable [ Name=$user ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [TwitterUsers]
   ]
-  AS
-  Variable [ Name=$user ]
+  AS Variable [ Name=$user ]
 ]
 Orderby
   FieldAccessor [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-numeric.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-numeric.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-numeric.ast
index a49fe29..cf34acc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-numeric.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-numeric.ast
@@ -17,8 +17,7 @@ Variable [ Name=$user ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [TwitterUsers]
   ]
-  AS
-  Variable [ Name=$user ]
+  AS Variable [ Name=$user ]
 ]
 Orderby
   FieldAccessor [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-string-desc.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-string-desc.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-string-desc.ast
index 4f20128..2f803f6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-string-desc.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-string-desc.ast
@@ -17,8 +17,7 @@ Variable [ Name=$user ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [TwitterUsers]
   ]
-  AS
-  Variable [ Name=$user ]
+  AS Variable [ Name=$user ]
 ]
 Orderby
   FieldAccessor [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-string.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-string.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-string.ast
index bc35555..3aedf4d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-string.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-string.ast
@@ -17,8 +17,7 @@ Variable [ Name=$user ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [TwitterUsers]
   ]
-  AS
-  Variable [ Name=$user ]
+  AS Variable [ Name=$user ]
 ]
 Orderby
   FieldAccessor [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/issue730.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/issue730.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/issue730.ast
index d7f7412..2efa289 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/issue730.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/issue730.ast
@@ -46,8 +46,7 @@ RecordConstructor [
       FROM [        FunctionCall Metadata.dataset@1[
           LiteralExpr [STRING] [TweetMessages]
         ]
-        AS
-        Variable [ Name=$t2 ]
+        AS Variable [ Name=$t2 ]
       ]
       Where
         FunctionCall test.spatial-intersect@2[
@@ -64,8 +63,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [TweetMessages]
   ]
-  AS
-  Variable [ Name=$t1 ]
+  AS Variable [ Name=$t1 ]
 ]
 Let Variable [ Name=$n ]
   :=

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
index 2b3ca1c..f09e21b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
@@ -70,8 +70,7 @@ RecordConstructor [
       FROM [        FunctionCall Metadata.dataset@1[
           LiteralExpr [STRING] [TweetMessages]
         ]
-        AS
-        Variable [ Name=$t2 ]
+        AS Variable [ Name=$t2 ]
       ]
       Where
         FunctionCall test.spatial-intersect@2[
@@ -95,8 +94,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [TweetMessages]
   ]
-  AS
-  Variable [ Name=$t1 ]
+  AS Variable [ Name=$t1 ]
 ]
 Let Variable [ Name=$n ]
   :=

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
index 0a2af0c..ae63a0a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
@@ -70,8 +70,7 @@ RecordConstructor [
       FROM [        FunctionCall Metadata.dataset@1[
           LiteralExpr [STRING] [TweetMessages]
         ]
-        AS
-        Variable [ Name=$t2 ]
+        AS Variable [ Name=$t2 ]
       ]
       Where
         OperatorExpr [
@@ -109,8 +108,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [TweetMessages]
   ]
-  AS
-  Variable [ Name=$t1 ]
+  AS Variable [ Name=$t1 ]
 ]
 Let Variable [ Name=$n ]
   :=

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/query-issue838.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/query-issue838.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/query-issue838.ast
index c1b795d..a6266b8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/query-issue838.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/query-issue838.ast
@@ -47,8 +47,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [TweetHistorySubscriptions]
   ]
-  AS
-  Variable [ Name=$sub ]
+  AS Variable [ Name=$sub ]
 ,
   (
     SELECT ELEMENT [
@@ -57,8 +56,7 @@ FROM [  FunctionCall Metadata.dataset@1[
     FROM [      FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [TweetMessages]
       ]
-      AS
-      Variable [ Name=$tweet ]
+      AS Variable [ Name=$tweet ]
     ]
     Let Variable [ Name=$circle ]
       :=
@@ -77,8 +75,7 @@ FROM [  FunctionCall Metadata.dataset@1[
         Variable [ Name=$circle ]
       ]
   )
-  AS
-  Variable [ Name=$text ]
+  AS Variable [ Name=$text ]
 ]
 Let Variable [ Name=$location ]
   :=

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_01.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_01.ast
index 5b3f0ed..988c5be 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_01.ast
@@ -32,14 +32,12 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [MyData1]
   ]
-  AS
-  Variable [ Name=$a ]
+  AS Variable [ Name=$a ]
 ,
   FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [MyData2]
   ]
-  AS
-  Variable [ Name=$b ]
+  AS Variable [ Name=$b ]
 ]
 Where
   FunctionCall test.spatial-intersect@2[

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_02.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_02.ast
index 65dcb89..7c60f2b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_02.ast
@@ -32,14 +32,12 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [MyData1]
   ]
-  AS
-  Variable [ Name=$a ]
+  AS Variable [ Name=$a ]
 ,
   FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [MyData2]
   ]
-  AS
-  Variable [ Name=$b ]
+  AS Variable [ Name=$b ]
 ]
 Where
   FunctionCall test.spatial-intersect@2[

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_03.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_03.ast
index a23d20d..1a79f18 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_03.ast
@@ -31,14 +31,12 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [MyData]
   ]
-  AS
-  Variable [ Name=$a ]
+  AS Variable [ Name=$a ]
 ,
   FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [MyData]
   ]
-  AS
-  Variable [ Name=$b ]
+  AS Variable [ Name=$b ]
 ]
 Where
   FunctionCall test.spatial-intersect@2[

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-secondary-index-open.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-secondary-index-open.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-secondary-index-open.ast
index d448f79..373614f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-secondary-index-open.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-secondary-index-open.ast
@@ -30,8 +30,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [MyData]
   ]
-  AS
-  Variable [ Name=$o ]
+  AS Variable [ Name=$o ]
 ]
 Where
   FunctionCall test.spatial-intersect@2[

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-secondary-index.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-secondary-index.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-secondary-index.ast
index be9f7ba..54a2eee 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-secondary-index.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-secondary-index.ast
@@ -30,8 +30,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [MyData]
   ]
-  AS
-  Variable [ Name=$o ]
+  AS Variable [ Name=$o ]
 ]
 Where
   FunctionCall test.spatial-intersect@2[

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_01.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_01.ast
index 5d98fcf..4148306 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_01.ast
@@ -17,8 +17,7 @@ Variable [ Name=$ed ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$o ]
+  AS Variable [ Name=$o ]
 ]
 Let Variable [ Name=$ed ]
   :=

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_02.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_02.ast
index 8cb00e4..e3c5cf3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_02.ast
@@ -17,8 +17,7 @@ Variable [ Name=$ed ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$o ]
+  AS Variable [ Name=$o ]
 ]
 Let Variable [ Name=$ed ]
   :=

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_03.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_03.ast
index be27388..8e315b0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_03.ast
@@ -17,8 +17,7 @@ Variable [ Name=$ed ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$o ]
+  AS Variable [ Name=$o ]
 ]
 Let Variable [ Name=$ed ]
   :=

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_04.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_04.ast
index 82c6a12..01927d0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_04.ast
@@ -17,8 +17,7 @@ Variable [ Name=$ed ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$o ]
+  AS Variable [ Name=$o ]
 ]
 Let Variable [ Name=$ed ]
   :=

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_05.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_05.ast
index a1a6dc6..cd42e5c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_05.ast
@@ -17,8 +17,7 @@ Variable [ Name=$ed ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$o ]
+  AS Variable [ Name=$o ]
 ]
 Let Variable [ Name=$ed ]
   :=

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_06.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_06.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_06.ast
index 1b44ad2..22a703b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_06.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_06.ast
@@ -17,8 +17,7 @@ Variable [ Name=$ed ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$o ]
+  AS Variable [ Name=$o ]
 ]
 Let Variable [ Name=$ed ]
   :=

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_07.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_07.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_07.ast
index 5479ba4..5c0f7a4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_07.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_07.ast
@@ -17,8 +17,7 @@ Variable [ Name=$ed ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$o ]
+  AS Variable [ Name=$o ]
 ]
 Let Variable [ Name=$ed ]
   :=

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_08.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_08.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_08.ast
index 06ff6a1..400dc1d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_08.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_08.ast
@@ -17,8 +17,7 @@ Variable [ Name=$ed ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$o ]
+  AS Variable [ Name=$o ]
 ]
 Let Variable [ Name=$ed ]
   :=

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_01.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_01.ast
index b0d66b8..e87ab92 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_01.ast
@@ -17,8 +17,7 @@ Variable [ Name=$o ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$o ]
+  AS Variable [ Name=$o ]
 ]
 Where
   OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_02.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_02.ast
index bc55325..6113114 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_02.ast
@@ -17,8 +17,7 @@ Variable [ Name=$o ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$o ]
+  AS Variable [ Name=$o ]
 ]
 Where
   OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_03.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_03.ast
index dbcb285..14bb9fa 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_03.ast
@@ -17,8 +17,7 @@ Variable [ Name=$o ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$o ]
+  AS Variable [ Name=$o ]
 ]
 Where
   OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_04.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_04.ast
index dcaaab9..c3034c2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_04.ast
@@ -17,8 +17,7 @@ Variable [ Name=$o ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$o ]
+  AS Variable [ Name=$o ]
 ]
 Where
   OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_05.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_05.ast
index ab8a7ac..f32115c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_05.ast
@@ -17,8 +17,7 @@ Variable [ Name=$o ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$o ]
+  AS Variable [ Name=$o ]
 ]
 Where
   OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_06.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_06.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_06.ast
index 2ec5fca..071f279 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_06.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_06.ast
@@ -17,8 +17,7 @@ Variable [ Name=$o ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$o ]
+  AS Variable [ Name=$o ]
 ]
 Where
   OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_07.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_07.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_07.ast
index 44c733d..57a392a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_07.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_07.ast
@@ -17,8 +17,7 @@ Variable [ Name=$o ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$o ]
+  AS Variable [ Name=$o ]
 ]
 Where
   OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_08.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_08.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_08.ast
index 366a0bc..325931d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_08.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_08.ast
@@ -17,8 +17,7 @@ Variable [ Name=$o ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$o ]
+  AS Variable [ Name=$o ]
 ]
 Where
   OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/fuzzyeq-to-edit-distance-check.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/fuzzyeq-to-edit-distance-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/fuzzyeq-to-edit-distance-check.ast
index 225cd3c..c1b3382 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/fuzzyeq-to-edit-distance-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/fuzzyeq-to-edit-distance-check.ast
@@ -19,8 +19,7 @@ Variable [ Name=$o ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$o ]
+  AS Variable [ Name=$o ]
 ]
 Where
   OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/fuzzyeq-to-jaccard-check.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/fuzzyeq-to-jaccard-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/fuzzyeq-to-jaccard-check.ast
index bc71c3e..84c17f4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/fuzzyeq-to-jaccard-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/fuzzyeq-to-jaccard-check.ast
@@ -19,8 +19,7 @@ Variable [ Name=$paper ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$paper ]
+  AS Variable [ Name=$paper ]
 ]
 Where
   OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_01.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_01.ast
index b91b293..711a1dc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_01.ast
@@ -17,8 +17,7 @@ Variable [ Name=$jacc ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$paper ]
+  AS Variable [ Name=$paper ]
 ]
 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/similarity/jaccard-let-to-jaccard-check_02.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_02.ast
index 9394db4..27ac1cb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_02.ast
@@ -17,8 +17,7 @@ Variable [ Name=$jacc ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$paper ]
+  AS Variable [ Name=$paper ]
 ]
 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/similarity/jaccard-let-to-jaccard-check_03.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_03.ast
index 22ec108..7556b6f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_03.ast
@@ -17,8 +17,7 @@ Variable [ Name=$jacc ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$paper ]
+  AS Variable [ Name=$paper ]
 ]
 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/similarity/jaccard-let-to-jaccard-check_04.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_04.ast
index 1094e45..0e8ce0c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_04.ast
@@ -17,8 +17,7 @@ Variable [ Name=$jacc ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$paper ]
+  AS Variable [ Name=$paper ]
 ]
 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/similarity/jaccard-let-to-jaccard-check_05.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_05.ast
index d83e97d..67702f3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_05.ast
@@ -17,8 +17,7 @@ Variable [ Name=$jacc ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$paper ]
+  AS Variable [ Name=$paper ]
 ]
 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/similarity/jaccard-let-to-jaccard-check_06.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_06.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_06.ast
index 84cbc0d..0b189e9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_06.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_06.ast
@@ -17,8 +17,7 @@ Variable [ Name=$jacc ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$paper ]
+  AS Variable [ Name=$paper ]
 ]
 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/similarity/jaccard-let-to-jaccard-check_07.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_07.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_07.ast
index 693651d..8435543 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_07.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_07.ast
@@ -17,8 +17,7 @@ Variable [ Name=$jacc ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$paper ]
+  AS Variable [ Name=$paper ]
 ]
 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/similarity/jaccard-let-to-jaccard-check_08.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_08.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_08.ast
index 15e3929..8269193 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_08.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_08.ast
@@ -17,8 +17,7 @@ Variable [ Name=$jacc ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$paper ]
+  AS Variable [ Name=$paper ]
 ]
 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/similarity/jaccard-to-jaccard-check_01.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_01.ast
index 62661bb..d54ff7e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_01.ast
@@ -17,8 +17,7 @@ Variable [ Name=$paper ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$paper ]
+  AS Variable [ Name=$paper ]
 ]
 Where
   OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_02.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_02.ast
index 3386596..ab47111 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_02.ast
@@ -17,8 +17,7 @@ Variable [ Name=$paper ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$paper ]
+  AS Variable [ Name=$paper ]
 ]
 Where
   OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_03.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_03.ast
index 9b836ee..eca8a1b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_03.ast
@@ -17,8 +17,7 @@ Variable [ Name=$paper ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$paper ]
+  AS Variable [ Name=$paper ]
 ]
 Where
   OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_04.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_04.ast
index d601a98..d12f24e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_04.ast
@@ -17,8 +17,7 @@ Variable [ Name=$paper ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$paper ]
+  AS Variable [ Name=$paper ]
 ]
 Where
   OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_05.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_05.ast
index 3963f6f..9aaf423 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_05.ast
@@ -17,8 +17,7 @@ Variable [ Name=$paper ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$paper ]
+  AS Variable [ Name=$paper ]
 ]
 Where
   OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_06.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_06.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_06.ast
index d7e9ffcf..63e0f28 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_06.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_06.ast
@@ -17,8 +17,7 @@ Variable [ Name=$paper ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$paper ]
+  AS Variable [ Name=$paper ]
 ]
 Where
   OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_07.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_07.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_07.ast
index 484b6f1..cad2e24 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_07.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_07.ast
@@ -17,8 +17,7 @@ Variable [ Name=$paper ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$paper ]
+  AS Variable [ Name=$paper ]
 ]
 Where
   OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_08.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_08.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_08.ast
index e9d8f62..44d5c59 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_08.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_08.ast
@@ -17,8 +17,7 @@ Variable [ Name=$paper ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$paper ]
+  AS Variable [ Name=$paper ]
 ]
 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/dont-skip-primary-index.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/dont-skip-primary-index.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/dont-skip-primary-index.ast
index d5c4b08..a83918f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/dont-skip-primary-index.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/dont-skip-primary-index.ast
@@ -14,8 +14,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-ngram-index.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-ngram-index.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-ngram-index.ast
index 87e800c..3b23ad3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-ngram-index.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-ngram-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 ]
 ]
 Where
   FunctionCall test.contains@2[

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-rtree-secondary-index.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-rtree-secondary-index.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-rtree-secondary-index.ast
index be9f7ba..54a2eee 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-rtree-secondary-index.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-rtree-secondary-index.ast
@@ -30,8 +30,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [MyData]
   ]
-  AS
-  Variable [ Name=$o ]
+  AS Variable [ Name=$o ]
 ]
 Where
   FunctionCall test.spatial-intersect@2[

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-2.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-secondary-btree-index-2.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-secondary-btree-index-2.ast
index c534506..ccc8afc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-secondary-btree-index-2.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-secondary-btree-index-2.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 [