svn commit: r1361966 - in /lucene/dev/trunk/lucene: CHANGES.txt core/src/java/org/apache/lucene/index/TieredMergePolicy.java

[mi...@apache.org]

Author: mikemccand
Date: Mon Jul 16 10:28:04 2012
New Revision: 1361966

URL: http://svn.apache.org/viewvc?rev=1361966&view=rev
Log:
LUCENE-4222: return MB not Bytes from getFloorSegmentMB

Modified:
    lucene/dev/trunk/lucene/CHANGES.txt
    lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java

Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1361966&r1=1361965&r2=1361966&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Mon Jul 16 10:28:04 2012
@@ -55,6 +55,9 @@ Bug Fixes
 * LUCENE-4221: Fix overeager CheckIndex validation for term vector offsets.
   (Robert Muir)
 
+* LUCENE-4222: TieredMergePolicy.getFloorSegmentMB was returning the
+  size in bytes not MB (Chris Fuller via Mike McCandless)
+
 Build
 
 * LUCENE-4094: Support overriding file.encoding on forked test JVMs

Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java?rev=1361966&r1=1361965&r2=1361966&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java Mon Jul 16 10:28:04 2012
@@ -168,7 +168,7 @@ public class TieredMergePolicy extends M
 
   /** @see #setFloorSegmentMB */
   public double getFloorSegmentMB() {
-    return floorSegmentBytes/1024*1024.;
+    return floorSegmentBytes/(1024*1024.);
   }
 
   /** When forceMergeDeletes is called, we only merge away a