dsmiley commented on a change in pull request #1576:
URL: https://github.com/apache/lucene-solr/pull/1576#discussion_r443266362
##########
File path: lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
##########
@@ -2144,39 +2145,43 @@ private synchronized boolean
updatePendingMerges(MergePolicy mergePolicy, MergeT
assert maxNumSegments == UNBOUNDED_MAX_MERGE_SEGMENTS || maxNumSegments >
0;
assert trigger != null;
if (stopMerges) {
- return false;
+ return null;
}
// Do not start new merges if disaster struck
if (tragedy.get() != null) {
- return false;
+ return null;
}
- boolean newMergesFound = false;
final MergePolicy.MergeSpecification spec;
if (maxNumSegments != UNBOUNDED_MAX_MERGE_SEGMENTS) {
assert trigger == MergeTrigger.EXPLICIT || trigger ==
MergeTrigger.MERGE_FINISHED :
"Expected EXPLICT or MERGE_FINISHED as trigger even with maxNumSegments
set but was: " + trigger.name();
spec = mergePolicy.findForcedMerges(segmentInfos, maxNumSegments,
Collections.unmodifiableMap(segmentsToMerge), this);
- newMergesFound = spec != null;
- if (newMergesFound) {
+ if (spec != null) {
final int numMerges = spec.merges.size();
for(int i=0;i<numMerges;i++) {
final MergePolicy.OneMerge merge = spec.merges.get(i);
merge.maxNumSegments = maxNumSegments;
}
}
} else {
- spec = mergePolicy.findMerges(trigger, segmentInfos, this);
+ switch (trigger) {
+ case COMMIT:
Review comment:
There is an inconsistency here that suggests something is wrong, or at
least confusing enough to deserve a comment. For case COMMIT, we call a
findFullFlushMerges. Shouldn't it be on case FULL_FLUSH to be consistent with
the method we are calling? Or should findFullFlushMerges be called
findCommitMerges?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org
For additional commands, e-mail: issues-h...@lucene.apache.org
