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

[12/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/fuzzyjoin/dblp-csx-2_2/dblp-csx-2_2.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_2/dblp-csx-2_2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_2/dblp-csx-2_2.3.ast
index 4093d2a..7818c84 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_2/dblp-csx-2_2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_2/dblp-csx-2_2.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,8 +94,7 @@ Let Variable [ Name=$tokensDBLP ]
               Field=title
             ]
           ]
-          AS
-          Variable [ Name=$token ]
+          AS Variable [ Name=$token ]
         ]
         Let Variable [ Name=$id ]
           :=
@@ -113,25 +106,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=$prefixTokenCSX ]
-           AS prefixTokenCSX
-          Variable [ Name=$paperCSX ]
-           AS paperCSX
-          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 ]
+            prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ]
+            paperCSX:=Variable [ Name=$paperCSX ]
+            prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ]
+            paperDBLP:=Variable [ Name=$paperDBLP ]
           )
 
         Orderby
@@ -144,8 +128,7 @@ Let Variable [ Name=$tokensDBLP ]
               ]
               ]
               FROM [                Variable [ Name=#1 ]
-                AS
-                Variable [ Name=#2 ]
+                AS Variable [ Name=#2 ]
               ]
             )
           ]
@@ -154,10 +137,9 @@ Let Variable [ Name=$tokensDBLP ]
           ASC
 
       )
-      AS
-      Variable [ Name=$tokenRanked ]
-      AT
-      Variable [ Name=$i ]
+      AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
     ]
     Where
       OperatorExpr [
@@ -182,8 +164,7 @@ Let Variable [ Name=$tokensCSX ]
           Field=title
         ]
       ]
-      AS
-      Variable [ Name=$tokenUnranked ]
+      AS Variable [ Name=$tokenUnranked ]
 ,
       (
         SELECT ELEMENT [
@@ -192,8 +173,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 [
@@ -201,8 +181,7 @@ Let Variable [ Name=$tokensCSX ]
               Field=title
             ]
           ]
-          AS
-          Variable [ Name=$token ]
+          AS Variable [ Name=$token ]
         ]
         Let Variable [ Name=$id ]
           :=
@@ -214,27 +193,17 @@ Let Variable [ Name=$tokensCSX ]
           Variable [ Name=$tokenGroupped ]
           :=
           Variable [ Name=$token ]
-          GROUP AS
-          Variable [ Name=#3 ]
+          GROUP AS Variable [ Name=#3 ]
           (
-          Variable [ Name=$id ]
-           AS id
-          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
+            id:=Variable [ Name=$id ]
+            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
@@ -247,8 +216,7 @@ Let Variable [ Name=$tokensCSX ]
               ]
               ]
               FROM [                Variable [ Name=#3 ]
-                AS
-                Variable [ Name=#4 ]
+                AS Variable [ Name=#4 ]
               ]
             )
           ]
@@ -257,10 +225,9 @@ Let Variable [ Name=$tokensCSX ]
           ASC
 
       )
-      AS
-      Variable [ Name=$tokenRanked ]
-      AT
-      Variable [ Name=$i ]
+      AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
     ]
     Where
       OperatorExpr [
@@ -327,23 +294,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

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_3/dblp-csx-2_3.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_3/dblp-csx-2_3.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_3/dblp-csx-2_3.3.ast
index 1276294..df4f32a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_3/dblp-csx-2_3.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_3/dblp-csx-2_3.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=$idDBLP ]
   :=
@@ -87,8 +83,7 @@ Let Variable [ Name=$tokensDBLP ]
           Field=title
         ]
       ]
-      AS
-      Variable [ Name=$tokenUnranked ]
+      AS Variable [ Name=$tokenUnranked ]
 ,
       (
         SELECT ELEMENT [
@@ -97,8 +92,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 [
@@ -106,8 +100,7 @@ Let Variable [ Name=$tokensDBLP ]
               Field=title
             ]
           ]
-          AS
-          Variable [ Name=$token ]
+          AS Variable [ Name=$token ]
         ]
         Let Variable [ Name=$id ]
           :=
@@ -119,27 +112,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=$idDBLP ]
-           AS idDBLP
-          Variable [ Name=$prefixTokenCSX ]
-           AS prefixTokenCSX
-          Variable [ Name=$paperCSX ]
-           AS paperCSX
-          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 ]
+            idDBLP:=Variable [ Name=$idDBLP ]
+            prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ]
+            paperCSX:=Variable [ Name=$paperCSX ]
+            prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ]
+            paperDBLP:=Variable [ Name=$paperDBLP ]
           )
 
         Orderby
@@ -152,8 +135,7 @@ Let Variable [ Name=$tokensDBLP ]
               ]
               ]
               FROM [                Variable [ Name=#1 ]
-                AS
-                Variable [ Name=#2 ]
+                AS Variable [ Name=#2 ]
               ]
             )
           ]
@@ -162,10 +144,9 @@ Let Variable [ Name=$tokensDBLP ]
           ASC
 
       )
-      AS
-      Variable [ Name=$tokenRanked ]
-      AT
-      Variable [ Name=$i ]
+      AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
     ]
     Where
       OperatorExpr [
@@ -196,8 +177,7 @@ Let Variable [ Name=$tokensCSX ]
           Field=title
         ]
       ]
-      AS
-      Variable [ Name=$tokenUnranked ]
+      AS Variable [ Name=$tokenUnranked ]
 ,
       (
         SELECT ELEMENT [
@@ -206,8 +186,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 [
@@ -215,8 +194,7 @@ Let Variable [ Name=$tokensCSX ]
               Field=title
             ]
           ]
-          AS
-          Variable [ Name=$token ]
+          AS Variable [ Name=$token ]
         ]
         Let Variable [ Name=$id ]
           :=
@@ -228,31 +206,19 @@ Let Variable [ Name=$tokensCSX ]
           Variable [ Name=$tokenGroupped ]
           :=
           Variable [ Name=$token ]
