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

[13/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/runtimets/results_parser_sqlpp/flwor/query-issue550/query-issue550.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/query-issue550/query-issue550.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/query-issue550/query-issue550.3.ast
index 7cf52e9..f8988ad 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/query-issue550/query-issue550.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/query-issue550/query-issue550.3.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/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_1/dblp-1_1.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_1/dblp-1_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_1/dblp-1_1.3.ast
index 0e2d5bf..9097792 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_1/dblp-1_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_1/dblp-1_1.3.ast
@@ -7,8 +7,7 @@ Variable [ Name=$tokenGroupped ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$paper ]
+  AS Variable [ Name=$paper ]
 ,
   FunctionCall fuzzyjoin.counthashed-word-tokens@1[
     FieldAccessor [
@@ -16,20 +15,16 @@ 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
+    token:=Variable [ Name=$token ]
+    paper:=Variable [ Name=$paper ]
   )
 
 Orderby
@@ -42,8 +37,7 @@ Orderby
       ]
       ]
       FROM [        Variable [ Name=#1 ]
-        AS
-        Variable [ Name=#2 ]
+        AS Variable [ Name=#2 ]
       ]
     )
   ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1.1/dblp-1_2.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1.1/dblp-1_2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1.1/dblp-1_2.3.ast
index 191068a..892dfd4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1.1/dblp-1_2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1.1/dblp-1_2.3.ast
@@ -7,8 +7,7 @@ Variable [ Name=$tokenGroupped ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$paper ]
+  AS Variable [ Name=$paper ]
 ,
   FunctionCall fuzzyjoin.counthashed-word-tokens@1[
     FieldAccessor [
@@ -16,8 +15,7 @@ FROM [  FunctionCall Metadata.dataset@1[
       Field=title
     ]
   ]
-  AS
-  Variable [ Name=$token ]
+  AS Variable [ Name=$token ]
 ]
 Let Variable [ Name=$id ]
   :=
@@ -29,15 +27,11 @@ Groupby
   Variable [ Name=$tokenGroupped ]
   :=
   Variable [ Name=$token ]
-  GROUP AS
-  Variable [ Name=#1 ]
+  GROUP AS Variable [ Name=#1 ]
   (
-  Variable [ Name=$id ]
-   AS id
-  Variable [ Name=$token ]
-   AS token
-  Variable [ Name=$paper ]
-   AS paper
+    id:=Variable [ Name=$id ]
+    token:=Variable [ Name=$token ]
+    paper:=Variable [ Name=$paper ]
   )
 
 Orderby
@@ -50,8 +44,7 @@ Orderby
       ]
       ]
       FROM [        Variable [ Name=#1 ]
-        AS
-        Variable [ Name=#2 ]
+        AS Variable [ Name=#2 ]
       ]
     )
   ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1/dblp-1_2.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1/dblp-1_2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1/dblp-1_2.3.ast
index 191068a..892dfd4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1/dblp-1_2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1/dblp-1_2.3.ast
@@ -7,8 +7,7 @@ Variable [ Name=$tokenGroupped ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$paper ]
+  AS Variable [ Name=$paper ]
 ,
   FunctionCall fuzzyjoin.counthashed-word-tokens@1[
     FieldAccessor [
@@ -16,8 +15,7 @@ FROM [  FunctionCall Metadata.dataset@1[
       Field=title
     ]
   ]
-  AS
-  Variable [ Name=$token ]
+  AS Variable [ Name=$token ]
 ]
 Let Variable [ Name=$id ]
   :=
@@ -29,15 +27,11 @@ Groupby
   Variable [ Name=$tokenGroupped ]
   :=
   Variable [ Name=$token ]
-  GROUP AS
-  Variable [ Name=#1 ]
+  GROUP AS Variable [ Name=#1 ]
   (
-  Variable [ Name=$id ]
-   AS id
-  Variable [ Name=$token ]
-   AS token
-  Variable [ Name=$paper ]
-   AS paper
+    id:=Variable [ Name=$id ]
+    token:=Variable [ Name=$token ]
+    paper:=Variable [ Name=$paper ]
   )
 
 Orderby
@@ -50,8 +44,7 @@ Orderby
       ]
       ]
       FROM [        Variable [ Name=#1 ]
-        AS
-        Variable [ Name=#2 ]
+        AS Variable [ Name=#2 ]
       ]
     )
   ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2/dblp-1_2.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2/dblp-1_2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2/dblp-1_2.3.ast
index fa9ab5f..fa2eda4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2/dblp-1_2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2/dblp-1_2.3.ast
@@ -7,8 +7,7 @@ Variable [ Name=$tokenGroupped ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$paper ]
+  AS Variable [ Name=$paper ]
 ,
   FunctionCall fuzzyjoin.counthashed-word-tokens@1[
     FieldAccessor [
@@ -16,8 +15,7 @@ FROM [  FunctionCall Metadata.dataset@1[
       Field=title
     ]
   ]
-  AS
-  Variable [ Name=$token ]
+  AS Variable [ Name=$token ]
 ]
 Let Variable [ Name=$paperid ]
   :=
@@ -29,15 +27,11 @@ Groupby
   Variable [ Name=$tokenGroupped ]
   :=
   Variable [ Name=$token ]
-  GROUP AS
-  Variable [ Name=#1 ]
+  GROUP AS Variable [ Name=#1 ]
   (
-  Variable [ Name=$paperid ]
-   AS paperid
-  Variable [ Name=$token ]
-   AS token
-  Variable [ Name=$paper ]
-   AS paper
+    paperid:=Variable [ Name=$paperid ]
+    token:=Variable [ Name=$token ]
+    paper:=Variable [ Name=$paper ]
   )
 
 Orderby
@@ -50,8 +44,7 @@ Orderby
       ]
       ]
       FROM [        Variable [ Name=#1 ]
-        AS
-        Variable [ Name=#2 ]
+        AS Variable [ Name=#2 ]
       ]
     )
   ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.1_5.3.1/dblp-2.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.1_5.3.1/dblp-2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.1_5.3.1/dblp-2.3.ast
index 315a705..51bc1bc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.1_5.3.1/dblp-2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.1_5.3.1/dblp-2.3.ast
@@ -23,8 +23,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$paperDBLP ]
+  AS Variable [ Name=$paperDBLP ]
 ,
   FunctionCall fuzzyjoin.subset-collection@3[
     FunctionCall Metadata.dataset@1[
@@ -38,8 +37,7 @@ FROM [  FunctionCall Metadata.dataset@1[
       LiteralExpr [FLOAT] [0.5]
     ]
   ]
-  AS
-  Variable [ Name=$prefixTokenDBLP ]
+  AS Variable [ Name=$prefixTokenDBLP ]
 ]
 Let Variable [ Name=$idDBLP ]
   :=
@@ -67,8 +65,7 @@ Let Variable [ Name=$tokensDBLP ]
     Variable [ Name=$i ]
     ]
     FROM [      Variable [ Name=$tokensUnrankedDBLP ]
-      AS
-      Variable [ Name=$tokenUnranked ]
+      AS Variable [ Name=$tokenUnranked ]
 ,
       (
         SELECT ELEMENT [
@@ -77,8 +74,7 @@ Let Variable [ Name=$tokensDBLP ]
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [DBLP]
           ]
-          AS
-          Variable [ Name=$paper ]
+          AS Variable [ Name=$paper ]
 ,
           FunctionCall fuzzyjoin.counthashed-word-tokens@1[
             FieldAccessor [
@@ -86,8 +82,7 @@ Let Variable [ Name=$tokensDBLP ]
               Field=title
             ]
           ]
-          AS
-          Variable [ Name=$token ]
+          AS Variable [ Name=$token ]
         ]
         Let Variable [ Name=$id ]
           :=
@@ -99,27 +94,17 @@ Let Variable [ Name=$tokensDBLP ]
           Variable [ Name=$tokenGroupped ]
           :=
           Variable [ Name=$token ]
-          GROUP AS
-          Variable [ Name=#1 ]
+          GROUP AS Variable [ Name=#1 ]
           (
-          Variable [ Name=$id ]
-           AS id
-          Variable [ Name=$token ]
-           AS token
-          Variable [ Name=$paper ]
-           AS paper
-          Variable [ Name=$tokenUnranked ]
-           AS tokenUnranked
-          Variable [ Name=$lenDBLP ]
-           AS lenDBLP
-          Variable [ Name=$tokensUnrankedDBLP ]
-           AS tokensUnrankedDBLP
-          Variable [ Name=$idDBLP ]
-           AS idDBLP
-          Variable [ Name=$prefixTokenDBLP ]
-           AS prefixTokenDBLP
-          Variable [ Name=$paperDBLP ]
-           AS paperDBLP
+            id:=Variable [ Name=$id ]
+            token:=Variable [ Name=$token ]
+            paper:=Variable [ Name=$paper ]
+            tokenUnranked:=Variable [ Name=$tokenUnranked ]
+            lenDBLP:=Variable [ Name=$lenDBLP ]
+            tokensUnrankedDBLP:=Variable [ Name=$tokensUnrankedDBLP ]
+            idDBLP:=Variable [ Name=$idDBLP ]
+            prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ]
+            paperDBLP:=Variable [ Name=$paperDBLP ]
           )
 
         Orderby
@@ -132,8 +117,7 @@ Let Variable [ Name=$tokensDBLP ]
               ]
               ]
               FROM [                Variable [ Name=#1 ]
-                AS
-                Variable [ Name=#2 ]
+                AS Variable [ Name=#2 ]
               ]
             )
           ]
@@ -142,10 +126,9 @@ Let Variable [ Name=$tokensDBLP ]
           ASC
 
       )
-      AS
-      Variable [ Name=$tokenRanked ]
-      AT
-      Variable [ Name=$i ]
+      AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
     ]
     Where
       OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.2/dblp-2.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.2/dblp-2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.2/dblp-2.3.ast
index 44a7325..83b5471 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.2/dblp-2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.2/dblp-2.3.ast
@@ -23,8 +23,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$paperDBLP ]
+  AS Variable [ Name=$paperDBLP ]
 ,
   FunctionCall fuzzyjoin.subset-collection@3[
     FunctionCall Metadata.dataset@1[
@@ -40,8 +39,7 @@ FROM [  FunctionCall Metadata.dataset@1[
       LiteralExpr [FLOAT] [0.5]
     ]
   ]
-  AS
-  Variable [ Name=$prefixTokenDBLP ]
+  AS Variable [ Name=$prefixTokenDBLP ]
 ]
 Let Variable [ Name=$idDBLP ]
   :=
@@ -72,14 +70,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/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_1/dblp-2_1.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_1/dblp-2_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_1/dblp-2_1.3.ast
index 8ea2c98..44c07b7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_1/dblp-2_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_1/dblp-2_1.3.ast
@@ -21,8 +21,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$paperDBLP ]
+  AS Variable [ Name=$paperDBLP ]
 ]
 Let Variable [ Name=$tokensDBLP ]
   :=
@@ -36,8 +35,7 @@ Let Variable [ Name=$tokensDBLP ]
           Field=title
         ]
       ]
-      AS
-      Variable [ Name=$tokenUnranked ]
+      AS Variable [ Name=$tokenUnranked ]
 ,
       (
         SELECT ELEMENT [
@@ -46,8 +44,7 @@ Let Variable [ Name=$tokensDBLP ]
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [DBLP]
           ]
-          AS
-          Variable [ Name=$paper ]
+          AS Variable [ Name=$paper ]
 ,
           FunctionCall fuzzyjoin.counthashed-word-tokens@1[
             FieldAccessor [
@@ -55,24 +52,18 @@ Let Variable [ Name=$tokensDBLP ]
               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=$paperDBLP ]
-           AS paperDBLP
+            token:=Variable [ Name=$token ]
+            paper:=Variable [ Name=$paper ]
+            tokenUnranked:=Variable [ Name=$tokenUnranked ]
+            paperDBLP:=Variable [ Name=$paperDBLP ]
           )
 
         Orderby
@@ -85,8 +76,7 @@ Let Variable [ Name=$tokensDBLP ]
               ]
               ]
               FROM [                Variable [ Name=#1 ]
-                AS
-                Variable [ Name=#2 ]
+                AS Variable [ Name=#2 ]
               ]
             )
           ]
@@ -95,10 +85,9 @@ Let Variable [ Name=$tokensDBLP ]
           ASC
 
       )
-      AS
-      Variable [ Name=$tokenRanked ]
-      AT
-      Variable [ Name=$i ]
+      AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
     ]
     Where
       OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_2/dblp-2_2.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_2/dblp-2_2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_2/dblp-2_2.3.ast
index bdec735..b6090dd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_2/dblp-2_2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_2/dblp-2_2.3.ast
@@ -21,8 +21,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$paperDBLP ]
+  AS Variable [ Name=$paperDBLP ]
 ]
 Let Variable [ Name=$tokensDBLP ]
   :=
@@ -36,8 +35,7 @@ Let Variable [ Name=$tokensDBLP ]
           Field=title
         ]
       ]
