Skip to content

Refactor verifiers and add remote check #134168

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
wants to merge 10 commits into from
Closed

Refactor verifiers and add remote check #134168

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d777561
Add check that remote enrich stays on remote side
smalyshev Sep 4, 2025
a93438f
Merge branch 'main' into remote-enrich-check
smalyshev Sep 8, 2025
b6244e5
Make it more generic
smalyshev Sep 9, 2025
a787ae8
[CI] Auto commit changes from spotless
Sep 9, 2025
6d638be
Verifier refactor
smalyshev Sep 9, 2025
95ef823
Merge branch 'main' into remote-enrich-check
smalyshev Sep 9, 2025
2490f60
Merge branch 'main' into remote-enrich-check
smalyshev Sep 12, 2025
4e16026
Fix the fix for https://github.com/elastic/elasticsearch/issues/118531
smalyshev Sep 12, 2025
932315f
Merge branch 'main' into remote-enrich-check
smalyshev Sep 16, 2025
ff5cabd
[CI] Update transport version definitions
Oct 2, 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
6 changes: 6 additions & 0 deletions ...ck/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/PhysicalVerifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import org.elasticsearch.xpack.esql.core.expression.Expressions;
import org.elasticsearch.xpack.esql.optimizer.rules.PlanConsistencyChecker;
import org.elasticsearch.xpack.esql.plan.logical.Enrich;
import org.elasticsearch.xpack.esql.plan.logical.ExecutesOn;
import org.elasticsearch.xpack.esql.plan.physical.EnrichExec;
import org.elasticsearch.xpack.esql.plan.physical.FieldExtractExec;
import org.elasticsearch.xpack.esql.plan.physical.PhysicalPlan;
Expand Down Expand Up @@ -54,6 +55,11 @@ void checkPlanConsistency(PhysicalPlan optimizedPlan, Failures failures, Failure
);
}
}

if (p instanceof ExecutesOn ex && ex.executesOn() == ExecutesOn.ExecuteLocation.REMOTE) {
failures.add(fail(p, "Physical plan contains remote executing operation [{}] in local part", p.nodeName()));
}

PlanConsistencyChecker.checkPlan(p, depFailures);

if (failures.hasFailures() == false) {
Expand Down
13 changes: 12 additions & 1 deletion x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/physical/EnrichExec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.elasticsearch.xpack.esql.index.EsIndex;
import org.elasticsearch.xpack.esql.io.stream.PlanStreamInput;
import org.elasticsearch.xpack.esql.plan.logical.Enrich;
import org.elasticsearch.xpack.esql.plan.logical.ExecutesOn;

import java.io.IOException;
import java.util.List;
Expand All @@ -30,7 +31,7 @@

import static org.elasticsearch.xpack.esql.expression.NamedExpressions.mergeOutputAttributes;

public class EnrichExec extends UnaryExec implements EstimatesRowSize {
public class EnrichExec extends UnaryExec implements EstimatesRowSize, ExecutesOn {
public static final NamedWriteableRegistry.Entry ENTRY = new NamedWriteableRegistry.Entry(
PhysicalPlan.class,
"EnrichExec",
Expand Down Expand Up @@ -220,4 +221,14 @@ public boolean equals(Object o) {
public int hashCode() {
return Objects.hash(super.hashCode(), mode, matchType, matchField, policyName, policyMatchField, concreteIndices, enrichFields);
}

@Override
public ExecuteLocation executesOn() {
if (mode == Enrich.Mode.REMOTE) {
return ExecuteLocation.REMOTE;
} else if (mode == Enrich.Mode.COORDINATOR) {
return ExecuteLocation.COORDINATOR;
}
return ExecuteLocation.ANY;
}
}