-          GROUP AS
-          Variable [ Name=#3 ]
+          GROUP AS Variable [ Name=#3 ]
           (
-          Variable [ Name=$id ]
-           AS id
-          Variable [ Name=$token ]
-           AS token
-          Variable [ Name=$paper ]
-           AS paper
-          Variable [ Name=$tokenUnranked ]
-           AS tokenUnranked
-          Variable [ Name=$idCSX ]
-           AS idCSX
-          Variable [ Name=$tokensDBLP ]
-           AS tokensDBLP
-          Variable [ Name=$idDBLP ]
-           AS idDBLP
-          Variable [ Name=$prefixTokenCSX ]
-           AS prefixTokenCSX
-          Variable [ Name=$paperCSX ]
-           AS paperCSX
-          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 ]
+            idCSX:=Variable [ Name=$idCSX ]
+            tokensDBLP:=Variable [ Name=$tokensDBLP ]
+            idDBLP:=Variable [ Name=$idDBLP ]
+            prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ]
+            paperCSX:=Variable [ Name=$paperCSX ]
+            prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ]
+            paperDBLP:=Variable [ Name=$paperDBLP ]
           )
 
         Orderby
@@ -265,8 +231,7 @@ Let Variable [ Name=$tokensCSX ]
               ]
               ]
               FROM [                Variable [ Name=#3 ]
-                AS
-                Variable [ Name=#4 ]
+                AS Variable [ Name=#4 ]
               ]
             )
           ]
@@ -275,10 +240,9 @@ Let Variable [ Name=$tokensCSX ]
           ASC
 
       )
-      AS
-      Variable [ Name=$tokenRanked ]
-      AT
-      Variable [ Name=$i ]
+      AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
     ]
     Where
       OperatorExpr [
@@ -339,27 +303,17 @@ 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=$idCSX ]
-   AS idCSX
-  Variable [ Name=$tokensDBLP ]
-   AS tokensDBLP
-  Variable [ Name=$idDBLP ]
-   AS idDBLP
-  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 ]
+    idCSX:=Variable [ Name=$idCSX ]
+    tokensDBLP:=Variable [ Name=$tokensDBLP ]
+    idDBLP:=Variable [ Name=$idDBLP ]
+    prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ]
+    paperCSX:=Variable [ Name=$paperCSX ]
+    prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ]
+    paperDBLP:=Variable [ Name=$paperDBLP ]
   )
 
 Orderby

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_4/dblp-csx-2_4.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_4/dblp-csx-2_4.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_4/dblp-csx-2_4.3.ast
index 5358e91..ce7906f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_4/dblp-csx-2_4.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_4/dblp-csx-2_4.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=$idDBLP ]
   :=
@@ -90,8 +86,7 @@ Let Variable [ Name=$tokensDBLP ]
     Variable [ Name=$i ]
     ]
     FROM [      Variable [ Name=$tokensUnrankedDBLP ]
-      AS
-      Variable [ Name=$tokenUnranked ]
+      AS Variable [ Name=$tokenUnranked ]
 ,
       (
         SELECT ELEMENT [
@@ -100,8 +95,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 [
@@ -109,8 +103,7 @@ Let Variable [ Name=$tokensDBLP ]
               Field=title
             ]
           ]
-          AS
-          Variable [ Name=$token ]
+          AS Variable [ Name=$token ]
         ]
         Let Variable [ Name=$id ]
           :=
@@ -122,29 +115,18 @@ 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=$prefixTokenCSX ]
-           AS prefixTokenCSX
-          Variable [ Name=$paperCSX ]
-           AS paperCSX
-          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 ]
+            tokensUnrankedDBLP:=Variable [ Name=$tokensUnrankedDBLP ]
+            idDBLP:=Variable [ Name=$idDBLP ]
+            prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ]
+            paperCSX:=Variable [ Name=$paperCSX ]
+            prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ]
+            paperDBLP:=Variable [ Name=$paperDBLP ]
           )
 
         Orderby
@@ -157,8 +139,7 @@ Let Variable [ Name=$tokensDBLP ]
               ]
               ]
               FROM [                Variable [ Name=#1 ]
-                AS
-                Variable [ Name=#2 ]
+                AS Variable [ Name=#2 ]
               ]
             )
           ]
@@ -167,10 +148,9 @@ Let Variable [ Name=$tokensDBLP ]
           ASC
 
       )
-      AS
-      Variable [ Name=$tokenRanked ]
-      AT
-      Variable [ Name=$i ]
+      AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
     ]
     Where
       OperatorExpr [
@@ -204,8 +184,7 @@ Let Variable [ Name=$tokensCSX ]
     Variable [ Name=$i ]
     ]
     FROM [      Variable [ Name=$tokensUnrankedCSX ]
-      AS
-      Variable [ Name=$tokenUnranked ]
+      AS Variable [ Name=$tokenUnranked ]
 ,
       (
         SELECT ELEMENT [
@@ -214,8 +193,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 [
@@ -223,8 +201,7 @@ Let Variable [ Name=$tokensCSX ]
               Field=title
             ]
           ]
-          AS
-          Variable [ Name=$token ]
+          AS Variable [ Name=$token ]
         ]
         Let Variable [ Name=$id ]
           :=
@@ -236,35 +213,21 @@ Let Variable [ Name=$tokensCSX ]
           Variable [ Name=$tokenGroupped ]
           :=
           Variable [ Name=$token ]
-          GROUP AS
-          Variable [ Name=#3 ]
+          GROUP AS Variable [ Name=#3 ]
           (
-          Variable [ Name=$id ]
-           AS id
-          Variable [ Name=$token ]
-           AS token
-          Variable [ Name=$paper ]
-           AS paper
-          Variable [ Name=$tokenUnranked ]
-           AS tokenUnranked
-          Variable [ Name=$tokensUnrankedCSX ]
-           AS tokensUnrankedCSX
-          Variable [ Name=$idCSX ]
-           AS idCSX
-          Variable [ Name=$tokensDBLP ]
-           AS tokensDBLP
-          Variable [ Name=$tokensUnrankedDBLP ]
-           AS tokensUnrankedDBLP
-          Variable [ Name=$idDBLP ]
-           AS idDBLP
-          Variable [ Name=$prefixTokenCSX ]
-           AS prefixTokenCSX
-          Variable [ Name=$paperCSX ]
-           AS paperCSX
-          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 ]
+            tokensUnrankedCSX:=Variable [ Name=$tokensUnrankedCSX ]
+            idCSX:=Variable [ Name=$idCSX ]
+            tokensDBLP:=Variable [ Name=$tokensDBLP ]
+            tokensUnrankedDBLP:=Variable [ Name=$tokensUnrankedDBLP ]
+            idDBLP:=Variable [ Name=$idDBLP ]
+            prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ]
+            paperCSX:=Variable [ Name=$paperCSX ]
+            prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ]
+            paperDBLP:=Variable [ Name=$paperDBLP ]
           )
 
         Orderby
