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 2017/01/03 16:49:09 UTC

[2/3] asterixdb git commit: ASTERIXDB-1650: fix undefined variable reference resolution.

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.2/dblp-2.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.2/dblp-2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.2/dblp-2.3.ast
index 83b5471..939f281 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.2/dblp-2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.2/dblp-2.3.ast
@@ -26,14 +26,16 @@ FROM [  FunctionCall Metadata.dataset@1[
   AS Variable [ Name=$paperDBLP ]
 ,
   FunctionCall fuzzyjoin.subset-collection@3[
-    FunctionCall Metadata.dataset@1[
+    FunctionCall Metadata.resolve@-1[
       LiteralExpr [STRING] [tokensDBLP]
+      Variable [ Name=$paperDBLP ]
     ]
     LiteralExpr [LONG] [0]
     FunctionCall fuzzyjoin.prefix-len-jaccard@2[
       FunctionCall fuzzyjoin.len@1[
-        FunctionCall Metadata.dataset@1[
+        FunctionCall Metadata.resolve@-1[
           LiteralExpr [STRING] [tokensDBLP]
+          Variable [ Name=$paperDBLP ]
         ]
       ]
       LiteralExpr [FLOAT] [0.5]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_2/dblp-2_2.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_2/dblp-2_2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_2/dblp-2_2.3.ast
index 4d4ecc8..5924f3e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_2/dblp-2_2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_2/dblp-2_2.3.ast
@@ -74,8 +74,15 @@ Let Variable [ Name=$tokensDBLP ]
           FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
-              FunctionCall Metadata.dataset@1[
+              FunctionCall Metadata.resolve@-1[
                 LiteralExpr [STRING] [id]
+                Variable [ Name=$token ]
+                Variable [ Name=$paper ]
+                Variable [ Name=$tokenGroupped ]
+                Variable [ Name=$paperDBLP ]
+                Variable [ Name=$tokenUnranked ]
+                Variable [ Name=#1 ]
+                Variable [ Name=#2 ]
               ]
               ]
               FROM [                Variable [ Name=#1 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_3/dblp-2_3.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_3/dblp-2_3.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_3/dblp-2_3.3.ast
index 0e7d067..bba988a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_3/dblp-2_3.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_3/dblp-2_3.3.ast
@@ -77,8 +77,16 @@ Let Variable [ Name=$tokensDBLP ]
           FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
-              FunctionCall Metadata.dataset@1[
+              FunctionCall Metadata.resolve@-1[
                 LiteralExpr [STRING] [id]
+                Variable [ Name=$token ]
+                Variable [ Name=$paper ]
+                Variable [ Name=$tokenGroupped ]
+                Variable [ Name=$paperDBLP ]
+                Variable [ Name=$tokenUnranked ]
+                Variable [ Name=#1 ]
+                Variable [ Name=#2 ]
+                Variable [ Name=$idDBLP ]
               ]
               ]
               FROM [                Variable [ Name=#1 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_4/dblp-2_4.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_4/dblp-2_4.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_4/dblp-2_4.3.ast
index b290858..5f6b822 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_4/dblp-2_4.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_4/dblp-2_4.3.ast
@@ -80,8 +80,17 @@ Let Variable [ Name=$tokensDBLP ]
           FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
-              FunctionCall Metadata.dataset@1[
+              FunctionCall Metadata.resolve@-1[
                 LiteralExpr [STRING] [id]
+                Variable [ Name=$token ]
+                Variable [ Name=$tokensUnrankedDBLP ]
+                Variable [ Name=$paper ]
+                Variable [ Name=$tokenGroupped ]
+                Variable [ Name=$paperDBLP ]
+                Variable [ Name=$tokenUnranked ]
+                Variable [ Name=#1 ]
+                Variable [ Name=#2 ]
+                Variable [ Name=$idDBLP ]
               ]
               ]
               FROM [                Variable [ Name=#1 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.1/dblp-2_5.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.1/dblp-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.1/dblp-2_5.3.ast
index 244cb0b..909baec 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.1/dblp-2_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.1/dblp-2_5.3.ast
@@ -90,8 +90,18 @@ Let Variable [ Name=$tokensDBLP ]
           FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
-              FunctionCall Metadata.dataset@1[
+              FunctionCall Metadata.resolve@-1[
                 LiteralExpr [STRING] [id]
+                Variable [ Name=$lenDBLP ]
+                Variable [ Name=$token ]
+                Variable [ Name=$tokensUnrankedDBLP ]
+                Variable [ Name=$paper ]
+                Variable [ Name=$tokenGrouped ]
+                Variable [ Name=$paperDBLP ]
+                Variable [ Name=$tokenUnranked ]
+                Variable [ Name=#1 ]
+                Variable [ Name=#2 ]
+                Variable [ Name=$idDBLP ]
               ]
               ]
               FROM [                Variable [ Name=#1 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.2/dblp-2_5.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.2/dblp-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.2/dblp-2_5.3.ast
index 244cb0b..909baec 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.2/dblp-2_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.2/dblp-2_5.3.ast
@@ -90,8 +90,18 @@ Let Variable [ Name=$tokensDBLP ]
           FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
-              FunctionCall Metadata.dataset@1[
+              FunctionCall Metadata.resolve@-1[
                 LiteralExpr [STRING] [id]
+                Variable [ Name=$lenDBLP ]
+                Variable [ Name=$token ]
+                Variable [ Name=$tokensUnrankedDBLP ]
+                Variable [ Name=$paper ]
+                Variable [ Name=$tokenGrouped ]
+                Variable [ Name=$paperDBLP ]
+                Variable [ Name=$tokenUnranked ]
+                Variable [ Name=#1 ]
+                Variable [ Name=#2 ]
+                Variable [ Name=$idDBLP ]
               ]
               ]
               FROM [                Variable [ Name=#1 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3.1/dblp-2_5.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3.1/dblp-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3.1/dblp-2_5.3.ast
index 244cb0b..909baec 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3.1/dblp-2_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3.1/dblp-2_5.3.ast
@@ -90,8 +90,18 @@ Let Variable [ Name=$tokensDBLP ]
           FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
-              FunctionCall Metadata.dataset@1[
+              FunctionCall Metadata.resolve@-1[
                 LiteralExpr [STRING] [id]
+                Variable [ Name=$lenDBLP ]
+                Variable [ Name=$token ]
+                Variable [ Name=$tokensUnrankedDBLP ]
+                Variable [ Name=$paper ]
+                Variable [ Name=$tokenGrouped ]
+                Variable [ Name=$paperDBLP ]
+                Variable [ Name=$tokenUnranked ]
+                Variable [ Name=#1 ]
+                Variable [ Name=#2 ]
+                Variable [ Name=$idDBLP ]
               ]
               ]
               FROM [                Variable [ Name=#1 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3/dblp-2_5.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3/dblp-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3/dblp-2_5.3.ast
index 244cb0b..909baec 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3/dblp-2_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3/dblp-2_5.3.ast
@@ -90,8 +90,18 @@ Let Variable [ Name=$tokensDBLP ]
           FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
-              FunctionCall Metadata.dataset@1[
+              FunctionCall Metadata.resolve@-1[
                 LiteralExpr [STRING] [id]
+                Variable [ Name=$lenDBLP ]
+                Variable [ Name=$token ]
+                Variable [ Name=$tokensUnrankedDBLP ]
+                Variable [ Name=$paper ]
+                Variable [ Name=$tokenGrouped ]
+                Variable [ Name=$paperDBLP ]
+                Variable [ Name=$tokenUnranked ]
+                Variable [ Name=#1 ]
+                Variable [ Name=#2 ]
+                Variable [ Name=$idDBLP ]
               ]
               ]
               FROM [                Variable [ Name=#1 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5/dblp-2_5.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5/dblp-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5/dblp-2_5.3.ast
index 60e0b24..f36d0c6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5/dblp-2_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5/dblp-2_5.3.ast
@@ -90,8 +90,18 @@ Let Variable [ Name=$tokensDBLP ]
           FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
-              FunctionCall Metadata.dataset@1[
+              FunctionCall Metadata.resolve@-1[
                 LiteralExpr [STRING] [id]
+                Variable [ Name=$lenDBLP ]
+                Variable [ Name=$token ]
+                Variable [ Name=$tokensUnrankedDBLP ]
+                Variable [ Name=$paper ]
+                Variable [ Name=$tokenGroupped ]
+                Variable [ Name=$paperDBLP ]
+                Variable [ Name=$tokenUnranked ]
+                Variable [ Name=#1 ]
+                Variable [ Name=#2 ]
+                Variable [ Name=$idDBLP ]
               ]
               ]
               FROM [                Variable [ Name=#1 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.1/dblp-3_1.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.1/dblp-3_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.1/dblp-3_1.3.ast
index fd16f56..9158753 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.1/dblp-3_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.1/dblp-3_1.3.ast
@@ -40,8 +40,19 @@ FROM [  (
         LiteralExpr [STRING] [sim]
         :
         IndexAccessor [
-          FunctionCall Metadata.dataset@1[
+          FunctionCall Metadata.resolve@-1[
             LiteralExpr [STRING] [sim]
+            Variable [ Name=#5 ]
+            Variable [ Name=$lenLeft ]
+            Variable [ Name=$idLeft ]
+            Variable [ Name=$lenRight ]
+            Variable [ Name=$tokensLeft ]
+            Variable [ Name=$prefixTokenRight ]
+            Variable [ Name=$tokensRight ]
+            Variable [ Name=$paperLeft ]
+            Variable [ Name=$paperRight ]
+            Variable [ Name=$idRight ]
+            Variable [ Name=$prefixTokenLeft ]
           ]
           Index:           LiteralExpr [LONG] [0]
         ]
@@ -54,13 +65,15 @@ FROM [  (
       AS Variable [ Name=$paperLeft ]
 ,
       FunctionCall fuzzyjoin.subset-collection@3[
-        FunctionCall Metadata.dataset@1[
+        FunctionCall Metadata.resolve@-1[
           LiteralExpr [STRING] [tokensLeft]
+          Variable [ Name=$paperLeft ]
         ]
         LiteralExpr [LONG] [0]
         FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-          FunctionCall Metadata.dataset@1[
+          FunctionCall Metadata.resolve@-1[
             LiteralExpr [STRING] [lenLeft]
+            Variable [ Name=$paperLeft ]
           ]
           LiteralExpr [FLOAT] [0.5]
         ]
@@ -73,13 +86,19 @@ FROM [  (
       AS Variable [ Name=$paperRight ]
 ,
       FunctionCall fuzzyjoin.subset-collection@3[
-        FunctionCall Metadata.dataset@1[
+        FunctionCall Metadata.resolve@-1[
           LiteralExpr [STRING] [tokensRight]
+          Variable [ Name=$paperLeft ]
+          Variable [ Name=$paperRight ]
+          Variable [ Name=$prefixTokenLeft ]
         ]
         LiteralExpr [LONG] [0]
         FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-          FunctionCall Metadata.dataset@1[
+          FunctionCall Metadata.resolve@-1[
             LiteralExpr [STRING] [lenRight]
+            Variable [ Name=$paperLeft ]
+            Variable [ Name=$paperRight ]
+            Variable [ Name=$prefixTokenLeft ]
           ]
           LiteralExpr [FLOAT] [0.5]
         ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.2/dblp-3_1.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.2/dblp-3_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.2/dblp-3_1.3.ast
index fd16f56..9158753 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.2/dblp-3_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.2/dblp-3_1.3.ast
@@ -40,8 +40,19 @@ FROM [  (
         LiteralExpr [STRING] [sim]
         :
         IndexAccessor [
-          FunctionCall Metadata.dataset@1[
+          FunctionCall Metadata.resolve@-1[
             LiteralExpr [STRING] [sim]
+            Variable [ Name=#5 ]
+            Variable [ Name=$lenLeft ]
+            Variable [ Name=$idLeft ]
+            Variable [ Name=$lenRight ]
+            Variable [ Name=$tokensLeft ]
+            Variable [ Name=$prefixTokenRight ]
+            Variable [ Name=$tokensRight ]
+            Variable [ Name=$paperLeft ]
+            Variable [ Name=$paperRight ]
+            Variable [ Name=$idRight ]
+            Variable [ Name=$prefixTokenLeft ]
           ]
           Index:           LiteralExpr [LONG] [0]
         ]
@@ -54,13 +65,15 @@ FROM [  (
       AS Variable [ Name=$paperLeft ]
 ,
       FunctionCall fuzzyjoin.subset-collection@3[
-        FunctionCall Metadata.dataset@1[
+        FunctionCall Metadata.resolve@-1[
           LiteralExpr [STRING] [tokensLeft]
+          Variable [ Name=$paperLeft ]
         ]
         LiteralExpr [LONG] [0]
         FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-          FunctionCall Metadata.dataset@1[
+          FunctionCall Metadata.resolve@-1[
             LiteralExpr [STRING] [lenLeft]
+            Variable [ Name=$paperLeft ]
           ]
           LiteralExpr [FLOAT] [0.5]
         ]
@@ -73,13 +86,19 @@ FROM [  (
       AS Variable [ Name=$paperRight ]
 ,
       FunctionCall fuzzyjoin.subset-collection@3[
-        FunctionCall Metadata.dataset@1[
+        FunctionCall Metadata.resolve@-1[
           LiteralExpr [STRING] [tokensRight]
+          Variable [ Name=$paperLeft ]
+          Variable [ Name=$paperRight ]
+          Variable [ Name=$prefixTokenLeft ]
         ]
         LiteralExpr [LONG] [0]
         FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-          FunctionCall Metadata.dataset@1[
+          FunctionCall Metadata.resolve@-1[
             LiteralExpr [STRING] [lenRight]
+            Variable [ Name=$paperLeft ]
+            Variable [ Name=$paperRight ]
+            Variable [ Name=$prefixTokenLeft ]
           ]
           LiteralExpr [FLOAT] [0.5]
         ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1/dblp-3_1.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1/dblp-3_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1/dblp-3_1.3.ast
index 05a8114..9ccb943 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1/dblp-3_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1/dblp-3_1.3.ast
@@ -50,8 +50,19 @@ FROM [  FunctionCall Metadata.dataset@1[
         LiteralExpr [STRING] [sim]
         :
         IndexAccessor [
-          FunctionCall Metadata.dataset@1[
+          FunctionCall Metadata.resolve@-1[
             LiteralExpr [STRING] [sim]
+            Variable [ Name=#5 ]
+            Variable [ Name=$lenLeft ]
+            Variable [ Name=$idLeft ]
+            Variable [ Name=$lenRight ]
+            Variable [ Name=$tokensLeft ]
+            Variable [ Name=$prefixTokenRight ]
+            Variable [ Name=$tokensRight ]
+            Variable [ Name=$paperLeft ]
+            Variable [ Name=$paperRight ]
+            Variable [ Name=$idRight ]
+            Variable [ Name=$prefixTokenLeft ]
           ]
           Index:           LiteralExpr [LONG] [0]
         ]
@@ -64,13 +75,17 @@ FROM [  FunctionCall Metadata.dataset@1[
       AS Variable [ Name=$paperLeft ]
 ,
       FunctionCall fuzzyjoin.subset-collection@3[
-        FunctionCall Metadata.dataset@1[
+        FunctionCall Metadata.resolve@-1[
           LiteralExpr [STRING] [tokensLeft]
+          Variable [ Name=$paperLeft ]
+          Variable [ Name=$paperRight ]
         ]
         LiteralExpr [LONG] [0]
         FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-          FunctionCall Metadata.dataset@1[
+          FunctionCall Metadata.resolve@-1[
             LiteralExpr [STRING] [lenLeft]
+            Variable [ Name=$paperLeft ]
+            Variable [ Name=$paperRight ]
           ]
           LiteralExpr [FLOAT] [0.5]
         ]
@@ -83,13 +98,19 @@ FROM [  FunctionCall Metadata.dataset@1[
       AS Variable [ Name=$paperRight ]
 ,
       FunctionCall fuzzyjoin.subset-collection@3[
-        FunctionCall Metadata.dataset@1[
+        FunctionCall Metadata.resolve@-1[
           LiteralExpr [STRING] [tokensRight]
+          Variable [ Name=$paperLeft ]
+          Variable [ Name=$paperRight ]
+          Variable [ Name=$prefixTokenLeft ]
         ]
         LiteralExpr [LONG] [0]
         FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-          FunctionCall Metadata.dataset@1[
+          FunctionCall Metadata.resolve@-1[
             LiteralExpr [STRING] [lenRight]
+            Variable [ Name=$paperLeft ]
+            Variable [ Name=$paperRight ]
+            Variable [ Name=$prefixTokenLeft ]
           ]
           LiteralExpr [FLOAT] [0.5]
         ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_1/dblp-csx-2_1.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_1/dblp-csx-2_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_1/dblp-csx-2_1.3.ast
index d3b6600..8098058 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_1/dblp-csx-2_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_1/dblp-csx-2_1.3.ast
@@ -29,14 +29,16 @@ FROM [  FunctionCall Metadata.dataset@1[
   AS Variable [ Name=$paperDBLP ]
 ,
   FunctionCall fuzzyjoin.subset-collection@3[
-    FunctionCall Metadata.dataset@1[
+    FunctionCall Metadata.resolve@-1[
       LiteralExpr [STRING] [tokensDBLP]
+      Variable [ Name=$paperDBLP ]
     ]
     LiteralExpr [LONG] [0]
     FunctionCall fuzzyjoin.prefix-len-jaccard@2[
       FunctionCall fuzzyjoin.len@1[
-        FunctionCall Metadata.dataset@1[
+        FunctionCall Metadata.resolve@-1[
           LiteralExpr [STRING] [tokensDBLP]
+          Variable [ Name=$paperDBLP ]
         ]
       ]
       LiteralExpr [FLOAT] [0.5]
@@ -50,14 +52,20 @@ FROM [  FunctionCall Metadata.dataset@1[
   AS Variable [ Name=$paperCSX ]
 ,
   FunctionCall fuzzyjoin.subset-collection@3[
-    FunctionCall Metadata.dataset@1[
+    FunctionCall Metadata.resolve@-1[
       LiteralExpr [STRING] [tokensCSX]
+      Variable [ Name=$prefixTokenDBLP ]
+      Variable [ Name=$paperDBLP ]
+      Variable [ Name=$paperCSX ]
     ]
     LiteralExpr [LONG] [0]
     FunctionCall fuzzyjoin.prefix-len-jaccard@2[
       FunctionCall fuzzyjoin.len@1[
-        FunctionCall Metadata.dataset@1[
+        FunctionCall Metadata.resolve@-1[
           LiteralExpr [STRING] [tokensCSX]
+          Variable [ Name=$prefixTokenDBLP ]
+          Variable [ Name=$paperDBLP ]
+          Variable [ Name=$paperCSX ]
         ]
       ]
       LiteralExpr [FLOAT] [0.5]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/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 af18d99..f572bde 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
@@ -29,14 +29,16 @@ FROM [  FunctionCall Metadata.dataset@1[
   AS Variable [ Name=$paperDBLP ]
 ,
   FunctionCall fuzzyjoin.subset-collection@3[
-    FunctionCall Metadata.dataset@1[
+    FunctionCall Metadata.resolve@-1[
       LiteralExpr [STRING] [tokensDBLP]
+      Variable [ Name=$paperDBLP ]
     ]
     LiteralExpr [LONG] [0]
     FunctionCall fuzzyjoin.prefix-len-jaccard@2[
       FunctionCall fuzzyjoin.len@1[
-        FunctionCall Metadata.dataset@1[
+        FunctionCall Metadata.resolve@-1[
           LiteralExpr [STRING] [tokensDBLP]
+          Variable [ Name=$paperDBLP ]
         ]
       ]
       LiteralExpr [FLOAT] [0.5]
@@ -50,14 +52,20 @@ FROM [  FunctionCall Metadata.dataset@1[
   AS Variable [ Name=$paperCSX ]
 ,
   FunctionCall fuzzyjoin.subset-collection@3[
-    FunctionCall Metadata.dataset@1[
+    FunctionCall Metadata.resolve@-1[
       LiteralExpr [STRING] [tokensCSX]
+      Variable [ Name=$prefixTokenDBLP ]
+      Variable [ Name=$paperDBLP ]
+      Variable [ Name=$paperCSX ]
     ]
     LiteralExpr [LONG] [0]
     FunctionCall fuzzyjoin.prefix-len-jaccard@2[
       FunctionCall fuzzyjoin.len@1[
-        FunctionCall Metadata.dataset@1[
+        FunctionCall Metadata.resolve@-1[
           LiteralExpr [STRING] [tokensCSX]
+          Variable [ Name=$prefixTokenDBLP ]
+          Variable [ Name=$paperDBLP ]
+          Variable [ Name=$paperCSX ]
         ]
       ]
       LiteralExpr [FLOAT] [0.5]
@@ -116,8 +124,18 @@ Let Variable [ Name=$tokensDBLP ]
           FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
-              FunctionCall Metadata.dataset@1[
+              FunctionCall Metadata.resolve@-1[
                 LiteralExpr [STRING] [id]
+                Variable [ Name=$prefixTokenCSX ]
+                Variable [ Name=$token ]
+                Variable [ Name=$paper ]
+                Variable [ Name=$tokenGroupped ]
+                Variable [ Name=$prefixTokenDBLP ]
+                Variable [ Name=$paperDBLP ]
+                Variable [ Name=$tokenUnranked ]
+                Variable [ Name=$paperCSX ]
+                Variable [ Name=#1 ]
+                Variable [ Name=#2 ]
               ]
               ]
               FROM [                Variable [ Name=#1 ]
@@ -196,8 +214,19 @@ Let Variable [ Name=$tokensCSX ]
           FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
-              FunctionCall Metadata.dataset@1[
+              FunctionCall Metadata.resolve@-1[
                 LiteralExpr [STRING] [id]
+                Variable [ Name=#4 ]
+                Variable [ Name=$prefixTokenCSX ]
+                Variable [ Name=$token ]
+                Variable [ Name=$paper ]
+                Variable [ Name=$tokenGroupped ]
+                Variable [ Name=$prefixTokenDBLP ]
+                Variable [ Name=$tokensDBLP ]
+                Variable [ Name=$paperDBLP ]
+                Variable [ Name=$tokenUnranked ]
+                Variable [ Name=$paperCSX ]
+                Variable [ Name=#3 ]
               ]
               ]
               FROM [                Variable [ Name=#3 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/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 e72a255..af67820 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
@@ -29,14 +29,16 @@ FROM [  FunctionCall Metadata.dataset@1[
   AS Variable [ Name=$paperDBLP ]
 ,
   FunctionCall fuzzyjoin.subset-collection@3[
-    FunctionCall Metadata.dataset@1[
+    FunctionCall Metadata.resolve@-1[
       LiteralExpr [STRING] [tokensDBLP]
+      Variable [ Name=$paperDBLP ]
     ]
     LiteralExpr [LONG] [0]
     FunctionCall fuzzyjoin.prefix-len-jaccard@2[
       FunctionCall fuzzyjoin.len@1[
-        FunctionCall Metadata.dataset@1[
+        FunctionCall Metadata.resolve@-1[
           LiteralExpr [STRING] [tokensDBLP]
+          Variable [ Name=$paperDBLP ]
         ]
       ]
       LiteralExpr [FLOAT] [0.5]
@@ -50,14 +52,20 @@ FROM [  FunctionCall Metadata.dataset@1[
   AS Variable [ Name=$paperCSX ]
 ,
   FunctionCall fuzzyjoin.subset-collection@3[
-    FunctionCall Metadata.dataset@1[
+    FunctionCall Metadata.resolve@-1[
       LiteralExpr [STRING] [tokensCSX]
+      Variable [ Name=$prefixTokenDBLP ]
+      Variable [ Name=$paperDBLP ]
+      Variable [ Name=$paperCSX ]
     ]
     LiteralExpr [LONG] [0]
     FunctionCall fuzzyjoin.prefix-len-jaccard@2[
       FunctionCall fuzzyjoin.len@1[
-        FunctionCall Metadata.dataset@1[
+        FunctionCall Metadata.resolve@-1[
           LiteralExpr [STRING] [tokensCSX]
+          Variable [ Name=$prefixTokenDBLP ]
+          Variable [ Name=$paperDBLP ]
+          Variable [ Name=$paperCSX ]
         ]
       ]
       LiteralExpr [FLOAT] [0.5]
@@ -122,8 +130,19 @@ Let Variable [ Name=$tokensDBLP ]
           FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
-              FunctionCall Metadata.dataset@1[
+              FunctionCall Metadata.resolve@-1[
                 LiteralExpr [STRING] [id]
+                Variable [ Name=$prefixTokenCSX ]
+                Variable [ Name=$token ]
+                Variable [ Name=$paper ]
+                Variable [ Name=$tokenGroupped ]
+                Variable [ Name=$prefixTokenDBLP ]
+                Variable [ Name=$paperDBLP ]
+                Variable [ Name=$tokenUnranked ]
+                Variable [ Name=$paperCSX ]
+                Variable [ Name=#1 ]
+                Variable [ Name=#2 ]
+                Variable [ Name=$idDBLP ]
               ]
               ]
               FROM [                Variable [ Name=#1 ]
@@ -208,8 +227,21 @@ Let Variable [ Name=$tokensCSX ]
           FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
-              FunctionCall Metadata.dataset@1[
+              FunctionCall Metadata.resolve@-1[
                 LiteralExpr [STRING] [id]
+                Variable [ Name=$paper ]
+                Variable [ Name=$tokensDBLP ]
+                Variable [ Name=$tokenUnranked ]
+                Variable [ Name=$idCSX ]
+                Variable [ Name=$idDBLP ]
+                Variable [ Name=#3 ]
+                Variable [ Name=#4 ]
+                Variable [ Name=$prefixTokenCSX ]
+                Variable [ Name=$token ]
+                Variable [ Name=$tokenGroupped ]
+                Variable [ Name=$prefixTokenDBLP ]
+                Variable [ Name=$paperDBLP ]
+                Variable [ Name=$paperCSX ]
               ]
               ]
               FROM [                Variable [ Name=#3 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/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 ce16186..13f3e86 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
@@ -29,14 +29,16 @@ FROM [  FunctionCall Metadata.dataset@1[
   AS Variable [ Name=$paperDBLP ]
 ,
   FunctionCall fuzzyjoin.subset-collection@3[
-    FunctionCall Metadata.dataset@1[
+    FunctionCall Metadata.resolve@-1[
       LiteralExpr [STRING] [tokensDBLP]
+      Variable [ Name=$paperDBLP ]
     ]
     LiteralExpr [LONG] [0]
     FunctionCall fuzzyjoin.prefix-len-jaccard@2[
       FunctionCall fuzzyjoin.len@1[
-        FunctionCall Metadata.dataset@1[
+        FunctionCall Metadata.resolve@-1[
           LiteralExpr [STRING] [tokensDBLP]
+          Variable [ Name=$paperDBLP ]
         ]
       ]
       LiteralExpr [FLOAT] [0.5]
@@ -50,14 +52,20 @@ FROM [  FunctionCall Metadata.dataset@1[
   AS Variable [ Name=$paperCSX ]
 ,
   FunctionCall fuzzyjoin.subset-collection@3[
-    FunctionCall Metadata.dataset@1[
+    FunctionCall Metadata.resolve@-1[
       LiteralExpr [STRING] [tokensCSX]
+      Variable [ Name=$prefixTokenDBLP ]
+      Variable [ Name=$paperDBLP ]
+      Variable [ Name=$paperCSX ]
     ]
     LiteralExpr [LONG] [0]
     FunctionCall fuzzyjoin.prefix-len-jaccard@2[
       FunctionCall fuzzyjoin.len@1[
-        FunctionCall Metadata.dataset@1[
+        FunctionCall Metadata.resolve@-1[
           LiteralExpr [STRING] [tokensCSX]
+          Variable [ Name=$prefixTokenDBLP ]
+          Variable [ Name=$paperDBLP ]
+          Variable [ Name=$paperCSX ]
         ]
       ]
       LiteralExpr [FLOAT] [0.5]
@@ -125,8 +133,20 @@ Let Variable [ Name=$tokensDBLP ]
           FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
-              FunctionCall Metadata.dataset@1[
+              FunctionCall Metadata.resolve@-1[
                 LiteralExpr [STRING] [id]
+                Variable [ Name=$prefixTokenCSX ]
+                Variable [ Name=$token ]
+                Variable [ Name=$tokensUnrankedDBLP ]
+                Variable [ Name=$paper ]
+                Variable [ Name=$tokenGroupped ]
+                Variable [ Name=$prefixTokenDBLP ]
+                Variable [ Name=$paperDBLP ]
+                Variable [ Name=$tokenUnranked ]
+                Variable [ Name=$paperCSX ]
+                Variable [ Name=#1 ]
+                Variable [ Name=#2 ]
+                Variable [ Name=$idDBLP ]
               ]
               ]
               FROM [                Variable [ Name=#1 ]
@@ -214,8 +234,23 @@ Let Variable [ Name=$tokensCSX ]
           FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
-              FunctionCall Metadata.dataset@1[
+              FunctionCall Metadata.resolve@-1[
                 LiteralExpr [STRING] [id]
+                Variable [ Name=$tokensUnrankedDBLP ]
+                Variable [ Name=$paper ]
+                Variable [ Name=$tokensDBLP ]
+                Variable [ Name=$tokenUnranked ]
+                Variable [ Name=$idCSX ]
+                Variable [ Name=$idDBLP ]
+                Variable [ Name=#3 ]
+                Variable [ Name=#4 ]
+                Variable [ Name=$prefixTokenCSX ]
+                Variable [ Name=$token ]
+                Variable [ Name=$tokensUnrankedCSX ]
+                Variable [ Name=$tokenGroupped ]
+                Variable [ Name=$prefixTokenDBLP ]
+                Variable [ Name=$paperDBLP ]
+                Variable [ Name=$paperCSX ]
               ]
               ]
               FROM [                Variable [ Name=#3 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/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 2b10846..d6384ce 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
@@ -17,8 +17,21 @@ RecordConstructor [
     LiteralExpr [STRING] [sim]
     :
     IndexAccessor [
-      FunctionCall Metadata.dataset@1[
+      FunctionCall Metadata.resolve@-1[
         LiteralExpr [STRING] [sim]
+        Variable [ Name=$lenDBLP ]
+        Variable [ Name=$tokensUnrankedDBLP ]
+        Variable [ Name=$tokensDBLP ]
+        Variable [ Name=$idCSX ]
+        Variable [ Name=$idDBLP ]
+        Variable [ Name=$prefixTokenCSX ]
+        Variable [ Name=#5 ]
+        Variable [ Name=$tokensUnrankedCSX ]
+        Variable [ Name=$prefixTokenDBLP ]
+        Variable [ Name=$lenCSX ]
+        Variable [ Name=$tokensCSX ]
+        Variable [ Name=$paperDBLP ]
+        Variable [ Name=$paperCSX ]
       ]
       Index:       LiteralExpr [LONG] [0]
     ]
@@ -31,14 +44,16 @@ FROM [  FunctionCall Metadata.dataset@1[
   AS Variable [ Name=$paperDBLP ]
 ,
   FunctionCall fuzzyjoin.subset-collection@3[
-    FunctionCall Metadata.dataset@1[
+    FunctionCall Metadata.resolve@-1[
       LiteralExpr [STRING] [tokensDBLP]
+      Variable [ Name=$paperDBLP ]
     ]
     LiteralExpr [LONG] [0]
     FunctionCall fuzzyjoin.prefix-len-jaccard@2[
       FunctionCall fuzzyjoin.len@1[
-        FunctionCall Metadata.dataset@1[
+        FunctionCall Metadata.resolve@-1[
           LiteralExpr [STRING] [tokensDBLP]
+          Variable [ Name=$paperDBLP ]
         ]
       ]
       LiteralExpr [FLOAT] [0.5]
@@ -52,14 +67,20 @@ FROM [  FunctionCall Metadata.dataset@1[
   AS Variable [ Name=$paperCSX ]
 ,
   FunctionCall fuzzyjoin.subset-collection@3[
-    FunctionCall Metadata.dataset@1[
+    FunctionCall Metadata.resolve@-1[
       LiteralExpr [STRING] [tokensCSX]
+      Variable [ Name=$prefixTokenDBLP ]
+      Variable [ Name=$paperDBLP ]
+      Variable [ Name=$paperCSX ]
     ]
     LiteralExpr [LONG] [0]
     FunctionCall fuzzyjoin.prefix-len-jaccard@2[
       FunctionCall fuzzyjoin.len@1[
-        FunctionCall Metadata.dataset@1[
+        FunctionCall Metadata.resolve@-1[
           LiteralExpr [STRING] [tokensCSX]
+          Variable [ Name=$prefixTokenDBLP ]
+          Variable [ Name=$paperDBLP ]
+          Variable [ Name=$paperCSX ]
         ]
       ]
       LiteralExpr [FLOAT] [0.5]
@@ -132,8 +153,21 @@ Let Variable [ Name=$tokensDBLP ]
           FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
-              FunctionCall Metadata.dataset@1[
+              FunctionCall Metadata.resolve@-1[
                 LiteralExpr [STRING] [id]
+                Variable [ Name=$lenDBLP ]
+                Variable [ Name=$tokensUnrankedDBLP ]
+                Variable [ Name=$paper ]
+                Variable [ Name=$tokenUnranked ]
+                Variable [ Name=#1 ]
+                Variable [ Name=#2 ]
+                Variable [ Name=$idDBLP ]
+                Variable [ Name=$prefixTokenCSX ]
+                Variable [ Name=$token ]
+                Variable [ Name=$tokenGrouped ]
+                Variable [ Name=$prefixTokenDBLP ]
+                Variable [ Name=$paperDBLP ]
+                Variable [ Name=$paperCSX ]
               ]
               ]
               FROM [                Variable [ Name=#1 ]
@@ -226,8 +260,25 @@ Let Variable [ Name=$tokensCSX ]
           FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
-              FunctionCall Metadata.dataset@1[
+              FunctionCall Metadata.resolve@-1[
                 LiteralExpr [STRING] [id]
+                Variable [ Name=$lenDBLP ]
+                Variable [ Name=$tokensUnrankedDBLP ]
+                Variable [ Name=$paper ]
+                Variable [ Name=$tokensDBLP ]
+                Variable [ Name=$tokenUnranked ]
+                Variable [ Name=$idCSX ]
+                Variable [ Name=$idDBLP ]
+                Variable [ Name=#3 ]
+                Variable [ Name=#4 ]
+                Variable [ Name=$prefixTokenCSX ]
+                Variable [ Name=$token ]
+                Variable [ Name=$tokensUnrankedCSX ]
+                Variable [ Name=$tokenGrouped ]
+                Variable [ Name=$prefixTokenDBLP ]
+                Variable [ Name=$lenCSX ]
+                Variable [ Name=$paperDBLP ]
+                Variable [ Name=$paperCSX ]
               ]
               ]
               FROM [                Variable [ Name=#3 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/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 2b10846..d6384ce 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
@@ -17,8 +17,21 @@ RecordConstructor [
     LiteralExpr [STRING] [sim]
     :
     IndexAccessor [
-      FunctionCall Metadata.dataset@1[
+      FunctionCall Metadata.resolve@-1[
         LiteralExpr [STRING] [sim]
+        Variable [ Name=$lenDBLP ]
+        Variable [ Name=$tokensUnrankedDBLP ]
+        Variable [ Name=$tokensDBLP ]
+        Variable [ Name=$idCSX ]
+        Variable [ Name=$idDBLP ]
+        Variable [ Name=$prefixTokenCSX ]
+        Variable [ Name=#5 ]
+        Variable [ Name=$tokensUnrankedCSX ]
+        Variable [ Name=$prefixTokenDBLP ]
+        Variable [ Name=$lenCSX ]
+        Variable [ Name=$tokensCSX ]
+        Variable [ Name=$paperDBLP ]
+        Variable [ Name=$paperCSX ]
       ]
       Index:       LiteralExpr [LONG] [0]
     ]
@@ -31,14 +44,16 @@ FROM [  FunctionCall Metadata.dataset@1[
   AS Variable [ Name=$paperDBLP ]
 ,
   FunctionCall fuzzyjoin.subset-collection@3[
-    FunctionCall Metadata.dataset@1[
+    FunctionCall Metadata.resolve@-1[
       LiteralExpr [STRING] [tokensDBLP]
+      Variable [ Name=$paperDBLP ]
     ]
     LiteralExpr [LONG] [0]
     FunctionCall fuzzyjoin.prefix-len-jaccard@2[
       FunctionCall fuzzyjoin.len@1[
-        FunctionCall Metadata.dataset@1[
+        FunctionCall Metadata.resolve@-1[
           LiteralExpr [STRING] [tokensDBLP]
+          Variable [ Name=$paperDBLP ]
         ]
       ]
       LiteralExpr [FLOAT] [0.5]
@@ -52,14 +67,20 @@ FROM [  FunctionCall Metadata.dataset@1[
   AS Variable [ Name=$paperCSX ]
 ,
   FunctionCall fuzzyjoin.subset-collection@3[
-    FunctionCall Metadata.dataset@1[
+    FunctionCall Metadata.resolve@-1[
       LiteralExpr [STRING] [tokensCSX]
+      Variable [ Name=$prefixTokenDBLP ]
+      Variable [ Name=$paperDBLP ]
+      Variable [ Name=$paperCSX ]
     ]
     LiteralExpr [LONG] [0]
     FunctionCall fuzzyjoin.prefix-len-jaccard@2[
       FunctionCall fuzzyjoin.len@1[
-        FunctionCall Metadata.dataset@1[
+        FunctionCall Metadata.resolve@-1[
           LiteralExpr [STRING] [tokensCSX]
+          Variable [ Name=$prefixTokenDBLP ]
+          Variable [ Name=$paperDBLP ]
+          Variable [ Name=$paperCSX ]
         ]
       ]
       LiteralExpr [FLOAT] [0.5]
@@ -132,8 +153,21 @@ Let Variable [ Name=$tokensDBLP ]
           FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
-              FunctionCall Metadata.dataset@1[
+              FunctionCall Metadata.resolve@-1[
                 LiteralExpr [STRING] [id]
+                Variable [ Name=$lenDBLP ]
+                Variable [ Name=$tokensUnrankedDBLP ]
+                Variable [ Name=$paper ]
+                Variable [ Name=$tokenUnranked ]
+                Variable [ Name=#1 ]
+                Variable [ Name=#2 ]
+                Variable [ Name=$idDBLP ]
+                Variable [ Name=$prefixTokenCSX ]
+                Variable [ Name=$token ]
+                Variable [ Name=$tokenGrouped ]
+                Variable [ Name=$prefixTokenDBLP ]
+                Variable [ Name=$paperDBLP ]
+                Variable [ Name=$paperCSX ]
               ]
               ]
               FROM [                Variable [ Name=#1 ]
@@ -226,8 +260,25 @@ Let Variable [ Name=$tokensCSX ]
           FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
-              FunctionCall Metadata.dataset@1[
+              FunctionCall Metadata.resolve@-1[
                 LiteralExpr [STRING] [id]
+                Variable [ Name=$lenDBLP ]
+                Variable [ Name=$tokensUnrankedDBLP ]
+                Variable [ Name=$paper ]
+                Variable [ Name=$tokensDBLP ]
+                Variable [ Name=$tokenUnranked ]
+                Variable [ Name=$idCSX ]
+                Variable [ Name=$idDBLP ]
+                Variable [ Name=#3 ]
+                Variable [ Name=#4 ]
+                Variable [ Name=$prefixTokenCSX ]
+                Variable [ Name=$token ]
+                Variable [ Name=$tokensUnrankedCSX ]
+                Variable [ Name=$tokenGrouped ]
+                Variable [ Name=$prefixTokenDBLP ]
+                Variable [ Name=$lenCSX ]
+                Variable [ Name=$paperDBLP ]
+                Variable [ Name=$paperCSX ]
               ]
               ]
               FROM [                Variable [ Name=#3 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/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 8ac97a6..7942271 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
@@ -29,14 +29,16 @@ FROM [  FunctionCall Metadata.dataset@1[
   AS Variable [ Name=$paperDBLP ]
 ,
   FunctionCall fuzzyjoin.subset-collection@3[
-    FunctionCall Metadata.dataset@1[
+    FunctionCall Metadata.resolve@-1[
       LiteralExpr [STRING] [tokensDBLP]
+      Variable [ Name=$paperDBLP ]
     ]
     LiteralExpr [LONG] [0]
     FunctionCall fuzzyjoin.prefix-len-jaccard@2[
       FunctionCall fuzzyjoin.len@1[
-        FunctionCall Metadata.dataset@1[
+        FunctionCall Metadata.resolve@-1[
           LiteralExpr [STRING] [tokensDBLP]
+          Variable [ Name=$paperDBLP ]
         ]
       ]
       LiteralExpr [FLOAT] [0.5]
@@ -50,14 +52,20 @@ FROM [  FunctionCall Metadata.dataset@1[
   AS Variable [ Name=$paperCSX ]
 ,
   FunctionCall fuzzyjoin.subset-collection@3[
-    FunctionCall Metadata.dataset@1[
+    FunctionCall Metadata.resolve@-1[
       LiteralExpr [STRING] [tokensCSX]
+      Variable [ Name=$prefixTokenDBLP ]
+      Variable [ Name=$paperDBLP ]
+      Variable [ Name=$paperCSX ]
     ]
     LiteralExpr [LONG] [0]
     FunctionCall fuzzyjoin.prefix-len-jaccard@2[
       FunctionCall fuzzyjoin.len@1[
-        FunctionCall Metadata.dataset@1[
+        FunctionCall Metadata.resolve@-1[
           LiteralExpr [STRING] [tokensCSX]
+          Variable [ Name=$prefixTokenDBLP ]
+          Variable [ Name=$paperDBLP ]
+          Variable [ Name=$paperCSX ]
         ]
       ]
       LiteralExpr [FLOAT] [0.5]
@@ -130,8 +138,21 @@ Let Variable [ Name=$tokensDBLP ]
           FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
-              FunctionCall Metadata.dataset@1[
+              FunctionCall Metadata.resolve@-1[
                 LiteralExpr [STRING] [id]
+                Variable [ Name=$lenDBLP ]
+                Variable [ Name=$tokensUnrankedDBLP ]
+                Variable [ Name=$paper ]
+                Variable [ Name=$tokenUnranked ]
+                Variable [ Name=#1 ]
+                Variable [ Name=#2 ]
+                Variable [ Name=$idDBLP ]
+                Variable [ Name=$prefixTokenCSX ]
+                Variable [ Name=$token ]
+                Variable [ Name=$tokenGroupped ]
+                Variable [ Name=$prefixTokenDBLP ]
+                Variable [ Name=$paperDBLP ]
+                Variable [ Name=$paperCSX ]
               ]
               ]
               FROM [                Variable [ Name=#1 ]
@@ -224,8 +245,25 @@ Let Variable [ Name=$tokensCSX ]
           FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
-              FunctionCall Metadata.dataset@1[
+              FunctionCall Metadata.resolve@-1[
                 LiteralExpr [STRING] [id]
+                Variable [ Name=$lenDBLP ]
+                Variable [ Name=$tokensUnrankedDBLP ]
+                Variable [ Name=$paper ]
+                Variable [ Name=$tokensDBLP ]
+                Variable [ Name=$tokenUnranked ]
+                Variable [ Name=$idCSX ]
+                Variable [ Name=$idDBLP ]
+                Variable [ Name=#3 ]
+                Variable [ Name=#4 ]
+                Variable [ Name=$prefixTokenCSX ]
+                Variable [ Name=$token ]
+                Variable [ Name=$tokensUnrankedCSX ]
+                Variable [ Name=$tokenGroupped ]
+                Variable [ Name=$prefixTokenDBLP ]
+                Variable [ Name=$lenCSX ]
+                Variable [ Name=$paperDBLP ]
+                Variable [ Name=$paperCSX ]
               ]
               ]
               FROM [                Variable [ Name=#3 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/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 2b10846..d6384ce 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
@@ -17,8 +17,21 @@ RecordConstructor [
     LiteralExpr [STRING] [sim]
     :
     IndexAccessor [
-      FunctionCall Metadata.dataset@1[
+      FunctionCall Metadata.resolve@-1[
         LiteralExpr [STRING] [sim]
+        Variable [ Name=$lenDBLP ]
+        Variable [ Name=$tokensUnrankedDBLP ]
+        Variable [ Name=$tokensDBLP ]
+        Variable [ Name=$idCSX ]
+        Variable [ Name=$idDBLP ]
+        Variable [ Name=$prefixTokenCSX ]
+        Variable [ Name=#5 ]
+        Variable [ Name=$tokensUnrankedCSX ]
+        Variable [ Name=$prefixTokenDBLP ]
+        Variable [ Name=$lenCSX ]
+        Variable [ Name=$tokensCSX ]
+        Variable [ Name=$paperDBLP ]
+        Variable [ Name=$paperCSX ]
       ]
       Index:       LiteralExpr [LONG] [0]
     ]
@@ -31,14 +44,16 @@ FROM [  FunctionCall Metadata.dataset@1[
   AS Variable [ Name=$paperDBLP ]
 ,
   FunctionCall fuzzyjoin.subset-collection@3[
-    FunctionCall Metadata.dataset@1[
+    FunctionCall Metadata.resolve@-1[
       LiteralExpr [STRING] [tokensDBLP]
+      Variable [ Name=$paperDBLP ]
     ]
     LiteralExpr [LONG] [0]
     FunctionCall fuzzyjoin.prefix-len-jaccard@2[
       FunctionCall fuzzyjoin.len@1[
-        FunctionCall Metadata.dataset@1[
+        FunctionCall Metadata.resolve@-1[
           LiteralExpr [STRING] [tokensDBLP]
+          Variable [ Name=$paperDBLP ]
         ]
       ]
       LiteralExpr [FLOAT] [0.5]
@@ -52,14 +67,20 @@ FROM [  FunctionCall Metadata.dataset@1[
   AS Variable [ Name=$paperCSX ]
 ,
   FunctionCall fuzzyjoin.subset-collection@3[
-    FunctionCall Metadata.dataset@1[
+    FunctionCall Metadata.resolve@-1[
       LiteralExpr [STRING] [tokensCSX]
+      Variable [ Name=$prefixTokenDBLP ]
+      Variable [ Name=$paperDBLP ]
+      Variable [ Name=$paperCSX ]
     ]
     LiteralExpr [LONG] [0]
     FunctionCall fuzzyjoin.prefix-len-jaccard@2[
       FunctionCall fuzzyjoin.len@1[
-        FunctionCall Metadata.dataset@1[
+        FunctionCall Metadata.resolve@-1[
           LiteralExpr [STRING] [tokensCSX]
+          Variable [ Name=$prefixTokenDBLP ]
+          Variable [ Name=$paperDBLP ]
+          Variable [ Name=$paperCSX ]
         ]
       ]
       LiteralExpr [FLOAT] [0.5]
@@ -132,8 +153,21 @@ Let Variable [ Name=$tokensDBLP ]
           FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
-              FunctionCall Metadata.dataset@1[
+              FunctionCall Metadata.resolve@-1[
                 LiteralExpr [STRING] [id]
+                Variable [ Name=$lenDBLP ]
+                Variable [ Name=$tokensUnrankedDBLP ]
+                Variable [ Name=$paper ]
+                Variable [ Name=$tokenUnranked ]
+                Variable [ Name=#1 ]
+                Variable [ Name=#2 ]
+                Variable [ Name=$idDBLP ]
+                Variable [ Name=$prefixTokenCSX ]
+                Variable [ Name=$token ]
+                Variable [ Name=$tokenGrouped ]
+                Variable [ Name=$prefixTokenDBLP ]
+                Variable [ Name=$paperDBLP ]
+                Variable [ Name=$paperCSX ]
               ]
               ]
               FROM [                Variable [ Name=#1 ]
@@ -226,8 +260,25 @@ Let Variable [ Name=$tokensCSX ]
           FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
-              FunctionCall Metadata.dataset@1[
+              FunctionCall Metadata.resolve@-1[
                 LiteralExpr [STRING] [id]
+                Variable [ Name=$lenDBLP ]
+                Variable [ Name=$tokensUnrankedDBLP ]
+                Variable [ Name=$paper ]
+                Variable [ Name=$tokensDBLP ]
+                Variable [ Name=$tokenUnranked ]
+                Variable [ Name=$idCSX ]
+                Variable [ Name=$idDBLP ]
+                Variable [ Name=#3 ]
+                Variable [ Name=#4 ]
+                Variable [ Name=$prefixTokenCSX ]
+                Variable [ Name=$token ]
+                Variable [ Name=$tokensUnrankedCSX ]
+                Variable [ Name=$tokenGrouped ]
+                Variable [ Name=$prefixTokenDBLP ]
+                Variable [ Name=$lenCSX ]
+                Variable [ Name=$paperDBLP ]
+                Variable [ Name=$paperCSX ]
               ]
               ]
               FROM [                Variable [ Name=#3 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/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 8ac97a6..7942271 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
@@ -29,14 +29,16 @@ FROM [  FunctionCall Metadata.dataset@1[
   AS Variable [ Name=$paperDBLP ]
 ,
   FunctionCall fuzzyjoin.subset-collection@3[
-    FunctionCall Metadata.dataset@1[
+    FunctionCall Metadata.resolve@-1[
       LiteralExpr [STRING] [tokensDBLP]
+      Variable [ Name=$paperDBLP ]
     ]
     LiteralExpr [LONG] [0]
     FunctionCall fuzzyjoin.prefix-len-jaccard@2[
       FunctionCall fuzzyjoin.len@1[
-        FunctionCall Metadata.dataset@1[
+        FunctionCall Metadata.resolve@-1[
           LiteralExpr [STRING] [tokensDBLP]
+          Variable [ Name=$paperDBLP ]
         ]
       ]
       LiteralExpr [FLOAT] [0.5]
@@ -50,14 +52,20 @@ FROM [  FunctionCall Metadata.dataset@1[
   AS Variable [ Name=$paperCSX ]
 ,
   FunctionCall fuzzyjoin.subset-collection@3[
-    FunctionCall Metadata.dataset@1[
+    FunctionCall Metadata.resolve@-1[
       LiteralExpr [STRING] [tokensCSX]
+      Variable [ Name=$prefixTokenDBLP ]
+      Variable [ Name=$paperDBLP ]
+      Variable [ Name=$paperCSX ]
     ]
     LiteralExpr [LONG] [0]
     FunctionCall fuzzyjoin.prefix-len-jaccard@2[
       FunctionCall fuzzyjoin.len@1[
-        FunctionCall Metadata.dataset@1[
+        FunctionCall Metadata.resolve@-1[
           LiteralExpr [STRING] [tokensCSX]
+          Variable [ Name=$prefixTokenDBLP ]
+          Variable [ Name=$paperDBLP ]
+          Variable [ Name=$paperCSX ]
         ]
       ]
       LiteralExpr [FLOAT] [0.5]
@@ -130,8 +138,21 @@ Let Variable [ Name=$tokensDBLP ]
           FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
-              FunctionCall Metadata.dataset@1[
+              FunctionCall Metadata.resolve@-1[
                 LiteralExpr [STRING] [id]
+                Variable [ Name=$lenDBLP ]
+                Variable [ Name=$tokensUnrankedDBLP ]
+                Variable [ Name=$paper ]
+                Variable [ Name=$tokenUnranked ]
+                Variable [ Name=#1 ]
+                Variable [ Name=#2 ]
+                Variable [ Name=$idDBLP ]
+                Variable [ Name=$prefixTokenCSX ]
+                Variable [ Name=$token ]
+                Variable [ Name=$tokenGroupped ]
+                Variable [ Name=$prefixTokenDBLP ]
+                Variable [ Name=$paperDBLP ]
+                Variable [ Name=$paperCSX ]
               ]
               ]
               FROM [                Variable [ Name=#1 ]
@@ -224,8 +245,25 @@ Let Variable [ Name=$tokensCSX ]
           FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
-              FunctionCall Metadata.dataset@1[
+              FunctionCall Metadata.resolve@-1[
                 LiteralExpr [STRING] [id]
+                Variable [ Name=$lenDBLP ]
+                Variable [ Name=$tokensUnrankedDBLP ]
+                Variable [ Name=$paper ]
+                Variable [ Name=$tokensDBLP ]
+                Variable [ Name=$tokenUnranked ]
+                Variable [ Name=$idCSX ]
+                Variable [ Name=$idDBLP ]
+                Variable [ Name=#3 ]
+                Variable [ Name=#4 ]
+                Variable [ Name=$prefixTokenCSX ]
+                Variable [ Name=$token ]
+                Variable [ Name=$tokensUnrankedCSX ]
+                Variable [ Name=$tokenGroupped ]
+                Variable [ Name=$prefixTokenDBLP ]
+                Variable [ Name=$lenCSX ]
+                Variable [ Name=$paperDBLP ]
+                Variable [ Name=$paperCSX ]
               ]
               ]
               FROM [                Variable [ Name=#3 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/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 ed3dd63..a7b9ab6 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
@@ -52,14 +52,16 @@ FROM [  (
       AS Variable [ Name=$paperDBLP ]
 ,
       FunctionCall fuzzyjoin.subset-collection@3[
-        FunctionCall Metadata.dataset@1[
+        FunctionCall Metadata.resolve@-1[
           LiteralExpr [STRING] [tokensDBLP]
+          Variable [ Name=$paperDBLP ]
         ]
         LiteralExpr [LONG] [0]
         FunctionCall fuzzyjoin.prefix-len-jaccard@2[
           FunctionCall fuzzyjoin.len@1[
-            FunctionCall Metadata.dataset@1[
+            FunctionCall Metadata.resolve@-1[
               LiteralExpr [STRING] [tokensDBLP]
+              Variable [ Name=$paperDBLP ]
             ]
           ]
           LiteralExpr [FLOAT] [0.5]
@@ -73,14 +75,20 @@ FROM [  (
       AS Variable [ Name=$paperCSX ]
 ,
       FunctionCall fuzzyjoin.subset-collection@3[
-        FunctionCall Metadata.dataset@1[
+        FunctionCall Metadata.resolve@-1[
           LiteralExpr [STRING] [tokensCSX]
+          Variable [ Name=$prefixTokenDBLP ]
+          Variable [ Name=$paperDBLP ]
+          Variable [ Name=$paperCSX ]
         ]
         LiteralExpr [LONG] [0]
         FunctionCall fuzzyjoin.prefix-len-jaccard@2[
           FunctionCall fuzzyjoin.len@1[
-            FunctionCall Metadata.dataset@1[
+            FunctionCall Metadata.resolve@-1[
               LiteralExpr [STRING] [tokensCSX]
+              Variable [ Name=$prefixTokenDBLP ]
+              Variable [ Name=$paperDBLP ]
+              Variable [ Name=$paperCSX ]
             ]
           ]
           LiteralExpr [FLOAT] [0.5]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/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 ef063ba..767b6a5 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
@@ -52,14 +52,16 @@ FROM [  (
       AS Variable [ Name=$paperDBLP ]
 ,
       FunctionCall fuzzyjoin.subset-collection@3[
-        FunctionCall Metadata.dataset@1[
+        FunctionCall Metadata.resolve@-1[
           LiteralExpr [STRING] [tokensDBLP]
+          Variable [ Name=$paperDBLP ]
         ]
         LiteralExpr [LONG] [0]
         FunctionCall fuzzyjoin.prefix-len-jaccard@2[
           FunctionCall fuzzyjoin.len@1[
-            FunctionCall Metadata.dataset@1[
+            FunctionCall Metadata.resolve@-1[
               LiteralExpr [STRING] [tokensDBLP]
+              Variable [ Name=$paperDBLP ]
             ]
           ]
           LiteralExpr [FLOAT] [0.5]
@@ -73,14 +75,20 @@ FROM [  (
       AS Variable [ Name=$paperCSX ]
 ,
       FunctionCall fuzzyjoin.subset-collection@3[
-        FunctionCall Metadata.dataset@1[
+        FunctionCall Metadata.resolve@-1[
           LiteralExpr [STRING] [tokensCSX]
+          Variable [ Name=$prefixTokenDBLP ]
+          Variable [ Name=$paperDBLP ]
+          Variable [ Name=$paperCSX ]
         ]
         LiteralExpr [LONG] [0]
         FunctionCall fuzzyjoin.prefix-len-jaccard@2[
           FunctionCall fuzzyjoin.len@1[
-            FunctionCall Metadata.dataset@1[
+            FunctionCall Metadata.resolve@-1[
               LiteralExpr [STRING] [tokensCSX]
+              Variable [ Name=$prefixTokenDBLP ]
+              Variable [ Name=$paperDBLP ]
+              Variable [ Name=$paperCSX ]
             ]
           ]
           LiteralExpr [FLOAT] [0.5]
@@ -139,8 +147,18 @@ FROM [  (
               FunctionCall fuzzyjoin.sql-count@1[
                 (
                   SELECT ELEMENT [
-                  FunctionCall Metadata.dataset@1[
+                  FunctionCall Metadata.resolve@-1[
                     LiteralExpr [STRING] [id]
+                    Variable [ Name=$prefixTokenCSX ]
+                    Variable [ Name=$token ]
+                    Variable [ Name=$paper ]
+                    Variable [ Name=$tokenGroupped ]
+                    Variable [ Name=$prefixTokenDBLP ]
+                    Variable [ Name=$paperDBLP ]
+                    Variable [ Name=$tokenUnranked ]
+                    Variable [ Name=$paperCSX ]
+                    Variable [ Name=#1 ]
+                    Variable [ Name=#2 ]
                   ]
                   ]
                   FROM [                    Variable [ Name=#1 ]
@@ -219,8 +237,19 @@ Variable [ Name=$i ]
               FunctionCall fuzzyjoin.sql-count@1[
                 (
                   SELECT ELEMENT [
-                  FunctionCall Metadata.dataset@1[
+                  FunctionCall Metadata.resolve@-1[
                     LiteralExpr [STRING] [id]
+                    Variable [ Name=#4 ]
+                    Variable [ Name=$prefixTokenCSX ]
+                    Variable [ Name=$token ]
+                    Variable [ Name=$paper ]
+                    Variable [ Name=$tokenGroupped ]
+                    Variable [ Name=$prefixTokenDBLP ]
+                    Variable [ Name=$tokensDBLP ]
+                    Variable [ Name=$paperDBLP ]
+                    Variable [ Name=$tokenUnranked ]
+                    Variable [ Name=$paperCSX ]
+                    Variable [ Name=#3 ]
                   ]
                   ]
                   FROM [                    Variable [ Name=#3 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/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 2d7c141..edf93fa 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
@@ -52,14 +52,16 @@ FROM [  (
       AS Variable [ Name=$paperDBLP ]
 ,
       FunctionCall fuzzyjoin.subset-collection@3[
-        FunctionCall Metadata.dataset@1[
+        FunctionCall Metadata.resolve@-1[
           LiteralExpr [STRING] [tokensDBLP]
+          Variable [ Name=$paperDBLP ]
         ]
         LiteralExpr [LONG] [0]
         FunctionCall fuzzyjoin.prefix-len-jaccard@2[
           FunctionCall fuzzyjoin.len@1[
-            FunctionCall Metadata.dataset@1[
+            FunctionCall Metadata.resolve@-1[
               LiteralExpr [STRING] [tokensDBLP]
+              Variable [ Name=$paperDBLP ]
             ]
           ]
           LiteralExpr [FLOAT] [0.5]
@@ -73,14 +75,20 @@ FROM [  (
       AS Variable [ Name=$paperCSX ]
 ,
       FunctionCall fuzzyjoin.subset-collection@3[
-        FunctionCall Metadata.dataset@1[
+        FunctionCall Metadata.resolve@-1[
           LiteralExpr [STRING] [tokensCSX]
+          Variable [ Name=$prefixTokenDBLP ]
+          Variable [ Name=$paperDBLP ]
+          Variable [ Name=$paperCSX ]
         ]
         LiteralExpr [LONG] [0]
         FunctionCall fuzzyjoin.prefix-len-jaccard@2[
           FunctionCall fuzzyjoin.len@1[
-            FunctionCall Metadata.dataset@1[
+            FunctionCall Metadata.resolve@-1[
               LiteralExpr [STRING] [tokensCSX]
+              Variable [ Name=$prefixTokenDBLP ]
+              Variable [ Name=$paperDBLP ]
+              Variable [ Name=$paperCSX ]
             ]
           ]
           LiteralExpr [FLOAT] [0.5]
@@ -145,8 +153,19 @@ FROM [  (
               FunctionCall fuzzyjoin.sql-count@1[
                 (
                   SELECT ELEMENT [
-                  FunctionCall Metadata.dataset@1[
+                  FunctionCall Metadata.resolve@-1[
                     LiteralExpr [STRING] [id]
+                    Variable [ Name=$prefixTokenCSX ]
+                    Variable [ Name=$token ]
+                    Variable [ Name=$paper ]
+                    Variable [ Name=$tokenGroupped ]
+                    Variable [ Name=$prefixTokenDBLP ]
+                    Variable [ Name=$paperDBLP ]
+                    Variable [ Name=$tokenUnranked ]
+                    Variable [ Name=$paperCSX ]
+                    Variable [ Name=#1 ]
+                    Variable [ Name=#2 ]
+                    Variable [ Name=$idDBLP ]
                   ]
                   ]
                   FROM [                    Variable [ Name=#1 ]
@@ -231,8 +250,21 @@ Variable [ Name=$i ]
               FunctionCall fuzzyjoin.sql-count@1[
                 (
                   SELECT ELEMENT [
-                  FunctionCall Metadata.dataset@1[
+                  FunctionCall Metadata.resolve@-1[
                     LiteralExpr [STRING] [id]
+                    Variable [ Name=$paper ]
+                    Variable [ Name=$tokensDBLP ]
+                    Variable [ Name=$tokenUnranked ]
+                    Variable [ Name=$idCSX ]
+                    Variable [ Name=$idDBLP ]
+                    Variable [ Name=#3 ]
+                    Variable [ Name=#4 ]
+                    Variable [ Name=$prefixTokenCSX ]
+                    Variable [ Name=$token ]
+                    Variable [ Name=$tokenGroupped ]
+                    Variable [ Name=$prefixTokenDBLP ]
+                    Variable [ Name=$paperDBLP ]
+                    Variable [ Name=$paperCSX ]
                   ]
                   ]
                   FROM [                    Variable [ Name=#3 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/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 c68832a..336465c 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
@@ -52,14 +52,16 @@ FROM [  (
       AS Variable [ Name=$paperDBLP ]
 ,
       FunctionCall fuzzyjoin.subset-collection@3[
-        FunctionCall Metadata.dataset@1[
+        FunctionCall Metadata.resolve@-1[
           LiteralExpr [STRING] [tokensDBLP]
+          Variable [ Name=$paperDBLP ]
         ]
         LiteralExpr [LONG] [0]
         FunctionCall fuzzyjoin.prefix-len-jaccard@2[
           FunctionCall fuzzyjoin.len@1[
-            FunctionCall Metadata.dataset@1[
+            FunctionCall Metadata.resolve@-1[
               LiteralExpr [STRING] [tokensDBLP]
+              Variable [ Name=$paperDBLP ]
             ]
           ]
           LiteralExpr [FLOAT] [0.5]
@@ -73,14 +75,20 @@ FROM [  (
       AS Variable [ Name=$paperCSX ]
 ,
       FunctionCall fuzzyjoin.subset-collection@3[
-        FunctionCall Metadata.dataset@1[
+        FunctionCall Metadata.resolve@-1[
           LiteralExpr [STRING] [tokensCSX]
+          Variable [ Name=$prefixTokenDBLP ]
+          Variable [ Name=$paperDBLP ]
+          Variable [ Name=$paperCSX ]
         ]
         LiteralExpr [LONG] [0]
         FunctionCall fuzzyjoin.prefix-len-jaccard@2[
           FunctionCall fuzzyjoin.len@1[
-            FunctionCall Metadata.dataset@1[
+            FunctionCall Metadata.resolve@-1[
               LiteralExpr [STRING] [tokensCSX]
+              Variable [ Name=$prefixTokenDBLP ]
+              Variable [ Name=$paperDBLP ]
+              Variable [ Name=$paperCSX ]
             ]
           ]
           LiteralExpr [FLOAT] [0.5]
@@ -148,8 +156,20 @@ FROM [  (
               FunctionCall fuzzyjoin.sql-count@1[
                 (
                   SELECT ELEMENT [
-                  FunctionCall Metadata.dataset@1[
+                  FunctionCall Metadata.resolve@-1[
                     LiteralExpr [STRING] [id]
+                    Variable [ Name=$prefixTokenCSX ]
+                    Variable [ Name=$token ]
+                    Variable [ Name=$tokensUnrankedDBLP ]
+                    Variable [ Name=$paper ]
+                    Variable [ Name=$tokenGroupped ]
+                    Variable [ Name=$prefixTokenDBLP ]
+                    Variable [ Name=$paperDBLP ]
+                    Variable [ Name=$tokenUnranked ]
+                    Variable [ Name=$paperCSX ]
+                    Variable [ Name=#1 ]
+                    Variable [ Name=#2 ]
+                    Variable [ Name=$idDBLP ]
                   ]
                   ]
                   FROM [                    Variable [ Name=#1 ]
@@ -237,8 +257,23 @@ Variable [ Name=$i ]
               FunctionCall fuzzyjoin.sql-count@1[
                 (
                   SELECT ELEMENT [
-                  FunctionCall Metadata.dataset@1[
+                  FunctionCall Metadata.resolve@-1[
                     LiteralExpr [STRING] [id]
+                    Variable [ Name=$tokensUnrankedDBLP ]
+                    Variable [ Name=$paper ]
+                    Variable [ Name=$tokensDBLP ]
+                    Variable [ Name=$tokenUnranked ]
+                    Variable [ Name=$idCSX ]
+                    Variable [ Name=$idDBLP ]
+                    Variable [ Name=#3 ]
+                    Variable [ Name=#4 ]
+                    Variable [ Name=$prefixTokenCSX ]
+                    Variable [ Name=$token ]
+                    Variable [ Name=$tokensUnrankedCSX ]
+                    Variable [ Name=$tokenGroupped ]
+                    Variable [ Name=$prefixTokenDBLP ]
+                    Variable [ Name=$paperDBLP ]
+                    Variable [ Name=$paperCSX ]
                   ]
                   ]
                   FROM [                    Variable [ Name=#3 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/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 b12fe05..05eb749 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
@@ -40,8 +40,21 @@ FROM [  (
         LiteralExpr [STRING] [sim]
         :
         IndexAccessor [
-          FunctionCall Metadata.dataset@1[
+          FunctionCall Metadata.resolve@-1[
             LiteralExpr [STRING] [sim]
+            Variable [ Name=$lenDBLP ]
+            Variable [ Name=$tokensUnrankedDBLP ]
+            Variable [ Name=$tokensDBLP ]
+            Variable [ Name=$idCSX ]
+            Variable [ Name=$idDBLP ]
+            Variable [ Name=$prefixTokenCSX ]
+            Variable [ Name=#5 ]
+            Variable [ Name=$tokensUnrankedCSX ]
+            Variable [ Name=$prefixTokenDBLP ]
+            Variable [ Name=$lenCSX ]
+            Variable [ Name=$tokensCSX ]
+            Variable [ Name=$paperDBLP ]
+            Variable [ Name=$paperCSX ]
           ]
           Index:           LiteralExpr [LONG] [0]
         ]
@@ -54,14 +67,16 @@ FROM [  (
       AS Variable [ Name=$paperDBLP ]
 ,
       FunctionCall fuzzyjoin.subset-collection@3[
-        FunctionCall Metadata.dataset@1[
+        FunctionCall Metadata.resolve@-1[
           LiteralExpr [STRING] [tokensDBLP]
+          Variable [ Name=$paperDBLP ]
         ]
         LiteralExpr [LONG] [0]
         FunctionCall fuzzyjoin.prefix-len-jaccard@2[
           FunctionCall fuzzyjoin.len@1[
-            FunctionCall Metadata.dataset@1[
+            FunctionCall Metadata.resolve@-1[
               LiteralExpr [STRING] [tokensDBLP]
+              Variable [ Name=$paperDBLP ]
             ]
           ]
           LiteralExpr [FLOAT] [0.5]
@@ -75,14 +90,20 @@ FROM [  (
       AS Variable [ Name=$paperCSX ]
 ,
       FunctionCall fuzzyjoin.subset-collection@3[
-        FunctionCall Metadata.dataset@1[
+        FunctionCall Metadata.resolve@-1[
           LiteralExpr [STRING] [tokensCSX]
+          Variable [ Name=$prefixTokenDBLP ]
+          Variable [ Name=$paperDBLP ]
+          Variable [ Name=$paperCSX ]
         ]
         LiteralExpr [LONG] [0]
         FunctionCall fuzzyjoin.prefix-len-jaccard@2[
           FunctionCall fuzzyjoin.len@1[
-            FunctionCall Metadata.dataset@1[
+            FunctionCall Metadata.resolve@-1[
               LiteralExpr [STRING] [tokensCSX]
+              Variable [ Name=$prefixTokenDBLP ]
+              Variable [ Name=$paperDBLP ]
+              Variable [ Name=$paperCSX ]
             ]
           ]
           LiteralExpr [FLOAT] [0.5]
@@ -155,8 +176,21 @@ FROM [  (
               FunctionCall fuzzyjoin.sql-count@1[
                 (
                   SELECT ELEMENT [
-                  FunctionCall Metadata.dataset@1[
+                  FunctionCall Metadata.resolve@-1[
                     LiteralExpr [STRING] [id]
+                    Variable [ Name=$lenDBLP ]
+                    Variable [ Name=$tokensUnrankedDBLP ]
+                    Variable [ Name=$paper ]
+                    Variable [ Name=$tokenUnranked ]
+                    Variable [ Name=#1 ]
+                    Variable [ Name=#2 ]
+                    Variable [ Name=$idDBLP ]
+                    Variable [ Name=$prefixTokenCSX ]
+                    Variable [ Name=$token ]
+                    Variable [ Name=$tokenGrouped ]
+                    Variable [ Name=$prefixTokenDBLP ]
+                    Variable [ Name=$paperDBLP ]
+                    Variable [ Name=$paperCSX ]
                   ]
                   ]
                   FROM [                    Variable [ Name=#1 ]
@@ -249,8 +283,25 @@ Variable [ Name=$i ]
               FunctionCall fuzzyjoin.sql-count@1[
                 (
                   SELECT ELEMENT [
-                  FunctionCall Metadata.dataset@1[
+                  FunctionCall Metadata.resolve@-1[
                     LiteralExpr [STRING] [id]
+                    Variable [ Name=$lenDBLP ]
+                    Variable [ Name=$tokensUnrankedDBLP ]
+                    Variable [ Name=$paper ]
+                    Variable [ Name=$tokensDBLP ]
+                    Variable [ Name=$tokenUnranked ]
+                    Variable [ Name=$idCSX ]
+                    Variable [ Name=$idDBLP ]
+                    Variable [ Name=#3 ]
+                    Variable [ Name=#4 ]
+                    Variable [ Name=$prefixTokenCSX ]
+                    Variable [ Name=$token ]
+                    Variable [ Name=$tokensUnrankedCSX ]
+                    Variable [ Name=$tokenGrouped ]
+                    Variable [ Name=$prefixTokenDBLP ]
+                    Variable [ Name=$lenCSX ]
+                    Variable [ Name=$paperDBLP ]
+                    Variable [ Name=$paperCSX ]
                   ]
                   ]
                   FROM [                    Variable [ Name=#3 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/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 b12fe05..05eb749 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
@@ -40,8 +40,21 @@ FROM [  (
         LiteralExpr [STRING] [sim]
         :
         IndexAccessor [
-          FunctionCall Metadata.dataset@1[
+          FunctionCall Metadata.resolve@-1[
             LiteralExpr [STRING] [sim]
+            Variable [ Name=$lenDBLP ]
+            Variable [ Name=$tokensUnrankedDBLP ]
+            Variable [ Name=$tokensDBLP ]
+            Variable [ Name=$idCSX ]
+            Variable [ Name=$idDBLP ]
+            Variable [ Name=$prefixTokenCSX ]
+            Variable [ Name=#5 ]
+            Variable [ Name=$tokensUnrankedCSX ]
+            Variable [ Name=$prefixTokenDBLP ]
+            Variable [ Name=$lenCSX ]
+            Variable [ Name=$tokensCSX ]
+            Variable [ Name=$paperDBLP ]
+            Variable [ Name=$paperCSX ]
           ]
           Index:           LiteralExpr [LONG] [0]
         ]
@@ -54,14 +67,16 @@ FROM [  (
       AS Variable [ Name=$paperDBLP ]
 ,
       FunctionCall fuzzyjoin.subset-collection@3[
-        FunctionCall Metadata.dataset@1[
+        FunctionCall Metadata.resolve@-1[
           LiteralExpr [STRING] [tokensDBLP]
+          Variable [ Name=$paperDBLP ]
         ]
         LiteralExpr [LONG] [0]
         FunctionCall fuzzyjoin.prefix-len-jaccard@2[
           FunctionCall fuzzyjoin.len@1[
-            FunctionCall Metadata.dataset@1[
+            FunctionCall Metadata.resolve@-1[
               LiteralExpr [STRING] [tokensDBLP]
+              Variable [ Name=$paperDBLP ]
             ]
           ]
           LiteralExpr [FLOAT] [0.5]
@@ -75,14 +90,20 @@ FROM [  (
       AS Variable [ Name=$paperCSX ]
 ,
       FunctionCall fuzzyjoin.subset-collection@3[
-        FunctionCall Metadata.dataset@1[
+        FunctionCall Metadata.resolve@-1[
           LiteralExpr [STRING] [tokensCSX]
+          Variable [ Name=$prefixTokenDBLP ]
+          Variable [ Name=$paperDBLP ]
+          Variable [ Name=$paperCSX ]
         ]
         LiteralExpr [LONG] [0]
         FunctionCall fuzzyjoin.prefix-len-jaccard@2[
           FunctionCall fuzzyjoin.len@1[
-            FunctionCall Metadata.dataset@1[
+            FunctionCall Metadata.resolve@-1[
               LiteralExpr [STRING] [tokensCSX]
+              Variable [ Name=$prefixTokenDBLP ]
+              Variable [ Name=$paperDBLP ]
+              Variable [ Name=$paperCSX ]
             ]
           ]
           LiteralExpr [FLOAT] [0.5]
@@ -155,8 +176,21 @@ FROM [  (
               FunctionCall fuzzyjoin.sql-count@1[
                 (
                   SELECT ELEMENT [
-                  FunctionCall Metadata.dataset@1[
+                  FunctionCall Metadata.resolve@-1[
                     LiteralExpr [STRING] [id]
+                    Variable [ Name=$lenDBLP ]
+                    Variable [ Name=$tokensUnrankedDBLP ]
+                    Variable [ Name=$paper ]
+                    Variable [ Name=$tokenUnranked ]
+                    Variable [ Name=#1 ]
+                    Variable [ Name=#2 ]
+                    Variable [ Name=$idDBLP ]
+                    Variable [ Name=$prefixTokenCSX ]
+                    Variable [ Name=$token ]
+                    Variable [ Name=$tokenGrouped ]
+                    Variable [ Name=$prefixTokenDBLP ]
+                    Variable [ Name=$paperDBLP ]
+                    Variable [ Name=$paperCSX ]
                   ]
                   ]
                   FROM [                    Variable [ Name=#1 ]
@@ -249,8 +283,25 @@ Variable [ Name=$i ]
               FunctionCall fuzzyjoin.sql-count@1[
                 (
                   SELECT ELEMENT [
-                  FunctionCall Metadata.dataset@1[
+                  FunctionCall Metadata.resolve@-1[
                     LiteralExpr [STRING] [id]
+                    Variable [ Name=$lenDBLP ]
+                    Variable [ Name=$tokensUnrankedDBLP ]
+                    Variable [ Name=$paper ]
+                    Variable [ Name=$tokensDBLP ]
+                    Variable [ Name=$tokenUnranked ]
+                    Variable [ Name=$idCSX ]
+                    Variable [ Name=$idDBLP ]
+                    Variable [ Name=#3 ]
+                    Variable [ Name=#4 ]
+                    Variable [ Name=$prefixTokenCSX ]
+                    Variable [ Name=$token ]
+                    Variable [ Name=$tokensUnrankedCSX ]
+                    Variable [ Name=$tokenGrouped ]
+                    Variable [ Name=$prefixTokenDBLP ]
+                    Variable [ Name=$lenCSX ]
+                    Variable [ Name=$paperDBLP ]
+                    Variable [ Name=$paperCSX ]
                   ]
                   ]
                   FROM [                    Variable [ Name=#3 ]