Skip to content

ESQL: Fix PushQueryIT#testEqualityOrTooBig #129657

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 18, 2025
Merged

ESQL: Fix PushQueryIT#testEqualityOrTooBig #129657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cd0ab9f
ESQL: Fix `PushQueryIT#testEqualityOrTooBig`
nik9000 Jun 18, 2025
29f4d97
Fix the other one
nik9000 Jun 18, 2025
3242292
Update docs/changelog/129657.yaml
nik9000 Jun 18, 2025
8be8d0f
Merge branch 'main' into fix_129545
nik9000 Jun 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions docs/changelog/129657.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 129657
summary: Fix `PushQueryIT#testEqualityOrTooBig`
area: ES|QL
type: bug
issues:
- 129545
6 changes: 0 additions & 6 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions ...node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/PushQueriesIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> 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 {
Expand Down Expand Up @@ -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) {
Expand Down
Loading