http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_negative_2/union_negative_2.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_negative_2/union_negative_2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_negative_2/union_negative_2.1.ddl.sqlpp deleted file mode 100644 index 4174a77..0000000 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_negative_2/union_negative_2.1.ddl.sqlpp +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -drop dataverse TinySocial if exists; -create dataverse TinySocial; - -use TinySocial; - - -create type TinySocial.FacebookUserType as -{ - id : bigint -}; - -create type TinySocial.FacebookMessageType as -{ - `message-id` : bigint -}; - -create dataset FacebookUsers(FacebookUserType) primary key id; - -create dataset FacebookMessages(FacebookMessageType) primary key `message-id`; -
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_negative_2/union_negative_2.2.update.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_negative_2/union_negative_2.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_negative_2/union_negative_2.2.update.sqlpp deleted file mode 100644 index ccd33a5..0000000 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_negative_2/union_negative_2.2.update.sqlpp +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -use TinySocial; - - -load dataset FacebookUsers using localfs ((`path`=`asterix_nc1://data/tinysocial/fbu.adm`),(`format`=`adm`)); - -load dataset FacebookMessages using localfs ((`path`=`asterix_nc1://data/tinysocial/fbm.adm`),(`format`=`adm`)); - http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_negative_2/union_negative_2.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_negative_2/union_negative_2.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_negative_2/union_negative_2.3.query.sqlpp deleted file mode 100644 index bd68de8..0000000 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_negative_2/union_negative_2.3.query.sqlpp +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -USE TinySocial; - -SELECT t.id id -FROM FacebookUsers AS t -UNION ALL -SELECT s.`message-id` id -FROM FacebookMessages AS s -UNION ALL -SELECT t.name id -FROM FacebookUsers AS t -ORDER BY t.id; // There is certainly no field called "t" in the union all results. http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_order_by_5/union_orderby_5.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_order_by_5/union_orderby_5.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_order_by_5/union_orderby_5.1.ddl.sqlpp new file mode 100644 index 0000000..4174a77 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_order_by_5/union_orderby_5.1.ddl.sqlpp @@ -0,0 +1,39 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +drop dataverse TinySocial if exists; +create dataverse TinySocial; + +use TinySocial; + + +create type TinySocial.FacebookUserType as +{ + id : bigint +}; + +create type TinySocial.FacebookMessageType as +{ + `message-id` : bigint +}; + +create dataset FacebookUsers(FacebookUserType) primary key id; + +create dataset FacebookMessages(FacebookMessageType) primary key `message-id`; + http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_order_by_5/union_orderby_5.2.update.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_order_by_5/union_orderby_5.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_order_by_5/union_orderby_5.2.update.sqlpp new file mode 100644 index 0000000..ccd33a5 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_order_by_5/union_orderby_5.2.update.sqlpp @@ -0,0 +1,26 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +use TinySocial; + + +load dataset FacebookUsers using localfs ((`path`=`asterix_nc1://data/tinysocial/fbu.adm`),(`format`=`adm`)); + +load dataset FacebookMessages using localfs ((`path`=`asterix_nc1://data/tinysocial/fbm.adm`),(`format`=`adm`)); + http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_order_by_5/union_orderby_5.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_order_by_5/union_orderby_5.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_order_by_5/union_orderby_5.3.query.sqlpp new file mode 100644 index 0000000..b527e71 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_order_by_5/union_orderby_5.3.query.sqlpp @@ -0,0 +1,30 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +USE TinySocial; + +SELECT t.id id +FROM FacebookUsers AS t +UNION ALL +SELECT s.`message-id` id +FROM FacebookMessages AS s +UNION ALL +SELECT t.name id +FROM FacebookUsers AS t +ORDER BY t.id, id; // There is certainly no field called "t" in the union all results. http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results/dapd/q2-7/q2-7.1.adm ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/dapd/q2-7/q2-7.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/dapd/q2-7/q2-7.1.adm index 5839a99..5adf5db 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results/dapd/q2-7/q2-7.1.adm +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/dapd/q2-7/q2-7.1.adm @@ -1,2 +1,2 @@ -{ "sig_id": 14, "total_count": 3, "chapter_breakdown": [ { "chapter_name": "Laguna Beach", "$2": [ { "e": { "Event": { "event_id": 1023, "name": "Art Opening: Southern Orange County Beaches", "organizers": {{ { "name": "Jane Smith" } }}, "sponsoring_sigs": [ { "sig_id": 14, "chapter_name": "San Clemente" }, { "sig_id": 14, "chapter_name": "Laguna Beach" } ], "interest_keywords": {{ "art", "landscape", "nature", "vernissage" }}, "start_time": datetime("2011-02-24T02:00:00.000Z"), "end_time": datetime("2011-02-24T05:00:00.000Z") }, "sponsor": { "sig_id": 14, "chapter_name": "Laguna Beach" } } }, { "e": { "Event": { "event_id": 1042, "name": "Orange County Landmarks", "organizers": {{ { "name": "John Smith" } }}, "sponsoring_sigs": [ { "sig_id": 14, "chapter_name": "Laguna Beach" } ], "interest_keywords": {{ "architecture", "photography" }}, "price": 10.0, "start_time": datetime("2011-02-24T01:00:00.000Z"), "end_time": datetime("2011-02-24T03:00:00.000Z") }, "sponsor": { "sig_id": 14, "chapter_name": "Laguna Beach" } } } ] }, { "chapter_name": "San Clemente", "$2": [ { "e": { "Event": { "event_id": 1023, "name": "Art Opening: Southern Orange County Beaches", "organizers": {{ { "name": "Jane Smith" } }}, "sponsoring_sigs": [ { "sig_id": 14, "chapter_name": "San Clemente" }, { "sig_id": 14, "chapter_name": "Laguna Beach" } ], "interest_keywords": {{ "art", "landscape", "nature", "vernissage" }}, "start_time": datetime("2011-02-24T02:00:00.000Z"), "end_time": datetime("2011-02-24T05:00:00.000Z") }, "sponsor": { "sig_id": 14, "chapter_name": "San Clemente" } } } ] } ] } -{ "sig_id": 31, "total_count": 1, "chapter_breakdown": [ { "chapter_name": "Huntington Beach", "$2": [ { "e": { "Event": { "event_id": 941, "name": "Intro to Scuba Diving", "organizers": {{ { "name": "Joseph Surfer", "affiliation": "Huntington Beach Scuba Assoc." } }}, "sponsoring_sigs": [ { "sig_id": 31, "chapter_name": "Huntington Beach" } ], "interest_keywords": {{ "scuba", "diving", "aquatics" }}, "price": 40.0, "start_time": datetime("2010-10-16T17:00:00.000Z"), "end_time": datetime("2010-10-16T20:00:00.000Z") }, "sponsor": { "sig_id": 31, "chapter_name": "Huntington Beach" } } } ] } ] } +{ "sig_id": 14, "total_count": 3, "chapter_breakdown": [ { "chapter_name": "Laguna Beach", "$1": [ { "e": { "Event": { "event_id": 1023, "name": "Art Opening: Southern Orange County Beaches", "organizers": {{ { "name": "Jane Smith" } }}, "sponsoring_sigs": [ { "sig_id": 14, "chapter_name": "San Clemente" }, { "sig_id": 14, "chapter_name": "Laguna Beach" } ], "interest_keywords": {{ "art", "landscape", "nature", "vernissage" }}, "start_time": datetime("2011-02-24T02:00:00.000Z"), "end_time": datetime("2011-02-24T05:00:00.000Z") }, "sponsor": { "sig_id": 14, "chapter_name": "Laguna Beach" } } }, { "e": { "Event": { "event_id": 1042, "name": "Orange County Landmarks", "organizers": {{ { "name": "John Smith" } }}, "sponsoring_sigs": [ { "sig_id": 14, "chapter_name": "Laguna Beach" } ], "interest_keywords": {{ "architecture", "photography" }}, "price": 10.0, "start_time": datetime("2011-02-24T01:00:00.000Z"), "end_time": datetime("2011-02-24T03:00:00.000Z") }, "sponsor": { "sig_id": 14, "chapter_name": "Laguna Beach" } } } ] }, { "chapter_name": "San Clemente", "$1": [ { "e": { "Event": { "event_id": 1023, "name": "Art Opening: Southern Orange County Beaches", "organizers": {{ { "name": "Jane Smith" } }}, "sponsoring_sigs": [ { "sig_id": 14, "chapter_name": "San Clemente" }, { "sig_id": 14, "chapter_name": "Laguna Beach" } ], "interest_keywords": {{ "art", "landscape", "nature", "vernissage" }}, "start_time": datetime("2011-02-24T02:00:00.000Z"), "end_time": datetime("2011-02-24T05:00:00.000Z") }, "sponsor": { "sig_id": 14, "chapter_name": "San Clemente" } } } ] } ] } +{ "sig_id": 31, "total_count": 1, "chapter_breakdown": [ { "chapter_name": "Huntington Beach", "$1": [ { "e": { "Event": { "event_id": 941, "name": "Intro to Scuba Diving", "organizers": {{ { "name": "Joseph Surfer", "affiliation": "Huntington Beach Scuba Assoc." } }}, "sponsoring_sigs": [ { "sig_id": 31, "chapter_name": "Huntington Beach" } ], "interest_keywords": {{ "scuba", "diving", "aquatics" }}, "price": 40.0, "start_time": datetime("2010-10-16T17:00:00.000Z"), "end_time": datetime("2010-10-16T20:00:00.000Z") }, "sponsor": { "sig_id": 31, "chapter_name": "Huntington Beach" } } } ] } ] } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results/explain/explain_field_access/explain_field_access.1.adm ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/explain/explain_field_access/explain_field_access.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/explain/explain_field_access/explain_field_access.1.adm index 5f6b71d..5f25e64 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results/explain/explain_field_access/explain_field_access.1.adm +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/explain/explain_field_access/explain_field_access.1.adm @@ -1,44 +1,44 @@ -distribute result [$$17] +distribute result [$$36] -- DISTRIBUTE_RESULT |PARTITIONED| exchange -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - project ([$$17]) + project ([$$36]) -- STREAM_PROJECT |PARTITIONED| - assign [$$17] <- [{"deptId": $#1, "star_cost": $$20}] + assign [$$36] <- [{"deptId": $#1, "star_cost": $$39}] -- ASSIGN |PARTITIONED| exchange -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - group by ([$#1 := $$25]) decor ([]) { - aggregate [$$20] <- [agg-sql-sum($$24)] + group by ([$#1 := $$44]) decor ([]) { + aggregate [$$39] <- [agg-sql-sum($$43)] -- AGGREGATE |LOCAL| nested tuple source -- NESTED_TUPLE_SOURCE |LOCAL| } - -- SORT_GROUP_BY[$$25] |PARTITIONED| + -- SORT_GROUP_BY[$$44] |PARTITIONED| exchange - -- HASH_PARTITION_EXCHANGE [$$25] |PARTITIONED| - group by ([$$25 := $$18]) decor ([]) { - aggregate [$$24] <- [agg-local-sql-sum($$15)] + -- HASH_PARTITION_EXCHANGE [$$44] |PARTITIONED| + group by ([$$44 := $$37]) decor ([]) { + aggregate [$$43] <- [agg-local-sql-sum($$34)] -- AGGREGATE |LOCAL| nested tuple source -- NESTED_TUPLE_SOURCE |LOCAL| } - -- SORT_GROUP_BY[$$18] |PARTITIONED| + -- SORT_GROUP_BY[$$37] |PARTITIONED| exchange -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - project ([$$15, $$18]) + project ([$$34, $$37]) -- STREAM_PROJECT |PARTITIONED| - assign [$$18] <- [substring($$22.getField("department_id"), 1)] + assign [$$37] <- [substring($$41.getField("department_id"), 1)] -- ASSIGN |PARTITIONED| - project ([$$15, $$22]) + project ([$$34, $$41]) -- STREAM_PROJECT |PARTITIONED| - assign [$$15, $$22] <- [$$e.getField("salary"), $$e.getField("dept")] + assign [$$34, $$41] <- [$$e.getField("salary"), $$e.getField("dept")] -- ASSIGN |PARTITIONED| project ([$$e]) -- STREAM_PROJECT |PARTITIONED| exchange -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - data-scan []<-[$$19, $$e] <- gby.Employee + data-scan []<-[$$38, $$e] <- gby.Employee -- DATASOURCE_SCAN |PARTITIONED| exchange -- ONE_TO_ONE_EXCHANGE |PARTITIONED| http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results/explain/explain_field_access_closed/explain_field_access_closed.1.adm ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/explain/explain_field_access_closed/explain_field_access_closed.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/explain/explain_field_access_closed/explain_field_access_closed.1.adm index c984482..92df490 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results/explain/explain_field_access_closed/explain_field_access_closed.1.adm +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/explain/explain_field_access_closed/explain_field_access_closed.1.adm @@ -1,40 +1,40 @@ -distribute result [$$16] +distribute result [$$35] -- DISTRIBUTE_RESULT |PARTITIONED| exchange -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - project ([$$16]) + project ([$$35]) -- STREAM_PROJECT |PARTITIONED| - assign [$$16] <- [{"deptId": $#1, "star_cost": $$19}] + assign [$$35] <- [{"deptId": $#1, "star_cost": $$38}] -- ASSIGN |PARTITIONED| exchange -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - group by ([$#1 := $$23]) decor ([]) { - aggregate [$$19] <- [agg-sql-sum($$22)] + group by ([$#1 := $$42]) decor ([]) { + aggregate [$$38] <- [agg-sql-sum($$41)] -- AGGREGATE |LOCAL| nested tuple source -- NESTED_TUPLE_SOURCE |LOCAL| } - -- SORT_GROUP_BY[$$23] |PARTITIONED| + -- SORT_GROUP_BY[$$42] |PARTITIONED| exchange - -- HASH_PARTITION_EXCHANGE [$$23] |PARTITIONED| - group by ([$$23 := $$17]) decor ([]) { - aggregate [$$22] <- [agg-local-sql-sum($$14)] + -- HASH_PARTITION_EXCHANGE [$$42] |PARTITIONED| + group by ([$$42 := $$36]) decor ([]) { + aggregate [$$41] <- [agg-local-sql-sum($$33)] -- AGGREGATE |LOCAL| nested tuple source -- NESTED_TUPLE_SOURCE |LOCAL| } - -- SORT_GROUP_BY[$$17] |PARTITIONED| + -- SORT_GROUP_BY[$$36] |PARTITIONED| exchange -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - project ([$$14, $$17]) + project ([$$33, $$36]) -- STREAM_PROJECT |PARTITIONED| - assign [$$17, $$14] <- [substring($$e.getField(1), 1), $$e.getField(2)] + assign [$$36, $$33] <- [substring($$e.getField(1), 1), $$e.getField(2)] -- ASSIGN |PARTITIONED| project ([$$e]) -- STREAM_PROJECT |PARTITIONED| exchange -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - data-scan []<-[$$18, $$e] <- gby.Employee + data-scan []<-[$$37, $$e] <- gby.Employee -- DATASOURCE_SCAN |PARTITIONED| exchange -- ONE_TO_ONE_EXCHANGE |PARTITIONED| http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results/misc/query-ASTERIXDB-1577/query-ASTERIXDB-1577.3.adm ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/misc/query-ASTERIXDB-1577/query-ASTERIXDB-1577.3.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/misc/query-ASTERIXDB-1577/query-ASTERIXDB-1577.3.adm new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataset_with_index/single_dataset_with_index.13.adm ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataset_with_index/single_dataset_with_index.13.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataset_with_index/single_dataset_with_index.13.adm index a76e980..2a155f9 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataset_with_index/single_dataset_with_index.13.adm +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataset_with_index/single_dataset_with_index.13.adm @@ -5,28 +5,28 @@ distribute result [$$l] project ([$$l]) -- STREAM_PROJECT |PARTITIONED| exchange - -- SORT_MERGE_EXCHANGE [$$7(ASC), $$8(ASC) ] |PARTITIONED| + -- SORT_MERGE_EXCHANGE [$$14(ASC), $$15(ASC) ] |PARTITIONED| select (eq($$l.getField(10), "1994-01-20")) -- STREAM_SELECT |PARTITIONED| exchange -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - unnest-map [$$7, $$8, $$l] <- index-search("LineItem", 0, "tpch", "LineItem", FALSE, FALSE, 2, $$15, $$16, 2, $$15, $$16, TRUE, TRUE, TRUE) + unnest-map [$$14, $$15, $$l] <- index-search("LineItem", 0, "tpch", "LineItem", FALSE, FALSE, 2, $$22, $$23, 2, $$22, $$23, TRUE, TRUE, TRUE) -- BTREE_SEARCH |PARTITIONED| exchange -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - order (ASC, $$15) (ASC, $$16) - -- STABLE_SORT [$$15(ASC), $$16(ASC)] |PARTITIONED| + order (ASC, $$22) (ASC, $$23) + -- STABLE_SORT [$$22(ASC), $$23(ASC)] |PARTITIONED| exchange -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - project ([$$15, $$16]) + project ([$$22, $$23]) -- STREAM_PROJECT |PARTITIONED| exchange -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - unnest-map [$$14, $$15, $$16] <- index-search("lineitem_shipdateIx", 0, "tpch", "LineItem", FALSE, FALSE, 1, $$12, 1, $$13, TRUE, TRUE, TRUE) + unnest-map [$$21, $$22, $$23] <- index-search("lineitem_shipdateIx", 0, "tpch", "LineItem", FALSE, FALSE, 1, $$19, 1, $$20, TRUE, TRUE, TRUE) -- BTREE_SEARCH |PARTITIONED| exchange -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - assign [$$12, $$13] <- ["1994-01-20", "1994-01-20"] + assign [$$19, $$20] <- ["1994-01-20", "1994-01-20"] -- ASSIGN |PARTITIONED| empty-tuple-source -- EMPTY_TUPLE_SOURCE |PARTITIONED| http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataset_with_index/single_dataset_with_index.8.adm ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataset_with_index/single_dataset_with_index.8.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataset_with_index/single_dataset_with_index.8.adm index a76e980..2a155f9 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataset_with_index/single_dataset_with_index.8.adm +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataset_with_index/single_dataset_with_index.8.adm @@ -5,28 +5,28 @@ distribute result [$$l] project ([$$l]) -- STREAM_PROJECT |PARTITIONED| exchange - -- SORT_MERGE_EXCHANGE [$$7(ASC), $$8(ASC) ] |PARTITIONED| + -- SORT_MERGE_EXCHANGE [$$14(ASC), $$15(ASC) ] |PARTITIONED| select (eq($$l.getField(10), "1994-01-20")) -- STREAM_SELECT |PARTITIONED| exchange -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - unnest-map [$$7, $$8, $$l] <- index-search("LineItem", 0, "tpch", "LineItem", FALSE, FALSE, 2, $$15, $$16, 2, $$15, $$16, TRUE, TRUE, TRUE) + unnest-map [$$14, $$15, $$l] <- index-search("LineItem", 0, "tpch", "LineItem", FALSE, FALSE, 2, $$22, $$23, 2, $$22, $$23, TRUE, TRUE, TRUE) -- BTREE_SEARCH |PARTITIONED| exchange -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - order (ASC, $$15) (ASC, $$16) - -- STABLE_SORT [$$15(ASC), $$16(ASC)] |PARTITIONED| + order (ASC, $$22) (ASC, $$23) + -- STABLE_SORT [$$22(ASC), $$23(ASC)] |PARTITIONED| exchange -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - project ([$$15, $$16]) + project ([$$22, $$23]) -- STREAM_PROJECT |PARTITIONED| exchange -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - unnest-map [$$14, $$15, $$16] <- index-search("lineitem_shipdateIx", 0, "tpch", "LineItem", FALSE, FALSE, 1, $$12, 1, $$13, TRUE, TRUE, TRUE) + unnest-map [$$21, $$22, $$23] <- index-search("lineitem_shipdateIx", 0, "tpch", "LineItem", FALSE, FALSE, 1, $$19, 1, $$20, TRUE, TRUE, TRUE) -- BTREE_SEARCH |PARTITIONED| exchange -- ONE_TO_ONE_EXCHANGE |PARTITIONED| - assign [$$12, $$13] <- ["1994-01-20", "1994-01-20"] + assign [$$19, $$20] <- ["1994-01-20", "1994-01-20"] -- ASSIGN |PARTITIONED| empty-tuple-source -- EMPTY_TUPLE_SOURCE |PARTITIONED| http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results/resolution/groupby_rename_with_sugar/groupby_rename_with_sugar.3.adm ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/resolution/groupby_rename_with_sugar/groupby_rename_with_sugar.3.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/resolution/groupby_rename_with_sugar/groupby_rename_with_sugar.3.adm new file mode 100644 index 0000000..d575d7f --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/resolution/groupby_rename_with_sugar/groupby_rename_with_sugar.3.adm @@ -0,0 +1,3 @@ +{ "g": [ { "ord": { "oid": 100, "pid": 0, "amount": 1 } }, { "ord": { "oid": 104, "pid": 0, "amount": 6 } } ], "pid": 0, "s": 7 } +{ "g": [ { "ord": { "oid": 101, "pid": 1, "amount": 2 } }, { "ord": { "oid": 103, "pid": 1, "amount": 4 } } ], "pid": 1, "s": 6 } +{ "g": [ { "ord": { "oid": 102, "pid": 2, "amount": 3 } } ], "pid": 2, "s": 3 } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results/resolution/order_1/order_1.3.adm ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/resolution/order_1/order_1.3.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/resolution/order_1/order_1.3.adm new file mode 100644 index 0000000..c9e3657 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/resolution/order_1/order_1.3.adm @@ -0,0 +1,4 @@ +100 +101 +103 +104 http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results/union/union_orderby_5/union_orderby_5.1.adm ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/union/union_orderby_5/union_orderby_5.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/union/union_orderby_5/union_orderby_5.1.adm new file mode 100644 index 0000000..6286610 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/union/union_orderby_5/union_orderby_5.1.adm @@ -0,0 +1,35 @@ +{ "id": 1 } +{ "id": 1 } +{ "id": 2 } +{ "id": 2 } +{ "id": 3 } +{ "id": 3 } +{ "id": 4 } +{ "id": 4 } +{ "id": 5 } +{ "id": 5 } +{ "id": 6 } +{ "id": 6 } +{ "id": 7 } +{ "id": 7 } +{ "id": 8 } +{ "id": 8 } +{ "id": 9 } +{ "id": 9 } +{ "id": 10 } +{ "id": 10 } +{ "id": 11 } +{ "id": 12 } +{ "id": 13 } +{ "id": 14 } +{ "id": 15 } +{ "id": "BramHatch" } +{ "id": "EmoryUnk" } +{ "id": "IsbelDull" } +{ "id": "MargaritaStoddard" } +{ "id": "NicholasStroh" } +{ "id": "NilaMilliron" } +{ "id": "SuzannaTillson" } +{ "id": "VonKemble" } +{ "id": "WillisWynne" } +{ "id": "WoodrowNehling" } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby/big_object_groupby.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby/big_object_groupby.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby/big_object_groupby.3.ast index 5a85eb5..64a6455 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby/big_object_groupby.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby/big_object_groupby.3.ast @@ -13,10 +13,9 @@ RecordConstructor [ : ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [i] - Variable [ Name=$partkey ] + FunctionCall asterix.field-access-by-name@2[ Variable [ Name=$g ] + LiteralExpr [STRING] [i] ] ] FROM [ Variable [ Name=$g ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dapd/q2/q2.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dapd/q2/q2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dapd/q2/q2.3.ast index 33df02e..809eb1d 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dapd/q2/q2.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dapd/q2/q2.3.ast @@ -51,7 +51,7 @@ Let Variable [ Name=$sig_sponsorship_count ] LiteralExpr [LONG] [1] ] FROM [ Variable [ Name=$es ] - AS Variable [ Name=#1 ] + AS Variable [ Name=#2 ] ] ) ] @@ -76,7 +76,7 @@ Let Variable [ Name=$by_chapter ] Field=e ] ] - FROM [ Variable [ Name=#2 ] + FROM [ Variable [ Name=#1 ] AS Variable [ Name=#3 ] ] ) @@ -97,7 +97,7 @@ Let Variable [ Name=$by_chapter ] ] Field=chapter_name ] - GROUP AS Variable [ Name=#2 ] + GROUP AS Variable [ Name=#1 ] ( e:=Variable [ Name=$e ] ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at06/at06.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at06/at06.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at06/at06.3.ast index 851c946..295e8db 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at06/at06.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at06/at06.3.ast @@ -54,14 +54,7 @@ FROM [ ( ( LiteralExpr [STRING] [partkey] : - FieldAccessor [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [i] - Variable [ Name=$g ] - Variable [ Name=$l_partkey ] - ] - Field=l_partkey - ] + Variable [ Name=$l_partkey ] ) ] ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1.1/dblp-1_2.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1.1/dblp-1_2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1.1/dblp-1_2.3.ast index da5057d..0bce814 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1.1/dblp-1_2.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1.1/dblp-1_2.3.ast @@ -31,19 +31,16 @@ Groupby ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [id] - Variable [ Name=$token ] - Variable [ Name=$paper ] - Variable [ Name=$tokenGroupped ] - Variable [ Name=#1 ] + FieldAccessor [ Variable [ Name=#2 ] + Field=id ] ] FROM [ Variable [ Name=#1 ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1/dblp-1_2.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1/dblp-1_2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1/dblp-1_2.3.ast index da5057d..0bce814 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1/dblp-1_2.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1/dblp-1_2.3.ast @@ -31,19 +31,16 @@ Groupby ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [id] - Variable [ Name=$token ] - Variable [ Name=$paper ] - Variable [ Name=$tokenGroupped ] - Variable [ Name=#1 ] + FieldAccessor [ Variable [ Name=#2 ] + Field=id ] ] FROM [ Variable [ Name=#1 ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2/dblp-1_2.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2/dblp-1_2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2/dblp-1_2.3.ast index 82bc1af..6c993a7 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2/dblp-1_2.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2/dblp-1_2.3.ast @@ -31,19 +31,16 @@ Groupby ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + paperid:=Variable [ Name=$paperid ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [paperid] - Variable [ Name=$token ] - Variable [ Name=$paper ] - Variable [ Name=$tokenGroupped ] - Variable [ Name=#1 ] + FieldAccessor [ Variable [ Name=#2 ] + Field=paperid ] ] FROM [ Variable [ Name=#1 ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.1_5.3.1/dblp-2.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.1_5.3.1/dblp-2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.1_5.3.1/dblp-2.3.ast index 41f326c..7f0f199 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.1_5.3.1/dblp-2.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.1_5.3.1/dblp-2.3.ast @@ -26,15 +26,13 @@ FROM [ FunctionCall asterix.dataset@1[ AS Variable [ Name=$paperDBLP ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensDBLP] - Variable [ Name=$paperDBLP ] ] LiteralExpr [LONG] [0] FunctionCall fuzzyjoin.prefix-len-jaccard@2[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [lenDBLP] - Variable [ Name=$paperDBLP ] ] LiteralExpr [FLOAT] [0.5] ] @@ -100,25 +98,16 @@ Let Variable [ Name=$tokensDBLP ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [id] - Variable [ Name=$lenDBLP ] - Variable [ Name=$token ] - Variable [ Name=$tokensUnrankedDBLP ] - Variable [ Name=$paper ] - Variable [ Name=$tokenGroupped ] - Variable [ Name=$prefixTokenDBLP ] - Variable [ Name=$paperDBLP ] - Variable [ Name=$tokenUnranked ] - Variable [ Name=#1 ] + FieldAccessor [ Variable [ Name=#2 ] - Variable [ Name=$idDBLP ] + Field=id ] ] FROM [ Variable [ Name=#1 ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.2/dblp-2.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.2/dblp-2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.2/dblp-2.3.ast index 0670274..eb4a457 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.2/dblp-2.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.2/dblp-2.3.ast @@ -26,16 +26,14 @@ FROM [ FunctionCall asterix.dataset@1[ AS Variable [ Name=$paperDBLP ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensDBLP] - Variable [ Name=$paperDBLP ] ] LiteralExpr [LONG] [0] FunctionCall fuzzyjoin.prefix-len-jaccard@2[ FunctionCall fuzzyjoin.len@1[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensDBLP] - Variable [ Name=$paperDBLP ] ] ] LiteralExpr [FLOAT] [0.5] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_2/dblp-2_2.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_2/dblp-2_2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_2/dblp-2_2.3.ast index aa31821..8b01dd1 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_2/dblp-2_2.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_2/dblp-2_2.3.ast @@ -68,21 +68,16 @@ Let Variable [ Name=$tokensDBLP ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [id] - Variable [ Name=$token ] - Variable [ Name=$paper ] - Variable [ Name=$tokenGroupped ] - Variable [ Name=$paperDBLP ] - Variable [ Name=$tokenUnranked ] - Variable [ Name=#1 ] + FieldAccessor [ Variable [ Name=#2 ] + Field=id ] ] FROM [ Variable [ Name=#1 ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_3/dblp-2_3.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_3/dblp-2_3.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_3/dblp-2_3.3.ast index 2bc4c27..aa90364 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_3/dblp-2_3.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_3/dblp-2_3.3.ast @@ -71,22 +71,16 @@ Let Variable [ Name=$tokensDBLP ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [id] - Variable [ Name=$token ] - Variable [ Name=$paper ] - Variable [ Name=$tokenGroupped ] - Variable [ Name=$paperDBLP ] - Variable [ Name=$tokenUnranked ] - Variable [ Name=#1 ] + FieldAccessor [ Variable [ Name=#2 ] - Variable [ Name=$idDBLP ] + Field=id ] ] FROM [ Variable [ Name=#1 ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_4/dblp-2_4.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_4/dblp-2_4.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_4/dblp-2_4.3.ast index 79263fe..119cb92 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_4/dblp-2_4.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_4/dblp-2_4.3.ast @@ -74,23 +74,16 @@ Let Variable [ Name=$tokensDBLP ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [id] - Variable [ Name=$token ] - Variable [ Name=$tokensUnrankedDBLP ] - Variable [ Name=$paper ] - Variable [ Name=$tokenGroupped ] - Variable [ Name=$paperDBLP ] - Variable [ Name=$tokenUnranked ] - Variable [ Name=#1 ] + FieldAccessor [ Variable [ Name=#2 ] - Variable [ Name=$idDBLP ] + Field=id ] ] FROM [ Variable [ Name=#1 ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.1/dblp-2_5.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.1/dblp-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.1/dblp-2_5.3.ast index 6285071..8bf8081 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.1/dblp-2_5.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.1/dblp-2_5.3.ast @@ -84,24 +84,16 @@ Let Variable [ Name=$tokensDBLP ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [id] - Variable [ Name=$lenDBLP ] - Variable [ Name=$token ] - Variable [ Name=$tokensUnrankedDBLP ] - Variable [ Name=$paper ] - Variable [ Name=$tokenGrouped ] - Variable [ Name=$paperDBLP ] - Variable [ Name=$tokenUnranked ] - Variable [ Name=#1 ] + FieldAccessor [ Variable [ Name=#2 ] - Variable [ Name=$idDBLP ] + Field=id ] ] FROM [ Variable [ Name=#1 ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.2/dblp-2_5.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.2/dblp-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.2/dblp-2_5.3.ast index 6285071..8bf8081 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.2/dblp-2_5.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.2/dblp-2_5.3.ast @@ -84,24 +84,16 @@ Let Variable [ Name=$tokensDBLP ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [id] - Variable [ Name=$lenDBLP ] - Variable [ Name=$token ] - Variable [ Name=$tokensUnrankedDBLP ] - Variable [ Name=$paper ] - Variable [ Name=$tokenGrouped ] - Variable [ Name=$paperDBLP ] - Variable [ Name=$tokenUnranked ] - Variable [ Name=#1 ] + FieldAccessor [ Variable [ Name=#2 ] - Variable [ Name=$idDBLP ] + Field=id ] ] FROM [ Variable [ Name=#1 ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3.1/dblp-2_5.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3.1/dblp-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3.1/dblp-2_5.3.ast index 6285071..8bf8081 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3.1/dblp-2_5.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3.1/dblp-2_5.3.ast @@ -84,24 +84,16 @@ Let Variable [ Name=$tokensDBLP ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [id] - Variable [ Name=$lenDBLP ] - Variable [ Name=$token ] - Variable [ Name=$tokensUnrankedDBLP ] - Variable [ Name=$paper ] - Variable [ Name=$tokenGrouped ] - Variable [ Name=$paperDBLP ] - Variable [ Name=$tokenUnranked ] - Variable [ Name=#1 ] + FieldAccessor [ Variable [ Name=#2 ] - Variable [ Name=$idDBLP ] + Field=id ] ] FROM [ Variable [ Name=#1 ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3/dblp-2_5.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3/dblp-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3/dblp-2_5.3.ast index 6285071..8bf8081 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3/dblp-2_5.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3/dblp-2_5.3.ast @@ -84,24 +84,16 @@ Let Variable [ Name=$tokensDBLP ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [id] - Variable [ Name=$lenDBLP ] - Variable [ Name=$token ] - Variable [ Name=$tokensUnrankedDBLP ] - Variable [ Name=$paper ] - Variable [ Name=$tokenGrouped ] - Variable [ Name=$paperDBLP ] - Variable [ Name=$tokenUnranked ] - Variable [ Name=#1 ] + FieldAccessor [ Variable [ Name=#2 ] - Variable [ Name=$idDBLP ] + Field=id ] ] FROM [ Variable [ Name=#1 ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5/dblp-2_5.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5/dblp-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5/dblp-2_5.3.ast index 93a6318..57865ba 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5/dblp-2_5.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5/dblp-2_5.3.ast @@ -84,24 +84,16 @@ Let Variable [ Name=$tokensDBLP ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [id] - Variable [ Name=$lenDBLP ] - Variable [ Name=$token ] - Variable [ Name=$tokensUnrankedDBLP ] - Variable [ Name=$paper ] - Variable [ Name=$tokenGroupped ] - Variable [ Name=$paperDBLP ] - Variable [ Name=$tokenUnranked ] - Variable [ Name=#1 ] + FieldAccessor [ Variable [ Name=#2 ] - Variable [ Name=$idDBLP ] + Field=id ] ] FROM [ Variable [ Name=#1 ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.1/dblp-3_1.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.1/dblp-3_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.1/dblp-3_1.3.ast index cda779d..630f9b0 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.1/dblp-3_1.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.1/dblp-3_1.3.ast @@ -40,20 +40,7 @@ FROM [ ( 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 ] - ] + Variable [ Name=$sim ] Index: LiteralExpr [LONG] [0] ] ) @@ -65,15 +52,13 @@ FROM [ ( AS Variable [ Name=$paperLeft ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensLeft] - Variable [ Name=$paperLeft ] ] LiteralExpr [LONG] [0] FunctionCall fuzzyjoin.prefix-len-jaccard@2[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [lenLeft] - Variable [ Name=$paperLeft ] ] LiteralExpr [FLOAT] [0.5] ] @@ -86,19 +71,13 @@ FROM [ ( 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] ] @@ -150,7 +129,7 @@ FROM [ ( Variable [ Name=$tokenGroupped ] := Variable [ Name=$token ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=#2 ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] @@ -161,12 +140,12 @@ FROM [ ( ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=#2 ] + Variable [ Name=#4 ] Field=paper ] ] - FROM [ Variable [ Name=#1 ] - AS Variable [ Name=#2 ] + FROM [ Variable [ Name=#2 ] + AS Variable [ Name=#4 ] ] ) ] @@ -246,12 +225,12 @@ Variable [ Name=$i ] ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=#4 ] + Variable [ Name=#5 ] Field=paper ] ] FROM [ Variable [ Name=#3 ] - AS Variable [ Name=#4 ] + AS Variable [ Name=#5 ] ] ) ] @@ -326,12 +305,20 @@ Variable [ Name=$i ] Variable [ Name=$paperRight ] Field=id ] - GROUP AS Variable [ Name=#5 ] + Variable [ Name=$sim ] + := + Variable [ Name=$sim ] + GROUP AS Variable [ Name=#1 ] ( paperLeft:=Variable [ Name=$paperLeft ] prefixTokenLeft:=Variable [ Name=$prefixTokenLeft ] paperRight:=Variable [ Name=$paperRight ] prefixTokenRight:=Variable [ Name=$prefixTokenRight ] + lenLeft:=Variable [ Name=$lenLeft ] + tokensLeft:=Variable [ Name=$tokensLeft ] + lenRight:=Variable [ Name=$lenRight ] + tokensRight:=Variable [ Name=$tokensRight ] + sim:=Variable [ Name=$sim ] ) ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.2/dblp-3_1.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.2/dblp-3_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.2/dblp-3_1.3.ast index cda779d..630f9b0 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.2/dblp-3_1.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.2/dblp-3_1.3.ast @@ -40,20 +40,7 @@ FROM [ ( 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 ] - ] + Variable [ Name=$sim ] Index: LiteralExpr [LONG] [0] ] ) @@ -65,15 +52,13 @@ FROM [ ( AS Variable [ Name=$paperLeft ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensLeft] - Variable [ Name=$paperLeft ] ] LiteralExpr [LONG] [0] FunctionCall fuzzyjoin.prefix-len-jaccard@2[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [lenLeft] - Variable [ Name=$paperLeft ] ] LiteralExpr [FLOAT] [0.5] ] @@ -86,19 +71,13 @@ FROM [ ( 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] ] @@ -150,7 +129,7 @@ FROM [ ( Variable [ Name=$tokenGroupped ] := Variable [ Name=$token ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=#2 ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] @@ -161,12 +140,12 @@ FROM [ ( ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=#2 ] + Variable [ Name=#4 ] Field=paper ] ] - FROM [ Variable [ Name=#1 ] - AS Variable [ Name=#2 ] + FROM [ Variable [ Name=#2 ] + AS Variable [ Name=#4 ] ] ) ] @@ -246,12 +225,12 @@ Variable [ Name=$i ] ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=#4 ] + Variable [ Name=#5 ] Field=paper ] ] FROM [ Variable [ Name=#3 ] - AS Variable [ Name=#4 ] + AS Variable [ Name=#5 ] ] ) ] @@ -326,12 +305,20 @@ Variable [ Name=$i ] Variable [ Name=$paperRight ] Field=id ] - GROUP AS Variable [ Name=#5 ] + Variable [ Name=$sim ] + := + Variable [ Name=$sim ] + GROUP AS Variable [ Name=#1 ] ( paperLeft:=Variable [ Name=$paperLeft ] prefixTokenLeft:=Variable [ Name=$prefixTokenLeft ] paperRight:=Variable [ Name=$paperRight ] prefixTokenRight:=Variable [ Name=$prefixTokenRight ] + lenLeft:=Variable [ Name=$lenLeft ] + tokensLeft:=Variable [ Name=$tokensLeft ] + lenRight:=Variable [ Name=$lenRight ] + tokensRight:=Variable [ Name=$tokensRight ] + sim:=Variable [ Name=$sim ] ) ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1/dblp-3_1.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1/dblp-3_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1/dblp-3_1.3.ast index 196972b..9af07aa 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1/dblp-3_1.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1/dblp-3_1.3.ast @@ -50,20 +50,7 @@ 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 ] - ] + Variable [ Name=$sim ] Index: LiteralExpr [LONG] [0] ] ) @@ -75,17 +62,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] ] @@ -98,19 +81,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] ] @@ -162,7 +139,7 @@ FROM [ FunctionCall asterix.dataset@1[ Variable [ Name=$tokenGroupped ] := Variable [ Name=$token ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=#2 ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] @@ -173,12 +150,12 @@ FROM [ FunctionCall asterix.dataset@1[ ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=#2 ] + Variable [ Name=#4 ] Field=paper ] ] - FROM [ Variable [ Name=#1 ] - AS Variable [ Name=#2 ] + FROM [ Variable [ Name=#2 ] + AS Variable [ Name=#4 ] ] ) ] @@ -258,12 +235,12 @@ Variable [ Name=$i ] ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=#4 ] + Variable [ Name=#5 ] Field=paper ] ] FROM [ Variable [ Name=#3 ] - AS Variable [ Name=#4 ] + AS Variable [ Name=#5 ] ] ) ] @@ -338,12 +315,20 @@ Variable [ Name=$i ] Variable [ Name=$paperRight ] Field=id ] - GROUP AS Variable [ Name=#5 ] + Variable [ Name=$sim ] + := + Variable [ Name=$sim ] + GROUP AS Variable [ Name=#1 ] ( paperLeft:=Variable [ Name=$paperLeft ] prefixTokenLeft:=Variable [ Name=$prefixTokenLeft ] paperRight:=Variable [ Name=$paperRight ] prefixTokenRight:=Variable [ Name=$prefixTokenRight ] + lenLeft:=Variable [ Name=$lenLeft ] + tokensLeft:=Variable [ Name=$tokensLeft ] + lenRight:=Variable [ Name=$lenRight ] + tokensRight:=Variable [ Name=$tokensRight ] + sim:=Variable [ Name=$sim ] ) ) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_1/dblp-csx-2_1.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_1/dblp-csx-2_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_1/dblp-csx-2_1.3.ast index 0318cb3..2fe46a5 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_1/dblp-csx-2_1.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_1/dblp-csx-2_1.3.ast @@ -29,16 +29,14 @@ FROM [ FunctionCall asterix.dataset@1[ AS Variable [ Name=$paperDBLP ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensDBLP] - Variable [ Name=$paperDBLP ] ] LiteralExpr [LONG] [0] FunctionCall fuzzyjoin.prefix-len-jaccard@2[ FunctionCall fuzzyjoin.len@1[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensDBLP] - Variable [ Name=$paperDBLP ] ] ] LiteralExpr [FLOAT] [0.5] @@ -52,20 +50,14 @@ FROM [ FunctionCall asterix.dataset@1[ AS Variable [ Name=$paperCSX ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensCSX] - Variable [ Name=$prefixTokenDBLP ] - Variable [ Name=$paperDBLP ] - Variable [ Name=$paperCSX ] ] LiteralExpr [LONG] [0] FunctionCall fuzzyjoin.prefix-len-jaccard@2[ FunctionCall fuzzyjoin.len@1[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensCSX] - Variable [ Name=$prefixTokenDBLP ] - Variable [ Name=$paperDBLP ] - Variable [ Name=$paperCSX ] ] ] LiteralExpr [FLOAT] [0.5] @@ -108,7 +100,7 @@ Let Variable [ Name=$tokensDBLP ] Variable [ Name=$tokenGroupped ] := Variable [ Name=$token ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=#2 ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] @@ -119,12 +111,12 @@ Let Variable [ Name=$tokensDBLP ] ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=#2 ] + Variable [ Name=#4 ] Field=paper ] ] - FROM [ Variable [ Name=#1 ] - AS Variable [ Name=#2 ] + FROM [ Variable [ Name=#2 ] + AS Variable [ Name=#4 ] ] ) ] @@ -194,12 +186,12 @@ Let Variable [ Name=$tokensCSX ] ( SELECT ELEMENT [ FieldAccessor [ - Variable [ Name=#4 ] + Variable [ Name=#5 ] Field=paper ] ] FROM [ Variable [ Name=#3 ] - AS Variable [ Name=#4 ] + AS Variable [ Name=#5 ] ] ) ] @@ -277,12 +269,15 @@ Groupby Variable [ Name=$sim ] := Variable [ Name=$sim ] - GROUP AS Variable [ Name=#5 ] + GROUP AS Variable [ Name=#1 ] ( paperDBLP:=Variable [ Name=$paperDBLP ] prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ] paperCSX:=Variable [ Name=$paperCSX ] prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ] + tokensDBLP:=Variable [ Name=$tokensDBLP ] + tokensCSX:=Variable [ Name=$tokensCSX ] + sim:=Variable [ Name=$sim ] ) Orderby http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_2/dblp-csx-2_2.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_2/dblp-csx-2_2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_2/dblp-csx-2_2.3.ast index 05d6767..0b82baa 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_2/dblp-csx-2_2.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_2/dblp-csx-2_2.3.ast @@ -29,16 +29,14 @@ FROM [ FunctionCall asterix.dataset@1[ AS Variable [ Name=$paperDBLP ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensDBLP] - Variable [ Name=$paperDBLP ] ] LiteralExpr [LONG] [0] FunctionCall fuzzyjoin.prefix-len-jaccard@2[ FunctionCall fuzzyjoin.len@1[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensDBLP] - Variable [ Name=$paperDBLP ] ] ] LiteralExpr [FLOAT] [0.5] @@ -52,20 +50,14 @@ FROM [ FunctionCall asterix.dataset@1[ AS Variable [ Name=$paperCSX ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensCSX] - Variable [ Name=$prefixTokenDBLP ] - Variable [ Name=$paperDBLP ] - Variable [ Name=$paperCSX ] ] LiteralExpr [LONG] [0] FunctionCall fuzzyjoin.prefix-len-jaccard@2[ FunctionCall fuzzyjoin.len@1[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensCSX] - Variable [ Name=$prefixTokenDBLP ] - Variable [ Name=$paperDBLP ] - Variable [ Name=$paperCSX ] ] ] LiteralExpr [FLOAT] [0.5] @@ -114,32 +106,24 @@ Let Variable [ Name=$tokensDBLP ] Variable [ Name=$tokenGroupped ] := Variable [ Name=$token ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=#2 ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [id] - Variable [ Name=$prefixTokenCSX ] - Variable [ Name=$token ] - Variable [ Name=$paper ] - Variable [ Name=$tokenGroupped ] - Variable [ Name=$prefixTokenDBLP ] - Variable [ Name=$paperDBLP ] - Variable [ Name=$tokenUnranked ] - Variable [ Name=$paperCSX ] - Variable [ Name=#1 ] - Variable [ Name=#2 ] + FieldAccessor [ + Variable [ Name=#4 ] + Field=id ] ] - FROM [ Variable [ Name=#1 ] - AS Variable [ Name=#2 ] + FROM [ Variable [ Name=#2 ] + AS Variable [ Name=#4 ] ] ) ] @@ -208,29 +192,20 @@ Let Variable [ Name=$tokensCSX ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [id] - Variable [ Name=#4 ] - Variable [ Name=$prefixTokenCSX ] - Variable [ Name=$token ] - Variable [ Name=$paper ] - Variable [ Name=$tokenGroupped ] - Variable [ Name=$prefixTokenDBLP ] - Variable [ Name=$tokensDBLP ] - Variable [ Name=$paperDBLP ] - Variable [ Name=$tokenUnranked ] - Variable [ Name=$paperCSX ] - Variable [ Name=#3 ] + FieldAccessor [ + Variable [ Name=#5 ] + Field=id ] ] FROM [ Variable [ Name=#3 ] - AS Variable [ Name=#4 ] + AS Variable [ Name=#5 ] ] ) ] @@ -308,12 +283,15 @@ Groupby Variable [ Name=$sim ] := Variable [ Name=$sim ] - GROUP AS Variable [ Name=#5 ] + GROUP AS Variable [ Name=#1 ] ( paperDBLP:=Variable [ Name=$paperDBLP ] prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ] paperCSX:=Variable [ Name=$paperCSX ] prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ] + tokensDBLP:=Variable [ Name=$tokensDBLP ] + tokensCSX:=Variable [ Name=$tokensCSX ] + sim:=Variable [ Name=$sim ] ) Orderby http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef1719e3/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_3/dblp-csx-2_3.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_3/dblp-csx-2_3.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_3/dblp-csx-2_3.3.ast index b6dfb5d..d51effa 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_3/dblp-csx-2_3.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_3/dblp-csx-2_3.3.ast @@ -29,16 +29,14 @@ FROM [ FunctionCall asterix.dataset@1[ AS Variable [ Name=$paperDBLP ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensDBLP] - Variable [ Name=$paperDBLP ] ] LiteralExpr [LONG] [0] FunctionCall fuzzyjoin.prefix-len-jaccard@2[ FunctionCall fuzzyjoin.len@1[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensDBLP] - Variable [ Name=$paperDBLP ] ] ] LiteralExpr [FLOAT] [0.5] @@ -52,20 +50,14 @@ FROM [ FunctionCall asterix.dataset@1[ AS Variable [ Name=$paperCSX ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensCSX] - Variable [ Name=$prefixTokenDBLP ] - Variable [ Name=$paperDBLP ] - Variable [ Name=$paperCSX ] ] LiteralExpr [LONG] [0] FunctionCall fuzzyjoin.prefix-len-jaccard@2[ FunctionCall fuzzyjoin.len@1[ - FunctionCall asterix.resolve@-1[ + FunctionCall asterix.dataset@1[ LiteralExpr [STRING] [tokensCSX] - Variable [ Name=$prefixTokenDBLP ] - Variable [ Name=$paperDBLP ] - Variable [ Name=$paperCSX ] ] ] LiteralExpr [FLOAT] [0.5] @@ -120,33 +112,24 @@ Let Variable [ Name=$tokensDBLP ] Variable [ Name=$tokenGroupped ] := Variable [ Name=$token ] - GROUP AS Variable [ Name=#1 ] + GROUP AS Variable [ Name=#2 ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [id] - Variable [ Name=$prefixTokenCSX ] - Variable [ Name=$token ] - Variable [ Name=$paper ] - Variable [ Name=$tokenGroupped ] - Variable [ Name=$prefixTokenDBLP ] - Variable [ Name=$paperDBLP ] - Variable [ Name=$tokenUnranked ] - Variable [ Name=$paperCSX ] - Variable [ Name=#1 ] - Variable [ Name=#2 ] - Variable [ Name=$idDBLP ] + FieldAccessor [ + Variable [ Name=#4 ] + Field=id ] ] - FROM [ Variable [ Name=#1 ] - AS Variable [ Name=#2 ] + FROM [ Variable [ Name=#2 ] + AS Variable [ Name=#4 ] ] ) ] @@ -221,31 +204,20 @@ Let Variable [ Name=$tokensCSX ] ( paper:=Variable [ Name=$paper ] token:=Variable [ Name=$token ] + id:=Variable [ Name=$id ] ) Orderby FunctionCall asterix.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall asterix.resolve@-1[ - LiteralExpr [STRING] [id] - Variable [ Name=$paper ] - Variable [ Name=$tokensDBLP ] - Variable [ Name=$tokenUnranked ] - Variable [ Name=$idCSX ] - Variable [ Name=$idDBLP ] - Variable [ Name=#3 ] - Variable [ Name=#4 ] - Variable [ Name=$prefixTokenCSX ] - Variable [ Name=$token ] - Variable [ Name=$tokenGroupped ] - Variable [ Name=$prefixTokenDBLP ] - Variable [ Name=$paperDBLP ] - Variable [ Name=$paperCSX ] + FieldAccessor [ + Variable [ Name=#5 ] + Field=id ] ] FROM [ Variable [ Name=#3 ] - AS Variable [ Name=#4 ] + AS Variable [ Name=#5 ] ] ) ] @@ -317,12 +289,17 @@ Groupby Variable [ Name=$sim ] := Variable [ Name=$sim ] - GROUP AS Variable [ Name=#5 ] + GROUP AS Variable [ Name=#1 ] ( paperDBLP:=Variable [ Name=$paperDBLP ] prefixTokenDBLP:=Variable [ Name=$prefixTokenDBLP ] paperCSX:=Variable [ Name=$paperCSX ] prefixTokenCSX:=Variable [ Name=$prefixTokenCSX ] + idDBLP:=Variable [ Name=$idDBLP ] + tokensDBLP:=Variable [ Name=$tokensDBLP ] + idCSX:=Variable [ Name=$idCSX ] + tokensCSX:=Variable [ Name=$tokensCSX ] + sim:=Variable [ Name=$sim ] ) Orderby
