http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/optimizerts/results/tpcds/query-ASTERIXDB-1581.plan ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results/tpcds/query-ASTERIXDB-1581.plan b/asterixdb/asterix-app/src/test/resources/optimizerts/results/tpcds/query-ASTERIXDB-1581.plan index f914055..c335414 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/results/tpcds/query-ASTERIXDB-1581.plan +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results/tpcds/query-ASTERIXDB-1581.plan @@ -16,7 +16,7 @@ -- STREAM_PROJECT |PARTITIONED| -- ASSIGN |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - -- PRE_CLUSTERED_GROUP_BY[$$92] |PARTITIONED| + -- PRE_CLUSTERED_GROUP_BY[$$141] |PARTITIONED| { -- AGGREGATE |LOCAL| -- AGGREGATE |LOCAL| @@ -28,9 +28,9 @@ -- ONE_TO_ONE_EXCHANGE |PARTITIONED| -- STREAM_PROJECT |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - -- HYBRID_HASH_JOIN [$$92][$$93] |PARTITIONED| + -- HYBRID_HASH_JOIN [$$141][$$142] |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - -- PRE_CLUSTERED_GROUP_BY[$$32] |PARTITIONED| + -- PRE_CLUSTERED_GROUP_BY[$$77] |PARTITIONED| { -- AGGREGATE |LOCAL| -- AGGREGATE |LOCAL| @@ -40,12 +40,12 @@ -- NESTED_TUPLE_SOURCE |LOCAL| } -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - -- STABLE_SORT [$$32(ASC)] |PARTITIONED| + -- STABLE_SORT [$$77(ASC)] |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| -- STREAM_PROJECT |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - -- HYBRID_HASH_JOIN [$$32][$$85] |PARTITIONED| - -- HASH_PARTITION_EXCHANGE [$$32] |PARTITIONED| + -- HYBRID_HASH_JOIN [$$77][$$134] |PARTITIONED| + -- HASH_PARTITION_EXCHANGE [$$77] |PARTITIONED| -- STREAM_PROJECT |UNPARTITIONED| -- ASSIGN |UNPARTITIONED| -- ONE_TO_ONE_EXCHANGE |UNPARTITIONED| @@ -63,7 +63,7 @@ -- DATASOURCE_SCAN |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| -- EMPTY_TUPLE_SOURCE |PARTITIONED| - -- HASH_PARTITION_EXCHANGE [$$85] |PARTITIONED| + -- HASH_PARTITION_EXCHANGE [$$134] |PARTITIONED| -- ASSIGN |PARTITIONED| -- STREAM_PROJECT |PARTITIONED| -- STREAM_SELECT |PARTITIONED| @@ -94,7 +94,7 @@ -- DATASOURCE_SCAN |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| -- EMPTY_TUPLE_SOURCE |PARTITIONED| - -- HASH_PARTITION_EXCHANGE [$$93] |PARTITIONED| + -- HASH_PARTITION_EXCHANGE [$$142] |PARTITIONED| -- ASSIGN |PARTITIONED| -- STREAM_PROJECT |PARTITIONED| -- STREAM_SELECT |PARTITIONED| @@ -108,7 +108,7 @@ -- STREAM_SELECT |PARTITIONED| -- ASSIGN |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - -- PRE_CLUSTERED_GROUP_BY[$$94] |PARTITIONED| + -- PRE_CLUSTERED_GROUP_BY[$$143] |PARTITIONED| { -- AGGREGATE |LOCAL| -- AGGREGATE |LOCAL| @@ -117,12 +117,12 @@ -- NESTED_TUPLE_SOURCE |LOCAL| } -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - -- STABLE_SORT [$$94(ASC)] |PARTITIONED| + -- STABLE_SORT [$$143(ASC)] |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| -- STREAM_PROJECT |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - -- HYBRID_HASH_JOIN [$$94][$$95] |PARTITIONED| - -- HASH_PARTITION_EXCHANGE [$$94] |PARTITIONED| + -- HYBRID_HASH_JOIN [$$143][$$144] |PARTITIONED| + -- HASH_PARTITION_EXCHANGE [$$143] |PARTITIONED| -- STREAM_PROJECT |UNPARTITIONED| -- ASSIGN |UNPARTITIONED| -- ONE_TO_ONE_EXCHANGE |UNPARTITIONED| @@ -140,7 +140,7 @@ -- DATASOURCE_SCAN |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| -- EMPTY_TUPLE_SOURCE |PARTITIONED| - -- HASH_PARTITION_EXCHANGE [$$95] |PARTITIONED| + -- HASH_PARTITION_EXCHANGE [$$144] |PARTITIONED| -- ASSIGN |PARTITIONED| -- STREAM_PROJECT |PARTITIONED| -- STREAM_SELECT |PARTITIONED|
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/optimizerts/results/tpcds/query-ASTERIXDB-1591.plan ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results/tpcds/query-ASTERIXDB-1591.plan b/asterixdb/asterix-app/src/test/resources/optimizerts/results/tpcds/query-ASTERIXDB-1591.plan index 90d7b02..4925110 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/results/tpcds/query-ASTERIXDB-1591.plan +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results/tpcds/query-ASTERIXDB-1591.plan @@ -4,76 +4,76 @@ -- STREAM_PROJECT |PARTITIONED| -- ASSIGN |PARTITIONED| -- STREAM_PROJECT |PARTITIONED| - -- SORT_MERGE_EXCHANGE [$$112(ASC) ] |PARTITIONED| + -- SORT_MERGE_EXCHANGE [$$168(ASC) ] |PARTITIONED| -- STREAM_LIMIT |PARTITIONED| -- STREAM_PROJECT |PARTITIONED| -- STREAM_SELECT |PARTITIONED| -- STREAM_PROJECT |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - -- SORT_GROUP_BY[$$121, $$122] |PARTITIONED| + -- SORT_GROUP_BY[$$177, $$178] |PARTITIONED| { -- AGGREGATE |LOCAL| -- NESTED_TUPLE_SOURCE |LOCAL| } - -- HASH_PARTITION_EXCHANGE [$$121, $$122] |PARTITIONED| - -- PRE_CLUSTERED_GROUP_BY[$$109, $$110] |PARTITIONED| + -- HASH_PARTITION_EXCHANGE [$$177, $$178] |PARTITIONED| + -- PRE_CLUSTERED_GROUP_BY[$$165, $$166] |PARTITIONED| { -- AGGREGATE |LOCAL| -- STREAM_SELECT |LOCAL| -- NESTED_TUPLE_SOURCE |LOCAL| } -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - -- STABLE_SORT [$$109(ASC), $$110(ASC)] |PARTITIONED| + -- STABLE_SORT [$$165(ASC), $$166(ASC)] |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| -- STREAM_PROJECT |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - -- HYBRID_HASH_JOIN [$$109][$$91] |PARTITIONED| - -- HASH_PARTITION_EXCHANGE [$$109] |PARTITIONED| - -- SORT_GROUP_BY[$$118, $$119] |PARTITIONED| + -- HYBRID_HASH_JOIN [$$165][$$147] |PARTITIONED| + -- HASH_PARTITION_EXCHANGE [$$165] |PARTITIONED| + -- SORT_GROUP_BY[$$174, $$175] |PARTITIONED| { -- AGGREGATE |LOCAL| -- NESTED_TUPLE_SOURCE |LOCAL| } - -- HASH_PARTITION_EXCHANGE [$$118, $$119] |PARTITIONED| - -- PRE_CLUSTERED_GROUP_BY[$$106, $$107] |PARTITIONED| + -- HASH_PARTITION_EXCHANGE [$$174, $$175] |PARTITIONED| + -- PRE_CLUSTERED_GROUP_BY[$$162, $$163] |PARTITIONED| { -- AGGREGATE |LOCAL| -- STREAM_SELECT |LOCAL| -- NESTED_TUPLE_SOURCE |LOCAL| } -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - -- STABLE_SORT [$$106(ASC), $$107(ASC)] |PARTITIONED| + -- STABLE_SORT [$$162(ASC), $$163(ASC)] |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| -- STREAM_PROJECT |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - -- HYBRID_HASH_JOIN [$$106][$$89] |PARTITIONED| - -- HASH_PARTITION_EXCHANGE [$$106] |PARTITIONED| + -- HYBRID_HASH_JOIN [$$162][$$145] |PARTITIONED| + -- HASH_PARTITION_EXCHANGE [$$162] |PARTITIONED| -- STREAM_PROJECT |PARTITIONED| -- STREAM_SELECT |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - -- SORT_GROUP_BY[$$115, $$116] |PARTITIONED| + -- SORT_GROUP_BY[$$171, $$172] |PARTITIONED| { -- AGGREGATE |LOCAL| -- NESTED_TUPLE_SOURCE |LOCAL| } - -- HASH_PARTITION_EXCHANGE [$$115, $$116] |PARTITIONED| - -- PRE_CLUSTERED_GROUP_BY[$$70, $$71] |PARTITIONED| + -- HASH_PARTITION_EXCHANGE [$$171, $$172] |PARTITIONED| + -- PRE_CLUSTERED_GROUP_BY[$$126, $$127] |PARTITIONED| { -- AGGREGATE |LOCAL| -- STREAM_SELECT |LOCAL| -- NESTED_TUPLE_SOURCE |LOCAL| } -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - -- STABLE_SORT [$$70(ASC), $$71(ASC)] |PARTITIONED| + -- STABLE_SORT [$$126(ASC), $$127(ASC)] |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| -- STREAM_PROJECT |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - -- HYBRID_HASH_JOIN [$$70][$$87] |PARTITIONED| - -- HASH_PARTITION_EXCHANGE [$$70] |PARTITIONED| + -- HYBRID_HASH_JOIN [$$126][$$143] |PARTITIONED| + -- HASH_PARTITION_EXCHANGE [$$126] |PARTITIONED| -- STREAM_PROJECT |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - -- HYBRID_HASH_JOIN [$$81][$$71] |PARTITIONED| - -- HASH_PARTITION_EXCHANGE [$$81] |PARTITIONED| + -- HYBRID_HASH_JOIN [$$137][$$127] |PARTITIONED| + -- HASH_PARTITION_EXCHANGE [$$137] |PARTITIONED| -- ASSIGN |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| -- DATASOURCE_SCAN |PARTITIONED| @@ -83,12 +83,12 @@ -- DATASOURCE_SCAN |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| -- EMPTY_TUPLE_SOURCE |PARTITIONED| - -- HASH_PARTITION_EXCHANGE [$$87] |PARTITIONED| + -- HASH_PARTITION_EXCHANGE [$$143] |PARTITIONED| -- ASSIGN |PARTITIONED| -- STREAM_PROJECT |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - -- HYBRID_HASH_JOIN [$$92][$$74] |PARTITIONED| - -- HASH_PARTITION_EXCHANGE [$$92] |PARTITIONED| + -- HYBRID_HASH_JOIN [$$148][$$130] |PARTITIONED| + -- HASH_PARTITION_EXCHANGE [$$148] |PARTITIONED| -- ASSIGN |PARTITIONED| -- STREAM_PROJECT |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| @@ -103,12 +103,12 @@ -- DATASOURCE_SCAN |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| -- EMPTY_TUPLE_SOURCE |PARTITIONED| - -- HASH_PARTITION_EXCHANGE [$$89] |PARTITIONED| + -- HASH_PARTITION_EXCHANGE [$$145] |PARTITIONED| -- ASSIGN |PARTITIONED| -- STREAM_PROJECT |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - -- HYBRID_HASH_JOIN [$$94][$$77] |PARTITIONED| - -- HASH_PARTITION_EXCHANGE [$$94] |PARTITIONED| + -- HYBRID_HASH_JOIN [$$150][$$133] |PARTITIONED| + -- HASH_PARTITION_EXCHANGE [$$150] |PARTITIONED| -- ASSIGN |PARTITIONED| -- STREAM_PROJECT |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| @@ -126,12 +126,12 @@ -- DATASOURCE_SCAN |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| -- EMPTY_TUPLE_SOURCE |PARTITIONED| - -- HASH_PARTITION_EXCHANGE [$$91] |PARTITIONED| + -- HASH_PARTITION_EXCHANGE [$$147] |PARTITIONED| -- ASSIGN |PARTITIONED| -- STREAM_PROJECT |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - -- HYBRID_HASH_JOIN [$$96][$$80] |PARTITIONED| - -- HASH_PARTITION_EXCHANGE [$$96] |PARTITIONED| + -- HYBRID_HASH_JOIN [$$152][$$136] |PARTITIONED| + -- HASH_PARTITION_EXCHANGE [$$152] |PARTITIONED| -- ASSIGN |PARTITIONED| -- STREAM_PROJECT |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/optimizerts/results/tpcds/query-ASTERIXDB-1596.plan ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results/tpcds/query-ASTERIXDB-1596.plan b/asterixdb/asterix-app/src/test/resources/optimizerts/results/tpcds/query-ASTERIXDB-1596.plan index 442d1ec..d845b25 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/results/tpcds/query-ASTERIXDB-1596.plan +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results/tpcds/query-ASTERIXDB-1596.plan @@ -3,16 +3,16 @@ -- STREAM_PROJECT |PARTITIONED| -- ASSIGN |PARTITIONED| -- STREAM_PROJECT |PARTITIONED| - -- SORT_MERGE_EXCHANGE [$$23(ASC), $$24(ASC) ] |PARTITIONED| - -- STABLE_SORT [$$23(ASC), $$24(ASC)] |PARTITIONED| + -- SORT_MERGE_EXCHANGE [$$44(ASC), $$45(ASC) ] |PARTITIONED| + -- STABLE_SORT [$$44(ASC), $$45(ASC)] |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| -- STREAM_PROJECT |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - -- HYBRID_HASH_JOIN [$$23][$$27] |PARTITIONED| - -- HASH_PARTITION_EXCHANGE [$$23] |PARTITIONED| + -- HYBRID_HASH_JOIN [$$44][$$48] |PARTITIONED| + -- HASH_PARTITION_EXCHANGE [$$44] |PARTITIONED| -- STREAM_PROJECT |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - -- HYBRID_HASH_JOIN [$$24, $$23][$$26, $$25] |PARTITIONED| + -- HYBRID_HASH_JOIN [$$45, $$44][$$47, $$46] |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| -- DATASOURCE_SCAN |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/optimizerts/results/tpch/q12_shipping.plan ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results/tpch/q12_shipping.plan b/asterixdb/asterix-app/src/test/resources/optimizerts/results/tpch/q12_shipping.plan index 655b2f5..c2790a4 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/results/tpch/q12_shipping.plan +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results/tpch/q12_shipping.plan @@ -3,13 +3,13 @@ -- STREAM_PROJECT |PARTITIONED| -- ASSIGN |PARTITIONED| -- SORT_MERGE_EXCHANGE [$$l_shipmode(ASC) ] |PARTITIONED| - -- SORT_GROUP_BY[$$91] |PARTITIONED| + -- SORT_GROUP_BY[$$119] |PARTITIONED| { -- AGGREGATE |LOCAL| -- NESTED_TUPLE_SOURCE |LOCAL| } - -- HASH_PARTITION_EXCHANGE [$$91] |PARTITIONED| - -- SORT_GROUP_BY[$$73] |PARTITIONED| + -- HASH_PARTITION_EXCHANGE [$$119] |PARTITIONED| + -- SORT_GROUP_BY[$$101] |PARTITIONED| { -- AGGREGATE |LOCAL| -- NESTED_TUPLE_SOURCE |LOCAL| @@ -17,12 +17,12 @@ -- ONE_TO_ONE_EXCHANGE |PARTITIONED| -- STREAM_PROJECT |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - -- HYBRID_HASH_JOIN [$$73][$$80] |PARTITIONED| + -- HYBRID_HASH_JOIN [$$101][$$108] |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| -- STREAM_PROJECT |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - -- HYBRID_HASH_JOIN [$$82][$$77] |PARTITIONED| - -- HASH_PARTITION_EXCHANGE [$$82] |PARTITIONED| + -- HYBRID_HASH_JOIN [$$110][$$105] |PARTITIONED| + -- HASH_PARTITION_EXCHANGE [$$110] |PARTITIONED| -- STREAM_PROJECT |PARTITIONED| -- STREAM_SELECT |PARTITIONED| -- ASSIGN |PARTITIONED| http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/optimizerts/results/tpch/q12_shipping_broadcast.plan ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results/tpch/q12_shipping_broadcast.plan b/asterixdb/asterix-app/src/test/resources/optimizerts/results/tpch/q12_shipping_broadcast.plan index 8fd10f5..789992e 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/results/tpch/q12_shipping_broadcast.plan +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results/tpch/q12_shipping_broadcast.plan @@ -3,13 +3,13 @@ -- STREAM_PROJECT |PARTITIONED| -- ASSIGN |PARTITIONED| -- SORT_MERGE_EXCHANGE [$$l_shipmode(ASC) ] |PARTITIONED| - -- SORT_GROUP_BY[$$91] |PARTITIONED| + -- SORT_GROUP_BY[$$119] |PARTITIONED| { -- AGGREGATE |LOCAL| -- NESTED_TUPLE_SOURCE |LOCAL| } - -- HASH_PARTITION_EXCHANGE [$$91] |PARTITIONED| - -- SORT_GROUP_BY[$$73] |PARTITIONED| + -- HASH_PARTITION_EXCHANGE [$$119] |PARTITIONED| + -- SORT_GROUP_BY[$$101] |PARTITIONED| { -- AGGREGATE |LOCAL| -- NESTED_TUPLE_SOURCE |LOCAL| @@ -17,11 +17,11 @@ -- ONE_TO_ONE_EXCHANGE |PARTITIONED| -- STREAM_PROJECT |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - -- HYBRID_HASH_JOIN [$$73][$$80] |PARTITIONED| + -- HYBRID_HASH_JOIN [$$101][$$108] |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| -- STREAM_PROJECT |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - -- HYBRID_HASH_JOIN [$$81][$$77] |PARTITIONED| + -- HYBRID_HASH_JOIN [$$109][$$105] |PARTITIONED| -- ONE_TO_ONE_EXCHANGE |PARTITIONED| -- STREAM_PROJECT |PARTITIONED| -- STREAM_SELECT |PARTITIONED| http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/secondary-equi-join_06.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/secondary-equi-join_06.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/secondary-equi-join_06.ast index b29f485..91f2ae0 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/secondary-equi-join_06.ast +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/secondary-equi-join_06.ast @@ -20,12 +20,12 @@ FROM [ ( SELECT ELEMENT [ LiteralExpr [LONG] [1] ] - FROM [ Variable [ Name=#1 ] - AS Variable [ Name=#2 ] + FROM [ Variable [ Name=#2 ] + AS Variable [ Name=#3 ] ] ) ] - null + $1 ] FROM [ FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [testdst] @@ -35,11 +35,11 @@ FROM [ ( Groupby Variable [ Name=$val ] := - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [val] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$testdst ] + LiteralExpr [STRING] [val] ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=#2 ] ( testdst:=Variable [ Name=$testdst ] ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-64.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-64.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-64.ast index b3036cb..3f9b7d2 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-64.ast +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-64.ast @@ -28,3 +28,8 @@ FROM [ FunctionCall asterix.dataset@1[ AS Variable [ Name=$testdst ] ] Group All + GROUP AS Variable [ Name=#1 ] + ( + testdst:=Variable [ Name=$testdst ] + ) + http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-65.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-65.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-65.ast index cbb7874..89be71d 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-65.ast +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-65.ast @@ -37,3 +37,8 @@ Where LiteralExpr [LONG] [3] ] Group All + GROUP AS Variable [ Name=#1 ] + ( + t:=Variable [ Name=$t ] + ) + http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-66.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-66.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-66.ast index e596270..f40c406 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-66.ast +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-66.ast @@ -34,3 +34,8 @@ FROM [ FunctionCall asterix.dataset@1[ AS Variable [ Name=$t ] ] Group All + GROUP AS Variable [ Name=#1 ] + ( + t:=Variable [ Name=$t ] + ) + http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-67.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-67.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-67.ast index 027e42d..645418e 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-67.ast +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-67.ast @@ -34,3 +34,8 @@ FROM [ FunctionCall asterix.dataset@1[ AS Variable [ Name=$t ] ] Group All + GROUP AS Variable [ Name=#1 ] + ( + t:=Variable [ Name=$t ] + ) + http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/count-tweets.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/count-tweets.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/count-tweets.ast index a0bee23..2a05929 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/count-tweets.ast +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/count-tweets.ast @@ -63,5 +63,6 @@ Groupby ( t:=Variable [ Name=$t ] token:=Variable [ Name=$token ] + tokens:=Variable [ Name=$tokens ] ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/denorm-cust-order.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/denorm-cust-order.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/denorm-cust-order.ast index 6cf99d5..d5aba38 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/denorm-cust-order.ast +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/denorm-cust-order.ast @@ -43,11 +43,18 @@ RecordConstructor [ ( LiteralExpr [STRING] [cust] : - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [cust] - Variable [ Name=$cid ] - Variable [ Name=#1 ] - ] + ( + SELECT [ + FunctionCall asterix.field-access-by-name@2[ + Variable [ Name=$g ] + LiteralExpr [STRING] [c] + ] + c + ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] + ] + ) ) ( LiteralExpr [STRING] [cnt-orders] @@ -56,12 +63,12 @@ RecordConstructor [ ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=#2 ] + Variable [ Name=#1 ] Field=o ] ] - FROM [ Variable [ Name=#1 ] - AS Variable [ Name=#2 ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=#1 ] ] ) ] @@ -69,11 +76,18 @@ RecordConstructor [ ( LiteralExpr [STRING] [orders] : - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [o] - Variable [ Name=$cid ] - Variable [ Name=#1 ] - ] + ( + SELECT [ + FunctionCall asterix.field-access-by-name@2[ + Variable [ Name=$g ] + LiteralExpr [STRING] [o] + ] + o + ] + FROM [ Variable [ Name=$g ] + AS Variable [ Name=$g ] + ] + ) ) ] ] @@ -106,7 +120,7 @@ Groupby Variable [ Name=$c ] Field=cid ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=$g ] ( c:=Variable [ Name=$c ] o:=Variable [ Name=$o ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/distinct_aggregate.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/distinct_aggregate.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/distinct_aggregate.ast index cbf0d66..29c8bc1 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/distinct_aggregate.ast +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/distinct_aggregate.ast @@ -45,7 +45,7 @@ RecordConstructor [ Field=g ] ] - FROM [ Variable [ Name=#2 ] + FROM [ Variable [ Name=#1 ] AS Variable [ Name=#3 ] ] ) @@ -106,7 +106,7 @@ FROM [ ( Variable [ Name=$l ] Field=l_suppkey ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=#2 ] ( l:=Variable [ Name=$l ] ) @@ -127,7 +127,7 @@ Groupby Variable [ Name=$g ] Field=l_linestatus ] - GROUP AS Variable [ Name=#2 ] + GROUP AS Variable [ Name=#1 ] ( g:=Variable [ Name=$g ] ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/fj-dblp-csx.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/fj-dblp-csx.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/fj-dblp-csx.ast index 3901eaf..37e1bc3 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/fj-dblp-csx.ast +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/fj-dblp-csx.ast @@ -176,6 +176,12 @@ Groupby prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ] paperCSX:=Variable [ Name=$paperCSX ] prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ] + idDBLP:=Variable [ Name=$idDBLP ] + unrankedTokensDBLP:=Variable [ Name=$unrankedTokensDBLP ] + tokensDBLP:=Variable [ Name=$tokensDBLP ] + idCSX:=Variable [ Name=$idCSX ] + unrankedTokensCSX:=Variable [ Name=$unrankedTokensCSX ] + tokensCSX:=Variable [ Name=$tokensCSX ] ) Orderby http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inlined_q18_large_volume_customer.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inlined_q18_large_volume_customer.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inlined_q18_large_volume_customer.ast index 5fc59bb..1f37cba 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inlined_q18_large_volume_customer.ast +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inlined_q18_large_volume_customer.ast @@ -148,7 +148,7 @@ FROM [ FunctionCall asterix.dataset@1[ Variable [ Name=$l ] Field=l_orderkey ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=#2 ] ( l:=Variable [ Name=$l ] ) @@ -241,7 +241,7 @@ Groupby Variable [ Name=$o ] Field=o_totalprice ] - GROUP AS Variable [ Name=#2 ] + GROUP AS Variable [ Name=#1 ] ( c:=Variable [ Name=$c ] o:=Variable [ Name=$o ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orderby-desc-using-gby.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orderby-desc-using-gby.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orderby-desc-using-gby.ast index 1984dbf..29582fe 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orderby-desc-using-gby.ast +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orderby-desc-using-gby.ast @@ -32,11 +32,7 @@ RecordConstructor [ ( LiteralExpr [STRING] [age] : - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [age] - Variable [ Name=$name ] - Variable [ Name=#1 ] - ] + Variable [ Name=$age ] ) ] ] @@ -52,6 +48,12 @@ Groupby Variable [ Name=$c ] Field=name ] + Variable [ Name=$age ] + := + FieldAccessor [ + Variable [ Name=$c ] + Field=age + ] GROUP AS Variable [ Name=#1 ] ( c:=Variable [ Name=$c ] @@ -60,10 +62,6 @@ Groupby Orderby Variable [ Name=$name ] DESC - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [age] - Variable [ Name=$name ] - Variable [ Name=#1 ] - ] + Variable [ Name=$age ] ASC http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-aggreg.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-aggreg.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-aggreg.ast index 213d7ef..5f5644e 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-aggreg.ast +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-aggreg.ast @@ -23,11 +23,7 @@ RecordConstructor [ LiteralExpr [STRING] [ordpercust] : FunctionCall asterix.count@1[ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [o] - Variable [ Name=$cid ] - Variable [ Name=#1 ] - ] + Variable [ Name=$g ] ] ) ( @@ -37,13 +33,14 @@ RecordConstructor [ ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=$i ] + FieldAccessor [ + Variable [ Name=$i ] + Field=o + ] Field=total ] ] - FROM [ FunctionCall asterix.dataset@1[ - LiteralExpr [STRING] [o] - ] + FROM [ Variable [ Name=$g ] AS Variable [ Name=$i ] ] ) @@ -56,13 +53,14 @@ RecordConstructor [ ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=$i ] + FieldAccessor [ + Variable [ Name=$i ] + Field=o + ] Field=total ] ] - FROM [ FunctionCall asterix.dataset@1[ - LiteralExpr [STRING] [o] - ] + FROM [ Variable [ Name=$g ] AS Variable [ Name=$i ] ] ) @@ -82,7 +80,7 @@ Groupby Variable [ Name=$o ] Field=cid ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=$g ] ( o:=Variable [ Name=$o ] ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q01_pricing_summary_report_nt.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q01_pricing_summary_report_nt.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q01_pricing_summary_report_nt.ast index 2ea4576..f023a0d 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q01_pricing_summary_report_nt.ast +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q01_pricing_summary_report_nt.ast @@ -41,13 +41,14 @@ RecordConstructor [ ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=$i ] + FieldAccessor [ + Variable [ Name=$i ] + Field=l + ] Field=l_quantity ] ] - FROM [ FunctionCall asterix.dataset@1[ - LiteralExpr [STRING] [l] - ] + FROM [ Variable [ Name=$g ] AS Variable [ Name=$i ] ] ) @@ -60,13 +61,14 @@ RecordConstructor [ ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=$i ] + FieldAccessor [ + Variable [ Name=$i ] + Field=l + ] Field=l_extendedprice ] ] - FROM [ FunctionCall asterix.dataset@1[ - LiteralExpr [STRING] [l] - ] + FROM [ Variable [ Name=$g ] AS Variable [ Name=$i ] ] ) @@ -80,7 +82,10 @@ RecordConstructor [ SELECT ELEMENT [ OperatorExpr [ FieldAccessor [ - Variable [ Name=$i ] + FieldAccessor [ + Variable [ Name=$i ] + Field=l + ] Field=l_extendedprice ] * @@ -88,15 +93,16 @@ RecordConstructor [ LiteralExpr [LONG] [1] - FieldAccessor [ - Variable [ Name=$i ] + FieldAccessor [ + Variable [ Name=$i ] + Field=l + ] Field=l_discount ] ] ] ] - FROM [ FunctionCall asterix.dataset@1[ - LiteralExpr [STRING] [l] - ] + FROM [ Variable [ Name=$g ] AS Variable [ Name=$i ] ] ) @@ -110,7 +116,10 @@ RecordConstructor [ SELECT ELEMENT [ OperatorExpr [ FieldAccessor [ - Variable [ Name=$i ] + FieldAccessor [ + Variable [ Name=$i ] + Field=l + ] Field=l_extendedprice ] * @@ -118,7 +127,10 @@ RecordConstructor [ LiteralExpr [LONG] [1] - FieldAccessor [ - Variable [ Name=$i ] + FieldAccessor [ + Variable [ Name=$i ] + Field=l + ] Field=l_discount ] ] @@ -127,15 +139,16 @@ RecordConstructor [ LiteralExpr [LONG] [1] + FieldAccessor [ - Variable [ Name=$i ] + FieldAccessor [ + Variable [ Name=$i ] + Field=l + ] Field=l_tax ] ] ] ] - FROM [ FunctionCall asterix.dataset@1[ - LiteralExpr [STRING] [l] - ] + FROM [ Variable [ Name=$g ] AS Variable [ Name=$i ] ] ) @@ -148,13 +161,14 @@ RecordConstructor [ ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=$i ] + FieldAccessor [ + Variable [ Name=$i ] + Field=l + ] Field=l_quantity ] ] - FROM [ FunctionCall asterix.dataset@1[ - LiteralExpr [STRING] [l] - ] + FROM [ Variable [ Name=$g ] AS Variable [ Name=$i ] ] ) @@ -167,13 +181,14 @@ RecordConstructor [ ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=$i ] + FieldAccessor [ + Variable [ Name=$i ] + Field=l + ] Field=l_extendedprice ] ] - FROM [ FunctionCall asterix.dataset@1[ - LiteralExpr [STRING] [l] - ] + FROM [ Variable [ Name=$g ] AS Variable [ Name=$i ] ] ) @@ -186,13 +201,14 @@ RecordConstructor [ ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=$i ] + FieldAccessor [ + Variable [ Name=$i ] + Field=l + ] Field=l_discount ] ] - FROM [ FunctionCall asterix.dataset@1[ - LiteralExpr [STRING] [l] - ] + FROM [ Variable [ Name=$g ] AS Variable [ Name=$i ] ] ) @@ -202,12 +218,7 @@ RecordConstructor [ LiteralExpr [STRING] [count_order] : FunctionCall asterix.count@1[ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [l] - Variable [ Name=$l_linestatus ] - Variable [ Name=$l_returnflag ] - Variable [ Name=#1 ] - ] + Variable [ Name=$g ] ] ) ] @@ -239,7 +250,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/ef1719e3/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q2.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q2.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q2.ast index d11b11c..5fe4817 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q2.ast +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q2.ast @@ -87,6 +87,7 @@ Groupby ( event:=Variable [ Name=$event ] sponsor:=Variable [ Name=$sponsor ] + es:=Variable [ Name=$es ] ) Let Variable [ Name=$sig_sponsorship_count ] @@ -94,17 +95,13 @@ Let Variable [ Name=$sig_sponsorship_count ] FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [es] - Variable [ Name=$sponsor ] - Variable [ Name=$event ] - Variable [ Name=$sig_name ] - Variable [ Name=#1 ] - Variable [ Name=#2 ] + FieldAccessor [ + Variable [ Name=#3 ] + Field=es ] ] FROM [ Variable [ Name=#1 ] - AS Variable [ Name=#2 ] + AS Variable [ Name=#3 ] ] ) ] @@ -129,7 +126,7 @@ Let Variable [ Name=$by_chapter ] Field=e ] ] - FROM [ Variable [ Name=#3 ] + FROM [ Variable [ Name=#2 ] AS Variable [ Name=#4 ] ] ) @@ -152,7 +149,7 @@ Let Variable [ Name=$by_chapter ] ] Field=chapter_name ] - GROUP AS Variable [ Name=#3 ] + GROUP AS Variable [ Name=#2 ] ( e:=Variable [ Name=$e ] ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue562.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue562.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue562.ast index f73b58d..370c903 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue562.ast +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue562.ast @@ -227,11 +227,7 @@ RecordConstructor [ LiteralExpr [STRING] [numcust] : FunctionCall asterix.count@1[ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [ct] - Variable [ Name=$cntrycode ] - Variable [ Name=#1 ] - ] + Variable [ Name=$g ] ] ) ( @@ -241,13 +237,14 @@ RecordConstructor [ ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=$i ] + FieldAccessor [ + Variable [ Name=$i ] + Field=ct + ] Field=c_acctbal ] ] - FROM [ FunctionCall asterix.dataset@1[ - LiteralExpr [STRING] [ct] - ] + FROM [ Variable [ Name=$g ] AS Variable [ Name=$i ] ] ) @@ -295,7 +292,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/ef1719e3/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/query-issue838.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/query-issue838.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/query-issue838.ast index 52aa967..abab286 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/query-issue838.ast +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/query-issue838.ast @@ -61,10 +61,9 @@ FROM [ FunctionCall asterix.dataset@1[ Let Variable [ Name=$circle ] := FunctionCall twitter.create-circle@2[ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [location] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$tweet ] - Variable [ Name=$sub ] + LiteralExpr [STRING] [location] ] LiteralExpr [DOUBLE] [30.0] ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization-above-join.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization-above-join.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization-above-join.ast index 70acd67..a37fcfa 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization-above-join.ast +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization-above-join.ast @@ -60,19 +60,12 @@ FROM [ FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [sim] : IndexAccessor [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [sim] - Variable [ Name=#5 ] - Variable [ Name=$lenLeft ] - Variable [ Name=$idLeft ] - Variable [ Name=$lenRight ] - Variable [ Name=$tokensLeft ] - Variable [ Name=$prefixTokenRight ] - Variable [ Name=$tokensRight ] - Variable [ Name=$paperLeft ] - Variable [ Name=$paperRight ] - Variable [ Name=$idRight ] - Variable [ Name=$prefixTokenLeft ] + FieldAccessor [ + IndexAccessor [ + Variable [ Name=$g ] + Index: LiteralExpr [LONG] [0] + ] + Field=sim ] Index: LiteralExpr [LONG] [0] ] @@ -85,17 +78,13 @@ FROM [ FunctionCall asterix.dataset@1[ AS Variable [ Name=$paperLeft ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensLeft] - Variable [ Name=$paperLeft ] - Variable [ Name=$paperRight ] ] LiteralExpr [LONG] [0] FunctionCall fuzzyjoin.prefix-len-jaccard@2[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [lenLeft] - Variable [ Name=$paperLeft ] - Variable [ Name=$paperRight ] ] LiteralExpr [FLOAT] [0.5] ] @@ -108,19 +97,13 @@ FROM [ FunctionCall asterix.dataset@1[ AS Variable [ Name=$paperRight ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensRight] - Variable [ Name=$paperLeft ] - Variable [ Name=$paperRight ] - Variable [ Name=$prefixTokenLeft ] ] LiteralExpr [LONG] [0] FunctionCall fuzzyjoin.prefix-len-jaccard@2[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [lenRight] - Variable [ Name=$paperLeft ] - Variable [ Name=$paperRight ] - Variable [ Name=$prefixTokenLeft ] ] LiteralExpr [FLOAT] [0.5] ] @@ -183,12 +166,12 @@ FROM [ FunctionCall asterix.dataset@1[ ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=#2 ] + Variable [ Name=#3 ] Field=paper ] ] FROM [ Variable [ Name=#1 ] - AS Variable [ Name=#2 ] + AS Variable [ Name=#3 ] ] ) ] @@ -198,7 +181,7 @@ FROM [ FunctionCall asterix.dataset@1[ ) AS Variable [ Name=$tokenRanked ] - AT + AT Variable [ Name=$i ] ] Where @@ -257,7 +240,7 @@ Variable [ Name=$i ] Variable [ Name=$tokenGroupped ] := Variable [ Name=$token ] - GROUP AS Variable [ Name=#3 ] + GROUP AS Variable [ Name=#2 ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] @@ -272,7 +255,7 @@ Variable [ Name=$i ] Field=paper ] ] - FROM [ Variable [ Name=#3 ] + FROM [ Variable [ Name=#2 ] AS Variable [ Name=#4 ] ] ) @@ -283,7 +266,7 @@ Variable [ Name=$i ] ) AS Variable [ Name=$tokenRanked ] - AT + AT Variable [ Name=$i ] ] Where @@ -348,12 +331,9 @@ Variable [ Name=$i ] Variable [ Name=$paperRight ] Field=id ] - GROUP AS Variable [ Name=#5 ] + GROUP AS Variable [ Name=$g ] ( - paperLeft:=Variable [ Name=$paperLeft ] - prefixTokenLeft:=Variable [ Name=$prefixTokenLeft ] - paperRight:=Variable [ Name=$paperRight ] - prefixTokenRight:=Variable [ Name=$prefixTokenRight ] + sim:=Variable [ Name=$sim ] ) ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/columnalias2.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/columnalias2.sqlpp b/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/columnalias2.sqlpp index f74cf47..2e82be5 100644 --- a/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/columnalias2.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/columnalias2.sqlpp @@ -17,8 +17,8 @@ * under the License. */ -SELECT SQRT(t.a*t.b) AS root FROM tbl_name root +SELECT sum(t.a*t.b) AS root FROM tbl_name root GROUP BY root.id -WITH u AS root.time -HAVING root.orders > 0 +WITH u AS min(root.time) +HAVING count(root.orders) > 0 ORDER BY u; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/2.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/2.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/2.ast index 9175953..a605028 100644 --- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/2.ast +++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/2.ast @@ -54,6 +54,7 @@ Groupby ( event:=Variable [ Name=$event ] sponsor:=Variable [ Name=$sponsor ] + es:=Variable [ Name=$es ] ) Let Variable [ Name=$sig_sponsorship_count ] @@ -61,17 +62,13 @@ Let Variable [ Name=$sig_sponsorship_count ] FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [es] - Variable [ Name=$sponsor ] - Variable [ Name=$event ] - Variable [ Name=$sig_name ] - Variable [ Name=#1 ] - Variable [ Name=#2 ] + FieldAccessor [ + Variable [ Name=#3 ] + Field=es ] ] FROM [ Variable [ Name=#1 ] - AS Variable [ Name=#2 ] + AS Variable [ Name=#3 ] ] ) ] @@ -91,19 +88,15 @@ Let Variable [ Name=$by_chapter ] FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [es] - Variable [ Name=#4 ] - Variable [ Name=$sponsor ] - Variable [ Name=$sig_sponsorship_count ] - Variable [ Name=$chapter_name ] - Variable [ Name=$event ] - Variable [ Name=$sig_name ] - Variable [ Name=#1 ] - Variable [ Name=#3 ] + FieldAccessor [ + FieldAccessor [ + Variable [ Name=#4 ] + Field=e + ] + Field=es ] ] - FROM [ Variable [ Name=#3 ] + FROM [ Variable [ Name=#2 ] AS Variable [ Name=#4 ] ] ) @@ -126,7 +119,7 @@ Let Variable [ Name=$by_chapter ] ] Field=chapter_name ] - GROUP AS Variable [ Name=#3 ] + GROUP AS Variable [ Name=#2 ] ( e:=Variable [ Name=$e ] ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/LetFor.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/LetFor.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/LetFor.ast index 5adaa1e..cf95f08 100644 --- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/LetFor.ast +++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/LetFor.ast @@ -1,7 +1,7 @@ Query: Let Variable [ Name=$users ] := - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [User] ] SELECT ELEMENT [ http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias.ast index 3bcc2ab..9c5aaf5 100644 --- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias.ast +++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias.ast @@ -1,28 +1,6 @@ Query: SELECT [ -FunctionCall null.sqrt@1[ - OperatorExpr [ - FieldAccessor [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [t] - Variable [ Name=$u ] - Variable [ Name=$root ] - Variable [ Name=#1 ] - ] - Field=a - ] - * - FieldAccessor [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [t] - Variable [ Name=$u ] - Variable [ Name=$root ] - Variable [ Name=#1 ] - ] - Field=b - ] - ] -] +Variable [ Name=$root ] root ] FROM [ FunctionCall asterix.dataset@1[ http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias2.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias2.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias2.ast index 1ffd234..563b883 100644 --- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias2.ast +++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias2.ast @@ -1,27 +1,36 @@ Query: SELECT [ -FunctionCall null.sqrt@1[ - OperatorExpr [ - FieldAccessor [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [t] - Variable [ Name=$u ] - Variable [ Name=#1 ] - Variable [ Name=$id ] +FunctionCall asterix.sql-sum@1[ + ( + SELECT ELEMENT [ + OperatorExpr [ + FieldAccessor [ + FieldAccessor [ + FieldAccessor [ + Variable [ Name=#4 ] + Field=root + ] + Field=t + ] + Field=a ] - Field=a - ] - * - FieldAccessor [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [t] - Variable [ Name=$u ] - Variable [ Name=#1 ] - Variable [ Name=$id ] + * + FieldAccessor [ + FieldAccessor [ + FieldAccessor [ + Variable [ Name=#4 ] + Field=root + ] + Field=t + ] + Field=b ] - Field=b ] - ] + ] + FROM [ Variable [ Name=#1 ] + AS Variable [ Name=#4 ] + ] + ) ] root ] @@ -44,24 +53,39 @@ Groupby Let Variable [ Name=$u ] := - FieldAccessor [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [root] - Variable [ Name=#1 ] - Variable [ Name=$id ] - ] - Field=time + FunctionCall asterix.sql-min@1[ + ( + SELECT ELEMENT [ + FieldAccessor [ + FieldAccessor [ + Variable [ Name=#2 ] + Field=root + ] + Field=time + ] + ] + FROM [ Variable [ Name=#1 ] + AS Variable [ Name=#2 ] + ] + ) ] HAVING OperatorExpr [ - FieldAccessor [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [root] - Variable [ Name=$u ] - Variable [ Name=#1 ] - Variable [ Name=$id ] - ] - Field=orders + FunctionCall asterix.sql-count@1[ + ( + SELECT ELEMENT [ + FieldAccessor [ + FieldAccessor [ + Variable [ Name=#3 ] + Field=root + ] + Field=orders + ] + ] + FROM [ Variable [ Name=#1 ] + AS Variable [ Name=#3 ] + ] + ) ] > LiteralExpr [LONG] [0] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias3.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias3.ast index 83a3894..6db92c9 100644 --- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias3.ast +++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias3.ast @@ -4,29 +4,7 @@ RecordConstructor [ ( LiteralExpr [STRING] [root] : - FunctionCall null.sqrt@1[ - OperatorExpr [ - FieldAccessor [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [t] - Variable [ Name=$u ] - Variable [ Name=$root ] - Variable [ Name=#1 ] - ] - Field=a - ] - * - FieldAccessor [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [t] - Variable [ Name=$u ] - Variable [ Name=$root ] - Variable [ Name=#1 ] - ] - Field=b - ] - ] - ] + Variable [ Name=$root ] ) ] ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/functionDecl1.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/functionDecl1.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/functionDecl1.ast index 3df40fc..6c92c37 100644 --- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/functionDecl1.ast +++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/functionDecl1.ast @@ -102,7 +102,7 @@ Query: Let Variable [ Name=$result ] := FunctionCall null.calculate@1[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [Events] ] ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR.ast index 695e4c6..b43814a 100644 --- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR.ast +++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR.ast @@ -14,7 +14,7 @@ RecordConstructor [ FROM [ ( Let Variable [ Name=$data ] := - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [User] ] SELECT ELEMENT [ http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR3.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR3.ast index 927c7f8..f4d8694 100644 --- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR3.ast +++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR3.ast @@ -54,6 +54,7 @@ Groupby ( event:=Variable [ Name=$event ] sponsor:=Variable [ Name=$sponsor ] + es:=Variable [ Name=$es ] ) Let Variable [ Name=$sig_sponsorship_count ] @@ -61,17 +62,13 @@ Let Variable [ Name=$sig_sponsorship_count ] FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [es] - Variable [ Name=$sponsor ] - Variable [ Name=$event ] - Variable [ Name=$sig_name ] - Variable [ Name=#1 ] - Variable [ Name=#2 ] + FieldAccessor [ + Variable [ Name=#3 ] + Field=es ] ] FROM [ Variable [ Name=#1 ] - AS Variable [ Name=#2 ] + AS Variable [ Name=#3 ] ] ) ] @@ -91,19 +88,15 @@ Let Variable [ Name=$by_chapter ] FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [es] - Variable [ Name=#4 ] - Variable [ Name=$sponsor ] - Variable [ Name=$sig_sponsorship_count ] - Variable [ Name=$chapter_name ] - Variable [ Name=$event ] - Variable [ Name=$sig_name ] - Variable [ Name=#1 ] - Variable [ Name=#3 ] + FieldAccessor [ + FieldAccessor [ + Variable [ Name=#4 ] + Field=e + ] + Field=es ] ] - FROM [ Variable [ Name=#3 ] + FROM [ Variable [ Name=#2 ] AS Variable [ Name=#4 ] ] ) @@ -126,7 +119,7 @@ Let Variable [ Name=$by_chapter ] ] Field=chapter_name ] - GROUP AS Variable [ Name=#3 ] + GROUP AS Variable [ Name=#2 ] ( e:=Variable [ Name=$e ] ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_09/join_q_09.2.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_09/join_q_09.2.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_09/join_q_09.2.query.sqlpp index 49aa67f..32071ee 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_09/join_q_09.2.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_09/join_q_09.2.query.sqlpp @@ -17,10 +17,10 @@ * under the License. */ -/** This query is a negative test for ambiguous alias reference. */ +/** This query is a test for ambiguous alias reference. */ SELECT c.name AS cust_name, - age AS cust_age, + age AS age, o.total AS order_total, [o.oid,o.cid] AS orderList FROM test.Customers c, test.Orders o http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-4/q2-4.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-4/q2-4.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-4/q2-4.3.query.sqlpp index a16706d..7aa1ca9 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-4/q2-4.3.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-4/q2-4.3.query.sqlpp @@ -29,11 +29,11 @@ SELECT sig_id, COUNT(1) total_count, ( SELECT chapter_name, COUNT(e) AS escount FROM es AS e - GROUP BY chapter_name + GROUP BY sponsor.chapter_name ) chapter_breakdown FROM Event, Event.sponsoring_sigs AS sponsor -GROUP BY sig_id GROUP AS es +GROUP BY sponsor.sig_id GROUP AS es ORDER BY total_count DESC LIMIT 5 ; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-3_1.1/dblp-3_1.1.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-3_1.1/dblp-3_1.1.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-3_1.1/dblp-3_1.1.3.query.sqlpp index 5e0785e..8adf8dd 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-3_1.1/dblp-3_1.1.3.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-3_1.1/dblp-3_1.1.3.query.sqlpp @@ -62,7 +62,7 @@ from ( sim as fuzzyjoin.`similarity-jaccard-prefix`(lenLeft,tokensLeft,lenRight,tokensRight,prefixTokenLeft,0.500000f) where ((prefixTokenLeft = prefixTokenRight) and ((sim >= 0.500000f) and (paperLeft.id < paperRight.id))) /* +hash */ - group by paperLeft.id as idLeft,paperRight.id as idRight + group by paperLeft.id as idLeft,paperRight.id as idRight,sim as sim ) as ridpair, DBLP as paperLeft, DBLP as paperRight http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-3_1.2/dblp-3_1.2.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-3_1.2/dblp-3_1.2.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-3_1.2/dblp-3_1.2.3.query.sqlpp index 5e0785e..8adf8dd 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-3_1.2/dblp-3_1.2.3.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-3_1.2/dblp-3_1.2.3.query.sqlpp @@ -62,7 +62,7 @@ from ( sim as fuzzyjoin.`similarity-jaccard-prefix`(lenLeft,tokensLeft,lenRight,tokensRight,prefixTokenLeft,0.500000f) where ((prefixTokenLeft = prefixTokenRight) and ((sim >= 0.500000f) and (paperLeft.id < paperRight.id))) /* +hash */ - group by paperLeft.id as idLeft,paperRight.id as idRight + group by paperLeft.id as idLeft,paperRight.id as idRight,sim as sim ) as ridpair, DBLP as paperLeft, DBLP as paperRight http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-3_1/dblp-3_1.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-3_1/dblp-3_1.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-3_1/dblp-3_1.3.query.sqlpp index dd94d30..d9e5106 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-3_1/dblp-3_1.3.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-3_1/dblp-3_1.3.query.sqlpp @@ -61,7 +61,7 @@ from DBLP as paperLeft, ), sim as fuzzyjoin.`similarity-jaccard-prefix`(lenLeft,tokensLeft,lenRight,tokensRight,prefixTokenLeft,0.500000f) where ((prefixTokenLeft = prefixTokenRight) and ((sim >= 0.500000f) and (paperLeft.id < paperRight.id))) - group by paperLeft.id as idLeft,paperRight.id as idRight + group by paperLeft.id as idLeft,paperRight.id as idRight,sim as sim ) as ridpair where ((ridpair.idLeft = paperLeft.id) and (ridpair.idRight = paperRight.id)) order by paperLeft.id,paperRight.id http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_5.1/dblp-csx-2_5.1.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_5.1/dblp-csx-2_5.1.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_5.1/dblp-csx-2_5.1.3.query.sqlpp index 1d1735c..21b0d5b 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_5.1/dblp-csx-2_5.1.3.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_5.1/dblp-csx-2_5.1.3.query.sqlpp @@ -65,6 +65,6 @@ with idDBLP as paperDBLP.id, ), sim as fuzzyjoin.`similarity-jaccard-prefix`(lenDBLP,tokensDBLP,lenCSX,tokensCSX,prefixTokenDBLP,0.500000f) where ((prefixTokenDBLP = prefixTokenCSX) and (sim >= 0.500000f)) -group by idDBLP as idDBLP,idCSX as idCSX +group by idDBLP as idDBLP,idCSX as idCSX,sim as sim order by idDBLP,idCSX ; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_5.2/dblp-csx-2_5.2.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_5.2/dblp-csx-2_5.2.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_5.2/dblp-csx-2_5.2.3.query.sqlpp index f17649b..deea71d 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_5.2/dblp-csx-2_5.2.3.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_5.2/dblp-csx-2_5.2.3.query.sqlpp @@ -66,6 +66,6 @@ with idDBLP as paperDBLP.id, sim as fuzzyjoin.`similarity-jaccard-prefix`(lenDBLP,tokensDBLP,lenCSX,tokensCSX,prefixTokenDBLP,0.500000f) where ((prefixTokenDBLP = prefixTokenCSX) and (sim >= 0.500000f)) /* +hash */ -group by idDBLP as idDBLP,idCSX as idCSX +group by idDBLP as idDBLP,idCSX as idCSX,sim as sim order by idDBLP,idCSX ; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_5.3/dblp-csx-2_5.3.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_5.3/dblp-csx-2_5.3.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_5.3/dblp-csx-2_5.3.3.query.sqlpp index f17649b..deea71d 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_5.3/dblp-csx-2_5.3.3.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_5.3/dblp-csx-2_5.3.3.query.sqlpp @@ -66,6 +66,6 @@ with idDBLP as paperDBLP.id, sim as fuzzyjoin.`similarity-jaccard-prefix`(lenDBLP,tokensDBLP,lenCSX,tokensCSX,prefixTokenDBLP,0.500000f) where ((prefixTokenDBLP = prefixTokenCSX) and (sim >= 0.500000f)) /* +hash */ -group by idDBLP as idDBLP,idCSX as idCSX +group by idDBLP as idDBLP,idCSX as idCSX,sim as sim order by idDBLP,idCSX ; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.1/dblp-csx-3_5.1.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.1/dblp-csx-3_5.1.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.1/dblp-csx-3_5.1.3.query.sqlpp index 2241df2..d85c7d3 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.1/dblp-csx-3_5.1.3.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.1/dblp-csx-3_5.1.3.query.sqlpp @@ -67,7 +67,7 @@ from ( ), sim as fuzzyjoin.`similarity-jaccard-prefix`(lenDBLP,tokensDBLP,lenCSX,tokensCSX,prefixTokenDBLP,0.500000f) where ((prefixTokenDBLP = prefixTokenCSX) and (sim >= 0.500000f)) - group by idDBLP as idDBLP,idCSX as idCSX + group by idDBLP as idDBLP,idCSX as idCSX,sim as sim ) as ridpair, DBLP as paperDBLP, CSX as paperCSX http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.2/dblp-csx-3_5.2.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.2/dblp-csx-3_5.2.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.2/dblp-csx-3_5.2.3.query.sqlpp index 0c69632..1238a9d 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.2/dblp-csx-3_5.2.3.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.2/dblp-csx-3_5.2.3.query.sqlpp @@ -68,7 +68,7 @@ from ( sim as fuzzyjoin.`similarity-jaccard-prefix`(lenDBLP,tokensDBLP,lenCSX,tokensCSX,prefixTokenDBLP,0.500000f) where ((prefixTokenDBLP = prefixTokenCSX) and (sim >= 0.500000f)) /* +hash */ - group by idDBLP as idDBLP,idCSX as idCSX + group by idDBLP as idDBLP,idCSX as idCSX,sim as sim ) as ridpair, DBLP as paperDBLP, CSX as paperCSX http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.3.1/dblp-csx-3_5.3.1.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.3.1/dblp-csx-3_5.3.1.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.3.1/dblp-csx-3_5.3.1.3.query.sqlpp index 0c69632..1238a9d 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.3.1/dblp-csx-3_5.3.1.3.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.3.1/dblp-csx-3_5.3.1.3.query.sqlpp @@ -68,7 +68,7 @@ from ( sim as fuzzyjoin.`similarity-jaccard-prefix`(lenDBLP,tokensDBLP,lenCSX,tokensCSX,prefixTokenDBLP,0.500000f) where ((prefixTokenDBLP = prefixTokenCSX) and (sim >= 0.500000f)) /* +hash */ - group by idDBLP as idDBLP,idCSX as idCSX + group by idDBLP as idDBLP,idCSX as idCSX,sim as sim ) as ridpair, DBLP as paperDBLP, CSX as paperCSX http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.4.1/dblp-csx-3_5.4.1.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.4.1/dblp-csx-3_5.4.1.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.4.1/dblp-csx-3_5.4.1.3.query.sqlpp index b9c649a..578d7c1 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.4.1/dblp-csx-3_5.4.1.3.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.4.1/dblp-csx-3_5.4.1.3.query.sqlpp @@ -72,7 +72,7 @@ from CSX as paperCSX, sim as fuzzyjoin.`similarity-jaccard-prefix`(lenDBLP,tokensDBLP,lenCSX,tokensCSX,prefixTokenDBLP,0.500000f) where ((prefixTokenDBLP = prefixTokenCSX) and (sim >= 0.500000f)) /* +hash */ - group by idDBLP as idDBLP,idCSX as idCSX + group by idDBLP as idDBLP,idCSX as idCSX,sim as sim ) as ridpair where (ridpair.idDBLP = paperDBLP.id) ) as paperDBLPridpair
