http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/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 4f16623..f727028 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,16 +29,14 @@ FROM [ FunctionCall asterix.dataset@1[ AS Variable [ Name=$paperDBLP ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensDBLP] - Variable [ Name=$paperDBLP ] ] LiteralExpr [LONG] [0] FunctionCall fuzzyjoin.prefix-len-jaccard@2[ FunctionCall fuzzyjoin.len@1[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensDBLP] - Variable [ Name=$paperDBLP ] ] ] LiteralExpr [FLOAT] [0.5] @@ -52,20 +50,14 @@ FROM [ FunctionCall asterix.dataset@1[ AS Variable [ Name=$paperCSX ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@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 asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensCSX] - Variable [ Name=$prefixTokenDBLP ] - Variable [ Name=$paperDBLP ] - Variable [ Name=$paperCSX ] ] ] LiteralExpr [FLOAT] [0.5] @@ -123,34 +115,24 @@ Let Variable [ Name=$tokensDBLP ] Variable [ Name=$tokenGroupped ] := Variable [ Name=$token ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=#2 ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.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 ] + FieldAccessor [ + Variable [ Name=#4 ] + Field=id ] ] - FROM [ Variable [ Name=#1 ] - AS Variable [ Name=#2 ] + FROM [ Variable [ Name=#2 ] + AS Variable [ Name=#4 ] ] ) ] @@ -228,33 +210,20 @@ Let Variable [ Name=$tokensCSX ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.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 ] + FieldAccessor [ + Variable [ Name=#5 ] + Field=id ] ] FROM [ Variable [ Name=#3 ] - AS Variable [ Name=#4 ] + AS Variable [ Name=#5 ] ] ) ] @@ -316,12 +285,19 @@ Groupby Variable [ Name=$sim ] := Variable [ Name=$sim ] - GROUP AS Variable [ Name=#5 ] + GROUP AS Variable [ Name=#1 ] ( paperDBLP:=Variable [ Name=$paperDBLP ] prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ] paperCSX:=Variable [ Name=$paperCSX ] prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ] + idDBLP:=Variable [ Name=$idDBLP ] + tokensUnrankedDBLP:=Variable [ Name=$tokensUnrankedDBLP ] + tokensDBLP:=Variable [ Name=$tokensDBLP ] + idCSX:=Variable [ Name=$idCSX ] + tokensUnrankedCSX:=Variable [ Name=$tokensUnrankedCSX ] + tokensCSX:=Variable [ Name=$tokensCSX ] + sim:=Variable [ Name=$sim ] ) Orderby
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/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 ec2346b..e4318eb 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,22 +17,7 @@ RecordConstructor [ LiteralExpr [STRING] [sim] : IndexAccessor [ - FunctionCall asterix.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 ] - ] + Variable [ Name=$sim ] Index: LiteralExpr [LONG] [0] ] ) @@ -44,16 +29,14 @@ FROM [ FunctionCall asterix.dataset@1[ AS Variable [ Name=$paperDBLP ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensDBLP] - Variable [ Name=$paperDBLP ] ] LiteralExpr [LONG] [0] FunctionCall fuzzyjoin.prefix-len-jaccard@2[ FunctionCall fuzzyjoin.len@1[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensDBLP] - Variable [ Name=$paperDBLP ] ] ] LiteralExpr [FLOAT] [0.5] @@ -67,20 +50,14 @@ FROM [ FunctionCall asterix.dataset@1[ AS Variable [ Name=$paperCSX ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@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 asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensCSX] - Variable [ Name=$prefixTokenDBLP ] - Variable [ Name=$paperDBLP ] - Variable [ Name=$paperCSX ] ] ] LiteralExpr [FLOAT] [0.5] @@ -143,35 +120,24 @@ Let Variable [ Name=$tokensDBLP ] Variable [ Name=$tokenGrouped ] := Variable [ Name=$token ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=#2 ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.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 ] + FieldAccessor [ + Variable [ Name=#4 ] + Field=id ] ] - FROM [ Variable [ Name=#1 ] - AS Variable [ Name=#2 ] + FROM [ Variable [ Name=#2 ] + AS Variable [ Name=#4 ] ] ) ] @@ -254,35 +220,20 @@ Let Variable [ Name=$tokensCSX ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.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 ] + FieldAccessor [ + Variable [ Name=#5 ] + Field=id ] ] FROM [ Variable [ Name=#3 ] - AS Variable [ Name=#4 ] + AS Variable [ Name=#5 ] ] ) ] @@ -337,12 +288,24 @@ Groupby Variable [ Name=$idCSX ] := Variable [ Name=$idCSX ] - GROUP AS Variable [ Name=#5 ] + Variable [ Name=$sim ] + := + Variable [ Name=$sim ] + GROUP AS Variable [ Name=#1 ] ( paperDBLP:=Variable [ Name=$paperDBLP ] prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ] paperCSX:=Variable [ Name=$paperCSX ] prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ] + idDBLP:=Variable [ Name=$idDBLP ] + tokensUnrankedDBLP:=Variable [ Name=$tokensUnrankedDBLP ] + lenDBLP:=Variable [ Name=$lenDBLP ] + tokensDBLP:=Variable [ Name=$tokensDBLP ] + idCSX:=Variable [ Name=$idCSX ] + tokensUnrankedCSX:=Variable [ Name=$tokensUnrankedCSX ] + lenCSX:=Variable [ Name=$lenCSX ] + tokensCSX:=Variable [ Name=$tokensCSX ] + sim:=Variable [ Name=$sim ] ) Orderby http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/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 ec2346b..e4318eb 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,22 +17,7 @@ RecordConstructor [ LiteralExpr [STRING] [sim] : IndexAccessor [ - FunctionCall asterix.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 ] - ] + Variable [ Name=$sim ] Index: LiteralExpr [LONG] [0] ] ) @@ -44,16 +29,14 @@ FROM [ FunctionCall asterix.dataset@1[ AS Variable [ Name=$paperDBLP ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensDBLP] - Variable [ Name=$paperDBLP ] ] LiteralExpr [LONG] [0] FunctionCall fuzzyjoin.prefix-len-jaccard@2[ FunctionCall fuzzyjoin.len@1[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensDBLP] - Variable [ Name=$paperDBLP ] ] ] LiteralExpr [FLOAT] [0.5] @@ -67,20 +50,14 @@ FROM [ FunctionCall asterix.dataset@1[ AS Variable [ Name=$paperCSX ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@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 asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensCSX] - Variable [ Name=$prefixTokenDBLP ] - Variable [ Name=$paperDBLP ] - Variable [ Name=$paperCSX ] ] ] LiteralExpr [FLOAT] [0.5] @@ -143,35 +120,24 @@ Let Variable [ Name=$tokensDBLP ] Variable [ Name=$tokenGrouped ] := Variable [ Name=$token ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=#2 ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.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 ] + FieldAccessor [ + Variable [ Name=#4 ] + Field=id ] ] - FROM [ Variable [ Name=#1 ] - AS Variable [ Name=#2 ] + FROM [ Variable [ Name=#2 ] + AS Variable [ Name=#4 ] ] ) ] @@ -254,35 +220,20 @@ Let Variable [ Name=$tokensCSX ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.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 ] + FieldAccessor [ + Variable [ Name=#5 ] + Field=id ] ] FROM [ Variable [ Name=#3 ] - AS Variable [ Name=#4 ] + AS Variable [ Name=#5 ] ] ) ] @@ -337,12 +288,24 @@ Groupby Variable [ Name=$idCSX ] := Variable [ Name=$idCSX ] - GROUP AS Variable [ Name=#5 ] + Variable [ Name=$sim ] + := + Variable [ Name=$sim ] + GROUP AS Variable [ Name=#1 ] ( paperDBLP:=Variable [ Name=$paperDBLP ] prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ] paperCSX:=Variable [ Name=$paperCSX ] prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ] + idDBLP:=Variable [ Name=$idDBLP ] + tokensUnrankedDBLP:=Variable [ Name=$tokensUnrankedDBLP ] + lenDBLP:=Variable [ Name=$lenDBLP ] + tokensDBLP:=Variable [ Name=$tokensDBLP ] + idCSX:=Variable [ Name=$idCSX ] + tokensUnrankedCSX:=Variable [ Name=$tokensUnrankedCSX ] + lenCSX:=Variable [ Name=$lenCSX ] + tokensCSX:=Variable [ Name=$tokensCSX ] + sim:=Variable [ Name=$sim ] ) Orderby http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/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 79cfac1..0509a90 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,16 +29,14 @@ FROM [ FunctionCall asterix.dataset@1[ AS Variable [ Name=$paperDBLP ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensDBLP] - Variable [ Name=$paperDBLP ] ] LiteralExpr [LONG] [0] FunctionCall fuzzyjoin.prefix-len-jaccard@2[ FunctionCall fuzzyjoin.len@1[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensDBLP] - Variable [ Name=$paperDBLP ] ] ] LiteralExpr [FLOAT] [0.5] @@ -52,20 +50,14 @@ FROM [ FunctionCall asterix.dataset@1[ AS Variable [ Name=$paperCSX ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@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 asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensCSX] - Variable [ Name=$prefixTokenDBLP ] - Variable [ Name=$paperDBLP ] - Variable [ Name=$paperCSX ] ] ] LiteralExpr [FLOAT] [0.5] @@ -128,35 +120,24 @@ Let Variable [ Name=$tokensDBLP ] Variable [ Name=$tokenGroupped ] := Variable [ Name=$token ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=#2 ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.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 ] + FieldAccessor [ + Variable [ Name=#4 ] + Field=id ] ] - FROM [ Variable [ Name=#1 ] - AS Variable [ Name=#2 ] + FROM [ Variable [ Name=#2 ] + AS Variable [ Name=#4 ] ] ) ] @@ -239,35 +220,20 @@ Let Variable [ Name=$tokensCSX ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.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 ] + FieldAccessor [ + Variable [ Name=#5 ] + Field=id ] ] FROM [ Variable [ Name=#3 ] - AS Variable [ Name=#4 ] + AS Variable [ Name=#5 ] ] ) ] @@ -325,12 +291,21 @@ Groupby Variable [ Name=$sim ] := Variable [ Name=$sim ] - GROUP AS Variable [ Name=#5 ] + GROUP AS Variable [ Name=#1 ] ( paperDBLP:=Variable [ Name=$paperDBLP ] prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ] paperCSX:=Variable [ Name=$paperCSX ] prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ] + idDBLP:=Variable [ Name=$idDBLP ] + tokensUnrankedDBLP:=Variable [ Name=$tokensUnrankedDBLP ] + lenDBLP:=Variable [ Name=$lenDBLP ] + tokensDBLP:=Variable [ Name=$tokensDBLP ] + idCSX:=Variable [ Name=$idCSX ] + tokensUnrankedCSX:=Variable [ Name=$tokensUnrankedCSX ] + lenCSX:=Variable [ Name=$lenCSX ] + tokensCSX:=Variable [ Name=$tokensCSX ] + sim:=Variable [ Name=$sim ] ) Orderby http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/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 ec2346b..e4318eb 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,22 +17,7 @@ RecordConstructor [ LiteralExpr [STRING] [sim] : IndexAccessor [ - FunctionCall asterix.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 ] - ] + Variable [ Name=$sim ] Index: LiteralExpr [LONG] [0] ] ) @@ -44,16 +29,14 @@ FROM [ FunctionCall asterix.dataset@1[ AS Variable [ Name=$paperDBLP ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensDBLP] - Variable [ Name=$paperDBLP ] ] LiteralExpr [LONG] [0] FunctionCall fuzzyjoin.prefix-len-jaccard@2[ FunctionCall fuzzyjoin.len@1[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensDBLP] - Variable [ Name=$paperDBLP ] ] ] LiteralExpr [FLOAT] [0.5] @@ -67,20 +50,14 @@ FROM [ FunctionCall asterix.dataset@1[ AS Variable [ Name=$paperCSX ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@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 asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensCSX] - Variable [ Name=$prefixTokenDBLP ] - Variable [ Name=$paperDBLP ] - Variable [ Name=$paperCSX ] ] ] LiteralExpr [FLOAT] [0.5] @@ -143,35 +120,24 @@ Let Variable [ Name=$tokensDBLP ] Variable [ Name=$tokenGrouped ] := Variable [ Name=$token ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=#2 ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.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 ] + FieldAccessor [ + Variable [ Name=#4 ] + Field=id ] ] - FROM [ Variable [ Name=#1 ] - AS Variable [ Name=#2 ] + FROM [ Variable [ Name=#2 ] + AS Variable [ Name=#4 ] ] ) ] @@ -254,35 +220,20 @@ Let Variable [ Name=$tokensCSX ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.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 ] + FieldAccessor [ + Variable [ Name=#5 ] + Field=id ] ] FROM [ Variable [ Name=#3 ] - AS Variable [ Name=#4 ] + AS Variable [ Name=#5 ] ] ) ] @@ -337,12 +288,24 @@ Groupby Variable [ Name=$idCSX ] := Variable [ Name=$idCSX ] - GROUP AS Variable [ Name=#5 ] + Variable [ Name=$sim ] + := + Variable [ Name=$sim ] + GROUP AS Variable [ Name=#1 ] ( paperDBLP:=Variable [ Name=$paperDBLP ] prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ] paperCSX:=Variable [ Name=$paperCSX ] prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ] + idDBLP:=Variable [ Name=$idDBLP ] + tokensUnrankedDBLP:=Variable [ Name=$tokensUnrankedDBLP ] + lenDBLP:=Variable [ Name=$lenDBLP ] + tokensDBLP:=Variable [ Name=$tokensDBLP ] + idCSX:=Variable [ Name=$idCSX ] + tokensUnrankedCSX:=Variable [ Name=$tokensUnrankedCSX ] + lenCSX:=Variable [ Name=$lenCSX ] + tokensCSX:=Variable [ Name=$tokensCSX ] + sim:=Variable [ Name=$sim ] ) Orderby http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/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 79cfac1..0509a90 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,16 +29,14 @@ FROM [ FunctionCall asterix.dataset@1[ AS Variable [ Name=$paperDBLP ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensDBLP] - Variable [ Name=$paperDBLP ] ] LiteralExpr [LONG] [0] FunctionCall fuzzyjoin.prefix-len-jaccard@2[ FunctionCall fuzzyjoin.len@1[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensDBLP] - Variable [ Name=$paperDBLP ] ] ] LiteralExpr [FLOAT] [0.5] @@ -52,20 +50,14 @@ FROM [ FunctionCall asterix.dataset@1[ AS Variable [ Name=$paperCSX ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@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 asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensCSX] - Variable [ Name=$prefixTokenDBLP ] - Variable [ Name=$paperDBLP ] - Variable [ Name=$paperCSX ] ] ] LiteralExpr [FLOAT] [0.5] @@ -128,35 +120,24 @@ Let Variable [ Name=$tokensDBLP ] Variable [ Name=$tokenGroupped ] := Variable [ Name=$token ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=#2 ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.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 ] + FieldAccessor [ + Variable [ Name=#4 ] + Field=id ] ] - FROM [ Variable [ Name=#1 ] - AS Variable [ Name=#2 ] + FROM [ Variable [ Name=#2 ] + AS Variable [ Name=#4 ] ] ) ] @@ -239,35 +220,20 @@ Let Variable [ Name=$tokensCSX ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.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 ] + FieldAccessor [ + Variable [ Name=#5 ] + Field=id ] ] FROM [ Variable [ Name=#3 ] - AS Variable [ Name=#4 ] + AS Variable [ Name=#5 ] ] ) ] @@ -325,12 +291,21 @@ Groupby Variable [ Name=$sim ] := Variable [ Name=$sim ] - GROUP AS Variable [ Name=#5 ] + GROUP AS Variable [ Name=#1 ] ( paperDBLP:=Variable [ Name=$paperDBLP ] prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ] paperCSX:=Variable [ Name=$paperCSX ] prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ] + idDBLP:=Variable [ Name=$idDBLP ] + tokensUnrankedDBLP:=Variable [ Name=$tokensUnrankedDBLP ] + lenDBLP:=Variable [ Name=$lenDBLP ] + tokensDBLP:=Variable [ Name=$tokensDBLP ] + idCSX:=Variable [ Name=$idCSX ] + tokensUnrankedCSX:=Variable [ Name=$tokensUnrankedCSX ] + lenCSX:=Variable [ Name=$lenCSX ] + tokensCSX:=Variable [ Name=$tokensCSX ] + sim:=Variable [ Name=$sim ] ) Orderby http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/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 26e2200..21fb6cb 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,16 +52,14 @@ FROM [ ( AS Variable [ Name=$paperDBLP ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensDBLP] - Variable [ Name=$paperDBLP ] ] LiteralExpr [LONG] [0] FunctionCall fuzzyjoin.prefix-len-jaccard@2[ FunctionCall fuzzyjoin.len@1[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensDBLP] - Variable [ Name=$paperDBLP ] ] ] LiteralExpr [FLOAT] [0.5] @@ -75,20 +73,14 @@ FROM [ ( AS Variable [ Name=$paperCSX ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@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 asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensCSX] - Variable [ Name=$prefixTokenDBLP ] - Variable [ Name=$paperDBLP ] - Variable [ Name=$paperCSX ] ] ] LiteralExpr [FLOAT] [0.5] @@ -131,7 +123,7 @@ FROM [ ( Variable [ Name=$tokenGroupped ] := Variable [ Name=$token ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=#2 ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] @@ -142,12 +134,12 @@ FROM [ ( ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=#2 ] + Variable [ Name=#4 ] Field=paper ] ] - FROM [ Variable [ Name=#1 ] - AS Variable [ Name=#2 ] + FROM [ Variable [ Name=#2 ] + AS Variable [ Name=#4 ] ] ) ] @@ -217,12 +209,12 @@ Variable [ Name=$i ] ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=#4 ] + Variable [ Name=#5 ] Field=paper ] ] FROM [ Variable [ Name=#3 ] - AS Variable [ Name=#4 ] + AS Variable [ Name=#5 ] ] ) ] @@ -300,12 +292,15 @@ Variable [ Name=$i ] Variable [ Name=$sim ] := Variable [ Name=$sim ] - GROUP AS Variable [ Name=#5 ] + GROUP AS Variable [ Name=#1 ] ( paperDBLP:=Variable [ Name=$paperDBLP ] prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ] paperCSX:=Variable [ Name=$paperCSX ] prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ] + tokensDBLP:=Variable [ Name=$tokensDBLP ] + tokensCSX:=Variable [ Name=$tokensCSX ] + sim:=Variable [ Name=$sim ] ) ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/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 b1c130b..7d5acad 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,16 +52,14 @@ FROM [ ( AS Variable [ Name=$paperDBLP ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensDBLP] - Variable [ Name=$paperDBLP ] ] LiteralExpr [LONG] [0] FunctionCall fuzzyjoin.prefix-len-jaccard@2[ FunctionCall fuzzyjoin.len@1[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensDBLP] - Variable [ Name=$paperDBLP ] ] ] LiteralExpr [FLOAT] [0.5] @@ -75,20 +73,14 @@ FROM [ ( AS Variable [ Name=$paperCSX ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@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 asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensCSX] - Variable [ Name=$prefixTokenDBLP ] - Variable [ Name=$paperDBLP ] - Variable [ Name=$paperCSX ] ] ] LiteralExpr [FLOAT] [0.5] @@ -137,32 +129,24 @@ FROM [ ( Variable [ Name=$tokenGroupped ] := Variable [ Name=$token ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=#2 ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.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 ] + FieldAccessor [ + Variable [ Name=#4 ] + Field=id ] ] - FROM [ Variable [ Name=#1 ] - AS Variable [ Name=#2 ] + FROM [ Variable [ Name=#2 ] + AS Variable [ Name=#4 ] ] ) ] @@ -231,29 +215,20 @@ Variable [ Name=$i ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.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 ] + FieldAccessor [ + Variable [ Name=#5 ] + Field=id ] ] FROM [ Variable [ Name=#3 ] - AS Variable [ Name=#4 ] + AS Variable [ Name=#5 ] ] ) ] @@ -331,12 +306,15 @@ Variable [ Name=$i ] Variable [ Name=$sim ] := Variable [ Name=$sim ] - GROUP AS Variable [ Name=#5 ] + GROUP AS Variable [ Name=#1 ] ( paperDBLP:=Variable [ Name=$paperDBLP ] prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ] paperCSX:=Variable [ Name=$paperCSX ] prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ] + tokensDBLP:=Variable [ Name=$tokensDBLP ] + tokensCSX:=Variable [ Name=$tokensCSX ] + sim:=Variable [ Name=$sim ] ) ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/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 c17294b..8dffafe 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,16 +52,14 @@ FROM [ ( AS Variable [ Name=$paperDBLP ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensDBLP] - Variable [ Name=$paperDBLP ] ] LiteralExpr [LONG] [0] FunctionCall fuzzyjoin.prefix-len-jaccard@2[ FunctionCall fuzzyjoin.len@1[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensDBLP] - Variable [ Name=$paperDBLP ] ] ] LiteralExpr [FLOAT] [0.5] @@ -75,20 +73,14 @@ FROM [ ( AS Variable [ Name=$paperCSX ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@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 asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensCSX] - Variable [ Name=$prefixTokenDBLP ] - Variable [ Name=$paperDBLP ] - Variable [ Name=$paperCSX ] ] ] LiteralExpr [FLOAT] [0.5] @@ -143,33 +135,24 @@ FROM [ ( Variable [ Name=$tokenGroupped ] := Variable [ Name=$token ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=#2 ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.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 ] + FieldAccessor [ + Variable [ Name=#4 ] + Field=id ] ] - FROM [ Variable [ Name=#1 ] - AS Variable [ Name=#2 ] + FROM [ Variable [ Name=#2 ] + AS Variable [ Name=#4 ] ] ) ] @@ -244,31 +227,20 @@ Variable [ Name=$i ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.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 ] + FieldAccessor [ + Variable [ Name=#5 ] + Field=id ] ] FROM [ Variable [ Name=#3 ] - AS Variable [ Name=#4 ] + AS Variable [ Name=#5 ] ] ) ] @@ -340,12 +312,17 @@ Variable [ Name=$i ] Variable [ Name=$sim ] := Variable [ Name=$sim ] - GROUP AS Variable [ Name=#5 ] + GROUP AS Variable [ Name=#1 ] ( paperDBLP:=Variable [ Name=$paperDBLP ] prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ] paperCSX:=Variable [ Name=$paperCSX ] prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ] + idDBLP:=Variable [ Name=$idDBLP ] + tokensDBLP:=Variable [ Name=$tokensDBLP ] + idCSX:=Variable [ Name=$idCSX ] + tokensCSX:=Variable [ Name=$tokensCSX ] + sim:=Variable [ Name=$sim ] ) ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/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 9403a30..f25d0b8 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,16 +52,14 @@ FROM [ ( AS Variable [ Name=$paperDBLP ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensDBLP] - Variable [ Name=$paperDBLP ] ] LiteralExpr [LONG] [0] FunctionCall fuzzyjoin.prefix-len-jaccard@2[ FunctionCall fuzzyjoin.len@1[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensDBLP] - Variable [ Name=$paperDBLP ] ] ] LiteralExpr [FLOAT] [0.5] @@ -75,20 +73,14 @@ FROM [ ( AS Variable [ Name=$paperCSX ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@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 asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensCSX] - Variable [ Name=$prefixTokenDBLP ] - Variable [ Name=$paperDBLP ] - Variable [ Name=$paperCSX ] ] ] LiteralExpr [FLOAT] [0.5] @@ -146,34 +138,24 @@ FROM [ ( Variable [ Name=$tokenGroupped ] := Variable [ Name=$token ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=#2 ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.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 ] + FieldAccessor [ + Variable [ Name=#4 ] + Field=id ] ] - FROM [ Variable [ Name=#1 ] - AS Variable [ Name=#2 ] + FROM [ Variable [ Name=#2 ] + AS Variable [ Name=#4 ] ] ) ] @@ -251,33 +233,20 @@ Variable [ Name=$i ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.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 ] + FieldAccessor [ + Variable [ Name=#5 ] + Field=id ] ] FROM [ Variable [ Name=#3 ] - AS Variable [ Name=#4 ] + AS Variable [ Name=#5 ] ] ) ] @@ -339,12 +308,19 @@ Variable [ Name=$i ] Variable [ Name=$sim ] := Variable [ Name=$sim ] - GROUP AS Variable [ Name=#5 ] + GROUP AS Variable [ Name=#1 ] ( paperDBLP:=Variable [ Name=$paperDBLP ] prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ] paperCSX:=Variable [ Name=$paperCSX ] prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ] + idDBLP:=Variable [ Name=$idDBLP ] + tokensUnrankedDBLP:=Variable [ Name=$tokensUnrankedDBLP ] + tokensDBLP:=Variable [ Name=$tokensDBLP ] + idCSX:=Variable [ Name=$idCSX ] + tokensUnrankedCSX:=Variable [ Name=$tokensUnrankedCSX ] + tokensCSX:=Variable [ Name=$tokensCSX ] + sim:=Variable [ Name=$sim ] ) ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/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 74a82c9..5794d99 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,22 +40,7 @@ FROM [ ( LiteralExpr [STRING] [sim] : IndexAccessor [ - FunctionCall asterix.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 ] - ] + Variable [ Name=$sim ] Index: LiteralExpr [LONG] [0] ] ) @@ -67,16 +52,14 @@ FROM [ ( AS Variable [ Name=$paperDBLP ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensDBLP] - Variable [ Name=$paperDBLP ] ] LiteralExpr [LONG] [0] FunctionCall fuzzyjoin.prefix-len-jaccard@2[ FunctionCall fuzzyjoin.len@1[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensDBLP] - Variable [ Name=$paperDBLP ] ] ] LiteralExpr [FLOAT] [0.5] @@ -90,20 +73,14 @@ FROM [ ( AS Variable [ Name=$paperCSX ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@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 asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensCSX] - Variable [ Name=$prefixTokenDBLP ] - Variable [ Name=$paperDBLP ] - Variable [ Name=$paperCSX ] ] ] LiteralExpr [FLOAT] [0.5] @@ -166,35 +143,24 @@ FROM [ ( Variable [ Name=$tokenGrouped ] := Variable [ Name=$token ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=#2 ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.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 ] + FieldAccessor [ + Variable [ Name=#4 ] + Field=id ] ] - FROM [ Variable [ Name=#1 ] - AS Variable [ Name=#2 ] + FROM [ Variable [ Name=#2 ] + AS Variable [ Name=#4 ] ] ) ] @@ -277,35 +243,20 @@ Variable [ Name=$i ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.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 ] + FieldAccessor [ + Variable [ Name=#5 ] + Field=id ] ] FROM [ Variable [ Name=#3 ] - AS Variable [ Name=#4 ] + AS Variable [ Name=#5 ] ] ) ] @@ -360,12 +311,24 @@ Variable [ Name=$i ] Variable [ Name=$idCSX ] := Variable [ Name=$idCSX ] - GROUP AS Variable [ Name=#5 ] + Variable [ Name=$sim ] + := + Variable [ Name=$sim ] + GROUP AS Variable [ Name=#1 ] ( paperDBLP:=Variable [ Name=$paperDBLP ] prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ] paperCSX:=Variable [ Name=$paperCSX ] prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ] + idDBLP:=Variable [ Name=$idDBLP ] + tokensUnrankedDBLP:=Variable [ Name=$tokensUnrankedDBLP ] + lenDBLP:=Variable [ Name=$lenDBLP ] + tokensDBLP:=Variable [ Name=$tokensDBLP ] + idCSX:=Variable [ Name=$idCSX ] + tokensUnrankedCSX:=Variable [ Name=$tokensUnrankedCSX ] + lenCSX:=Variable [ Name=$lenCSX ] + tokensCSX:=Variable [ Name=$tokensCSX ] + sim:=Variable [ Name=$sim ] ) ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/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 74a82c9..5794d99 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,22 +40,7 @@ FROM [ ( LiteralExpr [STRING] [sim] : IndexAccessor [ - FunctionCall asterix.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 ] - ] + Variable [ Name=$sim ] Index: LiteralExpr [LONG] [0] ] ) @@ -67,16 +52,14 @@ FROM [ ( AS Variable [ Name=$paperDBLP ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensDBLP] - Variable [ Name=$paperDBLP ] ] LiteralExpr [LONG] [0] FunctionCall fuzzyjoin.prefix-len-jaccard@2[ FunctionCall fuzzyjoin.len@1[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensDBLP] - Variable [ Name=$paperDBLP ] ] ] LiteralExpr [FLOAT] [0.5] @@ -90,20 +73,14 @@ FROM [ ( AS Variable [ Name=$paperCSX ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@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 asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensCSX] - Variable [ Name=$prefixTokenDBLP ] - Variable [ Name=$paperDBLP ] - Variable [ Name=$paperCSX ] ] ] LiteralExpr [FLOAT] [0.5] @@ -166,35 +143,24 @@ FROM [ ( Variable [ Name=$tokenGrouped ] := Variable [ Name=$token ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=#2 ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.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 ] + FieldAccessor [ + Variable [ Name=#4 ] + Field=id ] ] - FROM [ Variable [ Name=#1 ] - AS Variable [ Name=#2 ] + FROM [ Variable [ Name=#2 ] + AS Variable [ Name=#4 ] ] ) ] @@ -277,35 +243,20 @@ Variable [ Name=$i ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.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 ] + FieldAccessor [ + Variable [ Name=#5 ] + Field=id ] ] FROM [ Variable [ Name=#3 ] - AS Variable [ Name=#4 ] + AS Variable [ Name=#5 ] ] ) ] @@ -360,12 +311,24 @@ Variable [ Name=$i ] Variable [ Name=$idCSX ] := Variable [ Name=$idCSX ] - GROUP AS Variable [ Name=#5 ] + Variable [ Name=$sim ] + := + Variable [ Name=$sim ] + GROUP AS Variable [ Name=#1 ] ( paperDBLP:=Variable [ Name=$paperDBLP ] prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ] paperCSX:=Variable [ Name=$paperCSX ] prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ] + idDBLP:=Variable [ Name=$idDBLP ] + tokensUnrankedDBLP:=Variable [ Name=$tokensUnrankedDBLP ] + lenDBLP:=Variable [ Name=$lenDBLP ] + tokensDBLP:=Variable [ Name=$tokensDBLP ] + idCSX:=Variable [ Name=$idCSX ] + tokensUnrankedCSX:=Variable [ Name=$tokensUnrankedCSX ] + lenCSX:=Variable [ Name=$lenCSX ] + tokensCSX:=Variable [ Name=$tokensCSX ] + sim:=Variable [ Name=$sim ] ) ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/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 74a82c9..5794d99 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 @@ -40,22 +40,7 @@ FROM [ ( LiteralExpr [STRING] [sim] : IndexAccessor [ - FunctionCall asterix.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 ] - ] + Variable [ Name=$sim ] Index: LiteralExpr [LONG] [0] ] ) @@ -67,16 +52,14 @@ FROM [ ( AS Variable [ Name=$paperDBLP ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensDBLP] - Variable [ Name=$paperDBLP ] ] LiteralExpr [LONG] [0] FunctionCall fuzzyjoin.prefix-len-jaccard@2[ FunctionCall fuzzyjoin.len@1[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensDBLP] - Variable [ Name=$paperDBLP ] ] ] LiteralExpr [FLOAT] [0.5] @@ -90,20 +73,14 @@ FROM [ ( AS Variable [ Name=$paperCSX ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@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 asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensCSX] - Variable [ Name=$prefixTokenDBLP ] - Variable [ Name=$paperDBLP ] - Variable [ Name=$paperCSX ] ] ] LiteralExpr [FLOAT] [0.5] @@ -166,35 +143,24 @@ FROM [ ( Variable [ Name=$tokenGrouped ] := Variable [ Name=$token ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=#2 ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.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 ] + FieldAccessor [ + Variable [ Name=#4 ] + Field=id ] ] - FROM [ Variable [ Name=#1 ] - AS Variable [ Name=#2 ] + FROM [ Variable [ Name=#2 ] + AS Variable [ Name=#4 ] ] ) ] @@ -277,35 +243,20 @@ Variable [ Name=$i ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.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 ] + FieldAccessor [ + Variable [ Name=#5 ] + Field=id ] ] FROM [ Variable [ Name=#3 ] - AS Variable [ Name=#4 ] + AS Variable [ Name=#5 ] ] ) ] @@ -360,12 +311,24 @@ Variable [ Name=$i ] Variable [ Name=$idCSX ] := Variable [ Name=$idCSX ] - GROUP AS Variable [ Name=#5 ] + Variable [ Name=$sim ] + := + Variable [ Name=$sim ] + GROUP AS Variable [ Name=#1 ] ( paperDBLP:=Variable [ Name=$paperDBLP ] prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ] paperCSX:=Variable [ Name=$paperCSX ] prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ] + idDBLP:=Variable [ Name=$idDBLP ] + tokensUnrankedDBLP:=Variable [ Name=$tokensUnrankedDBLP ] + lenDBLP:=Variable [ Name=$lenDBLP ] + tokensDBLP:=Variable [ Name=$tokensDBLP ] + idCSX:=Variable [ Name=$idCSX ] + tokensUnrankedCSX:=Variable [ Name=$tokensUnrankedCSX ] + lenCSX:=Variable [ Name=$lenCSX ] + tokensCSX:=Variable [ Name=$tokensCSX ] + sim:=Variable [ Name=$sim ] ) ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/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 09b0092..04290ce 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 @@ -52,16 +52,14 @@ FROM [ ( AS Variable [ Name=$paperDBLP ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensDBLP] - Variable [ Name=$paperDBLP ] ] LiteralExpr [LONG] [0] FunctionCall fuzzyjoin.prefix-len-jaccard@2[ FunctionCall fuzzyjoin.len@1[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensDBLP] - Variable [ Name=$paperDBLP ] ] ] LiteralExpr [FLOAT] [0.5] @@ -75,20 +73,14 @@ FROM [ ( AS Variable [ Name=$paperCSX ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@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 asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensCSX] - Variable [ Name=$prefixTokenDBLP ] - Variable [ Name=$paperDBLP ] - Variable [ Name=$paperCSX ] ] ] LiteralExpr [FLOAT] [0.5] @@ -151,35 +143,24 @@ FROM [ ( Variable [ Name=$tokenGroupped ] := Variable [ Name=$token ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=#2 ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.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 ] + FieldAccessor [ + Variable [ Name=#4 ] + Field=id ] ] - FROM [ Variable [ Name=#1 ] - AS Variable [ Name=#2 ] + FROM [ Variable [ Name=#2 ] + AS Variable [ Name=#4 ] ] ) ] @@ -262,35 +243,20 @@ Variable [ Name=$i ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.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 ] + FieldAccessor [ + Variable [ Name=#5 ] + Field=id ] ] FROM [ Variable [ Name=#3 ] - AS Variable [ Name=#4 ] + AS Variable [ Name=#5 ] ] ) ] @@ -348,12 +314,21 @@ Variable [ Name=$i ] Variable [ Name=$sim ] := Variable [ Name=$sim ] - GROUP AS Variable [ Name=#5 ] + GROUP AS Variable [ Name=#1 ] ( paperDBLP:=Variable [ Name=$paperDBLP ] prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ] paperCSX:=Variable [ Name=$paperCSX ] prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ] + idDBLP:=Variable [ Name=$idDBLP ] + tokensUnrankedDBLP:=Variable [ Name=$tokensUnrankedDBLP ] + lenDBLP:=Variable [ Name=$lenDBLP ] + tokensDBLP:=Variable [ Name=$tokensDBLP ] + idCSX:=Variable [ Name=$idCSX ] + tokensUnrankedCSX:=Variable [ Name=$tokensUnrankedCSX ] + lenCSX:=Variable [ Name=$lenCSX ] + tokensCSX:=Variable [ Name=$tokensCSX ] + sim:=Variable [ Name=$sim ] ) )