@@ -277,8 +240,7 @@ Let Variable [ Name=$tokensCSX ]
               ]
               ]
               FROM [                Variable [ Name=#3 ]
-                AS
-                Variable [ Name=#4 ]
+                AS Variable [ Name=#4 ]
               ]
             )
           ]
@@ -287,10 +249,9 @@ Let Variable [ Name=$tokensCSX ]
           ASC
 
       )
-      AS
-      Variable [ Name=$tokenRanked ]
-      AT
-      Variable [ Name=$i ]
+      AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
     ]
     Where
       OperatorExpr [
@@ -341,31 +302,19 @@ 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=$tokensUnrankedCSX ]
-   AS tokensUnrankedCSX
-  Variable [ Name=$idCSX ]
-   AS idCSX
-  Variable [ Name=$tokensDBLP ]
-   AS tokensDBLP
-  Variable [ Name=$tokensUnrankedDBLP ]
-   AS tokensUnrankedDBLP
-  Variable [ Name=$idDBLP ]
-   AS idDBLP
-  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 ]
+    tokensUnrankedCSX:=Variable [ Name=$tokensUnrankedCSX ]
+    idCSX:=Variable [ Name=$idCSX ]
+    tokensDBLP:=Variable [ Name=$tokensDBLP ]
+    tokensUnrankedDBLP:=Variable [ Name=$tokensUnrankedDBLP ]
+    idDBLP:=Variable [ Name=$idDBLP ]
+    prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ]
+    paperCSX:=Variable [ Name=$paperCSX ]
+    prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ]
+    paperDBLP:=Variable [ Name=$paperDBLP ]
   )
 
 Orderby

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_5.1/dblp-csx-2_5.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.1/dblp-csx-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.1/dblp-csx-2_5.3.ast
index c925dea..e7f281d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.1/dblp-csx-2_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.1/dblp-csx-2_5.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=$idDBLP ]
   :=
@@ -95,8 +91,7 @@ Let Variable [ Name=$tokensDBLP ]
     Variable [ Name=$i ]
     ]
     FROM [      Variable [ Name=$tokensUnrankedDBLP ]
-      AS
-      Variable [ Name=$tokenUnranked ]
+      AS Variable [ Name=$tokenUnranked ]
 ,
       (
         SELECT ELEMENT [
@@ -105,8 +100,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 [
@@ -114,8 +108,7 @@ Let Variable [ Name=$tokensDBLP ]
               Field=title
             ]
           ]
-          AS
-          Variable [ Name=$token ]
+          AS Variable [ Name=$token ]
         ]
         Let Variable [ Name=$id ]
           :=
@@ -127,31 +120,19 @@ 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=$prefixTokenCSX ]
-           AS prefixTokenCSX
-          Variable [ Name=$paperCSX ]
-           AS paperCSX
-          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 ]
+            prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ]
+            paperCSX:=Variable [ Name=$paperCSX ]
+            prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ]
+            paperDBLP:=Variable [ Name=$paperDBLP ]
           )
 
         Orderby
@@ -164,8 +145,7 @@ Let Variable [ Name=$tokensDBLP ]
               ]
               ]
               FROM [                Variable [ Name=#1 ]
-                AS
-                Variable [ Name=#2 ]
+                AS Variable [ Name=#2 ]
               ]
             )
           ]
@@ -174,10 +154,9 @@ Let Variable [ Name=$tokensDBLP ]
           ASC
 
       )
-      AS
-      Variable [ Name=$tokenRanked ]
-      AT
-      Variable [ Name=$i ]
+      AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
     ]
     Where
       OperatorExpr [
@@ -216,8 +195,7 @@ Let Variable [ Name=$tokensCSX ]
     Variable [ Name=$i ]
     ]
     FROM [      Variable [ Name=$tokensUnrankedCSX ]
-      AS
-      Variable [ Name=$tokenUnranked ]
+      AS Variable [ Name=$tokenUnranked ]
 ,
       (
         SELECT ELEMENT [
@@ -226,8 +204,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 [
@@ -235,8 +212,7 @@ Let Variable [ Name=$tokensCSX ]
               Field=title
             ]
           ]
-          AS
-          Variable [ Name=$token ]
+          AS Variable [ Name=$token ]
         ]
         Let Variable [ Name=$id ]
           :=
@@ -248,39 +224,23 @@ Let Variable [ Name=$tokensCSX ]
           Variable [ Name=$tokenGrouped ]
           :=
           Variable [ Name=$token ]
-          GROUP AS
-          Variable [ Name=#3 ]
+          GROUP AS Variable [ Name=#3 ]
           (
-          Variable [ Name=$id ]
-           AS id
-          Variable [ Name=$token ]
-           AS token
-          Variable [ Name=$paper ]
-           AS paper
-          Variable [ Name=$tokenUnranked ]
-           AS tokenUnranked
-          Variable [ Name=$lenCSX ]
-           AS lenCSX
-          Variable [ Name=$tokensUnrankedCSX ]
-           AS tokensUnrankedCSX
-          Variable [ Name=$idCSX ]
-           AS idCSX
-          Variable [ Name=$tokensDBLP ]
-           AS tokensDBLP
-          Variable [ Name=$lenDBLP ]
-           AS lenDBLP
-          Variable [ Name=$tokensUnrankedDBLP ]
-           AS tokensUnrankedDBLP
-          Variable [ Name=$idDBLP ]
-           AS idDBLP
-          Variable [ Name=$prefixTokenCSX ]
-           AS prefixTokenCSX
-          Variable [ Name=$paperCSX ]
-           AS paperCSX
-          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 ]
+            lenCSX:=Variable [ Name=$lenCSX ]
+            tokensUnrankedCSX:=Variable [ Name=$tokensUnrankedCSX ]
+            idCSX:=Variable [ Name=$idCSX ]
+            tokensDBLP:=Variable [ Name=$tokensDBLP ]
+            lenDBLP:=Variable [ Name=$lenDBLP ]
+            tokensUnrankedDBLP:=Variable [ Name=$tokensUnrankedDBLP ]
+            idDBLP:=Variable [ Name=$idDBLP ]
+            prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ]
+            paperCSX:=Variable [ Name=$paperCSX ]
+            prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ]
+            paperDBLP:=Variable [ Name=$paperDBLP ]
           )
 
         Orderby
