diff --git a/docs/changelog/129657.yaml b/docs/changelog/129657.yaml new file mode 100644 index 0000000000000..95fc3f8cd24d0 --- /dev/null +++ b/docs/changelog/129657.yaml @@ -0,0 +1,6 @@ +pr: 129657 +summary: Fix `PushQueryIT#testEqualityOrTooBig` +area: ES|QL +type: bug +issues: + - 129545 diff --git a/muted-tests.yml b/muted-tests.yml index f9220c9166775..37504bb04036a 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -514,9 +514,6 @@ tests: - class: org.elasticsearch.entitlement.runtime.policy.FileAccessTreeTests method: testWindowsAbsolutPathAccess issue: https://github.com/elastic/elasticsearch/issues/129168 -- class: org.elasticsearch.xpack.esql.qa.single_node.PushQueriesIT - method: testCaseInsensitiveEquality {KEYWORD} - issue: https://github.com/elastic/elasticsearch/issues/129422 - class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlSpecIT method: test {knn-function.KnnSearchWithKOption ASYNC} issue: https://github.com/elastic/elasticsearch/issues/129447 @@ -565,9 +562,6 @@ tests: - class: org.elasticsearch.upgrades.QueryableBuiltInRolesUpgradeIT method: testBuiltInRolesSyncedOnClusterUpgrade issue: https://github.com/elastic/elasticsearch/issues/129534 -- class: org.elasticsearch.xpack.esql.qa.single_node.PushQueriesIT - method: testEqualityOrTooBig {KEYWORD} - issue: https://github.com/elastic/elasticsearch/issues/129545 - class: org.elasticsearch.search.query.VectorIT method: testFilteredQueryStrategy issue: https://github.com/elastic/elasticsearch/issues/129517 diff --git a/x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/PushQueriesIT.java b/x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/PushQueriesIT.java index a4db00fce1bde..9551c0fccc14a 100644 --- a/x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/PushQueriesIT.java +++ b/x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/PushQueriesIT.java @@ -128,16 +128,16 @@ public void testEqualityOrTooBig() throws IOException { FROM test | WHERE test == "%value" OR test == "%tooBig" """.replace("%tooBig", tooBig); - String luceneQuery = switch (type) { - case AUTO, CONSTANT_KEYWORD, MATCH_ONLY_TEXT_WITH_KEYWORD, TEXT_WITH_KEYWORD -> "*:*"; - case KEYWORD -> "test:(%tooBig %value)".replace("%tooBig", tooBig); - case SEMANTIC_TEXT_WITH_KEYWORD -> "FieldExistsQuery [field=_primary_term]"; + List luceneQuery = switch (type) { + case AUTO, CONSTANT_KEYWORD, MATCH_ONLY_TEXT_WITH_KEYWORD, TEXT_WITH_KEYWORD -> List.of("*:*"); + case KEYWORD -> List.of("test:(%tooBig %value)".replace("%tooBig", tooBig), "test:(%value %tooBig)".replace("%tooBig", tooBig)); + case SEMANTIC_TEXT_WITH_KEYWORD -> List.of("FieldExistsQuery [field=_primary_term]"); }; ComputeSignature dataNodeSignature = switch (type) { case CONSTANT_KEYWORD, KEYWORD -> ComputeSignature.FILTER_IN_QUERY; case AUTO, MATCH_ONLY_TEXT_WITH_KEYWORD, SEMANTIC_TEXT_WITH_KEYWORD, TEXT_WITH_KEYWORD -> ComputeSignature.FILTER_IN_COMPUTE; }; - testPushQuery(value, esqlQuery, List.of(luceneQuery), dataNodeSignature, true); + testPushQuery(value, esqlQuery, luceneQuery, dataNodeSignature, true); } public void testEqualityOrOther() throws IOException { @@ -229,7 +229,7 @@ public void testCaseInsensitiveEquality() throws IOException { """; String luceneQuery = switch (type) { case AUTO, CONSTANT_KEYWORD, MATCH_ONLY_TEXT_WITH_KEYWORD, TEXT_WITH_KEYWORD -> "*:*"; - case KEYWORD -> "CaseInsensitiveTermQuery{test:%value}"; + case KEYWORD -> "".equals(value) ? "test:" : "CaseInsensitiveTermQuery{test:%value}"; case SEMANTIC_TEXT_WITH_KEYWORD -> "FieldExistsQuery [field=_primary_term]"; }; ComputeSignature dataNodeSignature = switch (type) {