http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9c2e9f0e/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 0d5ca25..51bdde2 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 @@ -19,7 +19,17 @@ FunctionDecl tmp1([]) { Field=l_suppkey ] ] - FROM [ Variable [ Name=$l2 ] + FROM [ ( + SELECT ELEMENT [ + FieldAccessor [ + Variable [ Name=$g1 ] + Field=l2 + ] + ] + FROM [ Variable [ Name=$g1 ] + AS Variable [ Name=$g1 ] + ] + ) AS Variable [ Name=$i ] ] ) @@ -36,7 +46,17 @@ FunctionDecl tmp1([]) { Field=l_suppkey ] ] - FROM [ Variable [ Name=$l2 ] + FROM [ ( + SELECT ELEMENT [ + FieldAccessor [ + Variable [ Name=$g1 ] + Field=l2 + ] + ] + FROM [ Variable [ Name=$g1 ] + AS Variable [ Name=$g1 ] + ] + ) AS Variable [ Name=$i ] ] ) @@ -86,6 +106,7 @@ FunctionDecl tmp1([]) { Variable [ Name=$l2 ] Field=l_orderkey ] + GROUP AS Variable [ Name=$g1 ] ) } @@ -110,7 +131,17 @@ FunctionDecl tmp2([]) { Field=l_suppkey ] ] - FROM [ Variable [ Name=$l2 ] + FROM [ ( + SELECT ELEMENT [ + FieldAccessor [ + Variable [ Name=$g2 ] + Field=l2 + ] + ] + FROM [ Variable [ Name=$g2 ] + AS Variable [ Name=$g2 ] + ] + ) AS Variable [ Name=$i ] ] ) @@ -127,7 +158,17 @@ FunctionDecl tmp2([]) { Field=l_suppkey ] ] - FROM [ Variable [ Name=$l2 ] + FROM [ ( + SELECT ELEMENT [ + FieldAccessor [ + Variable [ Name=$g2 ] + Field=l2 + ] + ] + FROM [ Variable [ Name=$g2 ] + AS Variable [ Name=$g2 ] + ] + ) AS Variable [ Name=$i ] ] ) @@ -189,6 +230,7 @@ FunctionDecl tmp2([]) { Variable [ Name=$l2 ] Field=l_orderkey ] + GROUP AS Variable [ Name=$g2 ] ) } @@ -345,28 +387,26 @@ FROM [ ( Where OperatorExpr [ OperatorExpr [ - OperatorExpr [ - FieldAccessor [ - Variable [ Name=$ns ] - Field=s_suppkey - ] - = - FieldAccessor [ - Variable [ Name=$l ] - Field=l_suppkey - ] + FieldAccessor [ + Variable [ Name=$ns ] + Field=s_suppkey ] - and - OperatorExpr [ - FieldAccessor [ - Variable [ Name=$l ] - Field=l_receiptdate - ] - > - FieldAccessor [ - Variable [ Name=$l ] - Field=l_commitdate - ] + = + FieldAccessor [ + Variable [ Name=$l ] + Field=l_suppkey + ] + ] + and + OperatorExpr [ + FieldAccessor [ + Variable [ Name=$l ] + Field=l_receiptdate + ] + > + FieldAccessor [ + Variable [ Name=$l ] + Field=l_commitdate ] ] and @@ -434,15 +474,32 @@ Groupby Variable [ Name=$t4 ] Field=s_name ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=$g ] ( t4:=Variable [ Name=$t4 ] ) Let Variable [ Name=$numwait ] := - FunctionCall tpch.count@1[ - Variable [ Name=$t4 ] + FunctionCall tpch.sql-count@1[ + ( + SELECT ELEMENT [ + ( + SELECT ELEMENT [ + FieldAccessor [ + Variable [ Name=#1 ] + Field=t4 + ] + ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] + ] + ) + ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=#1 ] + ] + ) ] Orderby Variable [ Name=$numwait ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9c2e9f0e/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 cab2a8f..1ca3eb5 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 @@ -76,16 +76,17 @@ RecordConstructor [ ( LiteralExpr [STRING] [numcust] : - FunctionCall tpch.sql-count@1[ + FunctionCall tpch.count@1[ ( SELECT ELEMENT [ - FieldAccessor [ - Variable [ Name=#2 ] - Field=ct + FunctionCall Metadata.resolve@-1[ + LiteralExpr [STRING] [ct] + Variable [ Name=$g ] + Variable [ Name=$cntrycode ] ] ] - FROM [ Variable [ Name=#1 ] - AS Variable [ Name=#2 ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] ] ) ] @@ -101,7 +102,18 @@ RecordConstructor [ Field=c_acctbal ] ] - FROM [ Variable [ Name=$ct ] + FROM [ ( + SELECT ELEMENT [ + FunctionCall Metadata.resolve@-1[ + LiteralExpr [STRING] [ct] + Variable [ Name=$g ] + Variable [ Name=$cntrycode ] + ] + ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] + ] + ) AS Variable [ Name=$i ] ] ) @@ -129,7 +141,7 @@ Groupby Variable [ Name=$ct ] Field=cntrycode ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=$g ] ( ct:=Variable [ Name=$ct ] ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9c2e9f0e/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 6da2337..d12032a 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,13 +5,34 @@ RecordConstructor [ ( LiteralExpr [STRING] [l_linenumber] : - Variable [ Name=$l_linenumber ] + FieldAccessor [ + FunctionCall Metadata.resolve@-1[ + LiteralExpr [STRING] [l] + Variable [ Name=$g ] + Variable [ Name=$l_linenumber ] + ] + Field=l_linenumber + ] ) ( LiteralExpr [STRING] [count_order] : - FunctionCall tpch.count@1[ - Variable [ Name=$l ] + FunctionCall tpch.sql-count@1[ + ( + SELECT ELEMENT [ + ( + SELECT ELEMENT [ + Variable [ Name=$g ] + ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] + ] + ) + ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=#1 ] + ] + ) ] ) ] @@ -28,12 +49,19 @@ Groupby Variable [ Name=$l ] Field=l_linenumber ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=$g ] ( l:=Variable [ Name=$l ] ) Orderby - Variable [ Name=$l_linenumber ] + FieldAccessor [ + FunctionCall Metadata.resolve@-1[ + LiteralExpr [STRING] [l] + Variable [ Name=$g ] + Variable [ Name=$l_linenumber ] + ] + Field=l_linenumber + ] ASC http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9c2e9f0e/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue638/query-issue638.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue638/query-issue638.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue638/query-issue638.3.ast index bce73f5..14ed390 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue638/query-issue638.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue638/query-issue638.3.ast @@ -19,12 +19,15 @@ RecordConstructor [ ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=$pr ] + FieldAccessor [ + Variable [ Name=$g ] + Field=profit + ] Field=amount ] ] - FROM [ Variable [ Name=$profit ] - AS Variable [ Name=$pr ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] ] ) ] @@ -431,7 +434,7 @@ Groupby Variable [ Name=$profit ] Field=o_year ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=$g ] ( profit:=Variable [ Name=$profit ] ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9c2e9f0e/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue785-2/query-issue785-2.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue785-2/query-issue785-2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue785-2/query-issue785-2.3.ast index b56a7bc..f4cb736 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue785-2/query-issue785-2.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue785-2/query-issue785-2.3.ast @@ -120,7 +120,7 @@ Let Variable [ Name=$X ] Variable [ Name=$n ] Field=n_nationkey ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=$g2 ] ( n:=Variable [ Name=$n ] customer:=Variable [ Name=$customer ] @@ -133,12 +133,15 @@ Let Variable [ Name=$X ] ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=$o ] + FieldAccessor [ + Variable [ Name=$g2 ] + Field=orders + ] Field=o_totalprice ] ] - FROM [ Variable [ Name=$orders ] - AS Variable [ Name=$o ] + FROM [ Variable [ Name=$g2 ] + AS Variable [ Name=$g2 ] ] ) ] @@ -148,10 +151,7 @@ RecordConstructor [ ( LiteralExpr [STRING] [nation_key] : - FieldAccessor [ - Variable [ Name=$x ] - Field=nation_key - ] + Variable [ Name=$nation_key ] ) ( LiteralExpr [STRING] [sum_price] @@ -163,7 +163,10 @@ RecordConstructor [ LiteralExpr [STRING] [orderdate] : FieldAccessor [ - Variable [ Name=$y ] + FieldAccessor [ + Variable [ Name=$g ] + Field=x + ] Field=order_date ] ) @@ -171,18 +174,24 @@ RecordConstructor [ LiteralExpr [STRING] [sum_price] : FieldAccessor [ - Variable [ Name=$y ] + FieldAccessor [ + Variable [ Name=$g ] + Field=x + ] Field=sum_price ] ) ] ] - FROM [ Variable [ Name=$x ] - AS Variable [ Name=$y ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] ] Orderby FieldAccessor [ - Variable [ Name=$y ] + FieldAccessor [ + Variable [ Name=$g ] + Field=x + ] Field=sum_price ] DESC @@ -203,15 +212,12 @@ Groupby Variable [ Name=$x ] Field=nation_key ] - GROUP AS Variable [ Name=#2 ] + GROUP AS Variable [ Name=$g ] ( x:=Variable [ Name=$x ] ) Orderby - FieldAccessor [ - Variable [ Name=$x ] - Field=nation_key - ] + Variable [ Name=$nation_key ] ASC http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9c2e9f0e/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue785/query-issue785.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue785/query-issue785.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue785/query-issue785.3.ast index 59669e3..a3643c5 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue785/query-issue785.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue785/query-issue785.3.ast @@ -5,10 +5,7 @@ RecordConstructor [ ( LiteralExpr [STRING] [nation_key] : - FieldAccessor [ - Variable [ Name=$x ] - Field=nation_key - ] + Variable [ Name=$nation_key ] ) ( LiteralExpr [STRING] [sum_price] @@ -28,17 +25,20 @@ RecordConstructor [ ) ] ] - FROM [ Variable [ Name=$x ] + FROM [ Variable [ Name=$g ] AS Variable [ Name=$i ] ] Groupby Variable [ Name=$od ] := FieldAccessor [ - Variable [ Name=$i ] + FieldAccessor [ + Variable [ Name=$i ] + Field=x + ] Field=order_date ] - GROUP AS Variable [ Name=#3 ] + GROUP AS Variable [ Name=$g2 ] ( i:=Variable [ Name=$i ] ) @@ -49,12 +49,18 @@ RecordConstructor [ ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=$s ] + FieldAccessor [ + FieldAccessor [ + Variable [ Name=$g2 ] + Field=i + ] + Field=x + ] Field=sum_price ] ] - FROM [ Variable [ Name=$i ] - AS Variable [ Name=$s ] + FROM [ Variable [ Name=$g2 ] + AS Variable [ Name=$g2 ] ] ) ] @@ -88,12 +94,15 @@ FROM [ ( ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=$o ] + FieldAccessor [ + Variable [ Name=$g3 ] + Field=orders + ] Field=o_totalprice ] ] - FROM [ Variable [ Name=$orders ] - AS Variable [ Name=$o ] + FROM [ Variable [ Name=$g3 ] + AS Variable [ Name=$g3 ] ] ) ] @@ -154,7 +163,7 @@ FROM [ ( Variable [ Name=$n ] Field=n_nationkey ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=$g3 ] ( n:=Variable [ Name=$n ] customer:=Variable [ Name=$customer ] @@ -171,15 +180,12 @@ Groupby Variable [ Name=$x ] Field=nation_key ] - GROUP AS Variable [ Name=#2 ] + GROUP AS Variable [ Name=$g ] ( x:=Variable [ Name=$x ] ) Orderby - FieldAccessor [ - Variable [ Name=$x ] - Field=nation_key - ] + Variable [ Name=$nation_key ] ASC http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9c2e9f0e/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue786/query-issue786.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue786/query-issue786.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue786/query-issue786.3.ast index 5908531..78d629d 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue786/query-issue786.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue786/query-issue786.3.ast @@ -79,7 +79,7 @@ RecordConstructor [ Variable [ Name=$orders ] Field=o_orderdate ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=$g ] ( orders:=Variable [ Name=$orders ] customer:=Variable [ Name=$customer ] @@ -91,12 +91,15 @@ RecordConstructor [ ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=$o ] + FieldAccessor [ + Variable [ Name=$g ] + Field=orders + ] Field=o_totalprice ] ] - FROM [ Variable [ Name=$orders ] - AS Variable [ Name=$o ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] ] ) ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9c2e9f0e/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/nest_aggregate/nest_aggregate.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/nest_aggregate/nest_aggregate.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/nest_aggregate/nest_aggregate.3.ast index 0207a57..f851571 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/nest_aggregate/nest_aggregate.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/nest_aggregate/nest_aggregate.3.ast @@ -79,7 +79,7 @@ RecordConstructor [ Variable [ Name=$orders ] Field=o_orderdate ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=$g ] ( orders:=Variable [ Name=$orders ] customer:=Variable [ Name=$customer ] @@ -91,12 +91,15 @@ RecordConstructor [ ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=$o ] + FieldAccessor [ + Variable [ Name=$g ] + Field=orders + ] Field=o_totalprice ] ] - FROM [ Variable [ Name=$orders ] - AS Variable [ Name=$o ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] ] ) ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9c2e9f0e/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 54fe3f5..a665305 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 @@ -20,11 +20,14 @@ RecordConstructor [ ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=$i ] + FieldAccessor [ + Variable [ Name=$i ] + Field=l + ] Field=l_quantity ] ] - FROM [ Variable [ Name=$l ] + FROM [ Variable [ Name=$g ] AS Variable [ Name=$i ] ] ) @@ -37,11 +40,14 @@ RecordConstructor [ ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=$i ] + FieldAccessor [ + Variable [ Name=$i ] + Field=l + ] Field=l_extendedprice ] ] - FROM [ Variable [ Name=$l ] + FROM [ Variable [ Name=$g ] AS Variable [ Name=$i ] ] ) @@ -55,7 +61,10 @@ RecordConstructor [ SELECT ELEMENT [ OperatorExpr [ FieldAccessor [ - Variable [ Name=$i ] + FieldAccessor [ + Variable [ Name=$i ] + Field=l + ] Field=l_extendedprice ] * @@ -63,13 +72,16 @@ RecordConstructor [ LiteralExpr [LONG] [1] - FieldAccessor [ - Variable [ Name=$i ] + FieldAccessor [ + Variable [ Name=$i ] + Field=l + ] Field=l_discount ] ] ] ] - FROM [ Variable [ Name=$l ] + FROM [ Variable [ Name=$g ] AS Variable [ Name=$i ] ] ) @@ -83,7 +95,10 @@ RecordConstructor [ SELECT ELEMENT [ OperatorExpr [ FieldAccessor [ - Variable [ Name=$i ] + FieldAccessor [ + Variable [ Name=$i ] + Field=l + ] Field=l_extendedprice ] * @@ -91,7 +106,10 @@ RecordConstructor [ LiteralExpr [LONG] [1] - FieldAccessor [ - Variable [ Name=$i ] + FieldAccessor [ + Variable [ Name=$i ] + Field=l + ] Field=l_discount ] ] @@ -100,13 +118,16 @@ RecordConstructor [ LiteralExpr [LONG] [1] + FieldAccessor [ - Variable [ Name=$i ] + FieldAccessor [ + Variable [ Name=$i ] + Field=l + ] Field=l_tax ] ] ] ] - FROM [ Variable [ Name=$l ] + FROM [ Variable [ Name=$g ] AS Variable [ Name=$i ] ] ) @@ -119,11 +140,14 @@ RecordConstructor [ ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=$i ] + FieldAccessor [ + Variable [ Name=$i ] + Field=l + ] Field=l_quantity ] ] - FROM [ Variable [ Name=$l ] + FROM [ Variable [ Name=$g ] AS Variable [ Name=$i ] ] ) @@ -136,11 +160,14 @@ RecordConstructor [ ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=$i ] + FieldAccessor [ + Variable [ Name=$i ] + Field=l + ] Field=l_extendedprice ] ] - FROM [ Variable [ Name=$l ] + FROM [ Variable [ Name=$g ] AS Variable [ Name=$i ] ] ) @@ -153,11 +180,14 @@ RecordConstructor [ ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=$i ] + FieldAccessor [ + Variable [ Name=$i ] + Field=l + ] Field=l_discount ] ] - FROM [ Variable [ Name=$l ] + FROM [ Variable [ Name=$g ] AS Variable [ Name=$i ] ] ) @@ -167,7 +197,19 @@ RecordConstructor [ LiteralExpr [STRING] [count_order] : FunctionCall tpch.count@1[ - Variable [ Name=$l ] + ( + SELECT ELEMENT [ + FunctionCall Metadata.resolve@-1[ + LiteralExpr [STRING] [l] + Variable [ Name=$g ] + Variable [ Name=$l_linestatus ] + Variable [ Name=$l_returnflag ] + ] + ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] + ] + ) ] ) ] @@ -199,7 +241,7 @@ Groupby Variable [ Name=$l ] Field=l_linestatus ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=$g ] ( l:=Variable [ Name=$l ] ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9c2e9f0e/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q02_minimum_cost_supplier/q02_minimum_cost_supplier.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q02_minimum_cost_supplier/q02_minimum_cost_supplier.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q02_minimum_cost_supplier/q02_minimum_cost_supplier.3.ast index 72ac671..63795d3 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q02_minimum_cost_supplier/q02_minimum_cost_supplier.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q02_minimum_cost_supplier/q02_minimum_cost_supplier.3.ast @@ -341,11 +341,14 @@ FunctionDecl tmp2([]) { ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=$i ] + FieldAccessor [ + Variable [ Name=$i ] + Field=pssrn + ] Field=ps_supplycost ] ] - FROM [ Variable [ Name=$pssrn ] + FROM [ Variable [ Name=$g ] AS Variable [ Name=$i ] ] ) @@ -605,6 +608,7 @@ FunctionDecl tmp2([]) { Variable [ Name=$pssrn ] Field=p_partkey ] + GROUP AS Variable [ Name=$g ] ) } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9c2e9f0e/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 47d5a97..b99d828 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 @@ -115,7 +115,7 @@ Groupby Variable [ Name=$o ] Field=o_shippriority ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=$g ] ( c:=Variable [ Name=$c ] o:=Variable [ Name=$o ] @@ -143,7 +143,20 @@ Let Variable [ Name=$revenue ] ] ] ] - FROM [ Variable [ Name=$l ] + FROM [ ( + SELECT ELEMENT [ + FunctionCall Metadata.resolve@-1[ + LiteralExpr [STRING] [l] + Variable [ Name=$o_shippriority ] + Variable [ Name=$g ] + Variable [ Name=$o_orderdate ] + Variable [ Name=$l_orderkey ] + ] + ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] + ] + ) AS Variable [ Name=$i ] ] ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9c2e9f0e/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 5ee4bfe..61eb892 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 @@ -297,7 +297,7 @@ Groupby Variable [ Name=$o1 ] Field=n_name ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=$g ] ( c:=Variable [ Name=$c ] o1:=Variable [ Name=$o1 ] @@ -324,7 +324,18 @@ Let Variable [ Name=$revenue ] ] ] ] - FROM [ Variable [ Name=$o1 ] + FROM [ ( + SELECT ELEMENT [ + FunctionCall Metadata.resolve@-1[ + LiteralExpr [STRING] [o1] + Variable [ Name=$g ] + Variable [ Name=$n_name ] + ] + ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] + ] + ) AS Variable [ Name=$i ] ] ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9c2e9f0e/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 cc99aab..27f24e5 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 @@ -365,7 +365,7 @@ Groupby Variable [ Name=$l_year ] := Variable [ Name=$l_year0 ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=$g ] ( locs:=Variable [ Name=$locs ] t:=Variable [ Name=$t ] @@ -378,7 +378,10 @@ Let Variable [ Name=$revenue ] SELECT ELEMENT [ OperatorExpr [ FieldAccessor [ - Variable [ Name=$i ] + FieldAccessor [ + Variable [ Name=$i ] + Field=locs + ] Field=l_extendedprice ] * @@ -386,13 +389,16 @@ Let Variable [ Name=$revenue ] LiteralExpr [LONG] [1] - FieldAccessor [ - Variable [ Name=$i ] + FieldAccessor [ + Variable [ Name=$i ] + Field=locs + ] Field=l_discount ] ] ] ] - FROM [ Variable [ Name=$locs ] + FROM [ Variable [ Name=$g ] AS Variable [ Name=$i ] ] ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9c2e9f0e/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 53bdb44..6e434b4 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 @@ -36,7 +36,18 @@ RecordConstructor [ END ] - FROM [ Variable [ Name=$t ] + FROM [ ( + SELECT ELEMENT [ + FunctionCall Metadata.resolve@-1[ + LiteralExpr [STRING] [t] + Variable [ Name=$g ] + Variable [ Name=$year ] + ] + ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] + ] + ) AS Variable [ Name=$i ] ] ) @@ -50,7 +61,18 @@ RecordConstructor [ Field=revenue ] ] - FROM [ Variable [ Name=$t ] + FROM [ ( + SELECT ELEMENT [ + FunctionCall Metadata.resolve@-1[ + LiteralExpr [STRING] [t] + Variable [ Name=$g ] + Variable [ Name=$year ] + ] + ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] + ] + ) AS Variable [ Name=$i ] ] ) @@ -472,7 +494,7 @@ Groupby Variable [ Name=$t ] Field=year ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=$g ] ( t:=Variable [ Name=$t ] ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9c2e9f0e/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 3ee115a..84700db 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 @@ -23,7 +23,19 @@ RecordConstructor [ Field=amount ] ] - FROM [ Variable [ Name=$profit ] + FROM [ ( + SELECT ELEMENT [ + FunctionCall Metadata.resolve@-1[ + LiteralExpr [STRING] [profit] + Variable [ Name=$g ] + Variable [ Name=$nation ] + Variable [ Name=$o_year ] + ] + ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] + ] + ) AS Variable [ Name=$pr ] ] ) @@ -431,7 +443,7 @@ Groupby Variable [ Name=$profit ] Field=o_year ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=$g ] ( profit:=Variable [ Name=$profit ] ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9c2e9f0e/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q10_returned_item/q10_returned_item.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q10_returned_item/q10_returned_item.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q10_returned_item/q10_returned_item.3.ast index d755261..8662a53 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q10_returned_item/q10_returned_item.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q10_returned_item/q10_returned_item.3.ast @@ -328,7 +328,7 @@ Groupby Variable [ Name=$locn ] Field=c_comment ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=$g ] ( locn:=Variable [ Name=$locn ] ) @@ -340,7 +340,10 @@ Let Variable [ Name=$revenue ] SELECT ELEMENT [ OperatorExpr [ FieldAccessor [ - Variable [ Name=$i ] + FieldAccessor [ + Variable [ Name=$i ] + Field=locn + ] Field=l_extendedprice ] * @@ -348,13 +351,16 @@ Let Variable [ Name=$revenue ] LiteralExpr [LONG] [1] - FieldAccessor [ - Variable [ Name=$i ] + FieldAccessor [ + Variable [ Name=$i ] + Field=locn + ] Field=l_discount ] ] ] ] - FROM [ Variable [ Name=$locn ] + FROM [ Variable [ Name=$g ] AS Variable [ Name=$i ] ] ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9c2e9f0e/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q10_returned_item_int64/q10_returned_item_int64.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q10_returned_item_int64/q10_returned_item_int64.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q10_returned_item_int64/q10_returned_item_int64.3.ast index d755261..8662a53 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q10_returned_item_int64/q10_returned_item_int64.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q10_returned_item_int64/q10_returned_item_int64.3.ast @@ -328,7 +328,7 @@ Groupby Variable [ Name=$locn ] Field=c_comment ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=$g ] ( locn:=Variable [ Name=$locn ] ) @@ -340,7 +340,10 @@ Let Variable [ Name=$revenue ] SELECT ELEMENT [ OperatorExpr [ FieldAccessor [ - Variable [ Name=$i ] + FieldAccessor [ + Variable [ Name=$i ] + Field=locn + ] Field=l_extendedprice ] * @@ -348,13 +351,16 @@ Let Variable [ Name=$revenue ] LiteralExpr [LONG] [1] - FieldAccessor [ - Variable [ Name=$i ] + FieldAccessor [ + Variable [ Name=$i ] + Field=locn + ] Field=l_discount ] ] ] ] - FROM [ Variable [ Name=$locn ] + FROM [ Variable [ Name=$g ] AS Variable [ Name=$i ] ] ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9c2e9f0e/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q11_important_stock/q11_important_stock.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q11_important_stock/q11_important_stock.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q11_important_stock/q11_important_stock.3.ast index 8de0c01..a42b74b 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q11_important_stock/q11_important_stock.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q11_important_stock/q11_important_stock.3.ast @@ -110,17 +110,23 @@ FROM [ ( SELECT ELEMENT [ OperatorExpr [ FieldAccessor [ - Variable [ Name=$i ] + FieldAccessor [ + Variable [ Name=$i ] + Field=ps + ] Field=ps_supplycost ] * FieldAccessor [ - Variable [ Name=$i ] + FieldAccessor [ + Variable [ Name=$i ] + Field=ps + ] Field=ps_availqty ] ] ] - FROM [ Variable [ Name=$ps ] + FROM [ Variable [ Name=$g ] AS Variable [ Name=$i ] ] ) @@ -190,7 +196,7 @@ FROM [ ( Variable [ Name=$ps ] Field=ps_partkey ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=$g ] ( ps:=Variable [ Name=$ps ] sn:=Variable [ Name=$sn ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9c2e9f0e/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 fa86271..1a5c510 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 @@ -43,7 +43,18 @@ RecordConstructor [ END ] - FROM [ Variable [ Name=$o ] + FROM [ ( + SELECT ELEMENT [ + FunctionCall Metadata.resolve@-1[ + LiteralExpr [STRING] [o] + Variable [ Name=$g ] + Variable [ Name=$l_shipmode ] + ] + ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] + ] + ) AS Variable [ Name=$i ] ] ) @@ -82,7 +93,18 @@ RecordConstructor [ END ] - FROM [ Variable [ Name=$o ] + FROM [ ( + SELECT ELEMENT [ + FunctionCall Metadata.resolve@-1[ + LiteralExpr [STRING] [o] + Variable [ Name=$g ] + Variable [ Name=$l_shipmode ] + ] + ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] + ] + ) AS Variable [ Name=$i ] ] ) @@ -183,7 +205,7 @@ Groupby Variable [ Name=$l ] Field=l_shipmode ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=$g ] ( l:=Variable [ Name=$l ] o:=Variable [ Name=$o ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9c2e9f0e/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 4ab59b1..98f7a37 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 @@ -34,7 +34,18 @@ FROM [ ( Field=o_orderkey_count ] ] - FROM [ Variable [ Name=$co ] + FROM [ ( + SELECT ELEMENT [ + FunctionCall Metadata.resolve@-1[ + LiteralExpr [STRING] [co] + Variable [ Name=$g2 ] + Variable [ Name=$c_custkey ] + ] + ] + FROM [ Variable [ Name=$g2 ] + AS Variable [ Name=$g2 ] + ] + ) AS Variable [ Name=$i ] ] ) @@ -112,7 +123,7 @@ FROM [ ( Variable [ Name=$co ] Field=c_custkey ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=$g2 ] ( co:=Variable [ Name=$co ] ) @@ -127,7 +138,7 @@ Groupby Variable [ Name=$gco ] Field=c_count ] - GROUP AS Variable [ Name=#2 ] + GROUP AS Variable [ Name=$g ] ( gco:=Variable [ Name=$gco ] ) @@ -137,13 +148,20 @@ Let Variable [ Name=$custdist ] FunctionCall tpch.sql-count@1[ ( SELECT ELEMENT [ - FieldAccessor [ - Variable [ Name=#3 ] - Field=gco - ] + ( + SELECT ELEMENT [ + FieldAccessor [ + Variable [ Name=#1 ] + Field=gco + ] + ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] + ] + ) ] - FROM [ Variable [ Name=#2 ] - AS Variable [ Name=#3 ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=#1 ] ] ) ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9c2e9f0e/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 e52e659..d108e83 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 @@ -37,7 +37,20 @@ OperatorExpr [ END ] - FROM [ Variable [ Name=$lp ] + FROM [ ( + SELECT ELEMENT [ + FunctionCall Metadata.resolve@-1[ + LiteralExpr [STRING] [lp] + Variable [ Name=$g ] + Variable [ Name=$l ] + Variable [ Name=$p ] + Variable [ Name=$t ] + ] + ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] + ] + ) AS Variable [ Name=$i ] ] ) @@ -62,7 +75,20 @@ OperatorExpr [ ] ] ] - FROM [ Variable [ Name=$lp ] + FROM [ ( + SELECT ELEMENT [ + FunctionCall Metadata.resolve@-1[ + LiteralExpr [STRING] [lp] + Variable [ Name=$g ] + Variable [ Name=$l ] + Variable [ Name=$p ] + Variable [ Name=$t ] + ] + ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] + ] + ) AS Variable [ Name=$i ] ] ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9c2e9f0e/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q15_top_supplier/q15_top_supplier.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q15_top_supplier/q15_top_supplier.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q15_top_supplier/q15_top_supplier.3.ast index 0645c36..d4c9bb5 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q15_top_supplier/q15_top_supplier.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q15_top_supplier/q15_top_supplier.3.ast @@ -16,7 +16,10 @@ FunctionDecl revenue([]) { SELECT ELEMENT [ OperatorExpr [ FieldAccessor [ - Variable [ Name=$i ] + FieldAccessor [ + Variable [ Name=$i ] + Field=l + ] Field=l_extendedprice ] * @@ -24,13 +27,16 @@ FunctionDecl revenue([]) { LiteralExpr [LONG] [1] - FieldAccessor [ - Variable [ Name=$i ] + FieldAccessor [ + Variable [ Name=$i ] + Field=l + ] Field=l_discount ] ] ] ] - FROM [ Variable [ Name=$l ] + FROM [ Variable [ Name=$g ] AS Variable [ Name=$i ] ] ) @@ -68,6 +74,7 @@ FunctionDecl revenue([]) { Variable [ Name=$l ] Field=l_suppkey ] + GROUP AS Variable [ Name=$g ] ) } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9c2e9f0e/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 aef4422..c6ea4fa 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 @@ -324,7 +324,7 @@ Groupby Variable [ Name=$t2 ] Field=p_size ] - GROUP AS Variable [ Name=#2 ] + GROUP AS Variable [ Name=$g ] ( t2:=Variable [ Name=$t2 ] ) @@ -339,7 +339,20 @@ Let Variable [ Name=$supplier_cnt ] Field=ps_suppkey ] ] - FROM [ Variable [ Name=$t2 ] + FROM [ ( + SELECT ELEMENT [ + FunctionCall Metadata.resolve@-1[ + LiteralExpr [STRING] [t2] + Variable [ Name=$g ] + Variable [ Name=$p_brand ] + Variable [ Name=$p_size ] + Variable [ Name=$p_type ] + ] + ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] + ] + ) AS Variable [ Name=$i ] ] ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9c2e9f0e/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q17_large_gby_variant/q17_large_gby_variant.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q17_large_gby_variant/q17_large_gby_variant.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q17_large_gby_variant/q17_large_gby_variant.3.ast index c5ed1ef..11cb25f 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q17_large_gby_variant/q17_large_gby_variant.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q17_large_gby_variant/q17_large_gby_variant.3.ast @@ -11,7 +11,18 @@ RecordConstructor [ LiteralExpr [STRING] [t_count] : FunctionCall tpch.count@1[ - Variable [ Name=$l ] + ( + SELECT ELEMENT [ + FunctionCall Metadata.resolve@-1[ + LiteralExpr [STRING] [l] + Variable [ Name=$g ] + Variable [ Name=$l_partkey ] + ] + ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] + ] + ) ] ) ( @@ -28,7 +39,18 @@ RecordConstructor [ Field=l_quantity ] ] - FROM [ Variable [ Name=$l ] + FROM [ ( + SELECT ELEMENT [ + FunctionCall Metadata.resolve@-1[ + LiteralExpr [STRING] [l] + Variable [ Name=$g ] + Variable [ Name=$l_partkey ] + ] + ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] + ] + ) AS Variable [ Name=$i ] ] ) @@ -46,7 +68,18 @@ RecordConstructor [ Field=l_suppkey ] ] - FROM [ Variable [ Name=$l ] + FROM [ ( + SELECT ELEMENT [ + FunctionCall Metadata.resolve@-1[ + LiteralExpr [STRING] [l] + Variable [ Name=$g ] + Variable [ Name=$l_partkey ] + ] + ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] + ] + ) AS Variable [ Name=$i ] ] ) @@ -63,7 +96,18 @@ RecordConstructor [ Field=l_linenumber ] ] - FROM [ Variable [ Name=$l ] + FROM [ ( + SELECT ELEMENT [ + FunctionCall Metadata.resolve@-1[ + LiteralExpr [STRING] [l] + Variable [ Name=$g ] + Variable [ Name=$l_partkey ] + ] + ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] + ] + ) AS Variable [ Name=$i ] ] ) @@ -80,7 +124,18 @@ RecordConstructor [ Field=l_extendedprice ] ] - FROM [ Variable [ Name=$l ] + FROM [ ( + SELECT ELEMENT [ + FunctionCall Metadata.resolve@-1[ + LiteralExpr [STRING] [l] + Variable [ Name=$g ] + Variable [ Name=$l_partkey ] + ] + ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] + ] + ) AS Variable [ Name=$i ] ] ) @@ -97,7 +152,18 @@ RecordConstructor [ Field=l_discount ] ] - FROM [ Variable [ Name=$l ] + FROM [ ( + SELECT ELEMENT [ + FunctionCall Metadata.resolve@-1[ + LiteralExpr [STRING] [l] + Variable [ Name=$g ] + Variable [ Name=$l_partkey ] + ] + ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] + ] + ) AS Variable [ Name=$i ] ] ) @@ -114,7 +180,18 @@ RecordConstructor [ Field=l_tax ] ] - FROM [ Variable [ Name=$l ] + FROM [ ( + SELECT ELEMENT [ + FunctionCall Metadata.resolve@-1[ + LiteralExpr [STRING] [l] + Variable [ Name=$g ] + Variable [ Name=$l_partkey ] + ] + ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] + ] + ) AS Variable [ Name=$i ] ] ) @@ -131,7 +208,18 @@ RecordConstructor [ Field=l_shipdate ] ] - FROM [ Variable [ Name=$l ] + FROM [ ( + SELECT ELEMENT [ + FunctionCall Metadata.resolve@-1[ + LiteralExpr [STRING] [l] + Variable [ Name=$g ] + Variable [ Name=$l_partkey ] + ] + ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] + ] + ) AS Variable [ Name=$i ] ] ) @@ -148,7 +236,18 @@ RecordConstructor [ Field=l_commitdate ] ] - FROM [ Variable [ Name=$l ] + FROM [ ( + SELECT ELEMENT [ + FunctionCall Metadata.resolve@-1[ + LiteralExpr [STRING] [l] + Variable [ Name=$g ] + Variable [ Name=$l_partkey ] + ] + ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] + ] + ) AS Variable [ Name=$i ] ] ) @@ -165,7 +264,18 @@ RecordConstructor [ Field=l_receiptdate ] ] - FROM [ Variable [ Name=$l ] + FROM [ ( + SELECT ELEMENT [ + FunctionCall Metadata.resolve@-1[ + LiteralExpr [STRING] [l] + Variable [ Name=$g ] + Variable [ Name=$l_partkey ] + ] + ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] + ] + ) AS Variable [ Name=$i ] ] ) @@ -182,7 +292,18 @@ RecordConstructor [ Field=l_comment ] ] - FROM [ Variable [ Name=$l ] + FROM [ ( + SELECT ELEMENT [ + FunctionCall Metadata.resolve@-1[ + LiteralExpr [STRING] [l] + Variable [ Name=$g ] + Variable [ Name=$l_partkey ] + ] + ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] + ] + ) AS Variable [ Name=$i ] ] ) @@ -202,7 +323,7 @@ Groupby Variable [ Name=$l ] Field=l_partkey ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=$g ] ( l:=Variable [ Name=$l ] ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9c2e9f0e/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q18_large_volume_customer/q18_large_volume_customer.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q18_large_volume_customer/q18_large_volume_customer.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q18_large_volume_customer/q18_large_volume_customer.3.ast index a6eebfd..6bb9429 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q18_large_volume_customer/q18_large_volume_customer.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q18_large_volume_customer/q18_large_volume_customer.3.ast @@ -38,7 +38,22 @@ RecordConstructor [ Field=l_quantity ] ] - FROM [ Variable [ Name=$l ] + FROM [ ( + SELECT ELEMENT [ + FunctionCall Metadata.resolve@-1[ + LiteralExpr [STRING] [l] + Variable [ Name=$g ] + Variable [ Name=$o_orderdate ] + Variable [ Name=$c_name ] + Variable [ Name=$o_orderkey ] + Variable [ Name=$o_totalprice ] + Variable [ Name=$c_custkey ] + ] + ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] + ] + ) AS Variable [ Name=$j ] ] ) @@ -75,7 +90,20 @@ FROM [ FunctionCall Metadata.dataset@1[ Field=l_quantity ] ] - FROM [ Variable [ Name=$l ] + FROM [ ( + SELECT ELEMENT [ + FunctionCall Metadata.resolve@-1[ + LiteralExpr [STRING] [l] + Variable [ Name=$o ] + Variable [ Name=$l_orderkey ] + Variable [ Name=$g2 ] + Variable [ Name=$c ] + ] + ] + FROM [ Variable [ Name=$g2 ] + AS Variable [ Name=$g2 ] + ] + ) AS Variable [ Name=$i ] ] ) @@ -95,7 +123,7 @@ FROM [ FunctionCall Metadata.dataset@1[ Variable [ Name=$l ] Field=l_orderkey ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=$g2 ] ( l:=Variable [ Name=$l ] ) @@ -186,7 +214,7 @@ Groupby Variable [ Name=$o ] Field=o_totalprice ] - GROUP AS Variable [ Name=#2 ] + GROUP AS Variable [ Name=$g ] ( c:=Variable [ Name=$c ] o:=Variable [ Name=$o ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9c2e9f0e/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q20_potential_part_promotion/q20_potential_part_promotion.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q20_potential_part_promotion/q20_potential_part_promotion.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q20_potential_part_promotion/q20_potential_part_promotion.3.ast index 9993401..88f61d2 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q20_potential_part_promotion/q20_potential_part_promotion.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q20_potential_part_promotion/q20_potential_part_promotion.3.ast @@ -60,7 +60,19 @@ FROM [ ( Field=l_quantity ] ] - FROM [ Variable [ Name=$l ] + FROM [ ( + SELECT ELEMENT [ + FunctionCall Metadata.resolve@-1[ + LiteralExpr [STRING] [l] + Variable [ Name=$l_suppkey ] + Variable [ Name=$g ] + Variable [ Name=$l_partkey ] + ] + ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] + ] + ) AS Variable [ Name=$i ] ] ) @@ -87,7 +99,7 @@ FROM [ ( Variable [ Name=$l ] Field=l_suppkey ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=$g ] ( l:=Variable [ Name=$l ] ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9c2e9f0e/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/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/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/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.ast index cd588d6..51bdde2 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/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/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.ast @@ -19,7 +19,17 @@ FunctionDecl tmp1([]) { Field=l_suppkey ] ] - FROM [ Variable [ Name=$l2 ] + FROM [ ( + SELECT ELEMENT [ + FieldAccessor [ + Variable [ Name=$g1 ] + Field=l2 + ] + ] + FROM [ Variable [ Name=$g1 ] + AS Variable [ Name=$g1 ] + ] + ) AS Variable [ Name=$i ] ] ) @@ -36,7 +46,17 @@ FunctionDecl tmp1([]) { Field=l_suppkey ] ] - FROM [ Variable [ Name=$l2 ] + FROM [ ( + SELECT ELEMENT [ + FieldAccessor [ + Variable [ Name=$g1 ] + Field=l2 + ] + ] + FROM [ Variable [ Name=$g1 ] + AS Variable [ Name=$g1 ] + ] + ) AS Variable [ Name=$i ] ] ) @@ -86,6 +106,7 @@ FunctionDecl tmp1([]) { Variable [ Name=$l2 ] Field=l_orderkey ] + GROUP AS Variable [ Name=$g1 ] ) } @@ -110,7 +131,17 @@ FunctionDecl tmp2([]) { Field=l_suppkey ] ] - FROM [ Variable [ Name=$l2 ] + FROM [ ( + SELECT ELEMENT [ + FieldAccessor [ + Variable [ Name=$g2 ] + Field=l2 + ] + ] + FROM [ Variable [ Name=$g2 ] + AS Variable [ Name=$g2 ] + ] + ) AS Variable [ Name=$i ] ] ) @@ -127,7 +158,17 @@ FunctionDecl tmp2([]) { Field=l_suppkey ] ] - FROM [ Variable [ Name=$l2 ] + FROM [ ( + SELECT ELEMENT [ + FieldAccessor [ + Variable [ Name=$g2 ] + Field=l2 + ] + ] + FROM [ Variable [ Name=$g2 ] + AS Variable [ Name=$g2 ] + ] + ) AS Variable [ Name=$i ] ] ) @@ -189,6 +230,7 @@ FunctionDecl tmp2([]) { Variable [ Name=$l2 ] Field=l_orderkey ] + GROUP AS Variable [ Name=$g2 ] ) } @@ -432,7 +474,7 @@ Groupby Variable [ Name=$t4 ] Field=s_name ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=$g ] ( t4:=Variable [ Name=$t4 ] ) @@ -442,13 +484,20 @@ Let Variable [ Name=$numwait ] FunctionCall tpch.sql-count@1[ ( SELECT ELEMENT [ - FieldAccessor [ - Variable [ Name=#2 ] - Field=t4 - ] + ( + SELECT ELEMENT [ + FieldAccessor [ + Variable [ Name=#1 ] + Field=t4 + ] + ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] + ] + ) ] - FROM [ Variable [ Name=#1 ] - AS Variable [ Name=#2 ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=#1 ] ] ) ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9c2e9f0e/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q22_global_sales_opportunity/q22_global_sales_opportunity.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q22_global_sales_opportunity/q22_global_sales_opportunity.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q22_global_sales_opportunity/q22_global_sales_opportunity.3.ast index b7ff109..1ca3eb5 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q22_global_sales_opportunity/q22_global_sales_opportunity.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q22_global_sales_opportunity/q22_global_sales_opportunity.3.ast @@ -77,7 +77,18 @@ RecordConstructor [ LiteralExpr [STRING] [numcust] : FunctionCall tpch.count@1[ - Variable [ Name=$ct ] + ( + SELECT ELEMENT [ + FunctionCall Metadata.resolve@-1[ + LiteralExpr [STRING] [ct] + Variable [ Name=$g ] + Variable [ Name=$cntrycode ] + ] + ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] + ] + ) ] ) ( @@ -91,7 +102,18 @@ RecordConstructor [ Field=c_acctbal ] ] - FROM [ Variable [ Name=$ct ] + FROM [ ( + SELECT ELEMENT [ + FunctionCall Metadata.resolve@-1[ + LiteralExpr [STRING] [ct] + Variable [ Name=$g ] + Variable [ Name=$cntrycode ] + ] + ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] + ] + ) AS Variable [ Name=$i ] ] ) @@ -119,7 +141,7 @@ Groupby Variable [ Name=$ct ] Field=cntrycode ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=$g ] ( ct:=Variable [ Name=$ct ] ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9c2e9f0e/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue562/query-issue562.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue562/query-issue562.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue562/query-issue562.3.ast index cac889b..a77edfe 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue562/query-issue562.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue562/query-issue562.3.ast @@ -183,12 +183,12 @@ RecordConstructor [ ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=#2 ] + Variable [ Name=#1 ] Field=ct ] ] - FROM [ Variable [ Name=#1 ] - AS Variable [ Name=#2 ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=#1 ] ] ) ] @@ -204,7 +204,18 @@ RecordConstructor [ Field=c_acctbal ] ] - FROM [ Variable [ Name=$ct ] + FROM [ ( + SELECT ELEMENT [ + FunctionCall Metadata.resolve@-1[ + LiteralExpr [STRING] [ct] + Variable [ Name=$g ] + Variable [ Name=$cntrycode ] + ] + ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] + ] + ) AS Variable [ Name=$i ] ] ) @@ -252,7 +263,7 @@ Groupby Variable [ Name=$ct ] Field=cntrycode ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=$g ] ( ct:=Variable [ Name=$ct ] ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9c2e9f0e/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue601/query-issue601.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue601/query-issue601.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue601/query-issue601.3.ast index 35785dd..d12032a 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue601/query-issue601.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue601/query-issue601.3.ast @@ -6,7 +6,11 @@ RecordConstructor [ LiteralExpr [STRING] [l_linenumber] : FieldAccessor [ - Variable [ Name=$l ] + FunctionCall Metadata.resolve@-1[ + LiteralExpr [STRING] [l] + Variable [ Name=$g ] + Variable [ Name=$l_linenumber ] + ] Field=l_linenumber ] ) @@ -16,13 +20,17 @@ RecordConstructor [ FunctionCall tpch.sql-count@1[ ( SELECT ELEMENT [ - FieldAccessor [ - Variable [ Name=#2 ] - Field=l + ( + SELECT ELEMENT [ + Variable [ Name=$g ] + ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] + ] + ) ] - ] - FROM [ Variable [ Name=#1 ] - AS Variable [ Name=#2 ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=#1 ] ] ) ] @@ -41,14 +49,18 @@ Groupby Variable [ Name=$l ] Field=l_linenumber ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=$g ] ( l:=Variable [ Name=$l ] ) Orderby FieldAccessor [ - Variable [ Name=$l ] + FunctionCall Metadata.resolve@-1[ + LiteralExpr [STRING] [l] + Variable [ Name=$g ] + Variable [ Name=$l_linenumber ] + ] Field=l_linenumber ] ASC http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9c2e9f0e/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue638/query-issue638.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue638/query-issue638.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue638/query-issue638.3.ast index bce73f5..14ed390 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue638/query-issue638.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue638/query-issue638.3.ast @@ -19,12 +19,15 @@ RecordConstructor [ ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=$pr ] + FieldAccessor [ + Variable [ Name=$g ] + Field=profit + ] Field=amount ] ] - FROM [ Variable [ Name=$profit ] - AS Variable [ Name=$pr ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] ] ) ] @@ -431,7 +434,7 @@ Groupby Variable [ Name=$profit ] Field=o_year ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=$g ] ( profit:=Variable [ Name=$profit ] ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9c2e9f0e/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785-2/query-issue785-2.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785-2/query-issue785-2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785-2/query-issue785-2.3.ast index 4ff201e..f4cb736 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785-2/query-issue785-2.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785-2/query-issue785-2.3.ast @@ -120,7 +120,7 @@ Let Variable [ Name=$X ] Variable [ Name=$n ] Field=n_nationkey ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=$g2 ] ( n:=Variable [ Name=$n ] customer:=Variable [ Name=$customer ] @@ -133,12 +133,15 @@ Let Variable [ Name=$X ] ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=$o ] + FieldAccessor [ + Variable [ Name=$g2 ] + Field=orders + ] Field=o_totalprice ] ] - FROM [ Variable [ Name=$orders ] - AS Variable [ Name=$o ] + FROM [ Variable [ Name=$g2 ] + AS Variable [ Name=$g2 ] ] ) ] @@ -160,7 +163,10 @@ RecordConstructor [ LiteralExpr [STRING] [orderdate] : FieldAccessor [ - Variable [ Name=$y ] + FieldAccessor [ + Variable [ Name=$g ] + Field=x + ] Field=order_date ] ) @@ -168,18 +174,24 @@ RecordConstructor [ LiteralExpr [STRING] [sum_price] : FieldAccessor [ - Variable [ Name=$y ] + FieldAccessor [ + Variable [ Name=$g ] + Field=x + ] Field=sum_price ] ) ] ] - FROM [ Variable [ Name=$x ] - AS Variable [ Name=$y ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] ] Orderby FieldAccessor [ - Variable [ Name=$y ] + FieldAccessor [ + Variable [ Name=$g ] + Field=x + ] Field=sum_price ] DESC @@ -200,7 +212,7 @@ Groupby Variable [ Name=$x ] Field=nation_key ] - GROUP AS Variable [ Name=#2 ] + GROUP AS Variable [ Name=$g ] ( x:=Variable [ Name=$x ] ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9c2e9f0e/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785/query-issue785.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785/query-issue785.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785/query-issue785.3.ast index 066626b..a3643c5 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785/query-issue785.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785/query-issue785.3.ast @@ -25,17 +25,20 @@ RecordConstructor [ ) ] ] - FROM [ Variable [ Name=$x ] + FROM [ Variable [ Name=$g ] AS Variable [ Name=$i ] ] Groupby Variable [ Name=$od ] := FieldAccessor [ - Variable [ Name=$i ] + FieldAccessor [ + Variable [ Name=$i ] + Field=x + ] Field=order_date ] - GROUP AS Variable [ Name=#3 ] + GROUP AS Variable [ Name=$g2 ] ( i:=Variable [ Name=$i ] ) @@ -46,12 +49,18 @@ RecordConstructor [ ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=$s ] + FieldAccessor [ + FieldAccessor [ + Variable [ Name=$g2 ] + Field=i + ] + Field=x + ] Field=sum_price ] ] - FROM [ Variable [ Name=$i ] - AS Variable [ Name=$s ] + FROM [ Variable [ Name=$g2 ] + AS Variable [ Name=$g2 ] ] ) ] @@ -85,12 +94,15 @@ FROM [ ( ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=$o ] + FieldAccessor [ + Variable [ Name=$g3 ] + Field=orders + ] Field=o_totalprice ] ] - FROM [ Variable [ Name=$orders ] - AS Variable [ Name=$o ] + FROM [ Variable [ Name=$g3 ] + AS Variable [ Name=$g3 ] ] ) ] @@ -151,7 +163,7 @@ FROM [ ( Variable [ Name=$n ] Field=n_nationkey ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=$g3 ] ( n:=Variable [ Name=$n ] customer:=Variable [ Name=$customer ] @@ -168,7 +180,7 @@ Groupby Variable [ Name=$x ] Field=nation_key ] - GROUP AS Variable [ Name=#2 ] + GROUP AS Variable [ Name=$g ] ( x:=Variable [ Name=$x ] ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9c2e9f0e/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue786/query-issue786.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue786/query-issue786.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue786/query-issue786.3.ast index 5908531..78d629d 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue786/query-issue786.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue786/query-issue786.3.ast @@ -79,7 +79,7 @@ RecordConstructor [ Variable [ Name=$orders ] Field=o_orderdate ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=$g ] ( orders:=Variable [ Name=$orders ] customer:=Variable [ Name=$customer ] @@ -91,12 +91,15 @@ RecordConstructor [ ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=$o ] + FieldAccessor [ + Variable [ Name=$g ] + Field=orders + ] Field=o_totalprice ] ] - FROM [ Variable [ Name=$orders ] - AS Variable [ Name=$o ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] ] ) ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9c2e9f0e/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810-2/query-issue810-2.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810-2/query-issue810-2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810-2/query-issue810-2.3.ast index 91bebe6..ab45142 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810-2/query-issue810-2.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810-2/query-issue810-2.3.ast @@ -55,7 +55,7 @@ Groupby Variable [ Name=$l ] Field=l_linestatus ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=$g ] ( l:=Variable [ Name=$l ] ) @@ -64,15 +64,21 @@ Let Variable [ Name=$cheaps ] := ( SELECT ELEMENT [ - Variable [ Name=$m ] + FieldAccessor [ + Variable [ Name=$m ] + Field=l + ] ] - FROM [ Variable [ Name=$l ] + FROM [ Variable [ Name=$g ] AS Variable [ Name=$m ] ] Where OperatorExpr [ FieldAccessor [ - Variable [ Name=$m ] + FieldAccessor [ + Variable [ Name=$m ] + Field=l + ] Field=l_discount ] > @@ -85,7 +91,10 @@ Let Variable [ Name=$charges ] SELECT ELEMENT [ OperatorExpr [ FieldAccessor [ - Variable [ Name=$a ] + FieldAccessor [ + Variable [ Name=$a ] + Field=l + ] Field=l_extendedprice ] * @@ -93,7 +102,10 @@ Let Variable [ Name=$charges ] LiteralExpr [LONG] [1] - FieldAccessor [ - Variable [ Name=$a ] + FieldAccessor [ + Variable [ Name=$a ] + Field=l + ] Field=l_discount ] ] @@ -102,13 +114,16 @@ Let Variable [ Name=$charges ] LiteralExpr [LONG] [1] + FieldAccessor [ - Variable [ Name=$a ] + FieldAccessor [ + Variable [ Name=$a ] + Field=l + ] Field=l_tax ] ] ] ] - FROM [ Variable [ Name=$l ] + FROM [ Variable [ Name=$g ] AS Variable [ Name=$a ] ] )