-      AS
-      Variable [ Name=$tokenUnranked ]
+      AS Variable [ Name=$tokenUnranked ]
 ,
       (
         SELECT ELEMENT [
@@ -46,8 +44,7 @@ Let Variable [ Name=$tokensDBLP ]
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [DBLP]
           ]
-          AS
-          Variable [ Name=$paper ]
+          AS Variable [ Name=$paper ]
 ,
           FunctionCall fuzzyjoin.counthashed-word-tokens@1[
             FieldAccessor [
@@ -55,8 +52,7 @@ Let Variable [ Name=$tokensDBLP ]
               Field=title
             ]
           ]
-          AS
-          Variable [ Name=$token ]
+          AS Variable [ Name=$token ]
         ]
         Let Variable [ Name=$id ]
           :=
@@ -68,19 +64,13 @@ Let Variable [ Name=$tokensDBLP ]
           Variable [ Name=$tokenGroupped ]
           :=
           Variable [ Name=$token ]
-          GROUP AS
-          Variable [ Name=#1 ]
+          GROUP AS Variable [ Name=#1 ]
           (
-          Variable [ Name=$id ]
-           AS id
-          Variable [ Name=$token ]
-           AS token
-          Variable [ Name=$paper ]
-           AS paper
-          Variable [ Name=$tokenUnranked ]
-           AS tokenUnranked
-          Variable [ Name=$paperDBLP ]
-           AS paperDBLP
+            id:=Variable [ Name=$id ]
+            token:=Variable [ Name=$token ]
+            paper:=Variable [ Name=$paper ]
+            tokenUnranked:=Variable [ Name=$tokenUnranked ]
+            paperDBLP:=Variable [ Name=$paperDBLP ]
           )
 
         Orderby
@@ -93,8 +83,7 @@ Let Variable [ Name=$tokensDBLP ]
               ]
               ]
               FROM [                Variable [ Name=#1 ]
-                AS
-                Variable [ Name=#2 ]
+                AS Variable [ Name=#2 ]
               ]
             )
           ]
@@ -103,10 +92,9 @@ Let Variable [ Name=$tokensDBLP ]
           ASC
 
       )
