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.4.1/dblp-csx-3_5.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.4.1/dblp-csx-3_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.4.1/dblp-csx-3_5.3.ast index 1a9973c..897fe6b 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.4.1/dblp-csx-3_5.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.4.1/dblp-csx-3_5.3.ast @@ -87,22 +87,7 @@ FROM [ FunctionCall asterix.dataset@1[ 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] ] ) @@ -114,18 +99,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 ] - 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] [tokensDBLP] - Variable [ Name=$paperDBLP ] - Variable [ Name=$paperCSX ] ] ] LiteralExpr [FLOAT] [0.5] @@ -139,20 +120,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] @@ -215,35 +190,24 @@ FROM [ FunctionCall asterix.dataset@1[ 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 ] ] ) ] @@ -326,35 +290,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 ] ] ) ] @@ -409,12 +358,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.4/dblp-csx-3_5.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.4/dblp-csx-3_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.4/dblp-csx-3_5.3.ast index 58d5ac7..f404dac 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.4/dblp-csx-3_5.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.4/dblp-csx-3_5.3.ast @@ -87,22 +87,7 @@ FROM [ FunctionCall asterix.dataset@1[ 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] ] ) @@ -114,18 +99,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 ] - 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] [tokensDBLP] - Variable [ Name=$paperDBLP ] - Variable [ Name=$paperCSX ] ] ] LiteralExpr [FLOAT] [0.5] @@ -139,20 +120,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] @@ -215,35 +190,24 @@ FROM [ FunctionCall asterix.dataset@1[ 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 ] ] ) ] @@ -326,35 +290,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 ] ] ) ] @@ -409,12 +358,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/dblp-csx-3_5.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5/dblp-csx-3_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5/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/dblp-csx-3_5.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5/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 ] ) ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_02/hdfs_02.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_02/hdfs_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_02/hdfs_02.3.ast index b072ef5..f88caa5 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_02/hdfs_02.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_02/hdfs_02.3.ast @@ -13,10 +13,9 @@ RecordConstructor [ FunctionCall asterix.count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [token] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$tok ] + LiteralExpr [STRING] [token] ] ] FROM [ Variable [ Name=$g ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_03/hdfs_03.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_03/hdfs_03.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_03/hdfs_03.3.ast index b072ef5..f88caa5 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_03/hdfs_03.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_03/hdfs_03.3.ast @@ -13,10 +13,9 @@ RecordConstructor [ FunctionCall asterix.count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [token] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$tok ] + LiteralExpr [STRING] [token] ] ] FROM [ Variable [ Name=$g ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_shortcircuit/hdfs_shortcircuit.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_shortcircuit/hdfs_shortcircuit.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_shortcircuit/hdfs_shortcircuit.3.ast index b072ef5..f88caa5 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_shortcircuit/hdfs_shortcircuit.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_shortcircuit/hdfs_shortcircuit.3.ast @@ -13,10 +13,9 @@ RecordConstructor [ FunctionCall asterix.count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [token] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$tok ] + LiteralExpr [STRING] [token] ] ] FROM [ Variable [ Name=$g ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hints/issue_251_dataset_hint_6/issue_251_dataset_hint_6.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hints/issue_251_dataset_hint_6/issue_251_dataset_hint_6.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hints/issue_251_dataset_hint_6/issue_251_dataset_hint_6.3.ast index b072ef5..f88caa5 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hints/issue_251_dataset_hint_6/issue_251_dataset_hint_6.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hints/issue_251_dataset_hint_6/issue_251_dataset_hint_6.3.ast @@ -13,10 +13,9 @@ RecordConstructor [ FunctionCall asterix.count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [token] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$tok ] + LiteralExpr [STRING] [token] ] ] FROM [ Variable [ Name=$g ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/groupby-orderby-count/groupby-orderby-count.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/groupby-orderby-count/groupby-orderby-count.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/groupby-orderby-count/groupby-orderby-count.3.ast index 9c7ca3e..8784d48 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/groupby-orderby-count/groupby-orderby-count.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/groupby-orderby-count/groupby-orderby-count.3.ast @@ -13,10 +13,9 @@ RecordConstructor [ FunctionCall asterix.count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [token] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$tok ] + LiteralExpr [STRING] [token] ] ] FROM [ Variable [ Name=$g ] @@ -54,10 +53,9 @@ Orderby FunctionCall asterix.count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [token] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$tok ] + LiteralExpr [STRING] [token] ] ] FROM [ Variable [ Name=$g ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue456/query-issue456.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue456/query-issue456.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue456/query-issue456.3.ast index 09d263d..b276b19 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue456/query-issue456.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue456/query-issue456.3.ast @@ -2,14 +2,14 @@ DataverseUse test Query: SELECT ELEMENT [ OrderedListConstructor [ - FieldAccessor [ - Variable [ Name=$x ] - Field=int_m - ] + Variable [ Name=$int_m ] FunctionCall asterix.count@1[ ( SELECT ELEMENT [ - Variable [ Name=$x ] + FunctionCall asterix.field-access-by-name@2[ + Variable [ Name=$g ] + LiteralExpr [STRING] [x] + ] ] FROM [ Variable [ Name=$g ] AS Variable [ Name=$g ] @@ -39,12 +39,10 @@ Groupby GROUP AS Variable [ Name=$g ] ( x:=Variable [ Name=$x ] + id:=Variable [ Name=$id ] ) Orderby - FieldAccessor [ - Variable [ Name=$x ] - Field=int_m - ] + Variable [ Name=$int_m ] ASC http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/semistructured/count-nullable/count-nullable.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/semistructured/count-nullable/count-nullable.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/semistructured/count-nullable/count-nullable.3.ast index 0c83370..76e40c5 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/semistructured/count-nullable/count-nullable.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/semistructured/count-nullable/count-nullable.3.ast @@ -13,10 +13,9 @@ RecordConstructor [ FunctionCall asterix.count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [c] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$age ] + LiteralExpr [STRING] [c] ] ] FROM [ Variable [ Name=$g ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.3.ast index 8346dad..b37afaf 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.3.ast @@ -89,6 +89,8 @@ Groupby GROUP AS Variable [ Name=$g ] ( t:=Variable [ Name=$t ] + keywords:=Variable [ Name=$keywords ] + region:=Variable [ Name=$region ] ) Let Variable [ Name=$num ] @@ -96,7 +98,10 @@ Let Variable [ Name=$num ] FunctionCall asterix.count@1[ ( SELECT ELEMENT [ - Variable [ Name=$t ] + FunctionCall asterix.field-access-by-name@2[ + Variable [ Name=$g ] + LiteralExpr [STRING] [t] + ] ] FROM [ Variable [ Name=$g ] AS Variable [ Name=$g ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/cell-aggregation/cell-aggregation.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/cell-aggregation/cell-aggregation.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/cell-aggregation/cell-aggregation.3.ast index 2b26217..342584e 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/cell-aggregation/cell-aggregation.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/cell-aggregation/cell-aggregation.3.ast @@ -47,10 +47,9 @@ Let Variable [ Name=$grid ] FunctionCall asterix.count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [o] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$c ] + LiteralExpr [STRING] [o] ] ] FROM [ Variable [ Name=$g ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins_gby_0/overlap_bins_gby_0.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins_gby_0/overlap_bins_gby_0.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins_gby_0/overlap_bins_gby_0.3.ast index 44c2b3b..d237bd8 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins_gby_0/overlap_bins_gby_0.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins_gby_0/overlap_bins_gby_0.3.ast @@ -41,10 +41,9 @@ FROM [ ( : ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [i] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$bin ] + LiteralExpr [STRING] [i] ] ] FROM [ Variable [ Name=$g ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins_gby_1/overlap_bins_gby_1.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins_gby_1/overlap_bins_gby_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins_gby_1/overlap_bins_gby_1.3.ast index 6edcb68..998fc6c 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins_gby_1/overlap_bins_gby_1.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins_gby_1/overlap_bins_gby_1.3.ast @@ -10,20 +10,13 @@ RecordConstructor [ ( LiteralExpr [STRING] [count] : - FunctionCall asterix.sql-count@1[ + FunctionCall asterix.count@1[ ( SELECT ELEMENT [ - ( - SELECT ELEMENT [ - LiteralExpr [LONG] [1] - ] - FROM [ Variable [ Name=$g ] - AS Variable [ Name=$g ] - ] - ) + LiteralExpr [LONG] [1] ] FROM [ Variable [ Name=$g ] - AS Variable [ Name=#1 ] + AS Variable [ Name=$g ] ] ) ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.26.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.26.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.26.ast index 2228a45..9805e0a 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.26.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.26.ast @@ -1,14 +1,7 @@ DataverseUse TinySocial Query: SELECT [ -FieldAccessor [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [employment] - Variable [ Name=#1 ] - Variable [ Name=$organization-name ] - ] - Field=organization-name -] +Variable [ Name=$organization-name ] organization FunctionCall asterix.sql-avg@1[ ( @@ -125,13 +118,6 @@ Groupby ) Orderby - FieldAccessor [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [employment] - Variable [ Name=#1 ] - Variable [ Name=$organization-name ] - ] - Field=organization-name - ] + Variable [ Name=$organization-name ] ASC http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.27.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.27.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.27.ast index c982ef7..0cbc410 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.27.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.27.ast @@ -103,3 +103,9 @@ FROM [ FunctionCall asterix.dataset@1[ AS Variable [ Name=$employment ] ] Group All + GROUP AS Variable [ Name=#1 ] + ( + fbu:=Variable [ Name=$fbu ] + employment:=Variable [ Name=$employment ] + ) + http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.ast index 531a2ef..753f130 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.ast @@ -199,11 +199,9 @@ RecordConstructor [ FunctionCall asterix.count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [l] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$l_linestatus ] - Variable [ Name=$l_returnflag ] + LiteralExpr [STRING] [l] ] ] FROM [ Variable [ Name=$g ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q03_shipping_priority_nt/q03_shipping_priority_nt.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q03_shipping_priority_nt/q03_shipping_priority_nt.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q03_shipping_priority_nt/q03_shipping_priority_nt.3.ast index 7b69432..f0ad1f5 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q03_shipping_priority_nt/q03_shipping_priority_nt.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q03_shipping_priority_nt/q03_shipping_priority_nt.3.ast @@ -145,12 +145,9 @@ Let Variable [ Name=$revenue ] ] FROM [ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [l] - Variable [ Name=$o_shippriority ] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$o_orderdate ] - Variable [ Name=$l_orderkey ] + LiteralExpr [STRING] [l] ] ] FROM [ Variable [ Name=$g ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q05_local_supplier_volume/q05_local_supplier_volume.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q05_local_supplier_volume/q05_local_supplier_volume.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q05_local_supplier_volume/q05_local_supplier_volume.3.ast index 8a2f536..e65436e 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q05_local_supplier_volume/q05_local_supplier_volume.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q05_local_supplier_volume/q05_local_supplier_volume.3.ast @@ -326,10 +326,9 @@ Let Variable [ Name=$revenue ] ] FROM [ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [o1] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$n_name ] + LiteralExpr [STRING] [o1] ] ] FROM [ Variable [ Name=$g ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q06_forecast_revenue_change/q06_forecast_revenue_change.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q06_forecast_revenue_change/q06_forecast_revenue_change.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q06_forecast_revenue_change/q06_forecast_revenue_change.3.ast index 60ca4f3..5d306b5 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q06_forecast_revenue_change/q06_forecast_revenue_change.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q06_forecast_revenue_change/q06_forecast_revenue_change.3.ast @@ -82,3 +82,8 @@ Where ] ] Group All + GROUP AS Variable [ Name=#1 ] + ( + l:=Variable [ Name=$l ] + ) + http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q07_volume_shipping/q07_volume_shipping.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q07_volume_shipping/q07_volume_shipping.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q07_volume_shipping/q07_volume_shipping.3.ast index b5729fd..4a93077 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q07_volume_shipping/q07_volume_shipping.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q07_volume_shipping/q07_volume_shipping.3.ast @@ -369,6 +369,7 @@ Groupby ( locs:=Variable [ Name=$locs ] t:=Variable [ Name=$t ] + l_year0:=Variable [ Name=$l_year0 ] ) Let Variable [ Name=$revenue ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q10_returned_item/q10_returned_item.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q10_returned_item/q10_returned_item.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q10_returned_item/q10_returned_item.3.ast index 81ed2d2..1bb8627 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q10_returned_item/q10_returned_item.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q10_returned_item/q10_returned_item.3.ast @@ -356,16 +356,9 @@ Let Variable [ Name=$revenue ] ] FROM [ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [locn] - Variable [ Name=$c_address ] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$c_name ] - Variable [ Name=$c_phone ] - Variable [ Name=$c_acctbal ] - Variable [ Name=$n_name ] - Variable [ Name=$c_custkey ] - Variable [ Name=$c_comment ] + LiteralExpr [STRING] [locn] ] ] FROM [ Variable [ Name=$g ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q10_returned_item_int64/q10_returned_item_int64.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q10_returned_item_int64/q10_returned_item_int64.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q10_returned_item_int64/q10_returned_item_int64.3.ast index 81ed2d2..1bb8627 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q10_returned_item_int64/q10_returned_item_int64.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q10_returned_item_int64/q10_returned_item_int64.3.ast @@ -356,16 +356,9 @@ Let Variable [ Name=$revenue ] ] FROM [ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [locn] - Variable [ Name=$c_address ] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$c_name ] - Variable [ Name=$c_phone ] - Variable [ Name=$c_acctbal ] - Variable [ Name=$n_name ] - Variable [ Name=$c_custkey ] - Variable [ Name=$c_comment ] + LiteralExpr [STRING] [locn] ] ] FROM [ Variable [ Name=$g ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q13_customer_distribution/q13_customer_distribution.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q13_customer_distribution/q13_customer_distribution.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q13_customer_distribution/q13_customer_distribution.3.ast index 7f06804..0c026d7 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q13_customer_distribution/q13_customer_distribution.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q13_customer_distribution/q13_customer_distribution.3.ast @@ -36,10 +36,9 @@ FROM [ ( ] FROM [ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [co] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g2 ] - Variable [ Name=$c_custkey ] + LiteralExpr [STRING] [co] ] ] FROM [ Variable [ Name=$g2 ] @@ -145,23 +144,16 @@ Groupby Let Variable [ Name=$custdist ] := - FunctionCall asterix.sql-count@1[ + FunctionCall asterix.count@1[ ( SELECT ELEMENT [ - ( - SELECT ELEMENT [ - FieldAccessor [ - Variable [ Name=#1 ] - Field=gco - ] - ] - FROM [ Variable [ Name=$g ] - AS Variable [ Name=$g ] - ] - ) + FunctionCall asterix.field-access-by-name@2[ + Variable [ Name=$g ] + LiteralExpr [STRING] [gco] + ] ] FROM [ Variable [ Name=$g ] - AS Variable [ Name=#1 ] + AS Variable [ Name=$g ] ] ) ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q14_promotion_effect/q14_promotion_effect.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q14_promotion_effect/q14_promotion_effect.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q14_promotion_effect/q14_promotion_effect.3.ast index 05e22d1..9ac71e1 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q14_promotion_effect/q14_promotion_effect.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q14_promotion_effect/q14_promotion_effect.3.ast @@ -24,7 +24,7 @@ OperatorExpr [ ] * OperatorExpr [ - LiteralExpr [LONG] [1] + Variable [ Name=$t ] - FieldAccessor [ Variable [ Name=$i ] @@ -39,12 +39,9 @@ OperatorExpr [ ] FROM [ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [lp] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$l ] - Variable [ Name=$p ] - Variable [ Name=$t ] + LiteralExpr [STRING] [lp] ] ] FROM [ Variable [ Name=$g ] @@ -66,7 +63,7 @@ OperatorExpr [ ] * OperatorExpr [ - LiteralExpr [LONG] [1] + Variable [ Name=$t ] - FieldAccessor [ Variable [ Name=$i ] @@ -77,12 +74,9 @@ OperatorExpr [ ] FROM [ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [lp] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$l ] - Variable [ Name=$p ] - Variable [ Name=$t ] + LiteralExpr [STRING] [lp] ] ] FROM [ Variable [ Name=$g ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q16_parts_supplier_relationship/q16_parts_supplier_relationship.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q16_parts_supplier_relationship/q16_parts_supplier_relationship.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q16_parts_supplier_relationship/q16_parts_supplier_relationship.3.ast index a6d19ba..94cd5e4 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q16_parts_supplier_relationship/q16_parts_supplier_relationship.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q16_parts_supplier_relationship/q16_parts_supplier_relationship.3.ast @@ -341,12 +341,9 @@ Let Variable [ Name=$supplier_cnt ] ] FROM [ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [t2] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$p_brand ] - Variable [ Name=$p_size ] - Variable [ Name=$p_type ] + LiteralExpr [STRING] [t2] ] ] FROM [ Variable [ Name=$g ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q17_large_gby_variant/q17_large_gby_variant.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q17_large_gby_variant/q17_large_gby_variant.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q17_large_gby_variant/q17_large_gby_variant.3.ast index 25bc7f7..63834e1 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q17_large_gby_variant/q17_large_gby_variant.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q17_large_gby_variant/q17_large_gby_variant.3.ast @@ -13,10 +13,9 @@ RecordConstructor [ FunctionCall asterix.count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [l] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$l_partkey ] + LiteralExpr [STRING] [l] ] ] FROM [ Variable [ Name=$g ] @@ -41,10 +40,9 @@ RecordConstructor [ ] FROM [ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [l] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$l_partkey ] + LiteralExpr [STRING] [l] ] ] FROM [ Variable [ Name=$g ] @@ -70,10 +68,9 @@ RecordConstructor [ ] FROM [ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [l] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$l_partkey ] + LiteralExpr [STRING] [l] ] ] FROM [ Variable [ Name=$g ] @@ -98,10 +95,9 @@ RecordConstructor [ ] FROM [ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [l] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$l_partkey ] + LiteralExpr [STRING] [l] ] ] FROM [ Variable [ Name=$g ] @@ -126,10 +122,9 @@ RecordConstructor [ ] FROM [ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [l] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$l_partkey ] + LiteralExpr [STRING] [l] ] ] FROM [ Variable [ Name=$g ] @@ -154,10 +149,9 @@ RecordConstructor [ ] FROM [ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [l] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$l_partkey ] + LiteralExpr [STRING] [l] ] ] FROM [ Variable [ Name=$g ] @@ -182,10 +176,9 @@ RecordConstructor [ ] FROM [ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [l] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$l_partkey ] + LiteralExpr [STRING] [l] ] ] FROM [ Variable [ Name=$g ] @@ -210,10 +203,9 @@ RecordConstructor [ ] FROM [ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [l] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$l_partkey ] + LiteralExpr [STRING] [l] ] ] FROM [ Variable [ Name=$g ] @@ -238,10 +230,9 @@ RecordConstructor [ ] FROM [ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [l] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$l_partkey ] + LiteralExpr [STRING] [l] ] ] FROM [ Variable [ Name=$g ] @@ -266,10 +257,9 @@ RecordConstructor [ ] FROM [ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [l] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$l_partkey ] + LiteralExpr [STRING] [l] ] ] FROM [ Variable [ Name=$g ] @@ -294,10 +284,9 @@ RecordConstructor [ ] FROM [ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [l] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$l_partkey ] + LiteralExpr [STRING] [l] ] ] FROM [ Variable [ Name=$g ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q18_large_volume_customer/q18_large_volume_customer.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q18_large_volume_customer/q18_large_volume_customer.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q18_large_volume_customer/q18_large_volume_customer.3.ast index 4446895..0ab8030 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q18_large_volume_customer/q18_large_volume_customer.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q18_large_volume_customer/q18_large_volume_customer.3.ast @@ -40,14 +40,9 @@ RecordConstructor [ ] FROM [ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [l] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$o_orderdate ] - Variable [ Name=$c_name ] - Variable [ Name=$o_orderkey ] - Variable [ Name=$o_totalprice ] - Variable [ Name=$c_custkey ] + LiteralExpr [STRING] [l] ] ] FROM [ Variable [ Name=$g ] @@ -92,12 +87,9 @@ FROM [ FunctionCall asterix.dataset@1[ ] FROM [ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [l] - Variable [ Name=$o ] - Variable [ Name=$l_orderkey ] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g2 ] - Variable [ Name=$c ] + LiteralExpr [STRING] [l] ] ] FROM [ Variable [ Name=$g2 ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q20_potential_part_promotion/q20_potential_part_promotion.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q20_potential_part_promotion/q20_potential_part_promotion.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q20_potential_part_promotion/q20_potential_part_promotion.3.ast index 9ef07b1..41802c2 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q20_potential_part_promotion/q20_potential_part_promotion.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q20_potential_part_promotion/q20_potential_part_promotion.3.ast @@ -62,11 +62,9 @@ FROM [ ( ] FROM [ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [l] - Variable [ Name=$l_suppkey ] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$l_partkey ] + LiteralExpr [STRING] [l] ] ] FROM [ Variable [ Name=$g ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.ast index 62cbc19..b91a2a9 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.ast @@ -481,23 +481,16 @@ Groupby Let Variable [ Name=$numwait ] := - FunctionCall asterix.sql-count@1[ + FunctionCall asterix.count@1[ ( SELECT ELEMENT [ - ( - SELECT ELEMENT [ - FieldAccessor [ - Variable [ Name=#1 ] - Field=t4 - ] - ] - FROM [ Variable [ Name=$g ] - AS Variable [ Name=$g ] - ] - ) + FunctionCall asterix.field-access-by-name@2[ + Variable [ Name=$g ] + LiteralExpr [STRING] [t4] + ] ] FROM [ Variable [ Name=$g ] - AS Variable [ Name=#1 ] + AS Variable [ Name=$g ] ] ) ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q22_global_sales_opportunity/q22_global_sales_opportunity.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q22_global_sales_opportunity/q22_global_sales_opportunity.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q22_global_sales_opportunity/q22_global_sales_opportunity.3.ast index ffd3d1c..adeab44 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q22_global_sales_opportunity/q22_global_sales_opportunity.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q22_global_sales_opportunity/q22_global_sales_opportunity.3.ast @@ -79,10 +79,9 @@ RecordConstructor [ FunctionCall asterix.count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [ct] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$cntrycode ] + LiteralExpr [STRING] [ct] ] ] FROM [ Variable [ Name=$g ] @@ -104,10 +103,9 @@ RecordConstructor [ ] FROM [ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [ct] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$cntrycode ] + LiteralExpr [STRING] [ct] ] ] FROM [ Variable [ Name=$g ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue601/query-issue601.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue601/query-issue601.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue601/query-issue601.3.ast index f1705b8..2c32932 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue601/query-issue601.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue601/query-issue601.3.ast @@ -5,32 +5,18 @@ RecordConstructor [ ( LiteralExpr [STRING] [l_linenumber] : - FieldAccessor [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [l] - Variable [ Name=$g ] - Variable [ Name=$l_linenumber ] - ] - Field=l_linenumber - ] + Variable [ Name=$l_linenumber ] ) ( LiteralExpr [STRING] [count_order] : - FunctionCall asterix.sql-count@1[ + FunctionCall asterix.count@1[ ( SELECT ELEMENT [ - ( - SELECT ELEMENT [ - Variable [ Name=$g ] - ] - FROM [ Variable [ Name=$g ] - AS Variable [ Name=$g ] - ] - ) + Variable [ Name=$g ] ] FROM [ Variable [ Name=$g ] - AS Variable [ Name=#1 ] + AS Variable [ Name=$g ] ] ) ] @@ -55,13 +41,6 @@ Groupby ) Orderby - FieldAccessor [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [l] - Variable [ Name=$g ] - Variable [ Name=$l_linenumber ] - ] - Field=l_linenumber - ] + Variable [ Name=$l_linenumber ] ASC http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.ast index 531a2ef..753f130 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.ast @@ -199,11 +199,9 @@ RecordConstructor [ FunctionCall asterix.count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [l] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$l_linestatus ] - Variable [ Name=$l_returnflag ] + LiteralExpr [STRING] [l] ] ] FROM [ Variable [ Name=$g ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q03_shipping_priority_nt/q03_shipping_priority_nt.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q03_shipping_priority_nt/q03_shipping_priority_nt.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q03_shipping_priority_nt/q03_shipping_priority_nt.3.ast index 7b69432..f0ad1f5 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q03_shipping_priority_nt/q03_shipping_priority_nt.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q03_shipping_priority_nt/q03_shipping_priority_nt.3.ast @@ -145,12 +145,9 @@ Let Variable [ Name=$revenue ] ] FROM [ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [l] - Variable [ Name=$o_shippriority ] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$o_orderdate ] - Variable [ Name=$l_orderkey ] + LiteralExpr [STRING] [l] ] ] FROM [ Variable [ Name=$g ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q05_local_supplier_volume/q05_local_supplier_volume.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q05_local_supplier_volume/q05_local_supplier_volume.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q05_local_supplier_volume/q05_local_supplier_volume.3.ast index 8a2f536..e65436e 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q05_local_supplier_volume/q05_local_supplier_volume.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q05_local_supplier_volume/q05_local_supplier_volume.3.ast @@ -326,10 +326,9 @@ Let Variable [ Name=$revenue ] ] FROM [ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [o1] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$n_name ] + LiteralExpr [STRING] [o1] ] ] FROM [ Variable [ Name=$g ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.4.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.4.ast index 3791a43..17b2c43 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.4.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.4.ast @@ -69,3 +69,8 @@ Where ] ] Group All + GROUP AS Variable [ Name=#1 ] + ( + l:=Variable [ Name=$l ] + ) + http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q07_volume_shipping/q07_volume_shipping.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q07_volume_shipping/q07_volume_shipping.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q07_volume_shipping/q07_volume_shipping.3.ast index b5729fd..4a93077 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q07_volume_shipping/q07_volume_shipping.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q07_volume_shipping/q07_volume_shipping.3.ast @@ -369,6 +369,7 @@ Groupby ( locs:=Variable [ Name=$locs ] t:=Variable [ Name=$t ] + l_year0:=Variable [ Name=$l_year0 ] ) Let Variable [ Name=$revenue ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q08_national_market_share/q08_national_market_share.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q08_national_market_share/q08_national_market_share.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q08_national_market_share/q08_national_market_share.3.ast index f53ad0e..5c64434 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q08_national_market_share/q08_national_market_share.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q08_national_market_share/q08_national_market_share.3.ast @@ -38,10 +38,9 @@ RecordConstructor [ ] FROM [ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [t] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$year ] + LiteralExpr [STRING] [t] ] ] FROM [ Variable [ Name=$g ] @@ -63,10 +62,9 @@ RecordConstructor [ ] FROM [ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [t] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$year ] + LiteralExpr [STRING] [t] ] ] FROM [ Variable [ Name=$g ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q09_product_type_profit_nt/q09_product_type_profit_nt.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q09_product_type_profit_nt/q09_product_type_profit_nt.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q09_product_type_profit_nt/q09_product_type_profit_nt.3.ast index 74227e8..4810d68 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q09_product_type_profit_nt/q09_product_type_profit_nt.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q09_product_type_profit_nt/q09_product_type_profit_nt.3.ast @@ -25,11 +25,9 @@ RecordConstructor [ ] FROM [ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [profit] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$nation ] - Variable [ Name=$o_year ] + LiteralExpr [STRING] [profit] ] ] FROM [ Variable [ Name=$g ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q12_shipping/q12_shipping.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q12_shipping/q12_shipping.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q12_shipping/q12_shipping.3.ast index be59cf6..ad76f90 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q12_shipping/q12_shipping.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q12_shipping/q12_shipping.3.ast @@ -45,10 +45,9 @@ RecordConstructor [ ] FROM [ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [o] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$l_shipmode ] + LiteralExpr [STRING] [o] ] ] FROM [ Variable [ Name=$g ] @@ -95,10 +94,9 @@ RecordConstructor [ ] FROM [ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [o] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$l_shipmode ] + LiteralExpr [STRING] [o] ] ] FROM [ Variable [ Name=$g ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q13_customer_distribution/q13_customer_distribution.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q13_customer_distribution/q13_customer_distribution.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q13_customer_distribution/q13_customer_distribution.3.ast index 7f06804..2bf34bb 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q13_customer_distribution/q13_customer_distribution.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q13_customer_distribution/q13_customer_distribution.3.ast @@ -36,10 +36,9 @@ FROM [ ( ] FROM [ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [co] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g2 ] - Variable [ Name=$c_custkey ] + LiteralExpr [STRING] [co] ] ] FROM [ Variable [ Name=$g2 ] @@ -148,17 +147,10 @@ Let Variable [ Name=$custdist ] FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - ( - SELECT ELEMENT [ - FieldAccessor [ - Variable [ Name=#1 ] - Field=gco - ] - ] - FROM [ Variable [ Name=$g ] - AS Variable [ Name=$g ] - ] - ) + FieldAccessor [ + Variable [ Name=#1 ] + Field=gco + ] ] FROM [ Variable [ Name=$g ] AS Variable [ Name=#1 ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q14_promotion_effect/q14_promotion_effect.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q14_promotion_effect/q14_promotion_effect.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q14_promotion_effect/q14_promotion_effect.3.ast index 05e22d1..9ac71e1 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q14_promotion_effect/q14_promotion_effect.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q14_promotion_effect/q14_promotion_effect.3.ast @@ -24,7 +24,7 @@ OperatorExpr [ ] * OperatorExpr [ - LiteralExpr [LONG] [1] + Variable [ Name=$t ] - FieldAccessor [ Variable [ Name=$i ] @@ -39,12 +39,9 @@ OperatorExpr [ ] FROM [ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [lp] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$l ] - Variable [ Name=$p ] - Variable [ Name=$t ] + LiteralExpr [STRING] [lp] ] ] FROM [ Variable [ Name=$g ] @@ -66,7 +63,7 @@ OperatorExpr [ ] * OperatorExpr [ - LiteralExpr [LONG] [1] + Variable [ Name=$t ] - FieldAccessor [ Variable [ Name=$i ] @@ -77,12 +74,9 @@ OperatorExpr [ ] FROM [ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [lp] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$l ] - Variable [ Name=$p ] - Variable [ Name=$t ] + LiteralExpr [STRING] [lp] ] ] FROM [ Variable [ Name=$g ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q16_parts_supplier_relationship/q16_parts_supplier_relationship.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q16_parts_supplier_relationship/q16_parts_supplier_relationship.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q16_parts_supplier_relationship/q16_parts_supplier_relationship.3.ast index a6d19ba..94cd5e4 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q16_parts_supplier_relationship/q16_parts_supplier_relationship.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q16_parts_supplier_relationship/q16_parts_supplier_relationship.3.ast @@ -341,12 +341,9 @@ Let Variable [ Name=$supplier_cnt ] ] FROM [ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [t2] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] - Variable [ Name=$p_brand ] - Variable [ Name=$p_size ] - Variable [ Name=$p_type ] + LiteralExpr [STRING] [t2] ] ] FROM [ Variable [ Name=$g ]
