Skip to content

[enhancement](nereids)eliminate repeat node if there is only 1 grouping set and no grouping scalar function #35813

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 4 commits into from
Jun 4, 2024
Merged

[enhancement](nereids)eliminate repeat node if there is only 1 grouping set and no grouping scalar function #35813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
181da5c
[enhancement](nereids)eliminate repeat node if there is only 1 groupi…
starocean999 Jun 3, 2024
4454381
add more case
starocean999 Jun 3, 2024
fe8f62e
fix fe ut
starocean999 Jun 3, 2024
a6387e4
modify code
starocean999 Jun 4, 2024
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
6 changes: 6 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/NormalizeRepeat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,12 @@ public class NormalizeRepeat extends OneAnalysisRuleFactory {
public Rule build() {
return RuleType.NORMALIZE_REPEAT.build(
logicalRepeat(any()).when(LogicalRepeat::canBindVirtualSlot).then(repeat -> {
if (repeat.getGroupingSets().size() == 1
&& ExpressionUtils.collect(repeat.getOutputExpressions(),
GroupingScalarFunction.class::isInstance).isEmpty()) {
return new LogicalAggregate<>(repeat.getGroupByExpressions(),
repeat.getOutputExpressions(), repeat.child());
}
checkRepeatLegality(repeat);
repeat = removeDuplicateColumns(repeat);
// add virtual slot, LogicalAggregate and LogicalProject for normalize
Expand Down
39 changes: 38 additions & 1 deletion fe/fe-core/src/test/java/org/apache/doris/nereids/rules/analysis/NormalizeRepeatTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.apache.doris.nereids.trees.expressions.Alias;
import org.apache.doris.nereids.trees.expressions.Slot;
import org.apache.doris.nereids.trees.expressions.functions.agg.Sum;
import org.apache.doris.nereids.trees.expressions.functions.scalar.GroupingId;
import org.apache.doris.nereids.trees.plans.Plan;
import org.apache.doris.nereids.trees.plans.logical.LogicalOlapScan;
import org.apache.doris.nereids.trees.plans.logical.LogicalRepeat;
Expand All @@ -41,7 +42,7 @@ public void testKeepNullableAfterNormalizeRepeat() {
Slot name = scan1.getOutput().get(1);
Alias alias = new Alias(new Sum(name), "sum(name)");
Plan plan = new LogicalRepeat<>(
ImmutableList.of(ImmutableList.of(id)),
ImmutableList.of(ImmutableList.of(id), ImmutableList.of(name)),
ImmutableList.of(idNotNull, alias),
scan1
);
Expand All @@ -51,4 +52,40 @@ public void testKeepNullableAfterNormalizeRepeat() {
logicalRepeat().when(repeat -> repeat.getOutputExpressions().get(0).nullable())
);
}

@Test
public void testEliminateRepeat() {
Slot id = scan1.getOutput().get(0);
Slot idNotNull = id.withNullable(true);
Slot name = scan1.getOutput().get(1);
Alias alias = new Alias(new Sum(name), "sum(name)");
Plan plan = new LogicalRepeat<>(
ImmutableList.of(ImmutableList.of(id)),
ImmutableList.of(idNotNull, alias),
scan1
);
PlanChecker.from(MemoTestUtils.createCascadesContext(plan))
.applyTopDown(new NormalizeRepeat())
.matchesFromRoot(
logicalAggregate(logicalOlapScan())
);
}

@Test
public void testNoEliminateRepeat() {
Slot id = scan1.getOutput().get(0);
Slot idNotNull = id.withNullable(true);
Slot name = scan1.getOutput().get(1);
Alias alias = new Alias(new GroupingId(name), "grouping_id(name)");
Plan plan = new LogicalRepeat<>(
ImmutableList.of(ImmutableList.of(id)),
ImmutableList.of(idNotNull, alias),
scan1
);
PlanChecker.from(MemoTestUtils.createCascadesContext(plan))
.applyTopDown(new NormalizeRepeat())
.matchesFromRoot(
logicalAggregate(logicalRepeat(logicalOlapScan()))
);
}
}
15 changes: 15 additions & 0 deletions regression-test/suites/nereids_rules_p0/grouping_sets/grouping_normalize_test.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,19 @@ suite("grouping_normalize_test"){
SELECT ROUND( SUM(pk + 1) - 3) col_alias1, MAX( DISTINCT col_int_undef_signed - 5) AS col_alias2, pk + 1 AS col_alias3
FROM grouping_normalize_test GROUP BY GROUPING SETS ((col_int_undef_signed,col_int_undef_signed2,pk),()) order by 1,2,3;
"""

explain {
sql("SELECT col_int_undef_signed, col_int_undef_signed2, SUM(pk) FROM grouping_normalize_test GROUP BY GROUPING SETS ((col_int_undef_signed, col_int_undef_signed2));")
notContains("VREPEAT_NODE")
}

explain {
sql("SELECT col_int_undef_signed, col_int_undef_signed2, SUM(pk), grouping_id(col_int_undef_signed2) FROM grouping_normalize_test GROUP BY GROUPING SETS ((col_int_undef_signed, col_int_undef_signed2),());")
contains("VREPEAT_NODE")
}

explain {
sql("SELECT col_int_undef_signed, col_int_undef_signed2, SUM(pk) FROM grouping_normalize_test GROUP BY GROUPING SETS ((col_int_undef_signed, col_int_undef_signed2));")
notContains("VREPEAT_NODE")
}
}