-      AS
-      Variable [ Name=$tokenRanked ]
-      AT
-      Variable [ Name=$i ]
+      AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
     ]
     Where
       OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_3/dblp-2_3.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_3/dblp-2_3.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_3/dblp-2_3.3.ast
index 3faf452..c6dba16 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_3/dblp-2_3.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_3/dblp-2_3.3.ast
@@ -18,8 +18,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$paperDBLP ]
+  AS Variable [ Name=$paperDBLP ]
 ]
 Let Variable [ Name=$idDBLP ]
   :=
@@ -39,8 +38,7 @@ Let Variable [ Name=$tokensDBLP ]
           Field=title
         ]
       ]
-      AS
-      Variable [ Name=$tokenUnranked ]
+      AS Variable [ Name=$tokenUnranked ]
 ,
       (
         SELECT ELEMENT [
@@ -49,8 +47,7 @@ Let Variable [ Name=$tokensDBLP ]
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [DBLP]
           ]
-          AS
-          Variable [ Name=$paper ]
+          AS Variable [ Name=$paper ]
 ,
           FunctionCall fuzzyjoin.counthashed-word-tokens@1[
             FieldAccessor [
@@ -58,8 +55,7 @@ Let Variable [ Name=$tokensDBLP ]
               Field=title
             ]
           ]
-          AS
-          Variable [ Name=$token ]
+          AS Variable [ Name=$token ]
         ]
         Let Variable [ Name=$id ]
           :=
@@ -71,21 +67,14 @@ Let Variable [ Name=$tokensDBLP ]
           Variable [ Name=$tokenGroupped ]
           :=
           Variable [ Name=$token ]
-          GROUP AS
-          Variable [ Name=#1 ]
+          GROUP AS Variable [ Name=#1 ]
           (
-          Variable [ Name=$id ]
-           AS id
-          Variable [ Name=$token ]
-           AS token
-          Variable [ Name=$paper ]
-           AS paper
-          Variable [ Name=$tokenUnranked ]
-           AS tokenUnranked
-          Variable [ Name=$idDBLP ]
-           AS idDBLP
-          Variable [ Name=$paperDBLP ]
-           AS paperDBLP
+            id:=Variable [ Name=$id ]
+            token:=Variable [ Name=$token ]
+            paper:=Variable [ Name=$paper ]
+            tokenUnranked:=Variable [ Name=$tokenUnranked ]
+            idDBLP:=Variable [ Name=$idDBLP ]
+            paperDBLP:=Variable [ Name=$paperDBLP ]
           )
 
         Orderby
@@ -98,8 +87,7 @@ Let Variable [ Name=$tokensDBLP ]
               ]
               ]
               FROM [                Variable [ Name=#1 ]
-                AS
-                Variable [ Name=#2 ]
+                AS Variable [ Name=#2 ]
               ]
             )
           ]
@@ -108,10 +96,9 @@ Let Variable [ Name=$tokensDBLP ]
           ASC
 
       )
-      AS
-      Variable [ Name=$tokenRanked ]
-      AT
-      Variable [ Name=$i ]
+      AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
     ]
     Where
       OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_4/dblp-2_4.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_4/dblp-2_4.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_4/dblp-2_4.3.ast
index 6f085fc..3b1ded7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_4/dblp-2_4.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_4/dblp-2_4.3.ast
@@ -18,8 +18,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$paperDBLP ]
+  AS Variable [ Name=$paperDBLP ]
 ]
 Let Variable [ Name=$idDBLP ]
   :=
@@ -42,8 +41,7 @@ Let Variable [ Name=$tokensDBLP ]
     Variable [ Name=$i ]
     ]
     FROM [      Variable [ Name=$tokensUnrankedDBLP ]
-      AS
-      Variable [ Name=$tokenUnranked ]
+      AS Variable [ Name=$tokenUnranked ]
 ,
       (
         SELECT ELEMENT [
@@ -52,8 +50,7 @@ Let Variable [ Name=$tokensDBLP ]
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [DBLP]
           ]
-          AS
-          Variable [ Name=$paper ]
+          AS Variable [ Name=$paper ]
 ,
           FunctionCall fuzzyjoin.counthashed-word-tokens@1[
             FieldAccessor [
@@ -61,8 +58,7 @@ Let Variable [ Name=$tokensDBLP ]
               Field=title
             ]
           ]
-          AS
-          Variable [ Name=$token ]
+          AS Variable [ Name=$token ]
         ]
         Let Variable [ Name=$id ]
           :=
@@ -74,23 +70,15 @@ Let Variable [ Name=$tokensDBLP ]
           Variable [ Name=$tokenGroupped ]
           :=
           Variable [ Name=$token ]
-          GROUP AS
-          Variable [ Name=#1 ]
+          GROUP AS Variable [ Name=#1 ]
           (
-          Variable [ Name=$id ]
-           AS id
-          Variable [ Name=$token ]
-           AS token
-          Variable [ Name=$paper ]
-           AS paper
-          Variable [ Name=$tokenUnranked ]
-           AS tokenUnranked
-          Variable [ Name=$tokensUnrankedDBLP ]
-           AS tokensUnrankedDBLP
-          Variable [ Name=$idDBLP ]
-           AS idDBLP
-          Variable [ Name=$paperDBLP ]
-           AS paperDBLP
+            id:=Variable [ Name=$id ]
+            token:=Variable [ Name=$token ]
+            paper:=Variable [ Name=$paper ]
+            tokenUnranked:=Variable [ Name=$tokenUnranked ]
+            tokensUnrankedDBLP:=Variable [ Name=$tokensUnrankedDBLP ]
+            idDBLP:=Variable [ Name=$idDBLP ]
+            paperDBLP:=Variable [ Name=$paperDBLP ]
           )
 
         Orderby
@@ -103,8 +91,7 @@ Let Variable [ Name=$tokensDBLP ]
               ]
               ]
               FROM [                Variable [ Name=#1 ]
-                AS
-                Variable [ Name=#2 ]
+                AS Variable [ Name=#2 ]
               ]
             )
           ]
@@ -113,10 +100,9 @@ Let Variable [ Name=$tokensDBLP ]
           ASC
 
       )
-      AS
-      Variable [ Name=$tokenRanked ]
-      AT
-      Variable [ Name=$i ]
+      AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
     ]
     Where
       OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.1/dblp-2_5.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.1/dblp-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.1/dblp-2_5.3.ast
