From 2e4bdf8cb038bde7d1576229e62e77a1b6b89f43 Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Mon, 18 Aug 2025 18:59:44 -0600 Subject: [PATCH 1/3] Fix release tests for OptimizerVerificationTests --- .../optimizer/OptimizerVerificationTests.java | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/OptimizerVerificationTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/OptimizerVerificationTests.java index fcfe4a0a2a455..2689884284e8b 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/OptimizerVerificationTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/OptimizerVerificationTests.java @@ -7,6 +7,7 @@ package org.elasticsearch.xpack.esql.optimizer; +import org.elasticsearch.Build; import org.elasticsearch.common.Strings; import org.elasticsearch.xpack.esql.EsqlTestUtils; import org.elasticsearch.xpack.esql.VerificationException; @@ -27,6 +28,7 @@ import static org.elasticsearch.xpack.esql.analysis.AnalyzerTestUtils.defaultLookupResolution; import static org.elasticsearch.xpack.esql.analysis.AnalyzerTestUtils.loadEnrichPolicyResolution; import static org.elasticsearch.xpack.esql.analysis.AnalyzerTestUtils.loadMapping; +import static org.elasticsearch.xpack.esql.plugin.EsqlPlugin.INLINESTATS_FEATURE_FLAG; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.instanceOf; @@ -125,16 +127,18 @@ public void testRemoteEnrichAfterCoordinatorOnlyPlans() { """, analyzer); assertThat(err, containsString("4:3: ENRICH with remote policy can't be executed after [STATS count(*) BY language_code]@3:3")); - err = error(""" - FROM test - | EVAL language_code = languages - | INLINESTATS count(*) BY language_code - | ENRICH _remote:languages ON language_code - """, analyzer); - assertThat( - err, - containsString("4:3: ENRICH with remote policy can't be executed after [INLINESTATS count(*) BY language_code]@3:3") - ); + if (INLINESTATS_FEATURE_FLAG) { + err = error(""" + FROM test + | EVAL language_code = languages + | INLINESTATS count(*) BY language_code + | ENRICH _remote:languages ON language_code + """, analyzer); + assertThat( + err, + containsString("4:3: ENRICH with remote policy can't be executed after [INLINESTATS count(*) BY language_code]@3:3") + ); + } err = error(""" FROM test From ed8b83cf41b86a5e9ae5ff187cec57f7be6a5e78 Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Mon, 18 Aug 2025 19:00:36 -0600 Subject: [PATCH 2/3] unmute --- muted-tests.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/muted-tests.yml b/muted-tests.yml index edb8a82efc7f7..b137bb1187a29 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -588,9 +588,6 @@ tests: - class: org.elasticsearch.test.rest.yaml.CcsCommonYamlTestSuiteIT method: test {p0=search/160_exists_query/Test exists query on _id field} issue: https://github.com/elastic/elasticsearch/issues/133097 -- class: org.elasticsearch.xpack.esql.optimizer.OptimizerVerificationTests - method: testRemoteEnrichAfterCoordinatorOnlyPlans - issue: https://github.com/elastic/elasticsearch/issues/133015 - class: org.elasticsearch.xpack.esql.analysis.AnalyzerTests method: testNoDenseVectorFailsForMagnitude issue: https://github.com/elastic/elasticsearch/issues/133013 From 2f101be6116260d3b1fe5721be4cd8209ee9fd13 Mon Sep 17 00:00:00 2001 From: elasticsearchmachine Date: Tue, 19 Aug 2025 01:07:31 +0000 Subject: [PATCH 3/3] [CI] Auto commit changes from spotless --- .../xpack/esql/optimizer/OptimizerVerificationTests.java | 1 - 1 file changed, 1 deletion(-) diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/OptimizerVerificationTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/OptimizerVerificationTests.java index 2689884284e8b..9887588404c88 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/OptimizerVerificationTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/OptimizerVerificationTests.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.esql.optimizer; -import org.elasticsearch.Build; import org.elasticsearch.common.Strings; import org.elasticsearch.xpack.esql.EsqlTestUtils; import org.elasticsearch.xpack.esql.VerificationException;