This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 701e23b65b4 [Fix](nereids) fix condition function partition prune
(#39298) (#39332)
701e23b65b4 is described below
commit 701e23b65b4e8fef356e7aa9580aa27a55f6da47
Author: feiniaofeiafei <[email protected]>
AuthorDate: Wed Aug 14 18:32:50 2024 +0800
[Fix](nereids) fix condition function partition prune (#39298) (#39332)
cherry-pick #39298 to branch-2.1
---
.../rules/OneRangePartitionEvaluator.java | 16 +------
.../partition_prune/test_condition_function.groovy | 51 ++++++++++++++++++++++
2 files changed, 52 insertions(+), 15 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/rules/OneRangePartitionEvaluator.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/rules/OneRangePartitionEvaluator.java
index ac909a5b9fa..9de31fde6d5 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/rules/OneRangePartitionEvaluator.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/rules/OneRangePartitionEvaluator.java
@@ -181,21 +181,7 @@ public class OneRangePartitionEvaluator
@Override
public EvaluateRangeResult visit(Expression expr, EvaluateRangeInput
context) {
- EvaluateRangeResult result = evaluateChildrenThenThis(expr, context);
-
- // NOTE: if children exist empty range return false
- // !!! this is different from `returnFalseIfExistEmptyRange` !!!
- expr = result.result;
- if (expr.getDataType() instanceof BooleanType && !(expr instanceof
Literal)
- && result.childrenResult.stream().anyMatch(childResult ->
-
childResult.columnRanges.values().stream().anyMatch(ColumnRange::isEmptyRange)))
{
- // this assumes that for expression: func(A)
- // if A reject partition, then func(A) reject partition.
- // implement visitFunc for Func if Func does not satisfy the above
assumption.
- return new EvaluateRangeResult(BooleanLiteral.FALSE,
result.columnRanges, result.childrenResult);
- }
- // assumption: for func(A), if A accept range (n, m), then func(A)
accept range (n, m).
- return result;
+ return evaluateChildrenThenThis(expr, context);
}
@Override
diff --git
a/regression-test/suites/nereids_rules_p0/partition_prune/test_condition_function.groovy
b/regression-test/suites/nereids_rules_p0/partition_prune/test_condition_function.groovy
new file mode 100644
index 00000000000..86364ed63e5
--- /dev/null
+++
b/regression-test/suites/nereids_rules_p0/partition_prune/test_condition_function.groovy
@@ -0,0 +1,51 @@
+// 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_condition_function") {
+ sql "SET enable_nereids_planner=true"
+ sql "SET enable_fallback_to_original_planner=false"
+ sql "set enable_fold_constant_by_be=false;"
+ sql "set disable_nereids_rules='prune_empty_partition'"
+
+ sql "drop table if exists test_condition_function_partition_prune;"
+
+ sql """CREATE TABLE `test_condition_function_partition_prune` (id int
,`period` TEXT NULL, `part_dt` datetime NULL )
+ PARTITION BY RANGE(`part_dt`)
+ (PARTITION p20240501 VALUES [('2024-05-01 00:00:00'), ('2024-05-02
00:00:00'))
+ , PARTITION p20240601 VALUES [('2024-06-01 00:00:00'), ('2024-06-02
00:00:00'))
+ , PARTITION p20240610 VALUES [('2024-06-10 00:00:00'), ('2024-06-11
00:00:00')))
+ distributed by hash(id) properties("replication_num"="1");"""
+
+ sql "insert into
test_condition_function_partition_prune(id,part_dt,period)
values(1,'2024-05-01','20240606');"
+ sql "insert into
test_condition_function_partition_prune(id,part_dt,period)
values(2,'2024-06-01','20240606');"
+ sql "insert into
test_condition_function_partition_prune(id,part_dt,period)
values(3,'2024-06-10','20240606');"
+
+ explain {
+ sql """
+ select period
+ from test_condition_function_partition_prune as a
+ where
+ case when substr('abc',1,2)<>'123'
+ then substr(part_dt,1,4)>=substr('20240609',1,4)
+ else
+ part_dt<'20240601' and part_dt>='20240101'
+ end;"""
+ contains "partitions=3/3 (p20240501,p20240601,p20240610)"
+ }
+
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