index 460fb11..42edfe5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.1/dblp-2_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.1/dblp-2_5.3.ast
@@ -23,8 +23,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$paperDBLP ]
+  AS Variable [ Name=$paperDBLP ]
 ]
 Let Variable [ Name=$idDBLP ]
   :=
@@ -52,8 +51,7 @@ Let Variable [ Name=$tokensDBLP ]
     Variable [ Name=$i ]
     ]
     FROM [      Variable [ Name=$tokensUnrankedDBLP ]
-      AS
-      Variable [ Name=$tokenUnranked ]
+      AS Variable [ Name=$tokenUnranked ]
 ,
       (
         SELECT ELEMENT [
@@ -62,8 +60,7 @@ Let Variable [ Name=$tokensDBLP ]
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [DBLP]
           ]
-          AS
-          Variable [ Name=$paper ]
+          AS Variable [ Name=$paper ]
 ,
           FunctionCall fuzzyjoin.counthashed-word-tokens@1[
             FieldAccessor [
@@ -71,8 +68,7 @@ Let Variable [ Name=$tokensDBLP ]
               Field=title
             ]
           ]
-          AS
-          Variable [ Name=$token ]
+          AS Variable [ Name=$token ]
         ]
         Let Variable [ Name=$id ]
           :=
@@ -84,25 +80,16 @@ Let Variable [ Name=$tokensDBLP ]
           Variable [ Name=$tokenGrouped ]
           :=
           Variable [ Name=$token ]
-          GROUP AS
-          Variable [ Name=#1 ]
+          GROUP AS Variable [ Name=#1 ]
           (
-          Variable [ Name=$id ]
-           AS id
-          Variable [ Name=$token ]
-           AS token
-          Variable [ Name=$paper ]
-           AS paper
-          Variable [ Name=$tokenUnranked ]
-           AS tokenUnranked
-          Variable [ Name=$lenDBLP ]
-           AS lenDBLP
-          Variable [ Name=$tokensUnrankedDBLP ]
-           AS tokensUnrankedDBLP
-          Variable [ Name=$idDBLP ]
-           AS idDBLP
-          Variable [ Name=$paperDBLP ]
-           AS paperDBLP
+            id:=Variable [ Name=$id ]
+            token:=Variable [ Name=$token ]
+            paper:=Variable [ Name=$paper ]
+            tokenUnranked:=Variable [ Name=$tokenUnranked ]
+            lenDBLP:=Variable [ Name=$lenDBLP ]
+            tokensUnrankedDBLP:=Variable [ Name=$tokensUnrankedDBLP ]
+            idDBLP:=Variable [ Name=$idDBLP ]
+            paperDBLP:=Variable [ Name=$paperDBLP ]
           )
 
         Orderby
@@ -115,8 +102,7 @@ Let Variable [ Name=$tokensDBLP ]
               ]
               ]
               FROM [                Variable [ Name=#1 ]
-                AS
-                Variable [ Name=#2 ]
+                AS Variable [ Name=#2 ]
               ]
             )
           ]
@@ -125,10 +111,9 @@ Let Variable [ Name=$tokensDBLP ]
           ASC
 
       )
-      AS
-      Variable [ Name=$tokenRanked ]
-      AT
-      Variable [ Name=$i ]
+      AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
     ]
     Where
       OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.2/dblp-2_5.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.2/dblp-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.2/dblp-2_5.3.ast
index 460fb11..42edfe5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.2/dblp-2_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.2/dblp-2_5.3.ast
@@ -23,8 +23,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$paperDBLP ]
+  AS Variable [ Name=$paperDBLP ]
 ]
 Let Variable [ Name=$idDBLP ]
   :=
@@ -52,8 +51,7 @@ Let Variable [ Name=$tokensDBLP ]
     Variable [ Name=$i ]
     ]
     FROM [      Variable [ Name=$tokensUnrankedDBLP ]
-      AS
-      Variable [ Name=$tokenUnranked ]
+      AS Variable [ Name=$tokenUnranked ]
 ,
       (
         SELECT ELEMENT [
@@ -62,8 +60,7 @@ Let Variable [ Name=$tokensDBLP ]
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [DBLP]
           ]
-          AS
-          Variable [ Name=$paper ]
+          AS Variable [ Name=$paper ]
 ,
           FunctionCall fuzzyjoin.counthashed-word-tokens@1[
             FieldAccessor [
@@ -71,8 +68,7 @@ Let Variable [ Name=$tokensDBLP ]
               Field=title
             ]
           ]
-          AS
-          Variable [ Name=$token ]
+          AS Variable [ Name=$token ]
         ]
         Let Variable [ Name=$id ]
           :=
@@ -84,25 +80,16 @@ Let Variable [ Name=$tokensDBLP ]
           Variable [ Name=$tokenGrouped ]
           :=
           Variable [ Name=$token ]
-          GROUP AS
-          Variable [ Name=#1 ]
+          GROUP AS Variable [ Name=#1 ]
           (
-          Variable [ Name=$id ]
-           AS id
-          Variable [ Name=$token ]
-           AS token
-          Variable [ Name=$paper ]
-           AS paper
-          Variable [ Name=$tokenUnranked ]
-           AS tokenUnranked
-          Variable [ Name=$lenDBLP ]
-           AS lenDBLP
-          Variable [ Name=$tokensUnrankedDBLP ]
-           AS tokensUnrankedDBLP
-          Variable [ Name=$idDBLP ]
-           AS idDBLP
-          Variable [ Name=$paperDBLP ]
-           AS paperDBLP
+            id:=Variable [ Name=$id ]
+            token:=Variable [ Name=$token ]
+            paper:=Variable [ Name=$paper ]
+            tokenUnranked:=Variable [ Name=$tokenUnranked ]
+            lenDBLP:=Variable [ Name=$lenDBLP ]
+            tokensUnrankedDBLP:=Variable [ Name=$tokensUnrankedDBLP ]
+            idDBLP:=Variable [ Name=$idDBLP ]
+            paperDBLP:=Variable [ Name=$paperDBLP ]
           )
 
         Orderby
@@ -115,8 +102,7 @@ Let Variable [ Name=$tokensDBLP ]
               ]
               ]
               FROM [                Variable [ Name=#1 ]
-                AS
-                Variable [ Name=#2 ]
+                AS Variable [ Name=#2 ]
               ]
             )
           ]
@@ -125,10 +111,9 @@ Let Variable [ Name=$tokensDBLP ]
           ASC
 
       )
-      AS
-      Variable [ Name=$tokenRanked ]
-      AT
-      Variable [ Name=$i ]
+      AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
     ]
     Where
       OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3.1/dblp-2_5.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3.1/dblp-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3.1/dblp-2_5.3.ast