@@ -293,8 +253,7 @@ Let Variable [ Name=$tokensCSX ]
               ]
               ]
               FROM [                Variable [ Name=#3 ]
-                AS
-                Variable [ Name=#4 ]
+                AS Variable [ Name=#4 ]
               ]
             )
           ]
@@ -303,10 +262,9 @@ Let Variable [ Name=$tokensCSX ]
           ASC
 
       )
-      AS
-      Variable [ Name=$tokenRanked ]
-      AT
-      Variable [ Name=$i ]
+      AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
     ]
     Where
       OperatorExpr [
@@ -350,35 +308,21 @@ Groupby
   Variable [ Name=$idCSX ]
   :=
   Variable [ Name=$idCSX ]
-  GROUP AS
-  Variable [ Name=#5 ]
+  GROUP AS Variable [ Name=#5 ]
   (
-  Variable [ Name=$sim ]
-   AS sim
-  Variable [ Name=$tokensCSX ]
-   AS tokensCSX
-  Variable [ Name=$lenCSX ]
-   AS lenCSX
-  Variable [ Name=$tokensUnrankedCSX ]
-   AS tokensUnrankedCSX
-  Variable [ Name=$idCSX ]
-   AS idCSX
-  Variable [ Name=$tokensDBLP ]
-   AS tokensDBLP
-  Variable [ Name=$lenDBLP ]
-   AS lenDBLP
-  Variable [ Name=$tokensUnrankedDBLP ]
-   AS tokensUnrankedDBLP
-  Variable [ Name=$idDBLP ]
-   AS idDBLP
-  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 ]
+    lenCSX:=Variable [ Name=$lenCSX ]
+    tokensUnrankedCSX:=Variable [ Name=$tokensUnrankedCSX ]
+    idCSX:=Variable [ Name=$idCSX ]
+    tokensDBLP:=Variable [ Name=$tokensDBLP ]
+    lenDBLP:=Variable [ Name=$lenDBLP ]
+    tokensUnrankedDBLP:=Variable [ Name=$tokensUnrankedDBLP ]
+    idDBLP:=Variable [ Name=$idDBLP ]
+    prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ]
+    paperCSX:=Variable [ Name=$paperCSX ]
+    prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ]
+    paperDBLP:=Variable [ Name=$paperDBLP ]
   )
 
 Orderby

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_5.2/dblp-csx-2_5.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.2/dblp-csx-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.2/dblp-csx-2_5.3.ast
index c925dea..e7f281d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.2/dblp-csx-2_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.2/dblp-csx-2_5.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=$idDBLP ]
   :=
@@ -95,8 +91,7 @@ Let Variable [ Name=$tokensDBLP ]
     Variable [ Name=$i ]
     ]
     FROM [      Variable [ Name=$tokensUnrankedDBLP ]
-      AS
-      Variable [ Name=$tokenUnranked ]
+      AS Variable [ Name=$tokenUnranked ]
 ,
       (
         SELECT ELEMENT [
@@ -105,8 +100,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 [
@@ -114,8 +108,7 @@ Let Variable [ Name=$tokensDBLP ]
               Field=title
             ]
           ]
-          AS
-          Variable [ Name=$token ]
+          AS Variable [ Name=$token ]
         ]
         Let Variable [ Name=$id ]
           :=
@@ -127,31 +120,19 @@ 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=$prefixTokenCSX ]
-           AS prefixTokenCSX
-          Variable [ Name=$paperCSX ]
-           AS paperCSX
-          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 ]
+            prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ]
+            paperCSX:=Variable [ Name=$paperCSX ]
+            prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ]
+            paperDBLP:=Variable [ Name=$paperDBLP ]
           )
 
         Orderby
@@ -164,8 +145,7 @@ Let Variable [ Name=$tokensDBLP ]
               ]
               ]
               FROM [                Variable [ Name=#1 ]
-                AS
-                Variable [ Name=#2 ]
+                AS Variable [ Name=#2 ]
               ]
             )
           ]
@@ -174,10 +154,9 @@ Let Variable [ Name=$tokensDBLP ]
           ASC
 
       )
-      AS
-      Variable [ Name=$tokenRanked ]
-      AT
-      Variable [ Name=$i ]
+      AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
     ]
     Where
       OperatorExpr [
@@ -216,8 +195,7 @@ Let Variable [ Name=$tokensCSX ]
     Variable [ Name=$i ]
     ]
     FROM [      Variable [ Name=$tokensUnrankedCSX ]
-      AS
-      Variable [ Name=$tokenUnranked ]
+      AS Variable [ Name=$tokenUnranked ]
 ,
       (
         SELECT ELEMENT [
@@ -226,8 +204,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 [
@@ -235,8 +212,7 @@ Let Variable [ Name=$tokensCSX ]
               Field=title
             ]
           ]
-          AS
-          Variable [ Name=$token ]
+          AS Variable [ Name=$token ]
         ]
         Let Variable [ Name=$id ]
           :=
@@ -248,39 +224,23 @@ Let Variable [ Name=$tokensCSX ]
           Variable [ Name=$tokenGrouped ]
           :=
           Variable [ Name=$token ]
-          GROUP AS
-          Variable [ Name=#3 ]
+          GROUP AS Variable [ Name=#3 ]
           (
-          Variable [ Name=$id ]
-           AS id
-          Variable [ Name=$token ]
-           AS token
-          Variable [ Name=$paper ]
-           AS paper
-          Variable [ Name=$tokenUnranked ]
-           AS tokenUnranked
-          Variable [ Name=$lenCSX ]
-           AS lenCSX
-          Variable [ Name=$tokensUnrankedCSX ]
-           AS tokensUnrankedCSX
-          Variable [ Name=$idCSX ]
-           AS idCSX
-          Variable [ Name=$tokensDBLP ]
-           AS tokensDBLP
-          Variable [ Name=$lenDBLP ]
-           AS lenDBLP
-          Variable [ Name=$tokensUnrankedDBLP ]
-           AS tokensUnrankedDBLP
-          Variable [ Name=$idDBLP ]
-           AS idDBLP
-          Variable [ Name=$prefixTokenCSX ]
-           AS prefixTokenCSX
-          Variable [ Name=$paperCSX ]
-           AS paperCSX
-          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 ]
+            lenCSX:=Variable [ Name=$lenCSX ]
+            tokensUnrankedCSX:=Variable [ Name=$tokensUnrankedCSX ]
+            idCSX:=Variable [ Name=$idCSX ]
+            tokensDBLP:=Variable [ Name=$tokensDBLP ]
+            lenDBLP:=Variable [ Name=$lenDBLP ]
+            tokensUnrankedDBLP:=Variable [ Name=$tokensUnrankedDBLP ]
+            idDBLP:=Variable [ Name=$idDBLP ]
+            prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ]
+            paperCSX:=Variable [ Name=$paperCSX ]
+            prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ]
+            paperDBLP:=Variable [ Name=$paperDBLP ]
           )
 
         Orderby
