This is an automated email from the ASF dual-hosted git repository. mblow pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 40ca2a27a98d15c593ca03e7eb51813e038a59a3 Author: glennga <[email protected]> AuthorDate: Sun Jan 8 10:05:38 2023 -0800 [ASTERIXDB-3096][COMP] Array-index recognition bug w/ multiple subplans - user model changes: no - storage format changes: no - interface changes: no details: Fixing a bug where an error is thrown for a query containing multiple subplans. A deep-copy was being made alongside the original, and there was a use of the original instead of the deep-copy. Change-Id: I567fa4e47a5cf10bf6ab571c06780f7e41d028ef Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17306 Integration-Tests: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Reviewed-by: Ali Alsuliman <[email protected]> Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17353 Reviewed-by: Michael Blow <[email protected]> Tested-by: Michael Blow <[email protected]> --- .../array/AbstractOperatorFromSubplanRewrite.java | 8 +++- .../multiple-quantifiers/query10.sqlpp | 37 +++++++++++++++++++ .../multiple-quantifiers/query11.sqlpp | 37 +++++++++++++++++++ .../multiple-quantifiers/query10.plan | 36 ++++++++++++++++++ .../multiple-quantifiers/query11.plan | 43 ++++++++++++++++++++++ 5 files changed, 159 insertions(+), 2 deletions(-) diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/array/AbstractOperatorFromSubplanRewrite.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/array/AbstractOperatorFromSubplanRewrite.java index ba70aff830..2bb8e2e62d 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/array/AbstractOperatorFromSubplanRewrite.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/array/AbstractOperatorFromSubplanRewrite.java @@ -207,8 +207,12 @@ abstract public class AbstractOperatorFromSubplanRewrite<T> implements IIntroduc // Add the inputs from our subplan. Mutable<ILogicalOperator> traversalOperator = traversalOutput.first.getInputs().get(0); while (traversalOperator != null) { - workingNewOperator.getInputs().add(new MutableObject<>( - OperatorManipulationUtil.deepCopy(traversalOperator.getValue()))); + ILogicalOperator traversalOperatorDeepCopy = + OperatorManipulationUtil.deepCopy(traversalOperator.getValue()); + if (traversalOperator.getValue().equals(traversalOutput.second)) { + traversalOutput.second = (UnnestOperator) traversalOperatorDeepCopy; + } + workingNewOperator.getInputs().add(new MutableObject<>(traversalOperatorDeepCopy)); workingNewOperator = workingNewOperator.getInputs().get(0).getValue(); traversalOperator = (traversalOperator.getValue().getInputs().isEmpty()) ? null : traversalOperator.getValue().getInputs().get(0); diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/array-index/select-quantified-queries/multiple-quantifiers/query10.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/array-index/select-quantified-queries/multiple-quantifiers/query10.sqlpp new file mode 100644 index 0000000000..45a00b8c49 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/array-index/select-quantified-queries/multiple-quantifiers/query10.sqlpp @@ -0,0 +1,37 @@ +/* + * 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. + */ +SET `compiler.arrayindex` "true"; + +DROP DATAVERSE TestDataverse IF EXISTS; +CREATE DATAVERSE TestDataverse; +USE TestDataverse; + +CREATE TYPE TestType AS { + _id: uuid +}; +CREATE DATASET Dataset1 (TestType) +PRIMARY KEY _id AUTOGENERATED; +CREATE INDEX d1Idx +ON Dataset1 ( UNNEST items: string ) +EXCLUDE UNKNOWN KEY; + +-- Quantification in subplan, open index. +FROM Dataset1 D1 +WHERE TRUE IN [ D1.val = "a", "b" IN D1.items ] +SELECT *; diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/array-index/select-quantified-queries/multiple-quantifiers/query11.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/array-index/select-quantified-queries/multiple-quantifiers/query11.sqlpp new file mode 100644 index 0000000000..adc5607a3b --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/array-index/select-quantified-queries/multiple-quantifiers/query11.sqlpp @@ -0,0 +1,37 @@ +/* + * 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. + */ +SET `compiler.arrayindex` "true"; + +DROP DATAVERSE TestDataverse IF EXISTS; +CREATE DATAVERSE TestDataverse; +USE TestDataverse; + +CREATE TYPE TestType AS { + _id: uuid +}; +CREATE DATASET Dataset1 (TestType) +PRIMARY KEY _id AUTOGENERATED; +CREATE INDEX d1Idx +ON Dataset1 ( UNNEST items: string ) +EXCLUDE UNKNOWN KEY; + +-- Quantification nested in two subplans, open index. +FROM Dataset1 D1 +WHERE TRUE IN [ D1.val = "a", TRUE IN [ D1.val2 = "c", "b" IN D1.items ] ] +SELECT *; diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results/array-index/select-quantified-queries/multiple-quantifiers/query10.plan b/asterixdb/asterix-app/src/test/resources/optimizerts/results/array-index/select-quantified-queries/multiple-quantifiers/query10.plan new file mode 100644 index 0000000000..50d2d2d6c5 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results/array-index/select-quantified-queries/multiple-quantifiers/query10.plan @@ -0,0 +1,36 @@ +-- DISTRIBUTE_RESULT |PARTITIONED| + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + -- STREAM_PROJECT |PARTITIONED| + -- ASSIGN |PARTITIONED| + -- STREAM_PROJECT |PARTITIONED| + -- STREAM_SELECT |PARTITIONED| + -- STREAM_PROJECT |PARTITIONED| + -- SUBPLAN |PARTITIONED| + { + -- AGGREGATE |LOCAL| + -- STREAM_SELECT |LOCAL| + -- UNNEST |LOCAL| + -- SUBPLAN |LOCAL| + { + -- AGGREGATE |LOCAL| + -- STREAM_SELECT |LOCAL| + -- UNNEST |LOCAL| + -- NESTED_TUPLE_SOURCE |LOCAL| + } + -- NESTED_TUPLE_SOURCE |LOCAL| + } + -- ASSIGN |PARTITIONED| + -- STREAM_PROJECT |PARTITIONED| + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + -- BTREE_SEARCH (TestDataverse.Dataset1.Dataset1) |PARTITIONED| + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + -- PRE_SORTED_DISTINCT_BY |PARTITIONED| + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + -- STABLE_SORT [$$33(ASC)] |PARTITIONED| + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + -- STREAM_PROJECT |PARTITIONED| + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + -- BTREE_SEARCH (TestDataverse.Dataset1.d1Idx) |PARTITIONED| + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + -- ASSIGN |PARTITIONED| + -- EMPTY_TUPLE_SOURCE |PARTITIONED| diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results/array-index/select-quantified-queries/multiple-quantifiers/query11.plan b/asterixdb/asterix-app/src/test/resources/optimizerts/results/array-index/select-quantified-queries/multiple-quantifiers/query11.plan new file mode 100644 index 0000000000..f14e55a16c --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results/array-index/select-quantified-queries/multiple-quantifiers/query11.plan @@ -0,0 +1,43 @@ +-- DISTRIBUTE_RESULT |PARTITIONED| + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + -- STREAM_PROJECT |PARTITIONED| + -- ASSIGN |PARTITIONED| + -- STREAM_PROJECT |PARTITIONED| + -- STREAM_SELECT |PARTITIONED| + -- STREAM_PROJECT |PARTITIONED| + -- SUBPLAN |PARTITIONED| + { + -- AGGREGATE |LOCAL| + -- STREAM_SELECT |LOCAL| + -- UNNEST |LOCAL| + -- SUBPLAN |LOCAL| + { + -- AGGREGATE |LOCAL| + -- STREAM_SELECT |LOCAL| + -- UNNEST |LOCAL| + -- SUBPLAN |LOCAL| + { + -- AGGREGATE |LOCAL| + -- STREAM_SELECT |LOCAL| + -- UNNEST |LOCAL| + -- NESTED_TUPLE_SOURCE |LOCAL| + } + -- NESTED_TUPLE_SOURCE |LOCAL| + } + -- NESTED_TUPLE_SOURCE |LOCAL| + } + -- ASSIGN |PARTITIONED| + -- STREAM_PROJECT |PARTITIONED| + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + -- BTREE_SEARCH (TestDataverse.Dataset1.Dataset1) |PARTITIONED| + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + -- PRE_SORTED_DISTINCT_BY |PARTITIONED| + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + -- STABLE_SORT [$$41(ASC)] |PARTITIONED| + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + -- STREAM_PROJECT |PARTITIONED| + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + -- BTREE_SEARCH (TestDataverse.Dataset1.d1Idx) |PARTITIONED| + -- ONE_TO_ONE_EXCHANGE |PARTITIONED| + -- ASSIGN |PARTITIONED| + -- EMPTY_TUPLE_SOURCE |PARTITIONED|