index 460fb11..42edfe5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3.1/dblp-2_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3.1/dblp-2_5.3.ast
@@ -23,8 +23,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$paperDBLP ]
+  AS Variable [ Name=$paperDBLP ]
 ]
 Let Variable [ Name=$idDBLP ]
   :=
@@ -52,8 +51,7 @@ Let Variable [ Name=$tokensDBLP ]
     Variable [ Name=$i ]
     ]
     FROM [      Variable [ Name=$tokensUnrankedDBLP ]
-      AS
-      Variable [ Name=$tokenUnranked ]
+      AS Variable [ Name=$tokenUnranked ]
 ,
       (
         SELECT ELEMENT [
@@ -62,8 +60,7 @@ Let Variable [ Name=$tokensDBLP ]
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [DBLP]
           ]
-          AS
-          Variable [ Name=$paper ]
+          AS Variable [ Name=$paper ]
 ,
           FunctionCall fuzzyjoin.counthashed-word-tokens@1[
             FieldAccessor [
@@ -71,8 +68,7 @@ Let Variable [ Name=$tokensDBLP ]
               Field=title
             ]
           ]
-          AS
-          Variable [ Name=$token ]
+          AS Variable [ Name=$token ]
         ]
         Let Variable [ Name=$id ]
           :=
@@ -84,25 +80,16 @@ Let Variable [ Name=$tokensDBLP ]
           Variable [ Name=$tokenGrouped ]
           :=
           Variable [ Name=$token ]
-          GROUP AS
-          Variable [ Name=#1 ]
+          GROUP AS Variable [ Name=#1 ]
           (
-          Variable [ Name=$id ]
-           AS id
-          Variable [ Name=$token ]
-           AS token
-          Variable [ Name=$paper ]
-           AS paper
-          Variable [ Name=$tokenUnranked ]
-           AS tokenUnranked
-          Variable [ Name=$lenDBLP ]
-           AS lenDBLP
-          Variable [ Name=$tokensUnrankedDBLP ]
-           AS tokensUnrankedDBLP
-          Variable [ Name=$idDBLP ]
-           AS idDBLP
-          Variable [ Name=$paperDBLP ]
-           AS paperDBLP
+            id:=Variable [ Name=$id ]
+            token:=Variable [ Name=$token ]
+            paper:=Variable [ Name=$paper ]
+            tokenUnranked:=Variable [ Name=$tokenUnranked ]
+            lenDBLP:=Variable [ Name=$lenDBLP ]
+            tokensUnrankedDBLP:=Variable [ Name=$tokensUnrankedDBLP ]
+            idDBLP:=Variable [ Name=$idDBLP ]
+            paperDBLP:=Variable [ Name=$paperDBLP ]
           )
 
         Orderby
@@ -115,8 +102,7 @@ Let Variable [ Name=$tokensDBLP ]
               ]
               ]
               FROM [                Variable [ Name=#1 ]
-                AS
-                Variable [ Name=#2 ]
+                AS Variable [ Name=#2 ]
               ]
             )
           ]
@@ -125,10 +111,9 @@ Let Variable [ Name=$tokensDBLP ]
           ASC
 
       )
-      AS
-      Variable [ Name=$tokenRanked ]
-      AT
-      Variable [ Name=$i ]
+      AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
     ]
     Where
       OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3/dblp-2_5.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3/dblp-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3/dblp-2_5.3.ast
index 460fb11..42edfe5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3/dblp-2_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3/dblp-2_5.3.ast
@@ -23,8 +23,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$paperDBLP ]
+  AS Variable [ Name=$paperDBLP ]
 ]
 Let Variable [ Name=$idDBLP ]
   :=
@@ -52,8 +51,7 @@ Let Variable [ Name=$tokensDBLP ]
     Variable [ Name=$i ]
     ]
     FROM [      Variable [ Name=$tokensUnrankedDBLP ]
-      AS
-      Variable [ Name=$tokenUnranked ]
+      AS Variable [ Name=$tokenUnranked ]
 ,
       (
         SELECT ELEMENT [
@@ -62,8 +60,7 @@ Let Variable [ Name=$tokensDBLP ]
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [DBLP]
           ]
-          AS
-          Variable [ Name=$paper ]
+          AS Variable [ Name=$paper ]
 ,
           FunctionCall fuzzyjoin.counthashed-word-tokens@1[
             FieldAccessor [
@@ -71,8 +68,7 @@ Let Variable [ Name=$tokensDBLP ]
               Field=title
             ]
           ]
-          AS
-          Variable [ Name=$token ]
+          AS Variable [ Name=$token ]
         ]
         Let Variable [ Name=$id ]
           :=
@@ -84,25 +80,16 @@ Let Variable [ Name=$tokensDBLP ]
           Variable [ Name=$tokenGrouped ]
           :=
           Variable [ Name=$token ]
-          GROUP AS
-          Variable [ Name=#1 ]
+          GROUP AS Variable [ Name=#1 ]
           (
-          Variable [ Name=$id ]
-           AS id
-          Variable [ Name=$token ]
-           AS token
-          Variable [ Name=$paper ]
-           AS paper
-          Variable [ Name=$tokenUnranked ]
-           AS tokenUnranked
-          Variable [ Name=$lenDBLP ]
-           AS lenDBLP
-          Variable [ Name=$tokensUnrankedDBLP ]
-           AS tokensUnrankedDBLP
-          Variable [ Name=$idDBLP ]
-           AS idDBLP
-          Variable [ Name=$paperDBLP ]
-           AS paperDBLP
+            id:=Variable [ Name=$id ]
+            token:=Variable [ Name=$token ]
+            paper:=Variable [ Name=$paper ]
+            tokenUnranked:=Variable [ Name=$tokenUnranked ]
+            lenDBLP:=Variable [ Name=$lenDBLP ]
+            tokensUnrankedDBLP:=Variable [ Name=$tokensUnrankedDBLP ]
+            idDBLP:=Variable [ Name=$idDBLP ]
+            paperDBLP:=Variable [ Name=$paperDBLP ]
           )
 
         Orderby
@@ -115,8 +102,7 @@ Let Variable [ Name=$tokensDBLP ]
               ]
               ]
               FROM [                Variable [ Name=#1 ]
-                AS
-                Variable [ Name=#2 ]
+                AS Variable [ Name=#2 ]
               ]
             )
           ]
@@ -125,10 +111,9 @@ Let Variable [ Name=$tokensDBLP ]
           ASC
 
       )
-      AS
-      Variable [ Name=$tokenRanked ]
-      AT
-      Variable [ Name=$i ]
+      AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
     ]
     Where
       OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5/dblp-2_5.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5/dblp-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5/dblp-2_5.3.ast
