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 2014/10/08 11:49:10 UTC
svn commit: r1630050 - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/core/ lucene/core/src/java/org/apache/lucene/index/MergePolicy.java
lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java
Author: mikemccand
Date: Wed Oct 8 09:49:09 2014
New Revision: 1630050
URL: http://svn.apache.org/r1630050
Log:
assert that TMP always picks a non-empty candidate; clean up code a bit; consistently use super.size(info, writer) not info.sizeInBytes
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/core/ (props changed)
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/MergePolicy.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/MergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/MergePolicy.java?rev=1630050&r1=1630049&r2=1630050&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/MergePolicy.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/MergePolicy.java Wed Oct 8 09:49:09 2014
@@ -117,8 +117,9 @@ public abstract class MergePolicy {
* @param segments List of {@link SegmentCommitInfo}s
* to be merged. */
public OneMerge(List<SegmentCommitInfo> segments) {
- if (0 == segments.size())
+ if (0 == segments.size()) {
throw new RuntimeException("segments must include at least one segment");
+ }
// clone the list, as the in list may be based off original SegmentInfos and may be modified
this.segments = new ArrayList<>(segments);
int count = 0;
@@ -239,14 +240,17 @@ public abstract class MergePolicy {
StringBuilder b = new StringBuilder();
final int numSegments = segments.size();
for(int i=0;i<numSegments;i++) {
- if (i > 0) b.append(' ');
+ if (i > 0) {
+ b.append(' ');
+ }
b.append(segments.get(i).toString(dir, 0));
}
if (info != null) {
b.append(" into ").append(info.info.name);
}
- if (maxNumSegments != -1)
+ if (maxNumSegments != -1) {
b.append(" [maxNumSegments=" + maxNumSegments + "]");
+ }
if (aborted) {
b.append(" [ABORTED]");
}
@@ -312,8 +316,9 @@ public abstract class MergePolicy {
StringBuilder b = new StringBuilder();
b.append("MergeSpec:\n");
final int count = merges.size();
- for(int i=0;i<count;i++)
+ for(int i=0;i<count;i++) {
b.append(" ").append(1 + i).append(": ").append(merges.get(i).segString(dir));
+ }
return b.toString();
}
}
@@ -477,9 +482,9 @@ public abstract class MergePolicy {
protected long size(SegmentCommitInfo info, IndexWriter writer) throws IOException {
long byteSize = info.sizeInBytes();
int delCount = writer.numDeletedDocs(info);
- double delRatio = (info.info.getDocCount() <= 0 ? 0.0f : ((float)delCount / (float)info.info.getDocCount()));
+ double delRatio = info.info.getDocCount() <= 0 ? 0.0f : (float) delCount / (float) info.info.getDocCount();
assert delRatio <= 1.0;
- return (info.info.getDocCount() <= 0 ? byteSize : (long)(byteSize * (1.0 - delRatio)));
+ return (info.info.getDocCount() <= 0 ? byteSize : (long) (byteSize * (1.0 - delRatio)));
}
/** Returns true if this single info is already fully merged (has no
@@ -527,7 +532,7 @@ public abstract class MergePolicy {
throw new IllegalArgumentException("maxCFSSegmentSizeMB must be >=0 (got " + v + ")");
}
v *= 1024 * 1024;
- this.maxCFSSegmentSize = (v > Long.MAX_VALUE) ? Long.MAX_VALUE : (long) v;
+ this.maxCFSSegmentSize = v > Long.MAX_VALUE ? Long.MAX_VALUE : (long) v;
}
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java?rev=1630050&r1=1630049&r2=1630050&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java Wed Oct 8 09:49:09 2014
@@ -142,7 +142,7 @@ public class TieredMergePolicy extends M
throw new IllegalArgumentException("maxMergedSegmentMB must be >=0 (got " + v + ")");
}
v *= 1024 * 1024;
- maxMergedSegmentBytes = (v > Long.MAX_VALUE) ? Long.MAX_VALUE : (long) v;
+ maxMergedSegmentBytes = v > Long.MAX_VALUE ? Long.MAX_VALUE : (long) v;
return this;
}
@@ -183,7 +183,7 @@ public class TieredMergePolicy extends M
throw new IllegalArgumentException("floorSegmentMB must be >= 0.0 (got " + v + ")");
}
v *= 1024 * 1024;
- floorSegmentBytes = (v > Long.MAX_VALUE) ? Long.MAX_VALUE : (long) v;
+ floorSegmentBytes = v > Long.MAX_VALUE ? Long.MAX_VALUE : (long) v;
return this;
}
@@ -314,8 +314,12 @@ public class TieredMergePolicy extends M
// If we have too-large segments, grace them out
// of the maxSegmentCount:
int tooBigCount = 0;
- while (tooBigCount < infosSorted.size() && size(infosSorted.get(tooBigCount), writer) >= maxMergedSegmentBytes/2.0) {
- totIndexBytes -= size(infosSorted.get(tooBigCount), writer);
+ while (tooBigCount < infosSorted.size()) {
+ long segBytes = size(infosSorted.get(tooBigCount), writer);
+ if (segBytes < maxMergedSegmentBytes/2.0) {
+ break;
+ }
+ totIndexBytes -= segBytes;
tooBigCount++;
}
@@ -351,7 +355,7 @@ public class TieredMergePolicy extends M
for(int idx = tooBigCount; idx<infosSorted.size(); idx++) {
final SegmentCommitInfo info = infosSorted.get(idx);
if (merging.contains(info)) {
- mergingBytes += info.sizeInBytes();
+ mergingBytes += size(info, writer);
} else if (!toBeMerged.contains(info)) {
eligible.add(info);
}
@@ -400,6 +404,10 @@ public class TieredMergePolicy extends M
totAfterMergeBytes += segBytes;
}
+ // We should never see an empty candidate: we iterated over maxMergeAtOnce
+ // segments, and already pre-excluded the too-large segments:
+ assert candidate.size() > 0;
+
final MergeScore score = score(candidate, hitTooLarge, mergingBytes, writer);
if (verbose(writer)) {
message(" maybe=" + writer.segString(candidate) + " score=" + score.getScore() + " " + score.getExplanation() + " tooLarge=" + hitTooLarge + " size=" + String.format(Locale.ROOT, "%.3f MB", totAfterMergeBytes/1024./1024.), writer);