Consolidate shard level abstractions

core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeService.java

@@ -161,6 +161,7 @@ private IndexMetaData upgradeLegacyRoutingSettings(IndexMetaData indexMetaData)
     /** All known time settings for an index. */
     public static final Set<String> INDEX_TIME_SETTINGS = ImmutableSet.of(
                                     "index.gateway.wait_for_mapping_update_post_recovery",
+                                    "index.shard.wait_for_mapping_update_post_recovery",
                                     "index.gc_deletes",
                                     "index.indexing.slowlog.threshold.index.debug",
                                     "index.indexing.slowlog.threshold.index.info",

core/src/main/java/org/elasticsearch/index/IndexService.java

@@ -36,12 +36,10 @@
 import org.elasticsearch.index.analysis.AnalysisService;
 import org.elasticsearch.index.cache.IndexCache;
 import org.elasticsearch.index.cache.bitset.BitsetFilterCache;
-import org.elasticsearch.index.cache.filter.ShardFilterCache;
 import org.elasticsearch.index.deletionpolicy.DeletionPolicyModule;
 import org.elasticsearch.index.fielddata.IndexFieldDataService;
-import org.elasticsearch.index.gateway.IndexShardGatewayService;
+import org.elasticsearch.index.shard.StoreRecoveryService;
 import org.elasticsearch.index.mapper.MapperService;
-import org.elasticsearch.index.percolator.PercolatorQueriesRegistry;
 import org.elasticsearch.index.query.IndexQueryParserService;
 import org.elasticsearch.index.settings.IndexSettings;
 import org.elasticsearch.index.settings.IndexSettingsService;
@@ -60,10 +58,8 @@
 
 import java.io.Closeable;
 import java.io.IOException;
-import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -306,12 +302,16 @@ public synchronized IndexShard createShard(int sShardId, boolean primary) {
             // if we are on a shared FS we only own the shard (ie. we can safely delete it) if we are the primary.
             final boolean canDeleteShardContent = IndexMetaData.isOnSharedFilesystem(indexSettings) == false ||
                     (primary && IndexMetaData.isOnSharedFilesystem(indexSettings));
-            final ShardFilterCache shardFilterCache = new ShardFilterCache(shardId, injector.getInstance(IndicesFilterCache.class));
             ModulesBuilder modules = new ModulesBuilder();
             modules.add(new ShardsPluginsModule(indexSettings, pluginsService));
-            modules.add(new IndexShardModule(shardId, primary, indexSettings, shardFilterCache));
+            modules.add(new IndexShardModule(shardId, primary, indexSettings));
             modules.add(new StoreModule(injector.getInstance(IndexStore.class).shardDirectory(), lock,
-                    new StoreCloseListener(shardId, canDeleteShardContent, shardFilterCache), path));
+                    new StoreCloseListener(shardId, canDeleteShardContent,  new Closeable() {
+                        @Override
+                        public void close() throws IOException {
+                            injector.getInstance(IndicesFilterCache.class).onClose(shardId);
+                        }
+                    }), path));
             modules.add(new DeletionPolicyModule(indexSettings));
             try {
                 shardInjector = modules.createChildInjector(injector);
@@ -387,8 +387,7 @@ private void closeShardInjector(String reason, ShardId sId, Injector shardInject
                     }
                 }
                 closeInjectorResource(sId, shardInjector,
-                        IndexShardGatewayService.class,
-                        PercolatorQueriesRegistry.class);
+                        StoreRecoveryService.class);
 
                 // call this before we close the store, so we can release resources for it
                 indicesLifecycle.afterIndexShardClosed(sId, indexShard, indexSettings);

core/src/main/java/org/elasticsearch/index/cache/bitset/ShardBitsetFilterCache.java

