>From Ian Maxon <[email protected]>: Ian Maxon has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21983?usp=email )
Change subject: [ASTERIXDB-3577][TEST] Correct single-collection plans in NCServiceIT ...................................................................... [ASTERIXDB-3577][TEST] Correct single-collection plans in NCServiceIT Details: - Add the delta file folder for SqlppExcutionNCServiceIT, and the changed plans for the single-collection-queries in it Generated-by: Claude Opus 5.5 Change-Id: I708ec383df2bd490c297d29b1b23a0e28d5328c5 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21983 Tested-by: Ian Maxon <[email protected]> Reviewed-by: Ian Maxon <[email protected]> Integration-Tests: Jenkins <[email protected]> --- M asterixdb/asterix-app/pom.xml A asterixdb/asterix-app/src/test/resources/runtimets/results_ncservice/cardinality-estimation/single-collection-queries/single-collection-queries.10.plan A asterixdb/asterix-app/src/test/resources/runtimets/results_ncservice/cardinality-estimation/single-collection-queries/single-collection-queries.11.plan A asterixdb/asterix-app/src/test/resources/runtimets/results_ncservice/cardinality-estimation/single-collection-queries/single-collection-queries.12.plan A asterixdb/asterix-app/src/test/resources/runtimets/results_ncservice/cardinality-estimation/single-collection-queries/single-collection-queries.13.plan A asterixdb/asterix-app/src/test/resources/runtimets/results_ncservice/cardinality-estimation/single-collection-queries/single-collection-queries.14.plan A asterixdb/asterix-app/src/test/resources/runtimets/results_ncservice/cardinality-estimation/single-collection-queries/single-collection-queries.15.plan A asterixdb/asterix-app/src/test/resources/runtimets/results_ncservice/cardinality-estimation/single-collection-queries/single-collection-queries.17.plan A asterixdb/asterix-app/src/test/resources/runtimets/results_ncservice/cardinality-estimation/single-collection-queries/single-collection-queries.9.plan M asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/AbstractExecutionIT.java 10 files changed, 154 insertions(+), 1 deletion(-) Approvals: Ian Maxon: Looks good to me, approved; Verified Jenkins: Verified Objections: Anon. E. Moose #1000171: Violations found diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml index 6713eac..d4a18dd 100644 --- a/asterixdb/asterix-app/pom.xml +++ b/asterixdb/asterix-app/pom.xml @@ -421,6 +421,7 @@ <exclude>src/test/resources/**/results_cbo/**</exclude> <exclude>src/test/resources/**/results_column/**</exclude> <exclude>src/test/resources/**/results_cloud/**</exclude> + <exclude>src/test/resources/**/results_ncservice/**</exclude> <exclude>src/test/resources/**/results_less_parallelism/**</exclude> <exclude>src/test/resources/**/results_full_parallelism/**</exclude> <exclude>src/test/resources/fuzzyjoin/pub/fuzzy-join-aql*.dot</exclude> diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_ncservice/cardinality-estimation/single-collection-queries/single-collection-queries.10.plan b/asterixdb/asterix-app/src/test/resources/runtimets/results_ncservice/cardinality-estimation/single-collection-queries/single-collection-queries.10.plan new file mode 100644 index 0000000..01e8742 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_ncservice/cardinality-estimation/single-collection-queries/single-collection-queries.10.plan @@ -0,0 +1,18 @@ +distribute result [$$19] [cardinality: 1497.18, doc-size: 12.0, op-cost: 0.0, total-cost: 749.77] +-- DISTRIBUTE_RESULT |PARTITIONED| + exchange [cardinality: 1497.18, doc-size: 12.0, op-cost: 0.0, total-cost: 749.77] + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + assign [$$19] <- [{"o_orderdate": $$o.getField(4)}] project: [$$19] [cardinality: 1497.18, doc-size: 12.0, op-cost: 0.0, total-cost: 749.77] + -- ASSIGN |PARTITIONED| + project ([$$o]) [cardinality: 1497.18, doc-size: 12.0, op-cost: 0.0, total-cost: 749.77] + -- STREAM_PROJECT |PARTITIONED| + exchange [cardinality: 1497.18, doc-size: 12.0, op-cost: 0.0, total-cost: 749.77] + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + unnest-map [$$20, $$o] <- index-search("Orders", 0, "Default", "tpch", "Orders", false, false, 1, $$23, 0, false, true, false) [cardinality: 1497.18, doc-size: 12.0, op-cost: 0.0, total-cost: 749.77] + -- BTREE_SEARCH |PARTITIONED| + exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0] + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + assign [$$23] <- [5] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0] + -- ASSIGN |PARTITIONED| + empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0] + -- EMPTY_TUPLE_SOURCE |PARTITIONED| diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_ncservice/cardinality-estimation/single-collection-queries/single-collection-queries.11.plan b/asterixdb/asterix-app/src/test/resources/runtimets/results_ncservice/cardinality-estimation/single-collection-queries/single-collection-queries.11.plan new file mode 100644 index 0000000..05a0f17 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_ncservice/cardinality-estimation/single-collection-queries/single-collection-queries.11.plan @@ -0,0 +1,14 @@ +distribute result [$$o] [cardinality: 1500.0, doc-size: 152.61, op-cost: 0.0, total-cost: 750.82] +-- DISTRIBUTE_RESULT |PARTITIONED| + exchange [cardinality: 1500.0, doc-size: 152.61, op-cost: 0.0, total-cost: 750.82] + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + project ([$$o]) [cardinality: 1500.0, doc-size: 152.61, op-cost: 0.0, total-cost: 750.82] + -- STREAM_PROJECT |PARTITIONED| + exchange [cardinality: 1500.0, doc-size: 152.61, op-cost: 0.0, total-cost: 750.82] + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + data-scan []<-[$$15, $$o] <- tpch.Orders [cardinality: 1500.0, doc-size: 152.61, op-cost: 0.0, total-cost: 750.82] + -- DATASOURCE_SCAN |PARTITIONED| + exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0] + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0] + -- EMPTY_TUPLE_SOURCE |PARTITIONED| diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_ncservice/cardinality-estimation/single-collection-queries/single-collection-queries.12.plan b/asterixdb/asterix-app/src/test/resources/runtimets/results_ncservice/cardinality-estimation/single-collection-queries/single-collection-queries.12.plan new file mode 100644 index 0000000..48e61f5 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_ncservice/cardinality-estimation/single-collection-queries/single-collection-queries.12.plan @@ -0,0 +1,16 @@ +distribute result [$$16] [cardinality: 1500.0, doc-size: 12.0, op-cost: 0.0, total-cost: 750.82] +-- DISTRIBUTE_RESULT |PARTITIONED| + exchange [cardinality: 1500.0, doc-size: 12.0, op-cost: 0.0, total-cost: 750.82] + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + assign [$$16] <- [$$o.getField(4)] project: [$$16] [cardinality: 1500.0, doc-size: 12.0, op-cost: 0.0, total-cost: 750.82] + -- ASSIGN |PARTITIONED| + project ([$$o]) [cardinality: 1500.0, doc-size: 12.0, op-cost: 0.0, total-cost: 750.82] + -- STREAM_PROJECT |PARTITIONED| + exchange [cardinality: 1500.0, doc-size: 12.0, op-cost: 0.0, total-cost: 750.82] + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + data-scan []<-[$$17, $$o] <- tpch.Orders [cardinality: 1500.0, doc-size: 12.0, op-cost: 0.0, total-cost: 750.82] + -- DATASOURCE_SCAN |PARTITIONED| + exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0] + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0] + -- EMPTY_TUPLE_SOURCE |PARTITIONED| diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_ncservice/cardinality-estimation/single-collection-queries/single-collection-queries.13.plan b/asterixdb/asterix-app/src/test/resources/runtimets/results_ncservice/cardinality-estimation/single-collection-queries/single-collection-queries.13.plan new file mode 100644 index 0000000..b9ae1ee --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_ncservice/cardinality-estimation/single-collection-queries/single-collection-queries.13.plan @@ -0,0 +1,38 @@ +distribute result [$$52] [cardinality: 4.0, doc-size: 3.0, op-cost: 0.0, total-cost: 1150.17] +-- DISTRIBUTE_RESULT |PARTITIONED| + exchange [cardinality: 4.0, doc-size: 3.0, op-cost: 0.0, total-cost: 1150.17] + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + assign [$$52] <- [{"o_orderstatus": $$o_orderstatus, "cnt": $$55}] project: [$$52] [cardinality: 4.0, doc-size: 3.0, op-cost: 0.0, total-cost: 1150.17] + -- ASSIGN |PARTITIONED| + exchange [cardinality: 4.0, doc-size: 3.0, op-cost: 0.0, total-cost: 1150.17] + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + group by ([$$o_orderstatus := $$57]) decor ([]) { + aggregate [$$55] <- [sql-sum-serial($$56)] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0] + -- AGGREGATE |LOCAL| + nested tuple source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0] + -- NESTED_TUPLE_SOURCE |LOCAL| + } [cardinality: 4.0, doc-size: 3.0, op-cost: 20.0, total-cost: 1150.17] + -- EXTERNAL_GROUP_BY[$$57] |PARTITIONED| + exchange [cardinality: 4.0, doc-size: 3.0, op-cost: 0.0, total-cost: 1130.17] + -- HASH_PARTITION_EXCHANGE [$$57] |PARTITIONED| + group by ([$$57 := $$53]) decor ([]) { + aggregate [$$56] <- [sql-count-serial(1)] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0] + -- AGGREGATE |LOCAL| + nested tuple source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0] + -- NESTED_TUPLE_SOURCE |LOCAL| + } [cardinality: 4.0, doc-size: 3.0, op-cost: 379.35, total-cost: 1130.17] + -- EXTERNAL_GROUP_BY[$$53] |PARTITIONED| + exchange [cardinality: 1500.0, doc-size: 3.0, op-cost: 0.0, total-cost: 750.82] + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + assign [$$53] <- [$$o.getField(2)] project: [$$53] [cardinality: 1500.0, doc-size: 3.0, op-cost: 0.0, total-cost: 750.82] + -- ASSIGN |PARTITIONED| + project ([$$o]) [cardinality: 1500.0, doc-size: 3.0, op-cost: 0.0, total-cost: 750.82] + -- STREAM_PROJECT |PARTITIONED| + exchange [cardinality: 1500.0, doc-size: 3.0, op-cost: 0.0, total-cost: 750.82] + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + data-scan []<-[$$54, $$o] <- tpch.Orders [cardinality: 1500.0, doc-size: 3.0, op-cost: 0.0, total-cost: 750.82] + -- DATASOURCE_SCAN |PARTITIONED| + exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0] + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0] + -- EMPTY_TUPLE_SOURCE |PARTITIONED| diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_ncservice/cardinality-estimation/single-collection-queries/single-collection-queries.14.plan b/asterixdb/asterix-app/src/test/resources/runtimets/results_ncservice/cardinality-estimation/single-collection-queries/single-collection-queries.14.plan new file mode 100644 index 0000000..846b254 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_ncservice/cardinality-estimation/single-collection-queries/single-collection-queries.14.plan @@ -0,0 +1,16 @@ +distribute result [$$18] [cardinality: 1500.0, doc-size: 9.0, op-cost: 0.0, total-cost: 750.82] +-- DISTRIBUTE_RESULT |PARTITIONED| + exchange [cardinality: 1500.0, doc-size: 9.0, op-cost: 0.0, total-cost: 750.82] + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + assign [$$18] <- [{"doubled": numeric-multiply($$o.getField(3), 2)}] project: [$$18] [cardinality: 1500.0, doc-size: 9.0, op-cost: 0.0, total-cost: 750.82] + -- ASSIGN |PARTITIONED| + project ([$$o]) [cardinality: 1500.0, doc-size: 9.0, op-cost: 0.0, total-cost: 750.82] + -- STREAM_PROJECT |PARTITIONED| + exchange [cardinality: 1500.0, doc-size: 9.0, op-cost: 0.0, total-cost: 750.82] + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + data-scan []<-[$$19, $$o] <- tpch.Orders [cardinality: 1500.0, doc-size: 9.0, op-cost: 0.0, total-cost: 750.82] + -- DATASOURCE_SCAN |PARTITIONED| + exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0] + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0] + -- EMPTY_TUPLE_SOURCE |PARTITIONED| diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_ncservice/cardinality-estimation/single-collection-queries/single-collection-queries.15.plan b/asterixdb/asterix-app/src/test/resources/runtimets/results_ncservice/cardinality-estimation/single-collection-queries/single-collection-queries.15.plan new file mode 100644 index 0000000..33c468a --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_ncservice/cardinality-estimation/single-collection-queries/single-collection-queries.15.plan @@ -0,0 +1,14 @@ +distribute result [$$32] [cardinality: 5981.0, doc-size: 142.72, op-cost: 0.0, total-cost: 2994.43] +-- DISTRIBUTE_RESULT |PARTITIONED| + exchange [cardinality: 5981.0, doc-size: 142.72, op-cost: 0.0, total-cost: 2994.43] + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + assign [$$32] <- [{"l_orderkey": $$33, "l_partkey": $$l.getField(1), "l_suppkey": $$l.getField(2), "l_linenumber": $$34, "l_quantity": $$l.getField(4), "l_extendedprice": $$l.getField(5), "l_discount": $$l.getField(6), "l_tax": $$l.getField(7), "l_returnflag": $$l.getField(8), "l_linestatus": $$l.getField(9), "l_shipdate": $$l.getField(10), "l_commitdate": $$l.getField(11), "l_receiptdate": $$l.getField(12), "l_shipinstruct": $$l.getField(13), "l_shipmode": $$l.getField(14), "l_comment": $$l.getField(15)}] project: [$$32] [cardinality: 5981.0, doc-size: 142.72, op-cost: 0.0, total-cost: 2994.43] + -- ASSIGN |PARTITIONED| + exchange [cardinality: 5981.0, doc-size: 142.72, op-cost: 0.0, total-cost: 2994.43] + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + data-scan []<-[$$33, $$34, $$l] <- tpch.LineItem [cardinality: 5981.0, doc-size: 142.72, op-cost: 0.0, total-cost: 2994.43] + -- DATASOURCE_SCAN |PARTITIONED| + exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0] + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0] + -- EMPTY_TUPLE_SOURCE |PARTITIONED| diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_ncservice/cardinality-estimation/single-collection-queries/single-collection-queries.17.plan b/asterixdb/asterix-app/src/test/resources/runtimets/results_ncservice/cardinality-estimation/single-collection-queries/single-collection-queries.17.plan new file mode 100644 index 0000000..727eee7 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_ncservice/cardinality-estimation/single-collection-queries/single-collection-queries.17.plan @@ -0,0 +1,18 @@ +distribute result [$$18] [cardinality: 1501.41, doc-size: 12.0, op-cost: 0.0, total-cost: 750.82] +-- DISTRIBUTE_RESULT |PARTITIONED| + exchange [cardinality: 1501.41, doc-size: 12.0, op-cost: 0.0, total-cost: 750.82] + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + select (gt($$o.getField(1), 0)) project: [$$18] [cardinality: 1501.41, doc-size: 12.0, op-cost: 0.0, total-cost: 750.82] + -- STREAM_SELECT |PARTITIONED| + assign [$$18] <- [$$o.getField(4)] [cardinality: 1500.0, doc-size: 12.0, op-cost: 0.0, total-cost: 750.82] + -- ASSIGN |PARTITIONED| + project ([$$o]) [cardinality: 1500.0, doc-size: 12.0, op-cost: 0.0, total-cost: 750.82] + -- STREAM_PROJECT |PARTITIONED| + exchange [cardinality: 1500.0, doc-size: 12.0, op-cost: 0.0, total-cost: 750.82] + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + data-scan []<-[$$19, $$o] <- tpch.Orders [cardinality: 1500.0, doc-size: 12.0, op-cost: 0.0, total-cost: 750.82] + -- DATASOURCE_SCAN |PARTITIONED| + exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0] + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0] + -- EMPTY_TUPLE_SOURCE |PARTITIONED| diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_ncservice/cardinality-estimation/single-collection-queries/single-collection-queries.9.plan b/asterixdb/asterix-app/src/test/resources/runtimets/results_ncservice/cardinality-estimation/single-collection-queries/single-collection-queries.9.plan new file mode 100644 index 0000000..f8b87b9 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_ncservice/cardinality-estimation/single-collection-queries/single-collection-queries.9.plan @@ -0,0 +1,16 @@ +distribute result [$$17] [cardinality: 1500.0, doc-size: 12.0, op-cost: 0.0, total-cost: 750.82] +-- DISTRIBUTE_RESULT |PARTITIONED| + exchange [cardinality: 1500.0, doc-size: 12.0, op-cost: 0.0, total-cost: 750.82] + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + assign [$$17] <- [{"o_orderdate": $$o.getField(4)}] project: [$$17] [cardinality: 1500.0, doc-size: 12.0, op-cost: 0.0, total-cost: 750.82] + -- ASSIGN |PARTITIONED| + project ([$$o]) [cardinality: 1500.0, doc-size: 12.0, op-cost: 0.0, total-cost: 750.82] + -- STREAM_PROJECT |PARTITIONED| + exchange [cardinality: 1500.0, doc-size: 12.0, op-cost: 0.0, total-cost: 750.82] + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + data-scan []<-[$$18, $$o] <- tpch.Orders [cardinality: 1500.0, doc-size: 12.0, op-cost: 0.0, total-cost: 750.82] + -- DATASOURCE_SCAN |PARTITIONED| + exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0] + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0] + -- EMPTY_TUPLE_SOURCE |PARTITIONED| diff --git a/asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/AbstractExecutionIT.java b/asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/AbstractExecutionIT.java index 1360917..a6b77ec 100644 --- a/asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/AbstractExecutionIT.java +++ b/asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/AbstractExecutionIT.java @@ -59,7 +59,9 @@ protected static final String HDFS_BASE = "../asterix-app/"; - protected static final TestExecutor testExecutor = new TestExecutor(); + private static final String DELTA_RESULT_PATH = "results_ncservice"; + + protected static final TestExecutor testExecutor = new TestExecutor(DELTA_RESULT_PATH); private static final String EXTERNAL_LIBRARY_TEST_GROUP = "lib"; -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21983?usp=email To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I708ec383df2bd490c297d29b1b23a0e28d5328c5 Gerrit-Change-Number: 21983 Gerrit-PatchSet: 2 Gerrit-Owner: Ian Maxon <[email protected]> Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Ian Maxon <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]>
