Skip to content

Commit 9c1892f

Browse files
committed
Fix IndicesService building related to search operation listeners
1 parent 485918d commit 9c1892f

File tree

4 files changed

+4
-7
lines changed

4 files changed

+4
-7
lines changed

server/src/main/java/org/elasticsearch/index/IndexModule.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -478,8 +478,7 @@ public IndexService newIndexService(
478478
IdFieldMapper idFieldMapper,
479479
ValuesSourceRegistry valuesSourceRegistry,
480480
IndexStorePlugin.IndexFoldersDeletionListener indexFoldersDeletionListener,
481-
Map<String, IndexStorePlugin.SnapshotCommitSupplier> snapshotCommitSuppliers,
482-
List<SearchOperationListener> searchOperationListeners
481+
Map<String, IndexStorePlugin.SnapshotCommitSupplier> snapshotCommitSuppliers
483482
) throws IOException {
484483
final IndexEventListener eventListener = freeze();
485484
Function<IndexService, CheckedFunction<DirectoryReader, DirectoryReader, IOException>> readerWrapperFactory = indexReaderWrapper

server/src/main/java/org/elasticsearch/indices/IndicesService.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -782,8 +782,7 @@ private synchronized IndexService createIndexService(
782782
idFieldMappers.apply(idxSettings.getMode()),
783783
valuesSourceRegistry,
784784
indexFoldersDeletionListeners,
785-
snapshotCommitSuppliers,
786-
searchOperationListeners
785+
snapshotCommitSuppliers
787786
);
788787
}
789788

server/src/main/java/org/elasticsearch/indices/IndicesServiceBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public class IndicesServiceBuilder {
7575
@Nullable
7676
CheckedBiConsumer<ShardSearchRequest, StreamOutput, IOException> requestCacheKeyDifferentiator;
7777
MapperMetrics mapperMetrics;
78-
List<SearchOperationListener> searchOperationListener;
78+
List<SearchOperationListener> searchOperationListener = List.of();
7979

8080
public IndicesServiceBuilder settings(Settings settings) {
8181
this.settings = settings;

server/src/test/java/org/elasticsearch/index/IndexModuleTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,7 @@ private IndexService newIndexService(IndexModule module) throws IOException {
223223
module.indexSettings().getMode().idFieldMapperWithoutFieldData(),
224224
null,
225225
indexDeletionListener,
226-
emptyMap(),
227-
emptyList()
226+
emptyMap()
228227
);
229228
}
230229

0 commit comments

Comments
 (0)