@@ -293,8 +253,7 @@ Let Variable [ Name=$tokensCSX ]
               ]
               ]
               FROM [                Variable [ Name=#3 ]
-                AS
-                Variable [ Name=#4 ]
+                AS Variable [ Name=#4 ]
               ]
             )
           ]
@@ -303,10 +262,9 @@ Let Variable [ Name=$tokensCSX ]
           ASC
 
       )
-      AS
-      Variable [ Name=$tokenRanked ]
-      AT
-      Variable [ Name=$i ]
+      AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
     ]
     Where
       OperatorExpr [
@@ -350,35 +308,21 @@ Groupby
   Variable [ Name=$idCSX ]
   :=
   Variable [ Name=$idCSX ]
-  GROUP AS
-  Variable [ Name=#5 ]
+  GROUP AS Variable [ Name=#5 ]
   (
-  Variable [ Name=$sim ]
-   AS sim
-  Variable [ Name=$tokensCSX ]
-   AS tokensCSX
-  Variable [ Name=$lenCSX ]
-   AS lenCSX
-  Variable [ Name=$tokensUnrankedCSX ]
-   AS tokensUnrankedCSX
-  Variable [ Name=$idCSX ]
-   AS idCSX
-  Variable [ Name=$tokensDBLP ]
-   AS tokensDBLP
-  Variable [ Name=$lenDBLP ]
-   AS lenDBLP
-  Variable [ Name=$tokensUnrankedDBLP ]
-   AS tokensUnrankedDBLP
-  Variable [ Name=$idDBLP ]
-   AS idDBLP
-  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 ]
+    lenCSX:=Variable [ Name=$lenCSX ]
+    tokensUnrankedCSX:=Variable [ Name=$tokensUnrankedCSX ]
+    idCSX:=Variable [ Name=$idCSX ]
+    tokensDBLP:=Variable [ Name=$tokensDBLP ]
+    lenDBLP:=Variable [ Name=$lenDBLP ]
+    tokensUnrankedDBLP:=Variable [ Name=$tokensUnrankedDBLP ]
+    idDBLP:=Variable [ Name=$idDBLP ]
+    prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ]
+    paperCSX:=Variable [ Name=$paperCSX ]
+    prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ]
+    paperDBLP:=Variable [ Name=$paperDBLP ]
   )
 
 Orderby

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_5.3.1/dblp-csx-2_5.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.3.1/dblp-csx-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.3.1/dblp-csx-2_5.3.ast
index 8ddc7b1..3ffdad1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.3.1/dblp-csx-2_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.3.1/dblp-csx-2_5.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=$idDBLP ]
   :=
@@ -95,8 +91,7 @@ Let Variable [ Name=$tokensDBLP ]
     Variable [ Name=$i ]
     ]
     FROM [      Variable [ Name=$tokensUnrankedDBLP ]
-      AS
-      Variable [ Name=$tokenUnranked ]
+      AS Variable [ Name=$tokenUnranked ]
 ,
       (
         SELECT ELEMENT [
@@ -105,8 +100,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 [
@@ -114,8 +108,7 @@ Let Variable [ Name=$tokensDBLP ]
               Field=title
             ]
           ]
-          AS
-          Variable [ Name=$token ]
+          AS Variable [ Name=$token ]
         ]
         Let Variable [ Name=$id ]
           :=
@@ -127,31 +120,19 @@ 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=$prefixTokenCSX ]
-           AS prefixTokenCSX
-          Variable [ Name=$paperCSX ]
-           AS paperCSX
-          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 ]
+            prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ]
+            paperCSX:=Variable [ Name=$paperCSX ]
+            prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ]
+            paperDBLP:=Variable [ Name=$paperDBLP ]
           )
 
         Orderby
@@ -164,8 +145,7 @@ Let Variable [ Name=$tokensDBLP ]
               ]
               ]
               FROM [                Variable [ Name=#1 ]
-                AS
-                Variable [ Name=#2 ]
+                AS Variable [ Name=#2 ]
               ]
             )
           ]
@@ -174,10 +154,9 @@ Let Variable [ Name=$tokensDBLP ]
           ASC
 
       )
-      AS
-      Variable [ Name=$tokenRanked ]
-      AT
-      Variable [ Name=$i ]
+      AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
     ]
     Where
       OperatorExpr [
@@ -216,8 +195,7 @@ Let Variable [ Name=$tokensCSX ]
     Variable [ Name=$i ]
     ]
     FROM [      Variable [ Name=$tokensUnrankedCSX ]
-      AS
-      Variable [ Name=$tokenUnranked ]
+      AS Variable [ Name=$tokenUnranked ]
 ,
       (
         SELECT ELEMENT [
@@ -226,8 +204,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 [
@@ -235,8 +212,7 @@ Let Variable [ Name=$tokensCSX ]
               Field=title
             ]
           ]
-          AS
-          Variable [ Name=$token ]
+          AS Variable [ Name=$token ]
         ]
         Let Variable [ Name=$id ]
           :=
@@ -248,39 +224,23 @@ Let Variable [ Name=$tokensCSX ]
           Variable [ Name=$tokenGroupped ]
           :=
           Variable [ Name=$token ]
-          GROUP AS
-          Variable [ Name=#3 ]
+          GROUP AS Variable [ Name=#3 ]
           (
-          Variable [ Name=$id ]
-           AS id
-          Variable [ Name=$token ]
-           AS token
-          Variable [ Name=$paper ]
-           AS paper
-          Variable [ Name=$tokenUnranked ]
-           AS tokenUnranked
-          Variable [ Name=$lenCSX ]
-           AS lenCSX
-          Variable [ Name=$tokensUnrankedCSX ]
-           AS tokensUnrankedCSX
-          Variable [ Name=$idCSX ]
-           AS idCSX
-          Variable [ Name=$tokensDBLP ]
-           AS tokensDBLP
-          Variable [ Name=$lenDBLP ]
-           AS lenDBLP
-          Variable [ Name=$tokensUnrankedDBLP ]
-           AS tokensUnrankedDBLP
-          Variable [ Name=$idDBLP ]
-           AS idDBLP
-          Variable [ Name=$prefixTokenCSX ]
-           AS prefixTokenCSX
-          Variable [ Name=$paperCSX ]
-           AS paperCSX
-          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 ]
+            lenCSX:=Variable [ Name=$lenCSX ]
+            tokensUnrankedCSX:=Variable [ Name=$tokensUnrankedCSX ]
+            idCSX:=Variable [ Name=$idCSX ]
+            tokensDBLP:=Variable [ Name=$tokensDBLP ]
+            lenDBLP:=Variable [ Name=$lenDBLP ]
+            tokensUnrankedDBLP:=Variable [ Name=$tokensUnrankedDBLP ]
+            idDBLP:=Variable [ Name=$idDBLP ]
+            prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ]
+            paperCSX:=Variable [ Name=$paperCSX ]
+            prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ]
+            paperDBLP:=Variable [ Name=$paperDBLP ]
           )
 
         Orderby
