LUCENE-7671 - rename LiveUpgradeIndexMergePolicy to LiveUpgradeSegmen…

…tsMergePolicy
apache · Apr 5, 2017 · eefe8b1 · eefe8b1
1 parent cc49744
commit eefe8b1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java b/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
@@ -1382,7 +1382,7 @@ public void testUpgradeWithExplicitUpgrades() throws Exception {
 
       assertFalse("Excpected these segments to be an old version", versionBefore.equals(Version.LATEST));
 
-      LiveUpgradeIndexMergePolicy uimp = new LiveUpgradeIndexMergePolicy(NoMergePolicy.INSTANCE);
+      LiveUpgradeSegmentsMergePolicy uimp = new LiveUpgradeSegmentsMergePolicy(NoMergePolicy.INSTANCE);
 
       assertEquals(numSegmentsBefore, checkAllSegmentsUpgraded(dir, versionBefore, createdVersionBefore));
 

diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexUpgrader.java b/lucene/core/src/java/org/apache/lucene/index/IndexUpgrader.java
@@ -203,7 +203,7 @@ public void upgrade(int maxSegements) throws IOException {
 
     MergePolicy mp;
     if(includeNewSegments) {
-      LiveUpgradeIndexMergePolicy uimp = new LiveUpgradeIndexMergePolicy(iwc.getMergePolicy());
+      LiveUpgradeSegmentsMergePolicy uimp = new LiveUpgradeSegmentsMergePolicy(iwc.getMergePolicy());
       uimp.setEnableUpgrades(true);
       mp = uimp;
     } else {

diff --git a/...ne/index/LiveUpgradeIndexMergePolicy.java → ...index/LiveUpgradeSegmentsMergePolicy.java b/...ne/index/LiveUpgradeIndexMergePolicy.java → ...index/LiveUpgradeSegmentsMergePolicy.java
@@ -55,15 +55,15 @@
   * @lucene.experimental
   * @see IndexUpgrader
   */
-public class LiveUpgradeIndexMergePolicy extends MergePolicyWrapper {
+public class LiveUpgradeSegmentsMergePolicy extends MergePolicyWrapper {
 
   private int maxUpgradesAtATime = 5;
   private volatile boolean enableUpgrades = false;
-  private Predicate<SegmentCommitInfo> shouldSegmentUpgrade = LiveUpgradeIndexMergePolicy::segmentIsLatestVersion; 
+  private Predicate<SegmentCommitInfo> shouldSegmentUpgrade = LiveUpgradeSegmentsMergePolicy::segmentIsLatestVersion; 
 
   /** Wrap the given {@link MergePolicy} and intercept forceMerge requests to
    * only upgrade segments written with previous Lucene versions. */
-  public LiveUpgradeIndexMergePolicy(MergePolicy in) {
+  public LiveUpgradeSegmentsMergePolicy(MergePolicy in) {
     super(in);
   }