This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 4aa211139c7 [fix](nereids)EliminateGroupByConstant should replace
agg's output after removing constant group by keys (#32879)
4aa211139c7 is described below
commit 4aa211139c760c6894c62cd3e2cfc80e0728bee6
Author: starocean999 <[email protected]>
AuthorDate: Thu Mar 28 10:18:37 2024 +0800
[fix](nereids)EliminateGroupByConstant should replace agg's output after
removing constant group by keys (#32879)
---
.../rules/analysis/EliminateGroupByConstant.java | 8 +++-
.../apache/doris/nereids/util/ExpressionUtils.java | 17 ++++++++
.../aggregate/aggregate_groupby_constant.groovy | 50 ++++++++++++++++++++++
3 files changed, 74 insertions(+), 1 deletion(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/EliminateGroupByConstant.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/EliminateGroupByConstant.java
index e683153e9a2..4408e64487c 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/EliminateGroupByConstant.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/EliminateGroupByConstant.java
@@ -26,11 +26,14 @@ import
org.apache.doris.nereids.trees.expressions.Expression;
import org.apache.doris.nereids.trees.expressions.NamedExpression;
import org.apache.doris.nereids.trees.plans.Plan;
import org.apache.doris.nereids.trees.plans.logical.LogicalAggregate;
+import org.apache.doris.nereids.util.ExpressionUtils;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Sets;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.Set;
/**
@@ -54,6 +57,7 @@ public class EliminateGroupByConstant extends
OneRewriteRuleFactory {
List<Expression> groupByExprs = aggregate.getGroupByExpressions();
List<NamedExpression> outputExprs =
aggregate.getOutputExpressions();
Set<Expression> slotGroupByExprs = Sets.newLinkedHashSet();
+ Map<Expression, Expression> constantExprsReplaceMap = new
HashMap<>(groupByExprs.size());
Expression lit = null;
for (Expression expression : groupByExprs) {
// NOTICE: we should not use the expression after fold as new
aggregate's output or group expr
@@ -64,13 +68,15 @@ public class EliminateGroupByConstant extends
OneRewriteRuleFactory {
if (!foldExpression.isConstant()) {
slotGroupByExprs.add(expression);
} else {
+ constantExprsReplaceMap.put(expression, foldExpression);
lit = expression;
}
}
if (slotGroupByExprs.isEmpty() && lit != null) {
slotGroupByExprs.add(lit);
}
- return
aggregate.withGroupByAndOutput(ImmutableList.copyOf(slotGroupByExprs),
outputExprs);
+ return
aggregate.withGroupByAndOutput(ImmutableList.copyOf(slotGroupByExprs),
+ ExpressionUtils.replaceNamedExpressions(outputExprs,
constantExprsReplaceMap));
}).toRule(RuleType.ELIMINATE_GROUP_BY_CONSTANT);
}
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/util/ExpressionUtils.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/util/ExpressionUtils.java
index 4f3a8b1f575..46990827633 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/util/ExpressionUtils.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/util/ExpressionUtils.java
@@ -282,6 +282,23 @@ public class ExpressionUtils {
}
}
+ /**
+ * Replace expression node in the expression tree by `replaceMap` in
top-down manner.
+ */
+ public static List<NamedExpression>
replaceNamedExpressions(List<NamedExpression> namedExpressions,
+ Map<? extends Expression, ? extends Expression> replaceMap) {
+ Builder<NamedExpression> replaceExprs =
ImmutableList.builderWithExpectedSize(namedExpressions.size());
+ for (NamedExpression namedExpression : namedExpressions) {
+ NamedExpression newExpr = replaceNameExpression(namedExpression,
replaceMap);
+ if (newExpr.getExprId().equals(namedExpression.getExprId())) {
+ replaceExprs.add(newExpr);
+ } else {
+ replaceExprs.add(new Alias(namedExpression.getExprId(),
newExpr, namedExpression.getName()));
+ }
+ }
+ return replaceExprs.build();
+ }
+
/**
* Replace expression node in the expression tree by `replaceMap` in
top-down manner.
* For example.
diff --git
a/regression-test/suites/nereids_p0/aggregate/aggregate_groupby_constant.groovy
b/regression-test/suites/nereids_p0/aggregate/aggregate_groupby_constant.groovy
new file mode 100644
index 00000000000..ffd6c9b382e
--- /dev/null
+++
b/regression-test/suites/nereids_p0/aggregate/aggregate_groupby_constant.groovy
@@ -0,0 +1,50 @@
+// 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("aggregate_groupby_constant") {
+ sql "SET enable_nereids_planner=true"
+ sql "SET enable_fallback_to_original_planner=false"
+
+ sql """ DROP TABLE IF EXISTS
table_500_undef_partitions2_keys3_properties4_distributed_by5; """
+ sql """
+ create table
table_500_undef_partitions2_keys3_properties4_distributed_by5 (
+ col_date_undef_signed date ,
+ pk int,
+ col_int_undef_signed int ,
+ col_int_undef_signed2 int ,
+ col_date_undef_signed2 date ,
+ col_varchar_10__undef_signed varchar(10) ,
+ col_varchar_1024__undef_signed varchar(1024)
+ ) engine=olap
+ DUPLICATE KEY(col_date_undef_signed, pk, col_int_undef_signed)
+ PARTITION BY RANGE(col_date_undef_signed) ( FROM ('2023-12-09') TO
('2023-12-12') INTERVAL 1 DAY )
+ distributed by hash(pk) buckets 10
+ properties("replication_num" = "1");
+ """
+ sql """SELECT table1 . col_int_undef_signed2 AS field1,
+ ( TO_DATE (CASE
+ WHEN ( '2024-01-08' < '2024-02-18' ) THEN
+ '2023-12-19'
+ WHEN ( table1 . `col_date_undef_signed2` < DATE_ADD ( table1 .
`col_date_undef_signed` , INTERVAL 6 DAY ) ) THEN
+ '2026-02-18'
+ ELSE DATE_ADD( table1 . `col_date_undef_signed` , INTERVAL 365
DAY ) END)) AS field2, MAX( DISTINCT table1 . `col_varchar_10__undef_signed` )
AS field3
+ FROM table_500_undef_partitions2_keys3_properties4_distributed_by5
AS table1
+ WHERE ( ( table1 . `col_date_undef_signed` is NOT NULL )
+ OR table1 . `col_int_undef_signed` <> NULL )
+ GROUP BY field1,field2
+ ORDER BY field1,field2 LIMIT 10000;"""
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
