Skip to content

[9.0] ESQL: Reuse child outputSet inside the plan where possible (#124611) #125275

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

Merged
merged 1 commit into from
Mar 20, 2025
Merged

[9.0] ESQL: Reuse child outputSet inside the plan where possible (#124611) #125275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions docs/changelog/124611.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 124611
summary: Reuse child `outputSet` inside the plan where possible
area: ES|QL
type: enhancement
issues: []
10 changes: 10 additions & 0 deletions x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/logical/UnaryPlan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
package org.elasticsearch.xpack.esql.plan.logical;

import org.elasticsearch.xpack.esql.core.expression.Attribute;
import org.elasticsearch.xpack.esql.core.expression.AttributeSet;
import org.elasticsearch.xpack.esql.core.tree.Source;

import java.util.Collections;
Expand All @@ -20,6 +21,7 @@
public abstract class UnaryPlan extends LogicalPlan {

private final LogicalPlan child;
private AttributeSet lazyOutputSet;

protected UnaryPlan(Source source, LogicalPlan child) {
super(source, Collections.singletonList(child));
Expand All @@ -42,6 +44,14 @@ public List<Attribute> output() {
return child.output();
}

public AttributeSet outputSet() {
if (lazyOutputSet == null) {
List<Attribute> output = output();
lazyOutputSet = (output == child.output() ? child.outputSet() : new AttributeSet(output));
}
return lazyOutputSet;
}

@Override
public int hashCode() {
return Objects.hashCode(child());
Expand Down
7 changes: 0 additions & 7 deletions x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/physical/FilterExec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,12 @@
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.xpack.esql.core.expression.Attribute;
import org.elasticsearch.xpack.esql.core.expression.Expression;
import org.elasticsearch.xpack.esql.core.tree.NodeInfo;
import org.elasticsearch.xpack.esql.core.tree.Source;
import org.elasticsearch.xpack.esql.io.stream.PlanStreamInput;

import java.io.IOException;
import java.util.List;
import java.util.Objects;

public class FilterExec extends UnaryExec {
Expand Down Expand Up @@ -63,11 +61,6 @@ public Expression condition() {
return condition;
}

@Override
public List<Attribute> output() {
return child().output();
}

@Override
public int hashCode() {
return Objects.hash(condition, child());
Expand Down
12 changes: 12 additions & 0 deletions x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/physical/UnaryExec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
package org.elasticsearch.xpack.esql.plan.physical;

import org.elasticsearch.xpack.esql.core.expression.Attribute;
import org.elasticsearch.xpack.esql.core.expression.AttributeSet;
import org.elasticsearch.xpack.esql.core.tree.Source;

import java.util.Collections;
Expand All @@ -17,6 +18,7 @@
public abstract class UnaryExec extends PhysicalPlan {

private final PhysicalPlan child;
private AttributeSet lazyOutputSet;

protected UnaryExec(Source source, PhysicalPlan child) {
super(source, Collections.singletonList(child));
Expand All @@ -39,6 +41,16 @@ public List<Attribute> output() {
return child.output();
}

@Override
public AttributeSet outputSet() {
if (lazyOutputSet == null) {
List<Attribute> output = output();
lazyOutputSet = (output == child.output() ? child.outputSet() : new AttributeSet(output));
return lazyOutputSet;
}
return lazyOutputSet;
}

@Override
public int hashCode() {
return Objects.hashCode(child());
Expand Down