Skip to content

[fix](aggregate) Normalize projected count slots before null safety checks #67732

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
Sep 10, 2026
+40 −2
Merged

[fix](aggregate) Normalize projected count slots before null safety checks #67732

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
4 changes: 2 additions & 2 deletions ...core/src/main/java/org/apache/doris/nereids/rules/implementation/AggregateStrategies.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ public List<Rule> buildRules() {
return false;
}

Set<Slot> aggSlots = funcs.stream()
.flatMap(f -> f.getInputSlots().stream())
Set<Slot> aggSlots = normalizeArguments(funcs, agg.child()).stream()
.flatMap(argument -> argument.getInputSlots().stream())
.collect(Collectors.toSet());
return aggSlots.isEmpty() || conjuncts.stream().allMatch(expr ->
checkSlotInOrExpression(expr, aggSlots) && checkIsNullExpr(expr, aggSlots));
Expand Down
38 changes: 38 additions & 0 deletions ...c/test/java/org/apache/doris/nereids/rules/rewrite/PhysicalStorageLayerAggregateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@

import org.apache.doris.catalog.Column;
import org.apache.doris.catalog.DatabaseIf;
import org.apache.doris.catalog.Index;
import org.apache.doris.catalog.TableIf;
import org.apache.doris.catalog.Type;
import org.apache.doris.catalog.info.IndexType;
import org.apache.doris.datasource.CatalogIf;
import org.apache.doris.datasource.plugin.PluginDrivenExternalTable;
import org.apache.doris.nereids.CascadesContext;
Expand All @@ -29,6 +31,7 @@
import org.apache.doris.nereids.rules.RuleType;
import org.apache.doris.nereids.rules.implementation.AggregateStrategies;
import org.apache.doris.nereids.trees.expressions.Alias;
import org.apache.doris.nereids.trees.expressions.IsNull;
import org.apache.doris.nereids.trees.expressions.functions.agg.Count;
import org.apache.doris.nereids.trees.expressions.functions.agg.Max;
import org.apache.doris.nereids.trees.expressions.functions.agg.Min;
Expand All @@ -37,6 +40,7 @@
import org.apache.doris.nereids.trees.plans.logical.LogicalAggregate;
import org.apache.doris.nereids.trees.plans.logical.LogicalFileScan;
import org.apache.doris.nereids.trees.plans.logical.LogicalFileScan.SelectedPartitions;
import org.apache.doris.nereids.trees.plans.logical.LogicalFilter;
import org.apache.doris.nereids.trees.plans.logical.LogicalOlapScan;
import org.apache.doris.nereids.trees.plans.logical.LogicalProject;
import org.apache.doris.nereids.trees.plans.physical.PhysicalStorageLayerAggregate.PushDownAggOp;
Expand All @@ -46,6 +50,7 @@
import org.apache.doris.nereids.util.PlanConstructor;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;

Expand Down Expand Up @@ -259,6 +264,31 @@ public void testWithProject() {
);
}

@Test
public void testCountOnIndexRejectsIsNullOnProjectedCountSlot() {
LogicalOlapScan olapScan = PlanConstructor.newLogicalOlapScan(2, "count_alias", 0);
Index invertedIndex = new Index(1L, "idx_name", ImmutableList.of("name"),
IndexType.INVERTED, null, "");
olapScan.getTable().getIndexIdToMeta().values().forEach(
meta -> meta.setIndexes(ImmutableList.of(invertedIndex)));

LogicalFilter<LogicalOlapScan> filter = new LogicalFilter<>(
ImmutableSet.of(new IsNull(olapScan.getOutput().get(1))), olapScan);
LogicalProject<LogicalFilter<LogicalOlapScan>> project = new LogicalProject<>(
ImmutableList.of(new Alias(olapScan.getOutput().get(1), "x")), filter);
LogicalAggregate<LogicalProject<LogicalFilter<LogicalOlapScan>>> aggregate = new LogicalAggregate<>(
Collections.emptyList(),
ImmutableList.of(new Alias(new Count(project.getOutput().get(0)), "count_x"),
new Alias(new Count(), "count_star")),
true, Optional.empty(), project);
CascadesContext context = MemoTestUtils.createCascadesContext(aggregate);
context.getConnectContext().getSessionVariable().setEnablePushDownCountOnIndex(true);

PlanChecker.from(context)
.applyImplementation(countOnIndex())
.matches(logicalAggregate(logicalProject(logicalFilter(logicalOlapScan()))));
}

@Test
void testProjectionCheck() {
LogicalOlapScan olapScan = PlanConstructor.newLogicalOlapScan(1, "tbl", 0);
Expand Down Expand Up @@ -309,4 +339,12 @@ private Rule storageLayerAggregateWithProject() {
.findFirst()
.get();
}

private Rule countOnIndex() {
return new AggregateStrategies().buildRules()
.stream()
.filter(rule -> rule.getRuleType() == RuleType.COUNT_ON_INDEX)
.findFirst()
.get();
}
}
Loading