Skip to content

Commit e7a4436

Browse files
authored
ESQL: Disable remote enrich verification (#118534)
This disables verifying the plans generated for remote ENRICHing. It also re-enables corresponding failing test. Related: #118531 Fixes #118307.
1 parent d514315 commit e7a4436

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

muted-tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -276,9 +276,6 @@ tests:
276276
- class: org.elasticsearch.action.search.SearchQueryThenFetchAsyncActionTests
277277
method: testBottomFieldSort
278278
issue: https://github.com/elastic/elasticsearch/issues/118214
279-
- class: org.elasticsearch.xpack.esql.action.CrossClustersEnrichIT
280-
method: testTopNThenEnrichRemote
281-
issue: https://github.com/elastic/elasticsearch/issues/118307
282279
- class: org.elasticsearch.xpack.remotecluster.CrossClusterEsqlRCS1UnavailableRemotesIT
283280
method: testEsqlRcs1UnavailableRemoteScenarios
284281
issue: https://github.com/elastic/elasticsearch/issues/118350

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/PhysicalVerifier.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
import org.elasticsearch.xpack.esql.core.expression.Attribute;
1313
import org.elasticsearch.xpack.esql.core.expression.Expressions;
1414
import org.elasticsearch.xpack.esql.optimizer.rules.PlanConsistencyChecker;
15+
import org.elasticsearch.xpack.esql.plan.logical.Enrich;
1516
import org.elasticsearch.xpack.esql.plan.physical.AggregateExec;
17+
import org.elasticsearch.xpack.esql.plan.physical.EnrichExec;
1618
import org.elasticsearch.xpack.esql.plan.physical.FieldExtractExec;
1719
import org.elasticsearch.xpack.esql.plan.physical.PhysicalPlan;
1820

@@ -35,6 +37,12 @@ public Collection<Failure> verify(PhysicalPlan plan) {
3537
Set<Failure> failures = new LinkedHashSet<>();
3638
Failures depFailures = new Failures();
3739

40+
// AwaitsFix https://github.com/elastic/elasticsearch/issues/118531
41+
var enriches = plan.collectFirstChildren(EnrichExec.class::isInstance);
42+
if (enriches.isEmpty() == false && ((EnrichExec) enriches.get(0)).mode() == Enrich.Mode.REMOTE) {
43+
return failures;
44+
}
45+
3846
plan.forEachDown(p -> {
3947
if (p instanceof AggregateExec agg) {
4048
var exclude = Expressions.references(agg.ordinalAttributes());

0 commit comments

Comments
 (0)