@@ -32,7 +32,6 @@ public class ShardBitsetFilterCache extends AbstractIndexShardComponent {
 
     private final CounterMetric totalMetric = new CounterMetric();
 
-    @Inject
     public ShardBitsetFilterCache(ShardId shardId, @IndexSettings Settings indexSettings) {
         super(shardId, indexSettings);
     }

core/src/main/java/org/elasticsearch/index/cache/query/ShardQueryCache.java

@@ -39,7 +39,6 @@ public class ShardQueryCache extends AbstractIndexShardComponent implements Remo
     final CounterMetric hitCount = new CounterMetric();
     final CounterMetric missCount = new CounterMetric();
 
-    @Inject
     public ShardQueryCache(ShardId shardId, @IndexSettings Settings indexSettings) {
         super(shardId, indexSettings);
     }

core/src/main/java/org/elasticsearch/index/engine/Engine.java

@@ -45,7 +45,6 @@
 import org.elasticsearch.index.VersionType;
 import org.elasticsearch.index.deletionpolicy.SnapshotDeletionPolicy;
 import org.elasticsearch.index.deletionpolicy.SnapshotIndexCommit;
-import org.elasticsearch.index.fielddata.ShardFieldData;
 import org.elasticsearch.index.mapper.DocumentMapper;
 import org.elasticsearch.index.mapper.ParseContext.Document;
 import org.elasticsearch.index.mapper.ParsedDocument;

core/src/main/java/org/elasticsearch/index/engine/EngineConfig.java

@@ -53,6 +53,7 @@
 public final class EngineConfig {
     private final ShardId shardId;
     private final TranslogRecoveryPerformer translogRecoveryPerformer;
+    private final Settings indexSettings;
     private volatile ByteSizeValue indexingBufferSize;
     private volatile ByteSizeValue versionMapSize;
     private volatile String versionMapSizeSetting;
@@ -64,7 +65,6 @@ public final class EngineConfig {
     private final boolean optimizeAutoGenerateId;
     private final ThreadPool threadPool;
     private final ShardIndexingService indexingService;
-    private final IndexSettingsService indexSettingsService;
     @Nullable
     private final IndicesWarmer warmer;
     private final Store store;
@@ -141,14 +141,14 @@ public final class EngineConfig {
      * Creates a new {@link org.elasticsearch.index.engine.EngineConfig}
      */
     public EngineConfig(ShardId shardId, ThreadPool threadPool, ShardIndexingService indexingService,
-                        IndexSettingsService indexSettingsService, IndicesWarmer warmer, Store store, SnapshotDeletionPolicy deletionPolicy,
+                        Settings indexSettings, IndicesWarmer warmer, Store store, SnapshotDeletionPolicy deletionPolicy,
                         MergePolicy mergePolicy, MergeSchedulerConfig mergeSchedulerConfig, Analyzer analyzer,
                         Similarity similarity, CodecService codecService, Engine.FailedEngineListener failedEngineListener,
                         TranslogRecoveryPerformer translogRecoveryPerformer, QueryCache filterCache, QueryCachingPolicy filterCachingPolicy, TranslogConfig translogConfig) {
         this.shardId = shardId;
+        this.indexSettings = indexSettings;
         this.threadPool = threadPool;
         this.indexingService = indexingService;
-        this.indexSettingsService = indexSettingsService;
         this.warmer = warmer;
         this.store = store;
         this.deletionPolicy = deletionPolicy;
@@ -158,7 +158,6 @@ public EngineConfig(ShardId shardId, ThreadPool threadPool, ShardIndexingService
         this.similarity = similarity;
         this.codecService = codecService;
         this.failedEngineListener = failedEngineListener;
-        Settings indexSettings = indexSettingsService.getSettings();
         this.optimizeAutoGenerateId = indexSettings.getAsBoolean(EngineConfig.INDEX_OPTIMIZE_AUTOGENERATED_ID_SETTING, false);
         this.compoundOnFlush = indexSettings.getAsBoolean(EngineConfig.INDEX_COMPOUND_ON_FLUSH, compoundOnFlush);
         this.indexConcurrency = indexSettings.getAsInt(EngineConfig.INDEX_CONCURRENCY_SETTING, Math.max(IndexWriterConfig.DEFAULT_MAX_THREAD_STATES, (int) (EsExecutors.boundedNumberOfProcessors(indexSettings) * 0.65)));
@@ -364,7 +363,7 @@ public Engine.FailedEngineListener getFailedEngineListener() {
      * Returns the latest index settings directly from the index settings service.
      */
     public Settings getIndexSettings() {
-        return indexSettingsService.getSettings();
+        return indexSettings;
     }
 
     /**
@@ -429,9 +428,4 @@ public QueryCachingPolicy getFilterCachingPolicy() {
     public TranslogConfig getTranslogConfig() {
         return translogConfig;
     }
-
-    IndexSettingsService getIndexSettingsService() { // for testing
-        return indexSettingsService;
-    }
-
 }

core/src/main/java/org/elasticsearch/index/fielddata/ShardFieldData.java

@@ -36,18 +36,12 @@
 
 /**
  */
-public class ShardFieldData extends AbstractIndexShardComponent implements IndexFieldDataCache.Listener {
+public class ShardFieldData implements IndexFieldDataCache.Listener {
 
     final CounterMetric evictionsMetric = new CounterMetric();
     final CounterMetric totalMetric = new CounterMetric();
-
     final ConcurrentMap<String, CounterMetric> perFieldTotals = ConcurrentCollections.newConcurrentMap();
 
-    @Inject
-    public ShardFieldData(ShardId shardId, @IndexSettings Settings indexSettings) {
-        super(shardId, indexSettings);
-    }
-
     public FieldDataStats stats(String... fields) {
         ObjectLongHashMap<String> fieldTotals = null;
         if (fields != null && fields.length > 0) {