remove dead code from create index

jasontedor · jasontedor · commit 26e4c7689b9e · 2017-09-21T13:58:39.000-04:00
diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java b/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java
@@ -428,7 +428,7 @@ public ClusterState execute(ClusterState currentState) throws Exception {
                         (tmpImd.getNumberOfReplicas() + 1) + "]");
                 }
                 // create the index here (on the master) to validate it can be created, as well as adding the mapping
-                final IndexService indexService = indicesService.createIndex(tmpImd, Collections.emptyList(), s -> {});
+                final IndexService indexService = indicesService.createIndex(tmpImd, Collections.emptyList());
                 createdIndex = indexService.index();
                 // now add the mappings
                 MapperService mapperService = indexService.mapperService();
diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexAliasesService.java b/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexAliasesService.java
@@ -139,7 +139,7 @@ ClusterState innerExecute(ClusterState currentState, Iterable<AliasAction> actio
                             if (indexService == null) {
                                 // temporarily create the index and add mappings so we can parse the filter
                                 try {
-                                    indexService = indicesService.createIndex(index, emptyList(), s -> {});
+                                    indexService = indicesService.createIndex(index, emptyList());
                                     indicesToClose.add(index.getIndex());
                                 } catch (IOException e) {
                                     throw new ElasticsearchException("Failed to create temporary index for parsing the alias", e);
diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java b/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java
@@ -213,7 +213,7 @@ private static void validateAndAddTemplate(final PutRequest request, IndexTempla
                 .build();
 
             final IndexMetaData tmpIndexMetadata = IndexMetaData.builder(temporaryIndexName).settings(dummySettings).build();
-            IndexService dummyIndexService = indicesService.createIndex(tmpIndexMetadata, Collections.emptyList(), s -> {});
+            IndexService dummyIndexService = indicesService.createIndex(tmpIndexMetadata, Collections.emptyList());
             createdIndex = dummyIndexService.index();
 
             templateBuilder.order(request.order);
diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java b/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java
@@ -145,7 +145,7 @@ ClusterState executeRefresh(final ClusterState currentState, final List<RefreshT
             IndexService indexService = indicesService.indexService(indexMetaData.getIndex());
             if (indexService == null) {
                 // we need to create the index here, and add the current mapping to it, so we can merge
-                indexService = indicesService.createIndex(indexMetaData, Collections.emptyList(), s -> {});
+                indexService = indicesService.createIndex(indexMetaData, Collections.emptyList());
                 removeIndex = true;
                 indexService.mapperService().merge(indexMetaData, MergeReason.MAPPING_RECOVERY, true);
             }
diff --git a/core/src/main/java/org/elasticsearch/index/IndexModule.java b/core/src/main/java/org/elasticsearch/index/IndexModule.java
@@ -330,8 +330,7 @@ public IndexService newIndexService(
             IndicesQueryCache indicesQueryCache,
             MapperRegistry mapperRegistry,
             IndicesFieldDataCache indicesFieldDataCache,
-            NamedWriteableRegistry namedWriteableRegistry,
-            Consumer<ShardId> globalCheckpointSyncer)
+            NamedWriteableRegistry namedWriteableRegistry)
         throws IOException {
         final IndexEventListener eventListener = freeze();
         IndexSearcherWrapperFactory searcherWrapperFactory = indexSearcherWrapper.get() == null
diff --git a/core/src/main/java/org/elasticsearch/indices/IndicesService.java b/core/src/main/java/org/elasticsearch/indices/IndicesService.java
@@ -378,14 +378,11 @@ public IndexService indexServiceSafe(Index index) {
      * @param indexMetaData          the index metadata to create the index for
      * @param builtInListeners       a list of built-in lifecycle {@link IndexEventListener} that should should be used along side with the
      *                               per-index listeners
-     * @param globalCheckpointSyncer callback for syncing global checkpoints
      * @throws ResourceAlreadyExistsException if the index already exists.
      */
     @Override
     public synchronized IndexService createIndex(
-            final IndexMetaData indexMetaData,
-            final List<IndexEventListener> builtInListeners,
-            final Consumer<ShardId> globalCheckpointSyncer) throws IOException {
+            final IndexMetaData indexMetaData, final List<IndexEventListener> builtInListeners) throws IOException {
         ensureChangesAllowed();
         if (indexMetaData.getIndexUUID().equals(IndexMetaData.INDEX_UUID_NA_VALUE)) {
             throw new IllegalArgumentException("index must have a real UUID found value: [" + indexMetaData.getIndexUUID() + "]");
@@ -409,7 +406,6 @@ public void onStoreClosed(ShardId shardId) {
                         indexMetaData,
                         indicesQueryCache,
                         indicesFieldDataCache,
-                        globalCheckpointSyncer,
                         finalListeners,
                         indexingMemoryController);
         boolean success = false;
@@ -432,7 +428,6 @@ private synchronized IndexService createIndexService(final String reason,
                                                          IndexMetaData indexMetaData,
                                                          IndicesQueryCache indicesQueryCache,
                                                          IndicesFieldDataCache indicesFieldDataCache,
-                                                         Consumer<ShardId> globalCheckpointSyncer,
                                                          List<IndexEventListener> builtInListeners,
                                                          IndexingOperationListener... indexingOperationListeners) throws IOException {
         final IndexSettings idxSettings = new IndexSettings(indexMetaData, this.settings, indexScopeSetting);
@@ -462,8 +457,8 @@ private synchronized IndexService createIndexService(final String reason,
                 indicesQueryCache,
                 mapperRegistry,
                 indicesFieldDataCache,
-                namedWriteableRegistry,
-                globalCheckpointSyncer);
+                namedWriteableRegistry
+        );
     }
 
     /**
@@ -494,7 +489,7 @@ public synchronized void verifyIndexMetadata(IndexMetaData metaData, IndexMetaDa
             closeables.add(indicesQueryCache);
             // this will also fail if some plugin fails etc. which is nice since we can verify that early
             final IndexService service =
-                createIndexService("metadata verification", metaData, indicesQueryCache, indicesFieldDataCache, s -> {}, emptyList());
+                createIndexService("metadata verification", metaData, indicesQueryCache, indicesFieldDataCache, emptyList());
             closeables.add(() -> service.close("metadata verification", false));
             service.mapperService().merge(metaData, MapperService.MergeReason.MAPPING_RECOVERY, true);
             if (metaData.equals(metaDataUpdate) == false) {
diff --git a/core/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java b/core/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java
@@ -451,7 +451,7 @@ private void createIndices(final ClusterState state) {
 
             AllocatedIndex<? extends Shard> indexService = null;
             try {
-                indexService = indicesService.createIndex(indexMetaData, buildInIndexListener, globalCheckpointSyncer);
+                indexService = indicesService.createIndex(indexMetaData, buildInIndexListener);
                 if (indexService.updateMapping(indexMetaData) && sendRefreshMapping) {
                     nodeMappingRefreshAction.nodeMappingRefresh(state.nodes().getMasterNode(),
                         new NodeMappingRefreshAction.NodeMappingRefreshRequest(indexMetaData.getIndex().getName(),
@@ -798,12 +798,10 @@ public interface AllocatedIndices<T extends Shard, U extends AllocatedIndex<T>>
          * @param indexMetaData          the index metadata to create the index for
          * @param builtInIndexListener   a list of built-in lifecycle {@link IndexEventListener} that should should be used along side with
          *                               the per-index listeners
-         * @param globalCheckpointSyncer callback for syncing global checkpoints
          * @throws ResourceAlreadyExistsException if the index already exists.
          */
         U createIndex(IndexMetaData indexMetaData,
-                      List<IndexEventListener> builtInIndexListener,
-                      Consumer<ShardId> globalCheckpointSyncer) throws IOException;
+                      List<IndexEventListener> builtInIndexListener) throws IOException;
 
         /**
          * Verify that the contents on disk for the given index is deleted; if not, delete the contents.
diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/IndexCreationTaskTests.java b/core/src/test/java/org/elasticsearch/cluster/metadata/IndexCreationTaskTests.java
@@ -443,6 +443,6 @@ private void setupIndicesService() throws Exception {
         when(service.getIndexSortSupplier()).thenReturn(supplier);
         when(service.getIndexEventListener()).thenReturn(mock(IndexEventListener.class));
 
-        when(indicesService.createIndex(anyObject(), anyObject(), anyObject())).thenReturn(service);
+        when(indicesService.createIndex(anyObject(), anyObject())).thenReturn(service);
     }
 }
diff --git a/core/src/test/java/org/elasticsearch/index/IndexModuleTests.java b/core/src/test/java/org/elasticsearch/index/IndexModuleTests.java
@@ -140,7 +140,7 @@ public void tearDown() throws Exception {
     private IndexService newIndexService(IndexModule module) throws IOException {
         return module.newIndexService(nodeEnvironment, xContentRegistry(), deleter, circuitBreakerService, bigArrays, threadPool,
                 scriptService, null, indicesQueryCache, mapperRegistry,
-                new IndicesFieldDataCache(settings, listener), writableRegistry(), s -> {});
+                new IndicesFieldDataCache(settings, listener), writableRegistry());
     }
 
     public void testWrapperIsBound() throws IOException {
diff --git a/core/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerSingleNodeTests.java b/core/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerSingleNodeTests.java
@@ -121,7 +121,7 @@ public void afterIndexRemoved(Index index, IndexSettings indexSettings, IndexRem
         };
         indicesService.removeIndex(idx, DELETED, "simon says");
         try {
-            IndexService index = indicesService.createIndex(metaData, Arrays.asList(countingListener), s -> {});
+            IndexService index = indicesService.createIndex(metaData, Arrays.asList(countingListener));
             assertEquals(3, counter.get());
             idx = index.index();
             ShardRouting newRouting = shardRouting;
diff --git a/core/src/test/java/org/elasticsearch/indices/cluster/AbstractIndicesClusterStateServiceTestCase.java b/core/src/test/java/org/elasticsearch/indices/cluster/AbstractIndicesClusterStateServiceTestCase.java
@@ -190,8 +190,7 @@ protected class MockIndicesService implements AllocatedIndices<MockIndexShard, M
         @Override
         public synchronized MockIndexService createIndex(
                 IndexMetaData indexMetaData,
-                List<IndexEventListener> buildInIndexListener,
-                Consumer<ShardId> globalCheckpointSyncer) throws IOException {
+                List<IndexEventListener> buildInIndexListener) throws IOException {
             MockIndexService indexService = new MockIndexService(new IndexSettings(indexMetaData, Settings.EMPTY));
             indices = newMapBuilder(indices).put(indexMetaData.getIndexUUID(), indexService).immutableMap();
             return indexService;
diff --git a/core/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java b/core/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java
@@ -95,7 +95,6 @@
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyBoolean;
 import static org.mockito.Matchers.anyList;
-import static org.mockito.Matchers.anyObject;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
@@ -140,7 +139,7 @@ public ClusterStateChanges(NamedXContentRegistry xContentRegistry, ThreadPool th
         // MetaDataCreateIndexService creates indices using its IndicesService instance to check mappings -> fake it here
         try {
             @SuppressWarnings("unchecked") final List<IndexEventListener> listeners = anyList();
-            when(indicesService.createIndex(any(IndexMetaData.class), listeners, anyObject()))
+            when(indicesService.createIndex(any(IndexMetaData.class), listeners))
                 .then(invocationOnMock -> {
                     IndexService indexService = mock(IndexService.class);
                     IndexMetaData indexMetaData = (IndexMetaData)invocationOnMock.getArguments()[0];

Original file line number	Diff line number	Diff line change
`@@ -428,7 +428,7 @@ public ClusterState execute(ClusterState currentState) throws Exception {`
`428`	`428`	`(tmpImd.getNumberOfReplicas() + 1) + "]");`
`429`	`429`	`}`
`430`	`430`	`// create the index here (on the master) to validate it can be created, as well as adding the mapping`
`431`		`- final IndexService indexService = indicesService.createIndex(tmpImd, Collections.emptyList(), s -> {});`
	`431`	`+ final IndexService indexService = indicesService.createIndex(tmpImd, Collections.emptyList());`
`432`	`432`	`createdIndex = indexService.index();`
`433`	`433`	`// now add the mappings`
`434`	`434`	`MapperService mapperService = indexService.mapperService();`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ ClusterState executeRefresh(final ClusterState currentState, final List<RefreshT`
`145`	`145`	`IndexService indexService = indicesService.indexService(indexMetaData.getIndex());`
`146`	`146`	`if (indexService == null) {`
`147`	`147`	`// we need to create the index here, and add the current mapping to it, so we can merge`
`148`		`- indexService = indicesService.createIndex(indexMetaData, Collections.emptyList(), s -> {});`
	`148`	`+ indexService = indicesService.createIndex(indexMetaData, Collections.emptyList());`
`149`	`149`	`removeIndex = true;`
`150`	`150`	`indexService.mapperService().merge(indexMetaData, MergeReason.MAPPING_RECOVERY, true);`
`151`	`151`	`}`
Original file line number	Diff line number	Diff line change
`@@ -443,6 +443,6 @@ private void setupIndicesService() throws Exception {`
`443`	`443`	`when(service.getIndexSortSupplier()).thenReturn(supplier);`
`444`	`444`	`when(service.getIndexEventListener()).thenReturn(mock(IndexEventListener.class));`
`445`	`445`
`446`		`- when(indicesService.createIndex(anyObject(), anyObject(), anyObject())).thenReturn(service);`
	`446`	`+ when(indicesService.createIndex(anyObject(), anyObject())).thenReturn(service);`
`447`	`447`	`}`
`448`	`448`	`}`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ public void tearDown() throws Exception {`
`140`	`140`	`private IndexService newIndexService(IndexModule module) throws IOException {`
`141`	`141`	`return module.newIndexService(nodeEnvironment, xContentRegistry(), deleter, circuitBreakerService, bigArrays, threadPool,`
`142`	`142`	`scriptService, null, indicesQueryCache, mapperRegistry,`
`143`		`- new IndicesFieldDataCache(settings, listener), writableRegistry(), s -> {});`
	`143`	`+ new IndicesFieldDataCache(settings, listener), writableRegistry());`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`public void testWrapperIsBound() throws IOException {`