Skip to content

Commit b474d01

Browse files
authored
ESQL: Fix PushQueryIT#testEqualityOrTooBig (#129657) (#129671)
Fixes a test about query pushing for `==` to lucene. Closes #129545
1 parent 4b3afde commit b474d01

File tree

2 files changed

+12
-6
lines changed
  • docs/changelog
  • x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node

2 files changed

+12
-6
lines changed

docs/changelog/129657.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 129657
2+
summary: Fix `PushQueryIT#testEqualityOrTooBig`
3+
area: ES|QL
4+
type: bug
5+
issues:
6+
- 129545

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

Lines changed: 6 additions & 6 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 {
@@ -229,7 +229,7 @@ public void testCaseInsensitiveEquality() throws IOException {
229229
""";
230230
String luceneQuery = switch (type) {
231231
case AUTO, CONSTANT_KEYWORD, MATCH_ONLY_TEXT_WITH_KEYWORD, TEXT_WITH_KEYWORD -> "*:*";
232-
case KEYWORD -> "CaseInsensitiveTermQuery{test:%value}";
232+
case KEYWORD -> "".equals(value) ? "test:" : "CaseInsensitiveTermQuery{test:%value}";
233233
case SEMANTIC_TEXT_WITH_KEYWORD -> "FieldExistsQuery [field=_primary_term]";
234234
};
235235
ComputeSignature dataNodeSignature = switch (type) {

0 commit comments

Comments
 (0)