@@ -293,8 +253,7 @@ Let Variable [ Name=$tokensCSX ]
               ]
               ]
               FROM [                Variable [ Name=#3 ]
-                AS
-                Variable [ Name=#4 ]
+                AS Variable [ Name=#4 ]
               ]
             )
           ]
@@ -303,10 +262,9 @@ Let Variable [ Name=$tokensCSX ]
           ASC
 
       )
-      AS
-      Variable [ Name=$tokenRanked ]
-      AT
-      Variable [ Name=$i ]
+      AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
     ]
     Where
       OperatorExpr [
@@ -353,35 +311,21 @@ 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=$lenCSX ]
-   AS lenCSX
-  Variable [ Name=$tokensUnrankedCSX ]
-   AS tokensUnrankedCSX
-  Variable [ Name=$idCSX ]
-   AS idCSX
-  Variable [ Name=$tokensDBLP ]
-   AS tokensDBLP
-  Variable [ Name=$lenDBLP ]
-   AS lenDBLP
-  Variable [ Name=$tokensUnrankedDBLP ]
-   AS tokensUnrankedDBLP
-  Variable [ Name=$idDBLP ]
-   AS idDBLP
-  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 ]
+    lenCSX:=Variable [ Name=$lenCSX ]
+    tokensUnrankedCSX:=Variable [ Name=$tokensUnrankedCSX ]
+    idCSX:=Variable [ Name=$idCSX ]
+    tokensDBLP:=Variable [ Name=$tokensDBLP ]
+    lenDBLP:=Variable [ Name=$lenDBLP ]
+    tokensUnrankedDBLP:=Variable [ Name=$tokensUnrankedDBLP ]
+    idDBLP:=Variable [ Name=$idDBLP ]
+    prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ]
+    paperCSX:=Variable [ Name=$paperCSX ]
+    prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ]
+    paperDBLP:=Variable [ Name=$paperDBLP ]
   )
 
 Orderby

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_5.3/dblp-csx-2_5.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.3/dblp-csx-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.3/dblp-csx-2_5.3.ast
index c925dea..e7f281d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.3/dblp-csx-2_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.3/dblp-csx-2_5.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=$idDBLP ]
   :=
@@ -95,8 +91,7 @@ Let Variable [ Name=$tokensDBLP ]
     Variable [ Name=$i ]
     ]
     FROM [      Variable [ Name=$tokensUnrankedDBLP ]
-      AS
-      Variable [ Name=$tokenUnranked ]
+      AS Variable [ Name=$tokenUnranked ]
 ,
       (
         SELECT ELEMENT [
@@ -105,8 +100,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 [
@@ -114,8 +108,7 @@ Let Variable [ Name=$tokensDBLP ]
               Field=title
             ]
           ]
-          AS
-          Variable [ Name=$token ]
+          AS Variable [ Name=$token ]
         ]
         Let Variable [ Name=$id ]
           :=
@@ -127,31 +120,19 @@ 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=$prefixTokenCSX ]
-           AS prefixTokenCSX
-          Variable [ Name=$paperCSX ]
-           AS paperCSX
-          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 ]
+            prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ]
+            paperCSX:=Variable [ Name=$paperCSX ]
+            prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ]
+            paperDBLP:=Variable [ Name=$paperDBLP ]
           )
 
         Orderby
@@ -164,8 +145,7 @@ Let Variable [ Name=$tokensDBLP ]
               ]
               ]
               FROM [                Variable [ Name=#1 ]
-                AS
-                Variable [ Name=#2 ]
+                AS Variable [ Name=#2 ]
               ]
             )
           ]
@@ -174,10 +154,9 @@ Let Variable [ Name=$tokensDBLP ]
           ASC
 
       )
-      AS
-      Variable [ Name=$tokenRanked ]
-      AT
-      Variable [ Name=$i ]
+      AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
     ]
     Where
       OperatorExpr [
@@ -216,8 +195,7 @@ Let Variable [ Name=$tokensCSX ]
     Variable [ Name=$i ]
     ]
     FROM [      Variable [ Name=$tokensUnrankedCSX ]
-      AS
-      Variable [ Name=$tokenUnranked ]
+      AS Variable [ Name=$tokenUnranked ]
 ,
       (
         SELECT ELEMENT [
@@ -226,8 +204,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 [
@@ -235,8 +212,7 @@ Let Variable [ Name=$tokensCSX ]
               Field=title
             ]
           ]
-          AS
-          Variable [ Name=$token ]
+          AS Variable [ Name=$token ]
         ]
         Let Variable [ Name=$id ]
           :=
@@ -248,39 +224,23 @@ Let Variable [ Name=$tokensCSX ]
           Variable [ Name=$tokenGrouped ]
           :=
           Variable [ Name=$token ]
-          GROUP AS
-          Variable [ Name=#3 ]
+          GROUP AS Variable [ Name=#3 ]
           (
-          Variable [ Name=$id ]
-           AS id
-          Variable [ Name=$token ]
-           AS token
-          Variable [ Name=$paper ]
-           AS paper
-          Variable [ Name=$tokenUnranked ]
-           AS tokenUnranked
-          Variable [ Name=$lenCSX ]
-           AS lenCSX
-          Variable [ Name=$tokensUnrankedCSX ]
-           AS tokensUnrankedCSX
-          Variable [ Name=$idCSX ]
-           AS idCSX
-          Variable [ Name=$tokensDBLP ]
-           AS tokensDBLP
-          Variable [ Name=$lenDBLP ]
-           AS lenDBLP
-          Variable [ Name=$tokensUnrankedDBLP ]
-           AS tokensUnrankedDBLP
-          Variable [ Name=$idDBLP ]
-           AS idDBLP
-          Variable [ Name=$prefixTokenCSX ]
-           AS prefixTokenCSX
-          Variable [ Name=$paperCSX ]
-           AS paperCSX
-          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 ]
+            lenCSX:=Variable [ Name=$lenCSX ]
+            tokensUnrankedCSX:=Variable [ Name=$tokensUnrankedCSX ]
+            idCSX:=Variable [ Name=$idCSX ]
+            tokensDBLP:=Variable [ Name=$tokensDBLP ]
+            lenDBLP:=Variable [ Name=$lenDBLP ]
+            tokensUnrankedDBLP:=Variable [ Name=$tokensUnrankedDBLP ]
+            idDBLP:=Variable [ Name=$idDBLP ]
+            prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ]
+            paperCSX:=Variable [ Name=$paperCSX ]
+            prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ]
+            paperDBLP:=Variable [ Name=$paperDBLP ]
           )
 
         Orderby
