Skip to content

[fix](cascades) FilteredRules::filterValidRules will filter nothing #55720

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[fix](cascades) FilteredRules::filterValidRules will filter nothing #55720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0bd42a9
fix FilteredRules::filterValidRules
flashzxi Sep 5, 2025
26dbafa
Merge branch 'master' into dev
flashzxi Sep 5, 2025
2e8afed
fix topDownVisitorRewriter use valid rules
flashzxi Sep 11, 2025
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
7 changes: 3 additions & 4 deletions fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/rewrite/TopDownVisitorRewriteJob.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.CascadesContext;
import org.apache.doris.nereids.PlanProcess;
import org.apache.doris.nereids.jobs.JobContext;
import org.apache.doris.nereids.rules.FilteredRules;
import org.apache.doris.nereids.rules.Rule;
import org.apache.doris.nereids.rules.Rules;
import org.apache.doris.nereids.trees.plans.Plan;
Expand Down Expand Up @@ -54,11 +55,9 @@ public void execute(JobContext jobContext) {
}

Plan root = rewrite(
null, -1, originPlan, jobContext, rules, false, new ProcessState(originPlan)
null, -1, originPlan, jobContext, relateRules.get(), false, new ProcessState(originPlan)
);
jobContext.getCascadesContext().setRewritePlan(root);

jobContext.getCascadesContext().setRewritePlan(root);
}

@Override
Expand Down Expand Up @@ -142,6 +141,6 @@ public static Optional<Rules> getRelatedRules(Plan plan, Rules originRules, Casc
if (validRules.isEmpty()) {
return Optional.empty();
}
return Optional.of(originRules);
return Optional.of(new FilteredRules(validRules));
}
}
2 changes: 1 addition & 1 deletion fe/fe-core/src/main/java/org/apache/doris/nereids/rules/FilteredRules.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public List<Rule> filterValidRules(CascadesContext cascadesContext) {
if (disableRules.isEmpty()) {
return allRules;
}
List<Rule> validRules = new ArrayList<>(allRules);
List<Rule> validRules = new ArrayList<>(allRules.size());
for (Rule rule : allRules) {
if (!disableRules.get(rule.getRuleType().type())) {
validRules.add(rule);
Expand Down