From 4bc427eef3ccb1aa31b966543d48f7b5a498ebe2 Mon Sep 17 00:00:00 2001 From: Ioana Tagirta Date: Thu, 12 Mar 2026 09:40:52 +0100 Subject: [PATCH] Fix MMR release test using subqueries --- muted-tests.yml | 3 --- .../xpack/esql/analysis/VerifierTests.java | 22 ++++++------------- .../esql/parser/StatementParserTests.java | 2 -- 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/muted-tests.yml b/muted-tests.yml index 70a239844d732..407f5963a1d0b 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -432,9 +432,6 @@ tests: - class: org.elasticsearch.xpack.esql.expression.function.EsqlFunctionRegistryTests method: testRegisteredFunctionHaveTests issue: https://github.com/elastic/elasticsearch/issues/144076 -- class: org.elasticsearch.xpack.esql.analysis.VerifierTests - method: testMMRLimitedInput - issue: https://github.com/elastic/elasticsearch/issues/144077 - class: org.elasticsearch.xpack.esql.expression.function.vector.MagnitudeSerializationTests method: testEqualsAndHashcode issue: https://github.com/elastic/elasticsearch/issues/144078 diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/VerifierTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/VerifierTests.java index b9222c0d07cdb..973634a8ab638 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/VerifierTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/VerifierTests.java @@ -3790,8 +3790,6 @@ public void testUnsupportedMetadata() { } public void testMMRDiversifyFieldIsValid() { - assumeTrue("MMR requires corresponding capability", EsqlCapabilities.Cap.MMR_V2.isEnabled()); - query("row dense_embedding=[0.5, 0.4, 0.3, 0.2]::dense_vector | mmr on dense_embedding limit 10"); assertThat( @@ -3801,8 +3799,6 @@ public void testMMRDiversifyFieldIsValid() { } public void testMMRLimitIsValid() { - assumeTrue("MMR requires corresponding capability", EsqlCapabilities.Cap.MMR_V2.isEnabled()); - query("row dense_embedding=[0.5, 0.4, 0.3, 0.2]::dense_vector | mmr on dense_embedding limit 10"); assertThat( @@ -3816,8 +3812,6 @@ public void testMMRLimitIsValid() { } public void testMMRResolvedQueryVectorIsValid() { - assumeTrue("MMR requires corresponding capability", EsqlCapabilities.Cap.MMR_V2.isEnabled()); - query( "row dense_embedding=[0.5, 0.4, 0.3, 0.2]::dense_vector | mmr [0.5, 0.4, 0.3, 0.2]::dense_vector on dense_embedding limit 10" ); @@ -3833,8 +3827,6 @@ public void testMMRResolvedQueryVectorIsValid() { } public void testMMRLambdaValueIsValid() { - assumeTrue("MMR requires corresponding capability", EsqlCapabilities.Cap.MMR_V2.isEnabled()); - query("row dense_embedding=[0.5, 0.4, 0.3, 0.2]::dense_vector | mmr on dense_embedding limit 10 with { \"lambda\": 0.5 }"); assertThat( @@ -3875,19 +3867,19 @@ public void testMMRLambdaValueIsValid() { } public void testMMRLimitedInput() { - assumeTrue("MMR requires corresponding capability", EsqlCapabilities.Cap.MMR_V2.isEnabled()); - assertThat(error(""" FROM test | EVAL dense_embedding=[0.5, 0.4, 0.3, 0.2]::dense_vector | MMR ON dense_embedding LIMIT 10 """), containsString("MMR can only be used on a limited number of rows. Consider adding a LIMIT before MMR.")); - assertThat(error(""" - FROM (FROM test METADATA _index, _id, _score | EVAL dense_embedding=[0.5, 0.4, 0.3, 0.2]::dense_vector), - (FROM test METADATA _index, _id, _score | LIMIT 10) - | MMR ON dense_embedding LIMIT 10 - """), containsString("MMR can only be used on a limited number of rows. Consider adding a LIMIT before MMR.")); + if (EsqlCapabilities.Cap.SUBQUERY_IN_FROM_COMMAND.isEnabled()) { + assertThat(error(""" + FROM (FROM test METADATA _index, _id, _score | EVAL dense_embedding=[0.5, 0.4, 0.3, 0.2]::dense_vector), + (FROM test METADATA _index, _id, _score | LIMIT 10) + | MMR ON dense_embedding LIMIT 10 + """), containsString("MMR can only be used on a limited number of rows. Consider adding a LIMIT before MMR.")); + } } private void query(String query) { diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/parser/StatementParserTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/parser/StatementParserTests.java index 50f7c25c67ff2..a17961567f2c6 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/parser/StatementParserTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/parser/StatementParserTests.java @@ -4534,8 +4534,6 @@ public Double getLambdaFromMMROptions(@Nullable MapExpression options) { } public void testInvalidMMRCommands() { - assumeTrue("MMR requires corresponding capability", EsqlCapabilities.Cap.MMR_V2.isEnabled()); - expectError("row a = 1 | mmr on some_field", "line 1:30: mismatched input '' expecting {'.', MMR_LIMIT}"); expectError("row a = 1 | mmr on some_field limit", "line 1:36: mismatched input '' expecting {INTEGER_LITERAL, '+', '-'}"); expectError(