@@ -293,8 +253,7 @@ Let Variable [ Name=$tokensCSX ]
               ]
               ]
               FROM [                Variable [ Name=#3 ]
-                AS
-                Variable [ Name=#4 ]
+                AS Variable [ Name=#4 ]
               ]
             )
           ]
@@ -303,10 +262,9 @@ Let Variable [ Name=$tokensCSX ]
           ASC
 
       )
-      AS
-      Variable [ Name=$tokenRanked ]
-      AT
-      Variable [ Name=$i ]
+      AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
     ]
     Where
       OperatorExpr [
@@ -350,35 +308,21 @@ Groupby
   Variable [ Name=$idCSX ]
   :=
   Variable [ Name=$idCSX ]
-  GROUP AS
-  Variable [ Name=#5 ]
+  GROUP AS Variable [ Name=#5 ]
   (
-  Variable [ Name=$sim ]
-   AS sim
-  Variable [ Name=$tokensCSX ]
-   AS tokensCSX
-  Variable [ Name=$lenCSX ]
-   AS lenCSX
-  Variable [ Name=$tokensUnrankedCSX ]
-   AS tokensUnrankedCSX
-  Variable [ Name=$idCSX ]
-   AS idCSX
-  Variable [ Name=$tokensDBLP ]
-   AS tokensDBLP
-  Variable [ Name=$lenDBLP ]
-   AS lenDBLP
-  Variable [ Name=$tokensUnrankedDBLP ]
-   AS tokensUnrankedDBLP
-  Variable [ Name=$idDBLP ]
-   AS idDBLP
-  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 ]
+    lenCSX:=Variable [ Name=$lenCSX ]
+    tokensUnrankedCSX:=Variable [ Name=$tokensUnrankedCSX ]
+    idCSX:=Variable [ Name=$idCSX ]
+    tokensDBLP:=Variable [ Name=$tokensDBLP ]
+    lenDBLP:=Variable [ Name=$lenDBLP ]
+    tokensUnrankedDBLP:=Variable [ Name=$tokensUnrankedDBLP ]
+    idDBLP:=Variable [ Name=$idDBLP ]
+    prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ]
+    paperCSX:=Variable [ Name=$paperCSX ]
+    prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ]
+    paperDBLP:=Variable [ Name=$paperDBLP ]
   )
 
 Orderby

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_5/dblp-csx-2_5.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5/dblp-csx-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5/dblp-csx-2_5.3.ast
index 8ddc7b1..3ffdad1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5/dblp-csx-2_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5/dblp-csx-2_5.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=$idDBLP ]
   :=
@@ -95,8 +91,7 @@ Let Variable [ Name=$tokensDBLP ]
     Variable [ Name=$i ]
     ]
     FROM [      Variable [ Name=$tokensUnrankedDBLP ]
-      AS
-      Variable [ Name=$tokenUnranked ]
+      AS Variable [ Name=$tokenUnranked ]
 ,
       (
         SELECT ELEMENT [
@@ -105,8 +100,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 [
@@ -114,8 +108,7 @@ Let Variable [ Name=$tokensDBLP ]
               Field=title
             ]
           ]
-          AS
-          Variable [ Name=$token ]
+          AS Variable [ Name=$token ]
         ]
         Let Variable [ Name=$id ]
           :=
@@ -127,31 +120,19 @@ 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=$prefixTokenCSX ]
-           AS prefixTokenCSX
-          Variable [ Name=$paperCSX ]
-           AS paperCSX
-          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 ]
+            prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ]
+            paperCSX:=Variable [ Name=$paperCSX ]
+            prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ]
+            paperDBLP:=Variable [ Name=$paperDBLP ]
           )
 
         Orderby
@@ -164,8 +145,7 @@ Let Variable [ Name=$tokensDBLP ]
               ]
               ]
               FROM [                Variable [ Name=#1 ]
-                AS
-                Variable [ Name=#2 ]
+                AS Variable [ Name=#2 ]
               ]
             )
           ]
@@ -174,10 +154,9 @@ Let Variable [ Name=$tokensDBLP ]
           ASC
 
       )
