Skip to content

Commit 2d180d2

Browse files
authored
ESQL: Fix PushQueryIt again (#137537)
Allow for `*:*` in some cases. That's ok. We're filtering in the compute engine anyway. Closes #137491
1 parent 410d877 commit 2d180d2

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

muted-tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -471,9 +471,6 @@ tests:
471471
- class: org.elasticsearch.smoketest.SmokeTestIngestWithAllDepsClientYamlTestSuiteIT
472472
method: test {yaml=ingest/100_sampling_with_reroute/Test get sample with multiple reroutes}
473473
issue: https://github.com/elastic/elasticsearch/issues/137457
474-
- class: org.elasticsearch.xpack.esql.qa.single_node.PushQueriesIT
475-
method: testEqualityAndOther {SEMANTIC_TEXT_WITH_KEYWORD}
476-
issue: https://github.com/elastic/elasticsearch/issues/137491
477474
- class: org.elasticsearch.xpack.ilm.CCRIndexLifecycleIT
478475
method: testBasicCCRAndILMIntegration {targetCluster=FOLLOWER}
479476
issue: https://github.com/elastic/elasticsearch/issues/137494

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,10 +178,11 @@ public void testEqualityAndOther() throws IOException {
178178
case CONSTANT_KEYWORD, MATCH_ONLY_TEXT_WITH_KEYWORD -> List.of("*:*");
179179
case SEMANTIC_TEXT_WITH_KEYWORD ->
180180
/*
181-
* single_value_match is here because there are extra documents hiding in the index
182-
* that don't have the `foo` field.
181+
* FieldExistsQuery is because there are extra documents hiding in the index
182+
* that don't have the `foo` field. "*:*" is because sometimes we end up on
183+
* a shard where all `foo = 1`.
183184
*/
184-
List.of("FieldExistsQuery [field=foo]", "foo:[1 TO 1]");
185+
List.of("FieldExistsQuery [field=foo]", "foo:[1 TO 1]", "*:*");
185186
};
186187
ComputeSignature dataNodeSignature = switch (type) {
187188
case AUTO, CONSTANT_KEYWORD, KEYWORD, TEXT_WITH_KEYWORD -> ComputeSignature.FILTER_IN_QUERY;

0 commit comments

Comments
 (0)