Skip to content

ESQL: WIP: simplify PruneColumns #140835

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

Closed
alex-spies wants to merge 2 commits into from
+28 −28
Closed

ESQL: WIP: simplify PruneColumns #140835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6422671
WIP: simplify PruneColumns
alex-spies Jan 16, 2026
e5a060f
[CI] Auto commit changes from spotless
Jan 16, 2026
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
52 changes: 26 additions & 26 deletions ...esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/PruneColumns.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import org.elasticsearch.xpack.esql.plan.logical.UnaryPlan;
import org.elasticsearch.xpack.esql.plan.logical.UnionAll;
import org.elasticsearch.xpack.esql.plan.logical.join.InlineJoin;
import org.elasticsearch.xpack.esql.plan.logical.join.StubRelation;
import org.elasticsearch.xpack.esql.plan.logical.local.LocalRelation;
import org.elasticsearch.xpack.esql.plan.logical.local.LocalSupplier;
import org.elasticsearch.xpack.esql.planner.PlannerUtils;
Expand All @@ -39,7 +38,6 @@
import java.util.Set;
import java.util.stream.Collectors;

import static org.elasticsearch.xpack.esql.expression.NamedExpressions.mergeOutputExpressions;
import static org.elasticsearch.xpack.esql.optimizer.rules.logical.PruneEmptyPlans.skipPlan;

/**
Expand Down Expand Up @@ -79,10 +77,10 @@ private static LogicalPlan pruneColumns(LogicalPlan plan, AttributeSet.Builder u
do {
recheck.set(false);
p = switch (p) {
case Aggregate agg -> pruneColumnsInAggregate(agg, used, inlineJoin);
case InlineJoin inj -> pruneColumnsInInlineJoinRight(inj, used, recheck);
case Aggregate agg -> pruneColumnsInAggregate(agg, used, false);
case InlineJoin inj -> pruneColumnsInInlineJoin(inj, used, recheck);
case Eval eval -> pruneColumnsInEval(eval, used, recheck);
case Project project -> inlineJoin ? pruneColumnsInProject(project, used, recheck) : p;
case Project project -> pruneColumnsInProject(project, used, recheck);
case EsRelation esr -> pruneColumnsInEsRelation(esr, used);
case Fork fork -> {
forkPresent.set(true);
Expand Down Expand Up @@ -139,33 +137,35 @@ private static LogicalPlan pruneColumnsInAggregate(Aggregate aggregate, Attribut
return p;
}

private static LogicalPlan pruneColumnsInInlineJoinRight(InlineJoin ij, AttributeSet.Builder used, Holder<Boolean> recheck) {
private static LogicalPlan pruneColumnsInInlineJoin(InlineJoin ij, AttributeSet.Builder used, Holder<Boolean> recheck) {
LogicalPlan p = ij;

var right = pruneColumns(ij.right(), used, true);
if (right.output().isEmpty() || isLocalEmptyRelation(right)) {
used.addAll(ij.references());

var right = pruneColumns(ij.right(), used, false);
if (right.outputSet().subtract(ij.references()).isEmpty() || isLocalEmptyRelation(right)) {
p = pruneRightSideAndProject(ij);
recheck.set(true);
} else if (right != ij.right()) {
if (right.anyMatch(plan -> plan instanceof Aggregate) == false) {// there is no aggregation on the right side anymore
if (right instanceof StubRelation) {// right is just a StubRelation, meaning nothing is needed from the right side
p = pruneRightSideAndProject(ij);
} else {
// if the right has no aggregation anymore, but it still has some other plans (evals, projects),
// we keep those and integrate them into the main plan. The InlineJoin is also replaced entirely.
p = InlineJoin.replaceStub(ij.left(), right);
p = new Project(ij.source(), p, mergeOutputExpressions(p.output(), ij.left().output()));
}
} else {
// if the right side has been updated, replace it
p = ij.replaceRight(right);
}
recheck.set(true);
// if (right.anyMatch(plan -> plan instanceof Aggregate) == false) {// there is no aggregation on the right side anymore
// if (right instanceof StubRelation) {// right is just a StubRelation, meaning nothing is needed from the right side
// p = pruneRightSideAndProject(ij);
// } else {
// // if the right has no aggregation anymore, but it still has some other plans (evals, projects),
// // we keep those and integrate them into the main plan. The InlineJoin is also replaced entirely.
// p = InlineJoin.replaceStub(ij.left(), right);
// p = new Project(ij.source(), p, mergeOutputExpressions(p.output(), ij.left().output()));
// }
// } else {
// // if the right side has been updated, replace it
// p = ij.replaceRight(right);
// }
// recheck.set(true);
}

if (recheck.get() == false) {
used.addAll(p.references());
}
// if (recheck.get() == false) {
// used.addAll(p.references());
// }

return p;
}
Expand Down Expand Up @@ -204,7 +204,7 @@ private static LogicalPlan pruneColumnsInProject(Project project, AttributeSet.B

var remaining = pruneUnusedAndAddReferences(project.projections(), used);
if (remaining != null) {
p = remaining.isEmpty() ? emptyLocalRelation(project) : new Project(project.source(), project.child(), remaining);
p = new Project(project.source(), project.child(), remaining);
recheck.set(true);
}

Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/rule/RuleExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,8 @@ protected final ExecutionInfo executeWithInfo(TreeType plan) {

if (tf.hasChanged()) {
hasChanged = true;
if (changeLog.isTraceEnabled()) {
changeLog.trace("Rule {} applied with change\n{}", rule, NodeUtils.diffString(tf.before, tf.after));
if (true) {
changeLog.info("Rule {} applied with change\n{}", rule, NodeUtils.diffString(tf.before, tf.after));
}
} else {
if (log.isTraceEnabled()) {
Expand Down