index 4a9aac3..2fc6e0f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5/dblp-2_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5/dblp-2_5.3.ast
@@ -23,8 +23,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$paperDBLP ]
+  AS Variable [ Name=$paperDBLP ]
 ]
 Let Variable [ Name=$idDBLP ]
   :=
@@ -52,8 +51,7 @@ Let Variable [ Name=$tokensDBLP ]
     Variable [ Name=$i ]
     ]
     FROM [      Variable [ Name=$tokensUnrankedDBLP ]
-      AS
-      Variable [ Name=$tokenUnranked ]
+      AS Variable [ Name=$tokenUnranked ]
 ,
       (
         SELECT ELEMENT [
@@ -62,8 +60,7 @@ Let Variable [ Name=$tokensDBLP ]
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [DBLP]
           ]
-          AS
-          Variable [ Name=$paper ]
+          AS Variable [ Name=$paper ]
 ,
           FunctionCall fuzzyjoin.counthashed-word-tokens@1[
             FieldAccessor [
@@ -71,8 +68,7 @@ Let Variable [ Name=$tokensDBLP ]
               Field=title
             ]
           ]
-          AS
-          Variable [ Name=$token ]
+          AS Variable [ Name=$token ]
         ]
         Let Variable [ Name=$id ]
           :=
@@ -84,25 +80,16 @@ Let Variable [ Name=$tokensDBLP ]
           Variable [ Name=$tokenGroupped ]
           :=
           Variable [ Name=$token ]
-          GROUP AS
-          Variable [ Name=#1 ]
+          GROUP AS Variable [ Name=#1 ]
           (
-          Variable [ Name=$id ]
-           AS id
-          Variable [ Name=$token ]
-           AS token
-          Variable [ Name=$paper ]
-           AS paper
-          Variable [ Name=$tokenUnranked ]
-           AS tokenUnranked
-          Variable [ Name=$lenDBLP ]
-           AS lenDBLP
-          Variable [ Name=$tokensUnrankedDBLP ]
-           AS tokensUnrankedDBLP
-          Variable [ Name=$idDBLP ]
-           AS idDBLP
-          Variable [ Name=$paperDBLP ]
-           AS paperDBLP
+            id:=Variable [ Name=$id ]
+            token:=Variable [ Name=$token ]
+            paper:=Variable [ Name=$paper ]
+            tokenUnranked:=Variable [ Name=$tokenUnranked ]
+            lenDBLP:=Variable [ Name=$lenDBLP ]
+            tokensUnrankedDBLP:=Variable [ Name=$tokensUnrankedDBLP ]
+            idDBLP:=Variable [ Name=$idDBLP ]
+            paperDBLP:=Variable [ Name=$paperDBLP ]
           )
 
         Orderby
@@ -115,8 +102,7 @@ Let Variable [ Name=$tokensDBLP ]
               ]
               ]
               FROM [                Variable [ Name=#1 ]
-                AS
-                Variable [ Name=#2 ]
+                AS Variable [ Name=#2 ]
               ]
             )
           ]
@@ -125,10 +111,9 @@ Let Variable [ Name=$tokensDBLP ]
           ASC
 
       )
-      AS
-      Variable [ Name=$tokenRanked ]
-      AT
-      Variable [ Name=$i ]
+      AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
     ]
     Where
       OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.1/dblp-3_1.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.1/dblp-3_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.1/dblp-3_1.3.ast
