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

[fix](Nereids) merge limit should use bottom phase (#29142)

Browse Source
This commit is contained in:
morrySnow
2023-12-27 21:04:00 +08:00
committed by GitHub
parent 0436013baf
commit abbd2cedff
2 changed files with 51 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/MergeLimits.java
View File

@ -50,7 +50,7 @@ public class MergeLimits extends OneRewriteRuleFactory {
Math.min(upperLimit.getLimit(),
Math.max(bottomLimit.getLimit() - upperLimit.getOffset(), 0)),
bottomLimit.getOffset() + upperLimit.getOffset(),
upperLimit.getPhase(), bottomLimit.child()
upperLimit.child().getPhase(), bottomLimit.child()
);
}).toRule(RuleType.MERGE_LIMITS);
}

50
fe/fe-core/src/test/java/org/apache/doris/nereids/rules/rewrite/MergeLimitsTest.java
View File

@ -17,6 +17,8 @@
package org.apache.doris.nereids.rules.rewrite;
import org.apache.doris.nereids.trees.plans.LimitPhase;
import org.apache.doris.nereids.trees.plans.logical.LogicalLimit;
import org.apache.doris.nereids.trees.plans.logical.LogicalOlapScan;
import org.apache.doris.nereids.trees.plans.logical.LogicalPlan;
import org.apache.doris.nereids.util.LogicalPlanBuilder;
@ -44,4 +46,52 @@ class MergeLimitsTest implements MemoPatternMatchSupported {
.matches(
logicalLimit().when(limit -> limit.getLimit() == 2).when(limit -> limit.getOffset() == 5));
}
@Test
void testMergeLimitsWithLocalUpperAndGlobalBottom() {
LogicalPlan logicalLimit = new LogicalLimit<>(2, 0, LimitPhase.LOCAL,
new LogicalLimit<>(10, 0, LimitPhase.GLOBAL, scan1));
PlanChecker.from(new ConnectContext(), logicalLimit).applyTopDown(new MergeLimits())
.matches(
logicalLimit().when(limit -> limit.getLimit() == 2)
.when(limit -> limit.getPhase() == LimitPhase.GLOBAL));
}
@Test
void testMergeLimitsWithLocalUpperAndLocalBottom() {
LogicalPlan logicalLimit = new LogicalLimit<>(2, 0, LimitPhase.LOCAL,
new LogicalLimit<>(10, 0, LimitPhase.LOCAL, scan1));
PlanChecker.from(new ConnectContext(), logicalLimit).applyTopDown(new MergeLimits())
.matches(
logicalLimit().when(limit -> limit.getLimit() == 2)
.when(limit -> limit.getPhase() == LimitPhase.LOCAL));
}
@Test
void testMergeLimitsWithGlobalUpperAndGlobalBottom() {
LogicalPlan logicalLimit = new LogicalLimit<>(2, 0, LimitPhase.GLOBAL,
new LogicalLimit<>(10, 0, LimitPhase.GLOBAL, scan1));
PlanChecker.from(new ConnectContext(), logicalLimit).applyTopDown(new MergeLimits())
.matches(
logicalLimit().when(limit -> limit.getLimit() == 2)
.when(limit -> limit.getPhase() == LimitPhase.GLOBAL));
}
@Test
void testMergeLimitsWithGlobalUpperAndLocalBottom() {
LogicalPlan logicalLimit = new LogicalLimit<>(2, 0, LimitPhase.GLOBAL,
new LogicalLimit<>(10, 0, LimitPhase.LOCAL, scan1));
PlanChecker.from(new ConnectContext(), logicalLimit).applyTopDown(new MergeLimits())
.matches(
logicalLimit(
logicalLimit()
.when(limit -> limit.getLimit() == 10)
.when(limit -> limit.getPhase() == LimitPhase.LOCAL))
.when(limit -> limit.getLimit() == 2)
.when(limit -> limit.getPhase() == LimitPhase.GLOBAL));
}
}