database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

branch-2.1: [fix](nereids) Fix the expr id are same but different expr when agg table with random distribute #52993 (#53618)

Browse Source 
pick #52993
This commit is contained in:
seawinde
2025-08-07 16:09:38 +08:00
committed by GitHub
parent dcef9eecb7
commit 80389069ee
2 changed files with 46 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/BindRelation.java
View File

@ -59,6 +59,7 @@ 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.trees.expressions.SlotReference;
import org.apache.doris.nereids.trees.expressions.StatementScopeIdGenerator;
import org.apache.doris.nereids.trees.expressions.functions.AggCombinerFunctionBuilder;
import org.apache.doris.nereids.trees.expressions.functions.FunctionBuilder;
import org.apache.doris.nereids.trees.expressions.functions.agg.BitmapUnion;
@ -283,8 +284,8 @@ public class BindRelation extends OneAnalysisRuleFactory {
if (function == null) {
return olapScan;
}
Alias alias = new Alias(exprId, ImmutableList.of(function), col.getName(),
olapScan.qualified(), true);
Alias alias = new Alias(StatementScopeIdGenerator.newExprId(), ImmutableList.of(function),
col.getName(), olapScan.qualified(), true);
outputExpressions.add(alias);
}
}

43
fe/fe-core/src/test/java/org/apache/doris/nereids/rules/analysis/BindRelationTest.java
View File

@ -20,10 +20,16 @@ package org.apache.doris.nereids.rules.analysis;
import org.apache.doris.nereids.analyzer.UnboundRelation;
import org.apache.doris.nereids.pattern.GeneratedPlanPatterns;
import org.apache.doris.nereids.rules.RulePromise;
import org.apache.doris.nereids.trees.expressions.Alias;
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.StatementScopeIdGenerator;
import org.apache.doris.nereids.trees.plans.Plan;
import org.apache.doris.nereids.trees.plans.logical.LogicalAggregate;
import org.apache.doris.nereids.trees.plans.logical.LogicalOlapScan;
import org.apache.doris.nereids.trees.plans.visitor.DefaultPlanVisitor;
import org.apache.doris.nereids.util.PlanChecker;
import org.apache.doris.nereids.util.PlanRewriter;
import org.apache.doris.utframe.TestWithFeService;
@ -31,6 +37,11 @@ import com.google.common.collect.ImmutableList;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
class BindRelationTest extends TestWithFeService implements GeneratedPlanPatterns {
private static final String DB1 = "db1";
private static final String DB2 = "db2";
@ -93,6 +104,38 @@ class BindRelationTest extends TestWithFeService implements GeneratedPlanPattern
plan.getOutput().get(1).getQualifier());
}
@Test
void testBindRandomAggTableExprIdSame() {
connectContext.getSessionVariable().setDisableNereidsRules("PRUNE_EMPTY_PARTITION");
connectContext.getState().setIsQuery(true);
PlanChecker.from(connectContext)
.checkPlannerResult("select * from db1.tagg",
planner -> {
List<Alias> collectedAlias = new ArrayList<>();
planner.getCascadesContext().getRewritePlan().accept(
new DefaultPlanVisitor<Void, List<Alias>>() {
@Override
public Void visitLogicalAggregate(LogicalAggregate<? extends Plan> aggregate,
List<Alias> context) {
for (Expression expression : aggregate.getExpressions()) {
collectedAlias.addAll(
expression.collectToList(Alias.class::isInstance));
}
return super.visitLogicalAggregate(aggregate, context);
}
}, collectedAlias);
for (Alias alias : collectedAlias) {
for (Expression child : alias.children()) {
Set<ExprId> childExpressionSet =
child.collectToSet(NamedExpression.class::isInstance).stream()
.map(expr -> ((NamedExpression) expr).getExprId())
.collect(Collectors.toSet());
Assertions.assertFalse(childExpressionSet.contains(alias.getExprId()));
}
}
});
}
@Override
public RulePromise defaultPromise() {
return RulePromise.REWRITE;