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 2012/07/16 12:28:49 UTC
svn commit: r1361967 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/CHANGES.txt lucene/core/
lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java
Author: mikemccand
Date: Mon Jul 16 10:28:49 2012
New Revision: 1361967
URL: http://svn.apache.org/viewvc?rev=1361967&view=rev
Log:
LUCENE-4222: return MB not Bytes from getFloorSegmentMB
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/lucene/core/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java
Modified: lucene/dev/branches/branch_4x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/CHANGES.txt?rev=1361967&r1=1361966&r2=1361967&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/lucene/CHANGES.txt Mon Jul 16 10:28:49 2012
@@ -54,6 +54,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/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java?rev=1361967&r1=1361966&r2=1361967&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java Mon Jul 16 10:28:49 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