Skip to content

Commit cd0ab9f

Browse files
committed
ESQL: Fix PushQueryIT#testEqualityOrTooBig
Fixes a test about query pushing for `==` to lucene. Closes #129545
1 parent 4275bc7 commit cd0ab9f

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

muted-tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -565,9 +565,6 @@ tests:
565565
- class: org.elasticsearch.upgrades.QueryableBuiltInRolesUpgradeIT
566566
method: testBuiltInRolesSyncedOnClusterUpgrade
567567
issue: https://github.com/elastic/elasticsearch/issues/129534
568-
- class: org.elasticsearch.xpack.esql.qa.single_node.PushQueriesIT
569-
method: testEqualityOrTooBig {KEYWORD}
570-
issue: https://github.com/elastic/elasticsearch/issues/129545
571568
- class: org.elasticsearch.search.query.VectorIT
572569
method: testFilteredQueryStrategy
573570
issue: https://github.com/elastic/elasticsearch/issues/129517

x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/PushQueriesIT.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -128,16 +128,16 @@ public void testEqualityOrTooBig() throws IOException {
128128
FROM test
129129
| WHERE test == "%value" OR test == "%tooBig"
130130
""".replace("%tooBig", tooBig);
131-
String luceneQuery = switch (type) {
132-
case AUTO, CONSTANT_KEYWORD, MATCH_ONLY_TEXT_WITH_KEYWORD, TEXT_WITH_KEYWORD -> "*:*";
133-
case KEYWORD -> "test:(%tooBig %value)".replace("%tooBig", tooBig);
134-
case SEMANTIC_TEXT_WITH_KEYWORD -> "FieldExistsQuery [field=_primary_term]";
131+
List<String> luceneQuery = switch (type) {
132+
case AUTO, CONSTANT_KEYWORD, MATCH_ONLY_TEXT_WITH_KEYWORD, TEXT_WITH_KEYWORD -> List.of("*:*");
133+
case KEYWORD -> List.of("test:(%tooBig %value)".replace("%tooBig", tooBig), "test:(%value %tooBig)".replace("%tooBig", tooBig));
134+
case SEMANTIC_TEXT_WITH_KEYWORD -> List.of("FieldExistsQuery [field=_primary_term]");
135135
};
136136
ComputeSignature dataNodeSignature = switch (type) {
137137
case CONSTANT_KEYWORD, KEYWORD -> ComputeSignature.FILTER_IN_QUERY;
138138
case AUTO, MATCH_ONLY_TEXT_WITH_KEYWORD, SEMANTIC_TEXT_WITH_KEYWORD, TEXT_WITH_KEYWORD -> ComputeSignature.FILTER_IN_COMPUTE;
139139
};
140-
testPushQuery(value, esqlQuery, List.of(luceneQuery), dataNodeSignature, true);
140+
testPushQuery(value, esqlQuery, luceneQuery, dataNodeSignature, true);
141141
}
142142

143143
public void testEqualityOrOther() throws IOException {

0 commit comments

Comments
 (0)