diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/VariantSubPathPruning.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/VariantSubPathPruning.java index df0eebc8d380f5..5b081ce2c2477c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/VariantSubPathPruning.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/VariantSubPathPruning.java @@ -386,7 +386,8 @@ public Plan visitLogicalProject(LogicalProject project, Context .withChildren(context.elementAtToSlotMap.get(child)); } else { addOthers = false; - newProjection = projection; + newProjection = (NamedExpression) projection + .withChildren(ExpressionUtils.replace(child, context.elementAtToSlotMap)); // try push element_at on this slot if (extractSlotToSubPathPair((ElementAt) child) == null) { diff --git a/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/rewrite/VariantPruningLogicTest.java b/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/rewrite/VariantPruningLogicTest.java index 6a23519e069ef3..611e209af996b8 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/rewrite/VariantPruningLogicTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/rewrite/VariantPruningLogicTest.java @@ -70,6 +70,24 @@ public void testVariantNumericIndexSubPath() throws Exception { ); } + @Test + public void testVariantArraySubscriptUsesPrunedSubPath() throws Exception { + String sql = "select cast(v['items']['type'] as array)[1] from variant_tbl"; + String explain = getSQLPlanOrErrorMsg(sql, true); + Assertions.assertTrue(explain.contains("final projections: element_at(CAST(v AS array), 1)"), + explain); + Assertions.assertTrue(explain.contains("subColPath=[items, type]"), + explain); + Assertions.assertFalse(explain.contains("element_at(CAST(element_at(element_at("), + explain); + assertVariantSubColumnSlots( + sql, + ImmutableList.of( + ImmutableList.of("items", "type") + ) + ); + } + @Test public void testVariantOrPredicatePaths() throws Exception { assertPredicateAccessPathsEqual( diff --git a/regression-test/suites/variant_p0/test_variant_array_subscript.groovy b/regression-test/suites/variant_p0/test_variant_array_subscript.groovy new file mode 100644 index 00000000000000..c038e5aefafbd0 --- /dev/null +++ b/regression-test/suites/variant_p0/test_variant_array_subscript.groovy @@ -0,0 +1,54 @@ +// 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. + +suite("test_variant_array_subscript", "p0") { + sql "set enable_nereids_planner = true" + sql "set enable_fallback_to_original_planner = false" + sql "set default_variant_enable_nested_group = false" + sql "set default_variant_max_subcolumns_count = 100" + + sql "DROP TABLE IF EXISTS test_variant_array_subscript" + sql """ + CREATE TABLE test_variant_array_subscript ( + id BIGINT, + v VARIANT + ) ENGINE=OLAP + DUPLICATE KEY(id) + DISTRIBUTED BY HASH(id) BUCKETS 1 + PROPERTIES ( + "replication_allocation" = "tag.location.default: 1", + "disable_auto_compaction" = "true" + ) + """ + + sql """ + INSERT INTO test_variant_array_subscript VALUES + (1, '{"items":{"type":["e2e_QC","platform_QC"]}}') + """ + sql "sync" + + explain { + verbose true + sql """ + SELECT CAST(v['items']['type'] AS ARRAY)[1] + FROM test_variant_array_subscript + """ + contains "subColPath=[items, type]" + contains "element_at(CAST(v" + notContains "element_at(CAST(element_at(element_at(" + } +}