From d9943d037487c77d0cb3212be55612fa86a7f372 Mon Sep 17 00:00:00 2001 From: chen Date: Tue, 5 Mar 2024 16:19:09 +0800 Subject: [PATCH] [chore](Nereids) change consumer rules name (#31777) --- .../main/java/org/apache/doris/nereids/rules/RuleType.java | 6 +++--- .../nereids/rules/rewrite/CollectFilterAboveConsumer.java | 2 +- .../nereids/rules/rewrite/CollectProjectAboveConsumer.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) 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 3b56738230..c42f0ef008 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 @@ -288,14 +288,14 @@ public enum RuleType { PULL_UP_CTE_ANCHOR(RuleTypeClass.REWRITE), CTE_INLINE(RuleTypeClass.REWRITE), REWRITE_CTE_CHILDREN(RuleTypeClass.REWRITE), - COLLECT_FILTER_ON_CONSUMER(RuleTypeClass.REWRITE), + COLLECT_FILTER_ABOVE_CTE_CONSUMER(RuleTypeClass.REWRITE), INLINE_VIEW(RuleTypeClass.REWRITE), CHECK_PRIVILEGES(RuleTypeClass.REWRITE), COLLECT_FILTER(RuleTypeClass.REWRITE), COLLECT_JOIN_CONSTRAINT(RuleTypeClass.REWRITE), - COLLECT_PROJECT_ABOVE_CONSUMER(RuleTypeClass.REWRITE), - COLLECT_PROJECT_ABOVE_FILTER_CONSUMER(RuleTypeClass.REWRITE), + COLLECT_PROJECT_ABOVE_CTE_CONSUMER(RuleTypeClass.REWRITE), + COLLECT_PROJECT_ABOVE_FILTER_CTE_CONSUMER(RuleTypeClass.REWRITE), LEADING_JOIN(RuleTypeClass.REWRITE), REWRITE_SENTINEL(RuleTypeClass.REWRITE), diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/CollectFilterAboveConsumer.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/CollectFilterAboveConsumer.java index 4c4249b69c..d2e61f9e66 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/CollectFilterAboveConsumer.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/CollectFilterAboveConsumer.java @@ -47,6 +47,6 @@ public class CollectFilterAboveConsumer extends OneRewriteRuleFactory { ctx.cascadesContext.putConsumerIdToFilter(cteConsumer.getRelationId(), rewrittenExpr); } return ctx.root; - }).toRule(RuleType.COLLECT_FILTER_ON_CONSUMER); + }).toRule(RuleType.COLLECT_FILTER_ABOVE_CTE_CONSUMER); } } diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/CollectProjectAboveConsumer.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/CollectProjectAboveConsumer.java index 43f8231cbc..0ecace726d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/CollectProjectAboveConsumer.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/CollectProjectAboveConsumer.java @@ -40,7 +40,7 @@ public class CollectProjectAboveConsumer implements RewriteRuleFactory { @Override public List buildRules() { - return ImmutableList.of(RuleType.COLLECT_PROJECT_ABOVE_CONSUMER + return ImmutableList.of(RuleType.COLLECT_PROJECT_ABOVE_CTE_CONSUMER .build(logicalProject(logicalCTEConsumer()).thenApply(ctx -> { LogicalProject project = ctx.root; List namedExpressions = project.getProjects(); @@ -48,7 +48,7 @@ public class CollectProjectAboveConsumer implements RewriteRuleFactory { collectProject(ctx.cascadesContext, namedExpressions, cteConsumer); return ctx.root; })), - RuleType.COLLECT_PROJECT_ABOVE_FILTER_CONSUMER + RuleType.COLLECT_PROJECT_ABOVE_FILTER_CTE_CONSUMER .build(logicalProject(logicalFilter(logicalCTEConsumer())).thenApply(ctx -> { LogicalProject> project = ctx.root; LogicalFilter filter = project.child();