Bake in TieredMergePolicy

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

@@ -41,8 +41,6 @@
 import org.elasticsearch.index.fielddata.IndexFieldDataService;
 import org.elasticsearch.index.gateway.IndexShardGatewayService;
 import org.elasticsearch.index.mapper.MapperService;
-import org.elasticsearch.index.merge.policy.MergePolicyModule;
-import org.elasticsearch.index.merge.policy.MergePolicyProvider;
 import org.elasticsearch.index.merge.scheduler.MergeSchedulerProvider;
 import org.elasticsearch.index.percolator.PercolatorQueriesRegistry;
 import org.elasticsearch.index.query.IndexQueryParserService;
@@ -298,7 +296,6 @@ public synchronized IndexShard createShard(int sShardId, boolean primary) {
             modules.add(new StoreModule(injector.getInstance(IndexStore.class).shardDirectory(), lock,
                     new StoreCloseListener(shardId, canDeleteShardContent, shardFilterCache), path));
             modules.add(new DeletionPolicyModule(indexSettings));
-            modules.add(new MergePolicyModule(indexSettings));
             try {
                 shardInjector = modules.createChildInjector(injector);
             } catch (CreationException e) {
@@ -374,7 +371,6 @@ private void closeShardInjector(String reason, ShardId sId, Injector shardInject
                 }
                 closeInjectorResource(sId, shardInjector,
                         MergeSchedulerProvider.class,
-                        MergePolicyProvider.class,
                         IndexShardGatewayService.class,
                         PercolatorQueriesRegistry.class);
 

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

@@ -21,6 +21,7 @@
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.codecs.Codec;
 import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.index.MergePolicy;
 import org.apache.lucene.search.QueryCache;
 import org.apache.lucene.search.QueryCachingPolicy;
 import org.apache.lucene.search.similarities.Similarity;
@@ -33,7 +34,6 @@
 import org.elasticsearch.index.codec.CodecService;
 import org.elasticsearch.index.deletionpolicy.SnapshotDeletionPolicy;
 import org.elasticsearch.index.indexing.ShardIndexingService;
-import org.elasticsearch.index.merge.policy.MergePolicyProvider;
 import org.elasticsearch.index.merge.scheduler.MergeSchedulerProvider;
 import org.elasticsearch.index.settings.IndexSettingsService;
 import org.elasticsearch.index.shard.ShardId;
@@ -69,7 +69,7 @@ public final class EngineConfig {
     private final IndicesWarmer warmer;
     private final Store store;
     private final SnapshotDeletionPolicy deletionPolicy;
-    private final MergePolicyProvider mergePolicyProvider;
+    private final MergePolicy mergePolicy;
     private final MergeSchedulerProvider mergeScheduler;
     private final Analyzer analyzer;
     private final Similarity similarity;
@@ -142,7 +142,7 @@ public final class EngineConfig {
      */
     public EngineConfig(ShardId shardId, ThreadPool threadPool, ShardIndexingService indexingService,
                         IndexSettingsService indexSettingsService, IndicesWarmer warmer, Store store, SnapshotDeletionPolicy deletionPolicy,
-                        MergePolicyProvider mergePolicyProvider, MergeSchedulerProvider mergeScheduler, Analyzer analyzer,
+                        MergePolicy mergePolicy, MergeSchedulerProvider mergeScheduler, Analyzer analyzer,
                         Similarity similarity, CodecService codecService, Engine.FailedEngineListener failedEngineListener,
                         TranslogRecoveryPerformer translogRecoveryPerformer, QueryCache filterCache, QueryCachingPolicy filterCachingPolicy, TranslogConfig translogConfig) {
         this.shardId = shardId;
@@ -152,7 +152,7 @@ public EngineConfig(ShardId shardId, ThreadPool threadPool, ShardIndexingService
         this.warmer = warmer;
         this.store = store;
         this.deletionPolicy = deletionPolicy;
-        this.mergePolicyProvider = mergePolicyProvider;
+        this.mergePolicy = mergePolicy;
         this.mergeScheduler = mergeScheduler;
         this.analyzer = analyzer;
         this.similarity = similarity;
@@ -340,11 +340,10 @@ public SnapshotDeletionPolicy getDeletionPolicy() {
     }
 
     /**
-     * Returns the {@link org.elasticsearch.index.merge.policy.MergePolicyProvider} used to obtain
-     * a {@link org.apache.lucene.index.MergePolicy} for the engines {@link org.apache.lucene.index.IndexWriter}
+     * Returns the {@link org.apache.lucene.index.MergePolicy} for the engines {@link org.apache.lucene.index.IndexWriter}
      */
-    public MergePolicyProvider getMergePolicyProvider() {
-        return mergePolicyProvider;
+    public MergePolicy getMergePolicy() {
+        return mergePolicy;
     }
 
     /**

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

@@ -45,8 +45,7 @@
 import org.elasticsearch.index.indexing.ShardIndexingService;
 import org.elasticsearch.index.mapper.Uid;
 import org.elasticsearch.index.merge.OnGoingMerge;
-import org.elasticsearch.index.merge.policy.ElasticsearchMergePolicy;
-import org.elasticsearch.index.merge.policy.MergePolicyProvider;
+import org.elasticsearch.index.shard.ElasticsearchMergePolicy;
 import org.elasticsearch.index.merge.scheduler.MergeSchedulerProvider;
 import org.elasticsearch.index.search.nested.IncludeNestedDocsQuery;
 import org.elasticsearch.index.shard.ShardId;
@@ -81,7 +80,6 @@ public class InternalEngine extends Engine {
     @Nullable
     private final IndicesWarmer warmer;
     private final Translog translog;
-    private final MergePolicyProvider mergePolicyProvider;
     private final MergeSchedulerProvider mergeScheduler;
 
     private final IndexWriter indexWriter;
@@ -116,7 +114,6 @@ public InternalEngine(EngineConfig engineConfig, boolean skipInitialTranslogReco
             this.lastDeleteVersionPruneTimeMSec = engineConfig.getThreadPool().estimatedTimeInMillis();
             this.indexingService = engineConfig.getIndexingService();
             this.warmer = engineConfig.getWarmer();
-            this.mergePolicyProvider = engineConfig.getMergePolicyProvider();
             this.mergeScheduler = engineConfig.getMergeScheduler();
             this.dirtyLocks = new Object[engineConfig.getIndexConcurrency() * 50]; // we multiply it to have enough...
             for (int i = 0; i < dirtyLocks.length; i++) {
@@ -1020,7 +1017,7 @@ private IndexWriter createWriter(boolean create) throws IOException {
             }
             iwc.setInfoStream(verbose ? InfoStream.getDefault() : new LoggerInfoStream(logger));
             iwc.setMergeScheduler(mergeScheduler.newMergeScheduler());
-            MergePolicy mergePolicy = mergePolicyProvider.getMergePolicy();
+            MergePolicy mergePolicy = config().getMergePolicy();
             // Give us the opportunity to upgrade old segments while performing
             // background merges
             mergePolicy = new ElasticsearchMergePolicy(mergePolicy);