Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-7915 - avoid looping over merges on best merge selection

This commit is contained in:
Tommaso Teofili 2017-08-01 15:00:25 +02:00
parent 9422da26e5
commit 59997091c8
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java
View File

@ -298,7 +298,7 @@ public class TieredMergePolicy extends MergePolicy {
// call size() once per segment and sort by that: // call size() once per segment and sort by that:
Map<SegmentCommitInfo,Long> sizeInBytes = getSegmentSizes(writer, infos.asList()); Map<SegmentCommitInfo,Long> sizeInBytes = getSegmentSizes(writer, infos.asList());
Collections.sort(infosSorted, new SegmentByteSizeDescending(sizeInBytes)); infosSorted.sort(new SegmentByteSizeDescending(sizeInBytes));
// Compute total index bytes & print details about the index // Compute total index bytes & print details about the index
long totIndexBytes = 0; long totIndexBytes = 0;
@ -439,9 +439,7 @@ public class TieredMergePolicy extends MergePolicy {
} }
final OneMerge merge = new OneMerge(best); final OneMerge merge = new OneMerge(best);
spec.add(merge); spec.add(merge);
for(SegmentCommitInfo info : merge.segments) { toBeMerged.addAll(merge.segments);
toBeMerged.add(info);
}
if (verbose(writer)) { if (verbose(writer)) {
message(" add merge=" + writer.segString(merge.segments) + " size=" + String.format(Locale.ROOT, "%.3f MB", bestMergeBytes/1024./1024.) + " score=" + String.format(Locale.ROOT, "%.3f", bestScore.getScore()) + " " + bestScore.getExplanation() + (bestTooLarge ? " [max merge]" : ""), writer); message(" add merge=" + writer.segString(merge.segments) + " size=" + String.format(Locale.ROOT, "%.3f MB", bestMergeBytes/1024./1024.) + " score=" + String.format(Locale.ROOT, "%.3f", bestScore.getScore()) + " " + bestScore.getExplanation() + (bestTooLarge ? " [max merge]" : ""), writer);
@ -553,7 +551,7 @@ public class TieredMergePolicy extends MergePolicy {
return null; return null;
} }
Collections.sort(eligible, new SegmentByteSizeDescending(sizeInBytes)); eligible.sort(new SegmentByteSizeDescending(sizeInBytes));
if (verbose(writer)) { if (verbose(writer)) {
message("eligible=" + eligible, writer); message("eligible=" + eligible, writer);
@ -614,7 +612,7 @@ public class TieredMergePolicy extends MergePolicy {
// call size() once per segment and sort by that: // call size() once per segment and sort by that:
Map<SegmentCommitInfo,Long> sizeInBytes = getSegmentSizes(writer, infos.asList()); Map<SegmentCommitInfo,Long> sizeInBytes = getSegmentSizes(writer, infos.asList());
Collections.sort(eligible, new SegmentByteSizeDescending(sizeInBytes)); eligible.sort(new SegmentByteSizeDescending(sizeInBytes));
if (verbose(writer)) { if (verbose(writer)) {
message("eligible=" + eligible, writer); message("eligible=" + eligible, writer);