index 7201110..9257b1e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.1/dblp-3_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.1/dblp-3_1.3.ast
@@ -49,8 +49,7 @@ FROM [  (
     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[
@@ -64,14 +63,12 @@ FROM [  (
           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[
@@ -85,8 +82,7 @@ FROM [  (
           LiteralExpr [FLOAT] [0.5]
         ]
       ]
-      AS
-      Variable [ Name=$prefixTokenRight ]
+      AS Variable [ Name=$prefixTokenRight ]
     ]
     Let Variable [ Name=$lenLeft ]
       :=
@@ -110,8 +106,7 @@ FROM [  (
               Field=title
             ]
           ]
-          AS
-          Variable [ Name=$tokenUnranked ]
+          AS Variable [ Name=$tokenUnranked ]
 ,
           (
             SELECT ELEMENT [
@@ -120,8 +115,7 @@ FROM [  (
             FROM [              FunctionCall Metadata.dataset@1[
                 LiteralExpr [STRING] [DBLP]
               ]
-              AS
-              Variable [ Name=$paper ]
+              AS Variable [ Name=$paper ]
 ,
               FunctionCall fuzzyjoin.counthashed-word-tokens@1[
                 FieldAccessor [
@@ -129,32 +123,22 @@ FROM [  (
                   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
@@ -167,8 +151,7 @@ FROM [  (
                   ]
                   ]
                   FROM [                    Variable [ Name=#1 ]
-                    AS
-                    Variable [ Name=#2 ]
+                    AS Variable [ Name=#2 ]
                   ]
                 )
               ]
@@ -177,10 +160,9 @@ FROM [  (
               ASC
 
           )
-          AS
-          Variable [ Name=$tokenRanked ]
-          AT
-          Variable [ Name=$i ]
+          AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
         ]
         Where
           OperatorExpr [
@@ -215,8 +197,7 @@ FROM [  (
               Field=title
             ]
           ]
-          AS
-          Variable [ Name=$tokenUnranked ]
+          AS Variable [ Name=$tokenUnranked ]
 ,
           (
             SELECT ELEMENT [
@@ -225,8 +206,7 @@ FROM [  (
             FROM [              FunctionCall Metadata.dataset@1[
                 LiteralExpr [STRING] [DBLP]
               ]
-              AS
-              Variable [ Name=$paper ]
+              AS Variable [ Name=$paper ]
 ,
               FunctionCall fuzzyjoin.counthashed-word-tokens@1[
                 FieldAccessor [
@@ -234,36 +214,24 @@ FROM [  (
                   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
@@ -276,8 +244,7 @@ FROM [  (
                   ]
                   ]
                   FROM [                    Variable [ Name=#3 ]
-                    AS
-                    Variable [ Name=#4 ]
+                    AS Variable [ Name=#4 ]
                   ]
                 )
               ]
@@ -286,10 +253,9 @@ FROM [  (
               ASC
 
           )
-          AS
-          Variable [ Name=$tokenRanked ]
-          AT
-          Variable [ Name=$i ]
+          AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
         ]
         Where
           OperatorExpr [
@@ -353,44 +319,31 @@ FROM [  (
         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 ]
 ,
   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 ]
 ]
 Where
   OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.2/dblp-3_1.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.2/dblp-3_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.2/dblp-3_1.3.ast
index 7201110..9257b1e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.2/dblp-3_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.2/dblp-3_1.3.ast
@@ -49,8 +49,7 @@ FROM [  (
     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[
@@ -64,14 +63,12 @@ FROM [  (
           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[
@@ -85,8 +82,7 @@ FROM [  (
           LiteralExpr [FLOAT] [0.5]
         ]
       ]
-      AS
-      Variable [ Name=$prefixTokenRight ]
+      AS Variable [ Name=$prefixTokenRight ]
     ]
     Let Variable [ Name=$lenLeft ]
       :=
@@ -110,8 +106,7 @@ FROM [  (
               Field=title
             ]
           ]
-          AS
-          Variable [ Name=$tokenUnranked ]
+          AS Variable [ Name=$tokenUnranked ]
 ,
           (
             SELECT ELEMENT [
@@ -120,8 +115,7 @@ FROM [  (
             FROM [              FunctionCall Metadata.dataset@1[
                 LiteralExpr [STRING] [DBLP]
               ]
-              AS
-              Variable [ Name=$paper ]
+              AS Variable [ Name=$paper ]
 ,
               FunctionCall fuzzyjoin.counthashed-word-tokens@1[
                 FieldAccessor [
@@ -129,32 +123,22 @@ FROM [  (
                   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
@@ -167,8 +151,7 @@ FROM [  (
                   ]
                   ]
                   FROM [                    Variable [ Name=#1 ]
-                    AS
-                    Variable [ Name=#2 ]
+                    AS Variable [ Name=#2 ]
                   ]
                 )
               ]
@@ -177,10 +160,9 @@ FROM [  (
               ASC
 
           )
-          AS
-          Variable [ Name=$tokenRanked ]
-          AT
-          Variable [ Name=$i ]
+          AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
         ]
         Where
           OperatorExpr [
@@ -215,8 +197,7 @@ FROM [  (
               Field=title
             ]
           ]
-          AS
-          Variable [ Name=$tokenUnranked ]
+          AS Variable [ Name=$tokenUnranked ]
 ,
           (
             SELECT ELEMENT [
@@ -225,8 +206,7 @@ FROM [  (
             FROM [              FunctionCall Metadata.dataset@1[
                 LiteralExpr [STRING] [DBLP]
               ]
-              AS
-              Variable [ Name=$paper ]
+              AS Variable [ Name=$paper ]
 ,
               FunctionCall fuzzyjoin.counthashed-word-tokens@1[
                 FieldAccessor [
@@ -234,36 +214,24 @@ FROM [  (
                   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
@@ -276,8 +244,7 @@ FROM [  (
                   ]
                   ]
                   FROM [                    Variable [ Name=#3 ]
-                    AS
-                    Variable [ Name=#4 ]
+                    AS Variable [ Name=#4 ]
                   ]
                 )
               ]
@@ -286,10 +253,9 @@ FROM [  (
               ASC
 
           )
-          AS
-          Variable [ Name=$tokenRanked ]
-          AT
-          Variable [ Name=$i ]
+          AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
         ]
         Where
           OperatorExpr [
@@ -353,44 +319,31 @@ FROM [  (
         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 ]
 ,
   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 ]
 ]
 Where
   OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1/dblp-3_1.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1/dblp-3_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1/dblp-3_1.3.ast
index 77b36ad..c9d8570 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1/dblp-3_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1/dblp-3_1.3.ast
@@ -26,14 +26,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 [
@@ -61,8 +59,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[
@@ -76,14 +73,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[
@@ -97,8 +92,7 @@ FROM [  FunctionCall Metadata.dataset@1[
           LiteralExpr [FLOAT] [0.5]
         ]
       ]
-      AS
-      Variable [ Name=$prefixTokenRight ]
+      AS Variable [ Name=$prefixTokenRight ]
     ]
     Let Variable [ Name=$lenLeft ]
       :=
@@ -122,8 +116,7 @@ FROM [  FunctionCall Metadata.dataset@1[
               Field=title
             ]
           ]
-          AS
-          Variable [ Name=$tokenUnranked ]
+          AS Variable [ Name=$tokenUnranked ]
 ,
           (
             SELECT ELEMENT [
@@ -132,8 +125,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 [
@@ -141,32 +133,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
@@ -179,8 +161,7 @@ FROM [  FunctionCall Metadata.dataset@1[
                   ]
                   ]
                   FROM [                    Variable [ Name=#1 ]
-                    AS
-                    Variable [ Name=#2 ]
+                    AS Variable [ Name=#2 ]
                   ]
                 )
               ]
@@ -189,10 +170,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 [
@@ -227,8 +207,7 @@ FROM [  FunctionCall Metadata.dataset@1[
               Field=title
             ]
           ]
-          AS
-          Variable [ Name=$tokenUnranked ]
+          AS Variable [ Name=$tokenUnranked ]
 ,
           (
             SELECT ELEMENT [
@@ -237,8 +216,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 [
@@ -246,36 +224,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
@@ -288,8 +254,7 @@ FROM [  FunctionCall Metadata.dataset@1[
                   ]
                   ]
                   FROM [                    Variable [ Name=#3 ]
-                    AS
-                    Variable [ Name=#4 ]
+                    AS Variable [ Name=#4 ]
                   ]
                 )
               ]
@@ -298,10 +263,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 [
@@ -365,32 +329,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/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-aqlplus_1/dblp-aqlplus_1.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-aqlplus_1/dblp-aqlplus_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-aqlplus_1/dblp-aqlplus_1.3.ast
index 22d651f..175ec78 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-aqlplus_1/dblp-aqlplus_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-aqlplus_1/dblp-aqlplus_1.3.ast
@@ -18,14 +18,12 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$dblp ]
+  AS Variable [ Name=$dblp ]
 ,
   FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$dblp2 ]
+  AS Variable [ Name=$dblp2 ]
 ]
 Where
   OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-aqlplus_2/dblp-aqlplus_2.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-aqlplus_2/dblp-aqlplus_2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-aqlplus_2/dblp-aqlplus_2.3.ast
index cc6eb88..6afb337 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-aqlplus_2/dblp-aqlplus_2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-aqlplus_2/dblp-aqlplus_2.3.ast
@@ -18,14 +18,12 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$dblp ]
+  AS Variable [ Name=$dblp ]
 ,
   FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$dblp2 ]
+  AS Variable [ Name=$dblp2 ]
 ]
 Where
   OperatorExpr [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1eedb4cb/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_1/dblp-csx-2_1.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_1/dblp-csx-2_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_1/dblp-csx-2_1.3.ast
index 4936e10..2c59ebb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_1/dblp-csx-2_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_1/dblp-csx-2_1.3.ast
@@ -26,8 +26,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$paperDBLP ]
+  AS Variable [ Name=$paperDBLP ]
 ,
   FunctionCall fuzzyjoin.subset-collection@3[
     FunctionCall Metadata.dataset@1[
@@ -43,14 +42,12 @@ FROM [  FunctionCall Metadata.dataset@1[
       LiteralExpr [FLOAT] [0.5]
     ]
   ]
-  AS
-  Variable [ Name=$prefixTokenDBLP ]
+  AS Variable [ Name=$prefixTokenDBLP ]
 ,
   FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [CSX]
   ]
-  AS
-  Variable [ Name=$paperCSX ]
+  AS Variable [ Name=$paperCSX ]
 ,
   FunctionCall fuzzyjoin.subset-collection@3[
     FunctionCall Metadata.dataset@1[
@@ -66,8 +63,7 @@ FROM [  FunctionCall Metadata.dataset@1[
       LiteralExpr [FLOAT] [0.5]
     ]
   ]
-  AS
-  Variable [ Name=$prefixTokenCSX ]
+  AS Variable [ Name=$prefixTokenCSX ]
 ]
 Let Variable [ Name=$tokensDBLP ]
   :=
@@ -81,8 +77,7 @@ Let Variable [ Name=$tokensDBLP ]
           Field=title
         ]
       ]
-      AS
-      Variable [ Name=$tokenUnranked ]
+      AS Variable [ Name=$tokenUnranked ]
 ,
       (
         SELECT ELEMENT [
@@ -91,8 +86,7 @@ Let Variable [ Name=$tokensDBLP ]
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [DBLP]
           ]
-          AS
-          Variable [ Name=$paper ]
+          AS Variable [ Name=$paper ]
 ,
           FunctionCall fuzzyjoin.counthashed-word-tokens@1[
             FieldAccessor [
@@ -100,30 +94,21 @@ Let Variable [ Name=$tokensDBLP ]
               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=$prefixTokenCSX ]
-           AS prefixTokenCSX
-          Variable [ Name=$paperCSX ]
-           AS paperCSX
-          Variable [ Name=$prefixTokenDBLP ]
-           AS prefixTokenDBLP
-          Variable [ Name=$paperDBLP ]
-           AS paperDBLP
+            token:=Variable [ Name=$token ]
+            paper:=Variable [ Name=$paper ]
+            tokenUnranked:=Variable [ Name=$tokenUnranked ]
+            prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ]
+            paperCSX:=Variable [ Name=$paperCSX ]
+            prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ]
+            paperDBLP:=Variable [ Name=$paperDBLP ]
           )
 
         Orderby
@@ -136,8 +121,7 @@ Let Variable [ Name=$tokensDBLP ]
               ]
               ]
               FROM [                Variable [ Name=#1 ]
-                AS
-                Variable [ Name=#2 ]
+                AS Variable [ Name=#2 ]
               ]
             )
           ]
@@ -146,10 +130,9 @@ Let Variable [ Name=$tokensDBLP ]
           ASC
 
       )
-      AS
-      Variable [ Name=$tokenRanked ]
-      AT
-      Variable [ Name=$i ]
+      AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
     ]
     Where
       OperatorExpr [
@@ -174,8 +157,7 @@ Let Variable [ Name=$tokensCSX ]
           Field=title
         ]
       ]
-      AS
-      Variable [ Name=$tokenUnranked ]
+      AS Variable [ Name=$tokenUnranked ]
 ,
       (
         SELECT ELEMENT [
@@ -184,8 +166,7 @@ Let Variable [ Name=$tokensCSX ]
         FROM [          FunctionCall Metadata.dataset@1[
             LiteralExpr [STRING] [DBLP]
           ]
-          AS
-          Variable [ Name=$paper ]
+          AS Variable [ Name=$paper ]
 ,
           FunctionCall fuzzyjoin.counthashed-word-tokens@1[
             FieldAccessor [
@@ -193,32 +174,22 @@ Let Variable [ Name=$tokensCSX ]
               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=$tokensDBLP ]
-           AS tokensDBLP
-          Variable [ Name=$prefixTokenCSX ]
-           AS prefixTokenCSX
-          Variable [ Name=$paperCSX ]
-           AS paperCSX
-          Variable [ Name=$prefixTokenDBLP ]
-           AS prefixTokenDBLP
-          Variable [ Name=$paperDBLP ]
-           AS paperDBLP
+            token:=Variable [ Name=$token ]
+            paper:=Variable [ Name=$paper ]
+            tokenUnranked:=Variable [ Name=$tokenUnranked ]
+            tokensDBLP:=Variable [ Name=$tokensDBLP ]
+            prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ]
+            paperCSX:=Variable [ Name=$paperCSX ]
+            prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ]
+            paperDBLP:=Variable [ Name=$paperDBLP ]
           )
 
         Orderby
@@ -231,8 +202,7 @@ Let Variable [ Name=$tokensCSX ]
               ]
               ]
               FROM [                Variable [ Name=#3 ]
-                AS
-                Variable [ Name=#4 ]
+                AS Variable [ Name=#4 ]
               ]
             )
           ]
@@ -241,10 +211,9 @@ Let Variable [ Name=$tokensCSX ]
           ASC
 
       )
-      AS
-      Variable [ Name=$tokenRanked ]
-      AT
-      Variable [ Name=$i ]
+      AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
     ]
     Where
       OperatorExpr [
@@ -311,23 +280,15 @@ Groupby
   Variable [ Name=$sim ]
   :=
   Variable [ Name=$sim ]
-  GROUP AS
-  Variable [ Name=#5 ]
+  GROUP AS Variable [ Name=#5 ]
   (
-  Variable [ Name=$sim ]
-   AS sim
-  Variable [ Name=$tokensCSX ]
-   AS tokensCSX
-  Variable [ Name=$tokensDBLP ]
-   AS tokensDBLP
-  Variable [ Name=$prefixTokenCSX ]
-   AS prefixTokenCSX
-  Variable [ Name=$paperCSX ]
-   AS paperCSX
-  Variable [ Name=$prefixTokenDBLP ]
-   AS prefixTokenDBLP
-  Variable [ Name=$paperDBLP ]
-   AS paperDBLP
+    sim:=Variable [ Name=$sim ]
+    tokensCSX:=Variable [ Name=$tokensCSX ]
+    tokensDBLP:=Variable [ Name=$tokensDBLP ]
+    prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ]
+    paperCSX:=Variable [ Name=$paperCSX ]
+    prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ]
+    paperDBLP:=Variable [ Name=$paperDBLP ]
   )
 
 Orderby