asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From buyin...@apache.org
Subject [11/28] incubator-asterixdb git commit: ASTERIXDB-1383: reduce the number of lines for "AS".
Date Mon, 18 Apr 2016 15:48:36 GMT
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_2/dblp-csx-3_2.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_2/dblp-csx-3_2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_2/dblp-csx-3_2.3.ast
index 4ee78c2..efbad42 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_2/dblp-csx-3_2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_2/dblp-csx-3_2.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,8 +117,7 @@ FROM [  (
                   Field=title
                 ]
               ]
-              AS
-              Variable [ Name=$token ]
+              AS Variable [ Name=$token ]
             ]
             Let Variable [ Name=$id ]
               :=
@@ -136,25 +129,16 @@ FROM [  (
               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
@@ -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 [
@@ -205,8 +187,7 @@ FROM [  (
               Field=title
             ]
           ]
-          AS
-          Variable [ Name=$tokenUnranked ]
+          AS Variable [ Name=$tokenUnranked ]
 ,
           (
             SELECT ELEMENT [
@@ -215,8 +196,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 [
@@ -224,8 +204,7 @@ FROM [  (
                   Field=title
                 ]
               ]
-              AS
-              Variable [ Name=$token ]
+              AS Variable [ Name=$token ]
             ]
             Let Variable [ Name=$id ]
               :=
@@ -237,27 +216,17 @@ FROM [  (
               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
@@ -270,8 +239,7 @@ FROM [  (
                   ]
                   ]
                   FROM [                    Variable [ Name=#3 ]
-                    AS
-                    Variable [ Name=#4 ]
+                    AS Variable [ Name=#4 ]
                   ]
                 )
               ]
@@ -280,10 +248,9 @@ FROM [  (
               ASC
 
           )
-          AS
-          Variable [ Name=$tokenRanked ]
-          AT
-          Variable [ Name=$i ]
+          AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
         ]
         Where
           OperatorExpr [
@@ -350,40 +317,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 [

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_3/dblp-csx-3_3.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_3/dblp-csx-3_3.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_3/dblp-csx-3_3.3.ast
index f22a4e2..2deaaf5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_3/dblp-csx-3_3.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_3/dblp-csx-3_3.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=$idDBLP ]
       :=
@@ -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,8 +123,7 @@ FROM [  (
                   Field=title
                 ]
               ]
-              AS
-              Variable [ Name=$token ]
+              AS Variable [ Name=$token ]
             ]
             Let Variable [ Name=$id ]
               :=
@@ -142,27 +135,17 @@ FROM [  (
               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
@@ -175,8 +158,7 @@ FROM [  (
                   ]
                   ]
                   FROM [                    Variable [ Name=#1 ]
-                    AS
-                    Variable [ Name=#2 ]
+                    AS Variable [ Name=#2 ]
                   ]
                 )
               ]
@@ -185,10 +167,9 @@ FROM [  (
               ASC
 
           )
-          AS
-          Variable [ Name=$tokenRanked ]
-          AT
-          Variable [ Name=$i ]
+          AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
         ]
         Where
           OperatorExpr [
@@ -219,8 +200,7 @@ FROM [  (
               Field=title
             ]
           ]
-          AS
-          Variable [ Name=$tokenUnranked ]
+          AS Variable [ Name=$tokenUnranked ]
 ,
           (
             SELECT ELEMENT [
@@ -229,8 +209,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 [
@@ -238,8 +217,7 @@ FROM [  (
                   Field=title
                 ]
               ]
-              AS
-              Variable [ Name=$token ]
+              AS Variable [ Name=$token ]
             ]
             Let Variable [ Name=$id ]
               :=
@@ -251,31 +229,19 @@ FROM [  (
               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
@@ -288,8 +254,7 @@ FROM [  (
                   ]
                   ]
                   FROM [                    Variable [ Name=#3 ]
-                    AS
-                    Variable [ Name=#4 ]
+                    AS Variable [ Name=#4 ]
                   ]
                 )
               ]
@@ -298,10 +263,9 @@ FROM [  (
               ASC
 
           )
-          AS
-          Variable [ Name=$tokenRanked ]
-          AT
-          Variable [ Name=$i ]
+          AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
         ]
         Where
           OperatorExpr [
@@ -362,44 +326,31 @@ 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=$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 ]
       )
 
   )
-  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 [

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_4/dblp-csx-3_4.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_4/dblp-csx-3_4.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_4/dblp-csx-3_4.3.ast
index 4e9103a..3dcfb48 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_4/dblp-csx-3_4.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_4/dblp-csx-3_4.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=$idDBLP ]
       :=
@@ -113,8 +109,7 @@ FROM [  (
         Variable [ Name=$i ]
         ]
         FROM [          Variable [ Name=$tokensUnrankedDBLP ]
-          AS
-          Variable [ Name=$tokenUnranked ]
+          AS Variable [ Name=$tokenUnranked ]
 ,
           (
             SELECT ELEMENT [
@@ -123,8 +118,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 [
@@ -132,8 +126,7 @@ FROM [  (
                   Field=title
                 ]
               ]
-              AS
-              Variable [ Name=$token ]
+              AS Variable [ Name=$token ]
             ]
             Let Variable [ Name=$id ]
               :=
@@ -145,29 +138,18 @@ FROM [  (
               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
@@ -180,8 +162,7 @@ FROM [  (
                   ]
                   ]
                   FROM [                    Variable [ Name=#1 ]
-                    AS
-                    Variable [ Name=#2 ]
+                    AS Variable [ Name=#2 ]
                   ]
                 )
               ]
@@ -190,10 +171,9 @@ FROM [  (
               ASC
 
           )
-          AS
-          Variable [ Name=$tokenRanked ]
-          AT
-          Variable [ Name=$i ]
+          AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
         ]
         Where
           OperatorExpr [
@@ -227,8 +207,7 @@ FROM [  (
         Variable [ Name=$i ]
         ]
         FROM [          Variable [ Name=$tokensUnrankedCSX ]
-          AS
-          Variable [ Name=$tokenUnranked ]
+          AS Variable [ Name=$tokenUnranked ]
 ,
           (
             SELECT ELEMENT [
@@ -237,8 +216,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 [
@@ -246,8 +224,7 @@ FROM [  (
                   Field=title
                 ]
               ]
-              AS
-              Variable [ Name=$token ]
+              AS Variable [ Name=$token ]
             ]
             Let Variable [ Name=$id ]
               :=
@@ -259,35 +236,21 @@ FROM [  (
               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
@@ -300,8 +263,7 @@ FROM [  (
                   ]
                   ]
                   FROM [                    Variable [ Name=#3 ]
-                    AS
-                    Variable [ Name=#4 ]
+                    AS Variable [ Name=#4 ]
                   ]
                 )
               ]
@@ -310,10 +272,9 @@ FROM [  (
               ASC
 
           )
-          AS
-          Variable [ Name=$tokenRanked ]
-          AT
-          Variable [ Name=$i ]
+          AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
         ]
         Where
           OperatorExpr [
@@ -364,48 +325,33 @@ 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=$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 ]
       )
 
   )
-  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 [

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_5.1/dblp-csx-3_5.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.1/dblp-csx-3_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.1/dblp-csx-3_5.3.ast
index 7f6a679..3588a30 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.1/dblp-csx-3_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.1/dblp-csx-3_5.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=$idDBLP ]
       :=
@@ -118,8 +114,7 @@ FROM [  (
         Variable [ Name=$i ]
         ]
         FROM [          Variable [ Name=$tokensUnrankedDBLP ]
-          AS
-          Variable [ Name=$tokenUnranked ]
+          AS Variable [ Name=$tokenUnranked ]
 ,
           (
             SELECT ELEMENT [
@@ -128,8 +123,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 [
@@ -137,8 +131,7 @@ FROM [  (
                   Field=title
                 ]
               ]
-              AS
-              Variable [ Name=$token ]
+              AS Variable [ Name=$token ]
             ]
             Let Variable [ Name=$id ]
               :=
@@ -150,31 +143,19 @@ FROM [  (
               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
@@ -187,8 +168,7 @@ FROM [  (
                   ]
                   ]
                   FROM [                    Variable [ Name=#1 ]
-                    AS
-                    Variable [ Name=#2 ]
+                    AS Variable [ Name=#2 ]
                   ]
                 )
               ]
@@ -197,10 +177,9 @@ FROM [  (
               ASC
 
           )
-          AS
-          Variable [ Name=$tokenRanked ]
-          AT
-          Variable [ Name=$i ]
+          AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
         ]
         Where
           OperatorExpr [
@@ -239,8 +218,7 @@ FROM [  (
         Variable [ Name=$i ]
         ]
         FROM [          Variable [ Name=$tokensUnrankedCSX ]
-          AS
-          Variable [ Name=$tokenUnranked ]
+          AS Variable [ Name=$tokenUnranked ]
 ,
           (
             SELECT ELEMENT [
@@ -249,8 +227,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 [
@@ -258,8 +235,7 @@ FROM [  (
                   Field=title
                 ]
               ]
-              AS
-              Variable [ Name=$token ]
+              AS Variable [ Name=$token ]
             ]
             Let Variable [ Name=$id ]
               :=
@@ -271,39 +247,23 @@ FROM [  (
               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
@@ -316,8 +276,7 @@ FROM [  (
                   ]
                   ]
                   FROM [                    Variable [ Name=#3 ]
-                    AS
-                    Variable [ Name=#4 ]
+                    AS Variable [ Name=#4 ]
                   ]
                 )
               ]
@@ -326,10 +285,9 @@ FROM [  (
               ASC
 
           )
-          AS
-          Variable [ Name=$tokenRanked ]
-          AT
-          Variable [ Name=$i ]
+          AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
         ]
         Where
           OperatorExpr [
@@ -373,52 +331,35 @@ FROM [  (
       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 ]
       )
 
   )
-  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 [

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_5.2/dblp-csx-3_5.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.2/dblp-csx-3_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.2/dblp-csx-3_5.3.ast
index 7f6a679..3588a30 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.2/dblp-csx-3_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.2/dblp-csx-3_5.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=$idDBLP ]
       :=
@@ -118,8 +114,7 @@ FROM [  (
         Variable [ Name=$i ]
         ]
         FROM [          Variable [ Name=$tokensUnrankedDBLP ]
-          AS
-          Variable [ Name=$tokenUnranked ]
+          AS Variable [ Name=$tokenUnranked ]
 ,
           (
             SELECT ELEMENT [
@@ -128,8 +123,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 [
@@ -137,8 +131,7 @@ FROM [  (
                   Field=title
                 ]
               ]
-              AS
-              Variable [ Name=$token ]
+              AS Variable [ Name=$token ]
             ]
             Let Variable [ Name=$id ]
               :=
@@ -150,31 +143,19 @@ FROM [  (
               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
@@ -187,8 +168,7 @@ FROM [  (
                   ]
                   ]
                   FROM [                    Variable [ Name=#1 ]
-                    AS
-                    Variable [ Name=#2 ]
+                    AS Variable [ Name=#2 ]
                   ]
                 )
               ]
@@ -197,10 +177,9 @@ FROM [  (
               ASC
 
           )
-          AS
-          Variable [ Name=$tokenRanked ]
-          AT
-          Variable [ Name=$i ]
+          AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
         ]
         Where
           OperatorExpr [
@@ -239,8 +218,7 @@ FROM [  (
         Variable [ Name=$i ]
         ]
         FROM [          Variable [ Name=$tokensUnrankedCSX ]
-          AS
-          Variable [ Name=$tokenUnranked ]
+          AS Variable [ Name=$tokenUnranked ]
 ,
           (
             SELECT ELEMENT [
@@ -249,8 +227,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 [
@@ -258,8 +235,7 @@ FROM [  (
                   Field=title
                 ]
               ]
-              AS
-              Variable [ Name=$token ]
+              AS Variable [ Name=$token ]
             ]
             Let Variable [ Name=$id ]
               :=
@@ -271,39 +247,23 @@ FROM [  (
               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
@@ -316,8 +276,7 @@ FROM [  (
                   ]
                   ]
                   FROM [                    Variable [ Name=#3 ]
-                    AS
-                    Variable [ Name=#4 ]
+                    AS Variable [ Name=#4 ]
                   ]
                 )
               ]
@@ -326,10 +285,9 @@ FROM [  (
               ASC
 
           )
-          AS
-          Variable [ Name=$tokenRanked ]
-          AT
-          Variable [ Name=$i ]
+          AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
         ]
         Where
           OperatorExpr [
@@ -373,52 +331,35 @@ FROM [  (
       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 ]
       )
 
   )
-  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 [

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_5.3.1/dblp-csx-3_5.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.3.1/dblp-csx-3_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.3.1/dblp-csx-3_5.3.ast
index 7f6a679..3588a30 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.3.1/dblp-csx-3_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.3.1/dblp-csx-3_5.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=$idDBLP ]
       :=
@@ -118,8 +114,7 @@ FROM [  (
         Variable [ Name=$i ]
         ]
         FROM [          Variable [ Name=$tokensUnrankedDBLP ]
-          AS
-          Variable [ Name=$tokenUnranked ]
+          AS Variable [ Name=$tokenUnranked ]
 ,
           (
             SELECT ELEMENT [
@@ -128,8 +123,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 [
@@ -137,8 +131,7 @@ FROM [  (
                   Field=title
                 ]
               ]
-              AS
-              Variable [ Name=$token ]
+              AS Variable [ Name=$token ]
             ]
             Let Variable [ Name=$id ]
               :=
@@ -150,31 +143,19 @@ FROM [  (
               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
@@ -187,8 +168,7 @@ FROM [  (
                   ]
                   ]
                   FROM [                    Variable [ Name=#1 ]
-                    AS
-                    Variable [ Name=#2 ]
+                    AS Variable [ Name=#2 ]
                   ]
                 )
               ]
@@ -197,10 +177,9 @@ FROM [  (
               ASC
 
           )
-          AS
-          Variable [ Name=$tokenRanked ]
-          AT
-          Variable [ Name=$i ]
+          AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
         ]
         Where
           OperatorExpr [
@@ -239,8 +218,7 @@ FROM [  (
         Variable [ Name=$i ]
         ]
         FROM [          Variable [ Name=$tokensUnrankedCSX ]
-          AS
-          Variable [ Name=$tokenUnranked ]
+          AS Variable [ Name=$tokenUnranked ]
 ,
           (
             SELECT ELEMENT [
@@ -249,8 +227,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 [
@@ -258,8 +235,7 @@ FROM [  (
                   Field=title
                 ]
               ]
-              AS
-              Variable [ Name=$token ]
+              AS Variable [ Name=$token ]
             ]
             Let Variable [ Name=$id ]
               :=
@@ -271,39 +247,23 @@ FROM [  (
               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
@@ -316,8 +276,7 @@ FROM [  (
                   ]
                   ]
                   FROM [                    Variable [ Name=#3 ]
-                    AS
-                    Variable [ Name=#4 ]
+                    AS Variable [ Name=#4 ]
                   ]
                 )
               ]
@@ -326,10 +285,9 @@ FROM [  (
               ASC
 
           )
-          AS
-          Variable [ Name=$tokenRanked ]
-          AT
-          Variable [ Name=$i ]
+          AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
         ]
         Where
           OperatorExpr [
@@ -373,52 +331,35 @@ FROM [  (
       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 ]
       )
 
   )
-  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 [

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_5.3/dblp-csx-3_5.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.3/dblp-csx-3_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.3/dblp-csx-3_5.3.ast
index 4838a20..adcea8c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.3/dblp-csx-3_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.3/dblp-csx-3_5.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=$idDBLP ]
       :=
@@ -118,8 +114,7 @@ FROM [  (
         Variable [ Name=$i ]
         ]
         FROM [          Variable [ Name=$tokensUnrankedDBLP ]
-          AS
-          Variable [ Name=$tokenUnranked ]
+          AS Variable [ Name=$tokenUnranked ]
 ,
           (
             SELECT ELEMENT [
@@ -128,8 +123,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 [
@@ -137,8 +131,7 @@ FROM [  (
                   Field=title
                 ]
               ]
-              AS
-              Variable [ Name=$token ]
+              AS Variable [ Name=$token ]
             ]
             Let Variable [ Name=$id ]
               :=
@@ -150,31 +143,19 @@ FROM [  (
               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
@@ -187,8 +168,7 @@ FROM [  (
                   ]
                   ]
                   FROM [                    Variable [ Name=#1 ]
-                    AS
-                    Variable [ Name=#2 ]
+                    AS Variable [ Name=#2 ]
                   ]
                 )
               ]
@@ -197,10 +177,9 @@ FROM [  (
               ASC
 
           )
-          AS
-          Variable [ Name=$tokenRanked ]
-          AT
-          Variable [ Name=$i ]
+          AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
         ]
         Where
           OperatorExpr [
@@ -239,8 +218,7 @@ FROM [  (
         Variable [ Name=$i ]
         ]
         FROM [          Variable [ Name=$tokensUnrankedCSX ]
-          AS
-          Variable [ Name=$tokenUnranked ]
+          AS Variable [ Name=$tokenUnranked ]
 ,
           (
             SELECT ELEMENT [
@@ -249,8 +227,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 [
@@ -258,8 +235,7 @@ FROM [  (
                   Field=title
                 ]
               ]
-              AS
-              Variable [ Name=$token ]
+              AS Variable [ Name=$token ]
             ]
             Let Variable [ Name=$id ]
               :=
@@ -271,39 +247,23 @@ FROM [  (
               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
@@ -316,8 +276,7 @@ FROM [  (
                   ]
                   ]
                   FROM [                    Variable [ Name=#3 ]
-                    AS
-                    Variable [ Name=#4 ]
+                    AS Variable [ Name=#4 ]
                   ]
                 )
               ]
@@ -326,10 +285,9 @@ FROM [  (
               ASC
 
           )
-          AS
-          Variable [ Name=$tokenRanked ]
-          AT
-          Variable [ Name=$i ]
+          AS Variable [ Name=$tokenRanked ]
+ AT 
+Variable [ Name=$i ]
         ]
         Where
           OperatorExpr [
@@ -376,52 +334,35 @@ 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=$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 ]
       )
 
   )
-  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 [

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_5.4.1/dblp-csx-3_5.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.4.1/dblp-csx-3_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.4.1/dblp-csx-3_5.3.ast
index 3f963eb..18723de 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.4.1/dblp-csx-3_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.4.1/dblp-csx-3_5.3.ast
@@ -29,8 +29,7 @@ RecordConstructor [
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [CSX]
   ]
-  AS
-  Variable [ Name=$paperCSX ]
+  AS Variable [ Name=$paperCSX ]
 ,
   (
     SELECT ELEMENT [
@@ -69,8 +68,7 @@ FROM [  FunctionCall Metadata.dataset@1[
     FROM [      FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [DBLP]
       ]
-      AS
-      Variable [ Name=$paperDBLP ]
+      AS Variable [ Name=$paperDBLP ]
 ,
       (
         SELECT ELEMENT [
@@ -98,8 +96,7 @@ FROM [  FunctionCall Metadata.dataset@1[
         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[
@@ -115,14 +112,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[
@@ -138,8 +133,7 @@ FROM [  FunctionCall Metadata.dataset@1[
               LiteralExpr [FLOAT] [0.5]
             ]
           ]
-          AS
-          Variable [ Name=$prefixTokenCSX ]
+          AS Variable [ Name=$prefixTokenCSX ]
         ]
         Let Variable [ Name=$idDBLP ]
           :=
@@ -167,8 +161,7 @@ FROM [  FunctionCall Metadata.dataset@1[
             Variable [ Name=$i ]
             ]
             FROM [              Variable [ Name=$tokensUnrankedDBLP ]
-              AS
-              Variable [ Name=$tokenUnranked ]
+              AS Variable [ Name=$tokenUnranked ]
 ,
               (
                 SELECT ELEMENT [
@@ -177,8 +170,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 [
@@ -186,8 +178,7 @@ FROM [  FunctionCall Metadata.dataset@1[
                       Field=title
                     ]
                   ]
-                  AS
-                  Variable [ Name=$token ]
+                  AS Variable [ Name=$token ]
                 ]
                 Let Variable [ Name=$id ]
                   :=
@@ -199,31 +190,19 @@ FROM [  FunctionCall Metadata.dataset@1[
                   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
@@ -236,8 +215,7 @@ FROM [  FunctionCall Metadata.dataset@1[
                       ]
                       ]
                       FROM [                        Variable [ Name=#1 ]
-                        AS
-                        Variable [ Name=#2 ]
+                        AS Variable [ Name=#2 ]
                       ]
                     )
                   ]
@@ -246,10 +224,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 [
@@ -288,8 +265,7 @@ FROM [  FunctionCall Metadata.dataset@1[
             Variable [ Name=$i ]
             ]
             FROM [              Variable [ Name=$tokensUnrankedCSX ]
-              AS
-              Variable [ Name=$tokenUnranked ]
+              AS Variable [ Name=$tokenUnranked ]
 ,
               (
                 SELECT ELEMENT [
@@ -298,8 +274,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 [
@@ -307,8 +282,7 @@ FROM [  FunctionCall Metadata.dataset@1[
                       Field=title
                     ]
                   ]
-                  AS
-                  Variable [ Name=$token ]
+                  AS Variable [ Name=$token ]
                 ]
                 Let Variable [ Name=$id ]
                   :=
@@ -320,39 +294,23 @@ FROM [  FunctionCall Metadata.dataset@1[
                   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
@@ -365,8 +323,7 @@ FROM [  FunctionCall Metadata.dataset@1[
                       ]
                       ]
                       FROM [                        Variable [ Name=#3 ]
-                        AS
-                        Variable [ Name=#4 ]
+                        AS Variable [ Name=#4 ]
                       ]
                     )
                   ]
@@ -375,10 +332,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 [
@@ -422,40 +378,25 @@ FROM [  FunctionCall Metadata.dataset@1[
           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 ]
           )
 
       )
-      AS
-      Variable [ Name=$ridpair ]
+      AS Variable [ Name=$ridpair ]
     ]
     Where
       OperatorExpr [
@@ -470,8 +411,7 @@ FROM [  FunctionCall Metadata.dataset@1[
         ]
       ]
   )
-  AS
-  Variable [ Name=$paperDBLPridpair ]
+  AS Variable [ Name=$paperDBLPridpair ]
 ]
 Where
   OperatorExpr [


Mime
View raw message