-      AS
-      Variable [ Name=$tokenRanked ]
-      AT
-      Variable [ Name=$i ]
+      AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
     ]
     Where
       OperatorExpr [
@@ -216,8 +195,7 @@ Let Variable [ Name=$tokensCSX ]
     Variable [ Name=$i ]
     ]
     FROM [      Variable [ Name=$tokensUnrankedCSX ]
-      AS
-      Variable [ Name=$tokenUnranked ]
+      AS Variable [ Name=$tokenUnranked ]
 ,
       (
         SELECT ELEMENT [
@@ -226,8 +204,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 [
@@ -235,8 +212,7 @@ Let Variable [ Name=$tokensCSX ]
               Field=title
             ]
           ]
-          AS
-          Variable [ Name=$token ]
+          AS Variable [ Name=$token ]
         ]
         Let Variable [ Name=$id ]
           :=
@@ -248,39 +224,23 @@ Let Variable [ Name=$tokensCSX ]
           Variable [ Name=$tokenGroupped ]
           :=
           Variable [ Name=$token ]
-          GROUP AS
-          Variable [ Name=#3 ]
+          GROUP AS Variable [ Name=#3 ]
           (
-          Variable [ Name=$id ]
-           AS id
-          Variable [ Name=$token ]
-           AS token
-          Variable [ Name=$paper ]
-           AS paper
-          Variable [ Name=$tokenUnranked ]
-           AS tokenUnranked
-          Variable [ Name=$lenCSX ]
-           AS lenCSX
-          Variable [ Name=$tokensUnrankedCSX ]
-           AS tokensUnrankedCSX
-          Variable [ Name=$idCSX ]
-           AS idCSX
-          Variable [ Name=$tokensDBLP ]
-           AS tokensDBLP
-          Variable [ Name=$lenDBLP ]
-           AS lenDBLP
-          Variable [ Name=$tokensUnrankedDBLP ]
-           AS tokensUnrankedDBLP
-          Variable [ Name=$idDBLP ]
-           AS idDBLP
-          Variable [ Name=$prefixTokenCSX ]
-           AS prefixTokenCSX
-          Variable [ Name=$paperCSX ]
-           AS paperCSX
-          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 ]
+            lenCSX:=Variable [ Name=$lenCSX ]
+            tokensUnrankedCSX:=Variable [ Name=$tokensUnrankedCSX ]
+            idCSX:=Variable [ Name=$idCSX ]
+            tokensDBLP:=Variable [ Name=$tokensDBLP ]
+            lenDBLP:=Variable [ Name=$lenDBLP ]
+            tokensUnrankedDBLP:=Variable [ Name=$tokensUnrankedDBLP ]
+            idDBLP:=Variable [ Name=$idDBLP ]
+            prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ]
+            paperCSX:=Variable [ Name=$paperCSX ]
+            prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ]
+            paperDBLP:=Variable [ Name=$paperDBLP ]
           )
 
         Orderby
@@ -293,8 +253,7 @@ Let Variable [ Name=$tokensCSX ]
               ]
               ]
               FROM [                Variable [ Name=#3 ]
-                AS
-                Variable [ Name=#4 ]
+                AS Variable [ Name=#4 ]
               ]
             )
           ]
@@ -303,10 +262,9 @@ Let Variable [ Name=$tokensCSX ]
           ASC
 
       )
-      AS
-      Variable [ Name=$tokenRanked ]
-      AT
-      Variable [ Name=$i ]
+      AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
     ]
     Where
       OperatorExpr [
@@ -353,35 +311,21 @@ 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=$lenCSX ]
-   AS lenCSX
-  Variable [ Name=$tokensUnrankedCSX ]
-   AS tokensUnrankedCSX
-  Variable [ Name=$idCSX ]
-   AS idCSX
-  Variable [ Name=$tokensDBLP ]
-   AS tokensDBLP
-  Variable [ Name=$lenDBLP ]
-   AS lenDBLP
-  Variable [ Name=$tokensUnrankedDBLP ]
-   AS tokensUnrankedDBLP
-  Variable [ Name=$idDBLP ]
-   AS idDBLP
-  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 ]
+    lenCSX:=Variable [ Name=$lenCSX ]
+    tokensUnrankedCSX:=Variable [ Name=$tokensUnrankedCSX ]
+    idCSX:=Variable [ Name=$idCSX ]
+    tokensDBLP:=Variable [ Name=$tokensDBLP ]
+    lenDBLP:=Variable [ Name=$lenDBLP ]
+    tokensUnrankedDBLP:=Variable [ Name=$tokensUnrankedDBLP ]
+    idDBLP:=Variable [ Name=$idDBLP ]
+    prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ]
+    paperCSX:=Variable [ Name=$paperCSX ]
+    prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ]
+    paperDBLP:=Variable [ Name=$paperDBLP ]
   )
 
 Orderby

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-3_1/dblp-csx-3_1.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_1/dblp-csx-3_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_1/dblp-csx-3_1.3.ast
index 74480b0..92e8c06 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_1/dblp-csx-3_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_1/dblp-csx-3_1.3.ast
@@ -49,8 +49,7 @@ FROM [  (
     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[
@@ -66,14 +65,12 @@ FROM [  (
           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[
@@ -89,8 +86,7 @@ FROM [  (
           LiteralExpr [FLOAT] [0.5]
         ]
       ]
-      AS
-      Variable [ Name=$prefixTokenCSX ]
+      AS Variable [ Name=$prefixTokenCSX ]
     ]
     Let Variable [ Name=$tokensDBLP ]
       :=
@@ -104,8 +100,7 @@ FROM [  (
               Field=title
             ]
           ]
-          AS
-          Variable [ Name=$tokenUnranked ]
+          AS Variable [ Name=$tokenUnranked ]
 ,
           (
             SELECT ELEMENT [
@@ -114,8 +109,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 [
@@ -123,30 +117,21 @@ 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=$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
@@ -159,8 +144,7 @@ FROM [  (
                   ]
                   ]
                   FROM [                    Variable [ Name=#1 ]
-                    AS
-                    Variable [ Name=#2 ]
+                    AS Variable [ Name=#2 ]
                   ]
                 )
               ]
@@ -169,10 +153,9 @@ FROM [  (
               ASC
 
           )
-          AS
-          Variable [ Name=$tokenRanked ]
-          AT
-          Variable [ Name=$i ]
+          AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
         ]
         Where
           OperatorExpr [
@@ -197,8 +180,7 @@ FROM [  (
               Field=title
             ]
           ]
-          AS
-          Variable [ Name=$tokenUnranked ]
+          AS Variable [ Name=$tokenUnranked ]
 ,
           (
             SELECT ELEMENT [
@@ -207,8 +189,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 [
@@ -216,32 +197,22 @@ 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=$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
@@ -254,8 +225,7 @@ FROM [  (
                   ]
                   ]
                   FROM [                    Variable [ Name=#3 ]
-                    AS
-                    Variable [ Name=#4 ]
+                    AS Variable [ Name=#4 ]
                   ]
                 )
               ]
@@ -264,10 +234,9 @@ FROM [  (
               ASC
 
           )
-          AS
-          Variable [ Name=$tokenRanked ]
-          AT
-          Variable [ Name=$i ]
+          AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
         ]
         Where
           OperatorExpr [
@@ -334,40 +303,29 @@ FROM [  (
       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 ]
       )
 
   )
-  AS
-  Variable [ Name=$ridpair ]
+  AS Variable [ Name=$ridpair ]
 ,
   FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [DBLP]
   ]
-  AS
-  Variable [ Name=$paperDBLP ]
+  AS Variable [ Name=$paperDBLP ]
 ,
   FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [CSX]
   ]
-  AS
-  Variable [ Name=$paperCSX ]
+  AS Variable [ Name=$paperCSX ]
 ]
 Where
   OperatorExpr [