This is an automated email from the ASF dual-hosted git repository.
kxiao 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 f3889a82924 [fix](Nereids) storage later agg rule process agg children
by mistake #26101 (#26698)
f3889a82924 is described below
commit f3889a82924a3325252a2d36d5d76ebc8da18d35
Author: morrySnow <[email protected]>
AuthorDate: Thu Nov 9 23:38:36 2023 +0800
[fix](Nereids) storage later agg rule process agg children by mistake
#26101 (#26698)
pick from master
PR #26101
commit id c0ed5f74ad28761280d124b7176d727a4d233b51
update Project#findProject
agg function's children could be any expression rather than only slot.
we use Project#findProject to process them. But this util could only
process slot. This PR update this util to let it could process all type
expression.
---
.../rules/implementation/AggregateStrategies.java | 6 ++---
.../nereids/rules/rewrite/EliminateAggregate.java | 4 +--
.../doris/nereids/trees/plans/algebra/Project.java | 31 ++++++++++++----------
.../apache/doris/nereids/util/ExpressionUtils.java | 2 +-
4 files changed, 23 insertions(+), 20 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/implementation/AggregateStrategies.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/implementation/AggregateStrategies.java
index a020656c686..6521929f164 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/implementation/AggregateStrategies.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/implementation/AggregateStrategies.java
@@ -397,7 +397,7 @@ public class AggregateStrategies implements
ImplementationRuleFactory {
if (project != null) {
argumentsOfAggregateFunction = Project.findProject(
- (List<SlotReference>) (List)
argumentsOfAggregateFunction, project.getProjects())
+ argumentsOfAggregateFunction, project.getProjects())
.stream()
.map(p -> p instanceof Alias ? p.child(0) : p)
.collect(ImmutableList.toImmutableList());
@@ -431,8 +431,8 @@ public class AggregateStrategies implements
ImplementationRuleFactory {
Set<SlotReference> aggUsedSlots =
ExpressionUtils.collect(argumentsOfAggregateFunction,
SlotReference.class::isInstance);
- List<SlotReference> usedSlotInTable = (List<SlotReference>) (List)
Project.findProject(aggUsedSlots,
- (List<NamedExpression>) (List) logicalScan.getOutput());
+ List<SlotReference> usedSlotInTable = (List<SlotReference>)
Project.findProject(aggUsedSlots,
+ logicalScan.getOutput());
for (SlotReference slot : usedSlotInTable) {
Column column = slot.getColumn().get();
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/EliminateAggregate.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/EliminateAggregate.java
index 88078246ddf..a848fcdc3f5 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/EliminateAggregate.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/EliminateAggregate.java
@@ -41,8 +41,8 @@ public class EliminateAggregate extends OneRewriteRuleFactory
{
if (!onlyHasSlots(outerAgg.getOutputExpressions())) {
return outerAgg;
}
- List<NamedExpression> prunedInnerAggOutput =
Project.findProject(outerAgg.getOutputSet(),
- innerAgg.getOutputExpressions());
+ List<NamedExpression> prunedInnerAggOutput =
(List<NamedExpression>) Project.findProject(
+ outerAgg.getOutputSet(), innerAgg.getOutputExpressions());
return innerAgg.withAggOutput(prunedInnerAggOutput);
}).toRule(RuleType.ELIMINATE_AGGREGATE);
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/algebra/Project.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/algebra/Project.java
index 5b214ad0900..1f1573fd65b 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/algebra/Project.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/algebra/Project.java
@@ -23,9 +23,9 @@ import org.apache.doris.nereids.trees.expressions.ExprId;
import org.apache.doris.nereids.trees.expressions.Expression;
import org.apache.doris.nereids.trees.expressions.NamedExpression;
import org.apache.doris.nereids.trees.expressions.Slot;
+import org.apache.doris.nereids.util.ExpressionUtils;
import org.apache.doris.nereids.util.PlanUtils;
-import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import java.util.Collection;
@@ -78,22 +78,25 @@ public interface Project {
/**
* find projects, if not found the slot, then throw AnalysisException
*/
- static List<NamedExpression> findProject(
- Collection<? extends Slot> slotReferences,
- List<NamedExpression> projects) throws AnalysisException {
+ static List<? extends Expression> findProject(
+ Collection<? extends Expression> expressions,
+ List<? extends NamedExpression> projects) throws AnalysisException
{
Map<ExprId, NamedExpression> exprIdToProject = projects.stream()
- .collect(ImmutableMap.toImmutableMap(p -> p.getExprId(), p ->
p));
+
.collect(ImmutableMap.toImmutableMap(NamedExpression::getExprId, p -> p));
- return slotReferences.stream()
- .map(slot -> {
- ExprId exprId = slot.getExprId();
- NamedExpression project = exprIdToProject.get(exprId);
- if (project == null) {
- throw new AnalysisException("ExprId " +
slot.getExprId() + " no exists in " + projects);
+ return ExpressionUtils.rewriteDownShortCircuit(expressions,
+ expr -> {
+ if (expr instanceof Slot) {
+ Slot slot = (Slot) expr;
+ ExprId exprId = slot.getExprId();
+ NamedExpression project = exprIdToProject.get(exprId);
+ if (project == null) {
+ throw new AnalysisException("ExprId " +
slot.getExprId() + " no exists in " + projects);
+ }
+ return project;
}
- return project;
- })
- .collect(ImmutableList.toImmutableList());
+ return expr;
+ });
}
}
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 1e67808c614..0c5faa20957 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,7 +282,7 @@ public class ExpressionUtils {
}
public static <E extends Expression> List<E> rewriteDownShortCircuit(
- List<E> exprs, Function<Expression, Expression> rewriteFunction) {
+ Collection<E> exprs, Function<Expression, Expression>
rewriteFunction) {
return exprs.stream()
.map(expr -> (E) expr.rewriteDownShortCircuit(rewriteFunction))
.collect(ImmutableList.toImmutableList());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
