[Rename] ElasticsearchMergePolicy class in server module (#181)

This commit refactors ElasticsearchMergePolicy class in the server module to OpenSearchMergePolicy. References and usages throughout the rest of the codebase are fully refactored. Signed-off-by: Nicholas Knize <[email protected]>
opensearch-project · Mar 4, 2021 · 792bb8d · 792bb8d
1 parent 25d2719
commit 792bb8d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java b/server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java
@@ -87,7 +87,7 @@
 import org.elasticsearch.index.seqno.LocalCheckpointTracker;
 import org.elasticsearch.index.seqno.SeqNoStats;
 import org.elasticsearch.index.seqno.SequenceNumbers;
-import org.elasticsearch.index.shard.ElasticsearchMergePolicy;
+import org.elasticsearch.index.shard.OpenSearchMergePolicy;
 import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.index.store.Store;
 import org.elasticsearch.index.translog.Translog;
@@ -2028,9 +2028,9 @@ public void forceMerge(final boolean flush, int maxNumSegments, boolean onlyExpu
          * thread for optimize, and the 'optimizeLock' guarding this code, and (3) ConcurrentMergeScheduler
          * syncs calls to findForcedMerges.
          */
-        assert indexWriter.getConfig().getMergePolicy() instanceof ElasticsearchMergePolicy : "MergePolicy is " +
+        assert indexWriter.getConfig().getMergePolicy() instanceof OpenSearchMergePolicy : "MergePolicy is " +
             indexWriter.getConfig().getMergePolicy().getClass().getName();
-        ElasticsearchMergePolicy mp = (ElasticsearchMergePolicy) indexWriter.getConfig().getMergePolicy();
+        OpenSearchMergePolicy mp = (OpenSearchMergePolicy) indexWriter.getConfig().getMergePolicy();
         optimizeLock.lock();
         try {
             ensureOpen();
@@ -2319,7 +2319,7 @@ private IndexWriterConfig getIndexWriterConfig() {
             // to enable it.
             mergePolicy = new ShuffleForcedMergePolicy(mergePolicy);
         }
-        iwc.setMergePolicy(new ElasticsearchMergePolicy(mergePolicy));
+        iwc.setMergePolicy(new OpenSearchMergePolicy(mergePolicy));
         iwc.setSimilarity(engineConfig.getSimilarity());
         iwc.setRAMBufferSizeMB(engineConfig.getIndexingBufferSize().getMbFrac());
         iwc.setCodec(engineConfig.getCodec());

diff --git a/...index/shard/ElasticsearchMergePolicy.java → ...ch/index/shard/OpenSearchMergePolicy.java b/...index/shard/ElasticsearchMergePolicy.java → ...ch/index/shard/OpenSearchMergePolicy.java
@@ -44,9 +44,9 @@
  * For now, this {@link MergePolicy} takes care of moving versions that used to
  * be stored as payloads to numeric doc values.
  */
-public final class ElasticsearchMergePolicy extends FilterMergePolicy {
+public final class OpenSearchMergePolicy extends FilterMergePolicy {
 
-    private static final Logger logger = LogManager.getLogger(ElasticsearchMergePolicy.class);
+    private static final Logger logger = LogManager.getLogger(OpenSearchMergePolicy.class);
 
     // True if the next merge request should do segment upgrades:
     private volatile boolean upgradeInProgress;
@@ -57,7 +57,7 @@ public final class ElasticsearchMergePolicy extends FilterMergePolicy {
     private static final int MAX_CONCURRENT_UPGRADE_MERGES = 5;
 
     /** @param delegate the merge policy to wrap */
-    public ElasticsearchMergePolicy(MergePolicy delegate) {
+    public OpenSearchMergePolicy(MergePolicy delegate) {
         super(delegate);
     }