diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/RuleType.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/RuleType.java index 7afc0123aa..657189f931 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/RuleType.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/RuleType.java @@ -65,6 +65,7 @@ public enum RuleType { FILL_UP_HAVING_AGGREGATE(RuleTypeClass.REWRITE), FILL_UP_HAVING_PROJECT(RuleTypeClass.REWRITE), FILL_UP_SORT_AGGREGATE(RuleTypeClass.REWRITE), + FILL_UP_SORT_HAVING_PROJECT(RuleTypeClass.REWRITE), FILL_UP_SORT_HAVING_AGGREGATE(RuleTypeClass.REWRITE), FILL_UP_SORT_PROJECT(RuleTypeClass.REWRITE), diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/FillUpMissingSlots.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/FillUpMissingSlots.java index 84d0dbae40..afee320f6f 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/FillUpMissingSlots.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/FillUpMissingSlots.java @@ -120,6 +120,26 @@ public class FillUpMissingSlots implements AnalysisRuleFactory { }); }) ), + RuleType.FILL_UP_SORT_HAVING_PROJECT.build( + logicalSort(logicalHaving(logicalProject())).then(sort -> { + Set childOutput = sort.child().getOutputSet(); + Set notExistedInProject = sort.getOrderKeys().stream() + .map(OrderKey::getExpr) + .map(Expression::getInputSlots) + .flatMap(Set::stream) + .filter(s -> !childOutput.contains(s)) + .collect(Collectors.toSet()); + if (notExistedInProject.size() == 0) { + return null; + } + LogicalProject project = sort.child().child(); + List projects = ImmutableList.builder() + .addAll(project.getProjects()) + .addAll(notExistedInProject).build(); + Plan child = sort.withChildren(sort.child().withChildren(project.withProjects(projects))); + return new LogicalProject<>(ImmutableList.copyOf(project.getOutput()), child); + }) + ), RuleType.FILL_UP_HAVING_AGGREGATE.build( logicalHaving(aggregate()).then(having -> { Aggregate agg = having.child(); diff --git a/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/analysis/FillUpMissingSlotsTest.java b/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/analysis/FillUpMissingSlotsTest.java index 2e479c0595..7b0c8095ba 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/analysis/FillUpMissingSlotsTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/analysis/FillUpMissingSlotsTest.java @@ -579,4 +579,11 @@ public class FillUpMissingSlotsTest extends AnalyzeCheckTestBase implements Memo PlanChecker.from(connectContext).analyze(sql) .matches(logicalFilter()); } + + @Test + void testSortHaving() { + String sql = "SELECT (pk + 1) as c FROM t1 HAVING c > 1 ORDER BY a1 + pk"; + PlanChecker.from(connectContext).analyze(sql) + .applyBottomUp(new CheckAfterRewrite()); + } }