Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yiguolei merged 2 commits into from
Aug 7, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47da386
[fix](nereids) Fix the expr id are same but different expr when agg t…
seawinde Jul 18, 2025
137399b
fix compile fail
seawinde Jul 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/BindRelation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
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;
Expand Down Expand Up @@ -282,8 +283,8 @@ private LogicalPlan preAggForRandomDistribution(LogicalOlapScan olapScan) {
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);
}
}
Expand Down
43 changes: 43 additions & 0 deletions fe/fe-core/src/test/java/org/apache/doris/nereids/rules/analysis/BindRelationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,28 @@
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;

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";
Expand Down Expand Up @@ -93,6 +104,38 @@ void bindRandomAggTable() {
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;
Expand Down