File tree Expand file tree Collapse file tree 3 files changed +7
-5
lines changed
internalClusterTest/java/org/elasticsearch/action/search
main/java/org/elasticsearch/search Expand file tree Collapse file tree 3 files changed +7
-5
lines changed Original file line number Diff line number Diff line change @@ -549,9 +549,6 @@ tests:
549
549
- class : org.elasticsearch.xpack.ml.integration.InferenceIT
550
550
method : testInferRegressionModel
551
551
issue : https://github.com/elastic/elasticsearch/issues/133603
552
- - class : org.elasticsearch.action.search.BatchedQueryPhaseIT
553
- method : testNumReducePhases
554
- issue : https://github.com/elastic/elasticsearch/issues/134943
555
552
- class : org.elasticsearch.reservedstate.service.RepositoriesFileSettingsIT
556
553
method : testSettingsApplied
557
554
issue : https://github.com/elastic/elasticsearch/issues/126748
Original file line number Diff line number Diff line change 16
16
import org .elasticsearch .cluster .routing .IndexShardRoutingTable ;
17
17
import org .elasticsearch .cluster .routing .ShardRouting ;
18
18
import org .elasticsearch .common .settings .Settings ;
19
+ import org .elasticsearch .search .SearchService ;
19
20
import org .elasticsearch .test .ESIntegTestCase ;
20
21
21
22
import java .util .Collections ;
31
32
public class BatchedQueryPhaseIT extends ESIntegTestCase {
32
33
33
34
public void testNumReducePhases () {
35
+ assumeTrue (
36
+ "test skipped because batched query execution disabled by feature flag" ,
37
+ SearchService .BATCHED_QUERY_PHASE_FEATURE_FLAG .isEnabled ()
38
+ );
34
39
String indexName = "test-idx" ;
35
40
assertAcked (
36
41
prepareCreate (indexName ).setMapping ("title" , "type=keyword" )
Original file line number Diff line number Diff line change @@ -298,7 +298,7 @@ public class SearchService extends AbstractLifecycleComponent implements IndexEv
298
298
Setting .Property .NodeScope
299
299
);
300
300
301
- private static final boolean BATCHED_QUERY_PHASE_FEATURE_FLAG = new FeatureFlag ("batched_query_phase" ). isEnabled ( );
301
+ public static final FeatureFlag BATCHED_QUERY_PHASE_FEATURE_FLAG = new FeatureFlag ("batched_query_phase" );
302
302
303
303
/**
304
304
* The size of the buffer used for memory accounting.
@@ -433,7 +433,7 @@ public SearchService(
433
433
clusterService .getClusterSettings ().addSettingsUpdateConsumer (SEARCH_WORKER_THREADS_ENABLED , this ::setEnableSearchWorkerThreads );
434
434
435
435
enableQueryPhaseParallelCollection = QUERY_PHASE_PARALLEL_COLLECTION_ENABLED .get (settings );
436
- if (BATCHED_QUERY_PHASE_FEATURE_FLAG ) {
436
+ if (BATCHED_QUERY_PHASE_FEATURE_FLAG . isEnabled () ) {
437
437
batchQueryPhase = BATCHED_QUERY_PHASE .get (settings );
438
438
} else {
439
439
batchQueryPhase = false ;
You can’t perform that action at this time.
0 commit comments