Skip to content

Commit c0da68e

Browse files
disable tests
1 parent c48c56a commit c0da68e

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

server/src/internalClusterTest/java/org/elasticsearch/search/ccs/CCSCanMatchIT.java

+2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.elasticsearch.index.shard.ShardLongFieldRange;
3333
import org.elasticsearch.plugins.EnginePlugin;
3434
import org.elasticsearch.plugins.Plugin;
35+
import org.elasticsearch.search.SearchService;
3536
import org.elasticsearch.search.builder.SearchSourceBuilder;
3637
import org.elasticsearch.test.AbstractMultiClustersTestCase;
3738
import org.elasticsearch.test.transport.MockTransportService;
@@ -144,6 +145,7 @@ int createIndexAndIndexDocs(String cluster, String index, int numberOfShards, lo
144145
}
145146

146147
public void testCanMatchOnTimeRange() throws Exception {
148+
assumeFalse("no actual can_match if batched execution is active", SearchService.BATCHED_QUERY_PHASE_FEATURE_FLAG);
147149
long timestamp = randomLongBetween(10_000_000, 50_000_000);
148150
int oldLocalNumShards = randomIntBetween(1, 5);
149151
createIndexAndIndexDocs(LOCAL_CLUSTER, "local_old_index", oldLocalNumShards, timestamp - 10_000, true);

server/src/main/java/org/elasticsearch/action/search/CanMatchPreFilterSearchPhase.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,7 @@ private void runCoordinatorRewritePhase() {
170170
// verify missing shards only for the shards that we hit for the query
171171
checkNoMissingShards(matchedShardLevelRequests);
172172
if (SearchService.BATCHED_QUERY_PHASE_FEATURE_FLAG) {
173-
matchedShardLevelRequests.sort(SearchShardIterator::compareTo);
174-
listener.onResponse(matchedShardLevelRequests);
173+
finishPhase();
175174
} else {
176175
new Round(matchedShardLevelRequests).run();
177176
}

0 commit comments

Comments
 (0)