You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2015/02/26 00:24:34 UTC

svn commit: r1662325 - in /lucene/dev/trunk/lucene/core/src: java/org/apache/lucene/index/LogByteSizeMergePolicy.java test/org/apache/lucene/index/TestLogMergePolicy.java

Author: mikemccand
Date: Wed Feb 25 23:24:33 2015
New Revision: 1662325

URL: http://svn.apache.org/r1662325
Log:
LUCENE-6297: make sure default LogByteSizeMP.getMaxMergeMBForForcedMerge is > 0.0

Modified:
    lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/LogByteSizeMergePolicy.java
    lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestLogMergePolicy.java

Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/LogByteSizeMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/LogByteSizeMergePolicy.java?rev=1662325&r1=1662324&r2=1662325&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/LogByteSizeMergePolicy.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/LogByteSizeMergePolicy.java Wed Feb 25 23:24:33 2015
@@ -39,6 +39,7 @@ public class LogByteSizeMergePolicy exte
   public LogByteSizeMergePolicy() {
     minMergeSize = (long) (DEFAULT_MIN_MERGE_MB*1024*1024);
     maxMergeSize = (long) (DEFAULT_MAX_MERGE_MB*1024*1024);
+    // NOTE: in Java, if you cast a too-large double to long, as we are doing here, then it becomes Long.MAX_VALUE
     maxMergeSizeForForcedMerge = (long) (DEFAULT_MAX_MERGE_MB_FOR_FORCED_MERGE*1024*1024);
   }
   

Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestLogMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestLogMergePolicy.java?rev=1662325&r1=1662324&r2=1662325&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestLogMergePolicy.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestLogMergePolicy.java Wed Feb 25 23:24:33 2015
@@ -23,4 +23,8 @@ public class TestLogMergePolicy extends
     return newLogMergePolicy(random());
   }
 
+  public void testDefaultForcedMergeMB() {
+    LogByteSizeMergePolicy mp = new LogByteSizeMergePolicy();
+    assertTrue(mp.getMaxMergeMBForForcedMerge() > 0.0);
+  }
 }