Skip to content

[fix](eager-agg) Skip eager aggregation for empty relation context #65257

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
morrySnow merged 1 commit into from
Jul 8, 2026
Merged

[fix](eager-agg) Skip eager aggregation for empty relation context #65257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions ...c/main/java/org/apache/doris/nereids/rules/rewrite/eageraggregation/EagerAggRewriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,9 @@ public Plan visitLogicalJoin(LogicalJoin<? extends Plan, ? extends Plan> join, P
context.needOutputCount(), rightFuncs);
boolean rightNeedOutputCount = needOutputCountForJoinChild(join, toRight, toLeft,
context.needOutputCount(), leftFuncs);
Optional<PushDownAggContext> leftChildContext = toLeft ? Optional.of(context.forOneBranch(leftFuncs,
Optional<PushDownAggContext> leftChildContext = toLeft ? Optional.ofNullable(context.forOneBranch(leftFuncs,
leftAliasMap, leftChildGroupByKeys, passThroughBigJoin, leftNeedOutputCount)) : Optional.empty();
Optional<PushDownAggContext> rightChildContext = toRight ? Optional.of(context.forOneBranch(rightFuncs,
Optional<PushDownAggContext> rightChildContext = toRight ? Optional.ofNullable(context.forOneBranch(rightFuncs,
rightAliasMap, rightChildGroupByKeys, passThroughBigJoin, rightNeedOutputCount)) : Optional.empty();

Plan newLeft = join.left();
Expand Down Expand Up @@ -744,6 +744,9 @@ public Plan visitLogicalFilter(LogicalFilter<? extends Plan> filter, PushDownAgg

@Override
public Plan visitLogicalRelation(LogicalRelation relation, PushDownAggContext context) {
if (context.aggFuncAndGroupKeyAllEmpty()) {
return relation;
}
return genAggregate(relation, context);
}

Expand Down
3 changes: 3 additions & 0 deletions ...main/java/org/apache/doris/nereids/rules/rewrite/eageraggregation/PushDownAggContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,9 @@ public PushDownAggContext withGroupKeys(List<SlotReference> groupKeys) {
public PushDownAggContext forOneBranch(List<AggregateFunction> branchAggFunctions,
Map<AggregateFunction, Alias> branchAliasMap, List<SlotReference> groupKeys,
boolean passThroughBigJoin, boolean needOutputCount) {
if (branchAggFunctions.isEmpty() && groupKeys.isEmpty()) {
return null;
}
return new PushDownAggContext(branchAggFunctions, groupKeys, branchAliasMap,
cascadesContext, passThroughBigJoin, hasDecomposedAggIf, hasCaseWhen,
bilateralState, needOutputCount);
Expand Down
22 changes: 22 additions & 0 deletions ...st/java/org/apache/doris/nereids/rules/rewrite/eageraggregation/EagerAggRewriterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.apache.doris.nereids.trees.plans.logical.LogicalAggregate;
import org.apache.doris.nereids.trees.plans.logical.LogicalFilter;
import org.apache.doris.nereids.trees.plans.logical.LogicalJoin;
import org.apache.doris.nereids.trees.plans.logical.LogicalRelation;
import org.apache.doris.nereids.types.BigIntType;
import org.apache.doris.nereids.util.MemoPatternMatchSupported;
import org.apache.doris.nereids.util.PlanChecker;
Expand Down Expand Up @@ -464,6 +465,27 @@ void testBilateralPushMultiLevelJoin() {
}
}

@Test
void testEmptyContextDoesNotAddRelationAggregate() {
Comment thread
morrySnow marked this conversation as resolved.
connectContext.getSessionVariable().setEagerAggregationMode(1);
try {
PlanChecker planChecker = PlanChecker.from(connectContext).analyze("select * from t1");
Plan analyzedPlan = planChecker.getPlan();
LogicalRelation relation = findFirstPlan(analyzedPlan, LogicalRelation.class);
Assertions.assertNotNull(relation, analyzedPlan.treeString());
PushDownAggContext context = new PushDownAggContext(
Collections.emptyList(), Collections.emptyList(), Collections.emptyMap(),
planChecker.getCascadesContext(),
true, false, false, new BilateralState(), false);

Plan rewritten = relation.accept(new EagerAggRewriter(), context);

Assertions.assertSame(relation, rewritten, rewritten.treeString());
} finally {
connectContext.getSessionVariable().setEagerAggregationMode(0);
}
}

@Test
void testVolatileJoinConjunctBlocksPushDown() {
connectContext.getSessionVariable().setEagerAggregationMode(1);
Expand Down
Loading