You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2016/02/01 18:12:04 UTC
lucene-solr git commit: LUCENE-7005: TieredMergePolicy tweaks (>= vs.
>, @see get vs. set)
Repository: lucene-solr
Updated Branches:
refs/heads/master 064c0ac00 -> fce97a6ca
LUCENE-7005: TieredMergePolicy tweaks (>= vs. >, @see get vs. set)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/fce97a6c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/fce97a6c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/fce97a6c
Branch: refs/heads/master
Commit: fce97a6ca6e14b3d0216957cee1621327c452dfc
Parents: 064c0ac
Author: Christine Poerschke <cp...@apache.org>
Authored: Mon Feb 1 17:11:47 2016 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Mon Feb 1 17:11:47 2016 +0000
----------------------------------------------------------------------
lucene/CHANGES.txt | 3 +++
.../core/src/java/org/apache/lucene/index/TieredMergePolicy.java | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fce97a6c/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index ad22c43..017742d 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -263,6 +263,9 @@ Other
* LUCENE-6988: You can now add IndexableFields directly to a MemoryIndex,
and create a MemoryIndex from a lucene Document. (Alan Woodward)
+* LUCENE-7005: TieredMergePolicy tweaks (>= vs. >, @see get vs. set)
+ (Christine Poerschke)
+
======================= Lucene 5.4.1 =======================
Bug Fixes
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fce97a6c/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java b/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java
index 205c7c7..d857c5e 100644
--- a/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java
+++ b/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java
@@ -148,7 +148,7 @@ public class TieredMergePolicy extends MergePolicy {
/** Returns the current maxMergedSegmentMB setting.
*
- * @see #getMaxMergedSegmentMB */
+ * @see #setMaxMergedSegmentMB */
public double getMaxMergedSegmentMB() {
return maxMergedSegmentBytes/1024/1024.;
}
@@ -180,7 +180,7 @@ public class TieredMergePolicy extends MergePolicy {
* Default is 2 MB. */
public TieredMergePolicy setFloorSegmentMB(double v) {
if (v <= 0.0) {
- throw new IllegalArgumentException("floorSegmentMB must be >= 0.0 (got " + v + ")");
+ throw new IllegalArgumentException("floorSegmentMB must be > 0.0 (got " + v + ")");
}
v *= 1024 * 1024;
floorSegmentBytes = v > Long.MAX_VALUE ? Long.MAX_VALUE : (long) v;