You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by so...@apache.org on 2020/06/12 21:56:29 UTC
[lucene-solr] branch jira/lucene-8962 updated: fix test failures
caused by attempt to merge a no-segments merge
This is an automated email from the ASF dual-hosted git repository.
sokolov pushed a commit to branch jira/lucene-8962
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/jira/lucene-8962 by this push:
new bf0f799 fix test failures caused by attempt to merge a no-segments merge
bf0f799 is described below
commit bf0f7990e919e9f5428ff4546bb936bfe1b13a3e
Author: Michael Sokolov <so...@amazon.com>
AuthorDate: Fri Jun 12 17:55:26 2020 -0400
fix test failures caused by attempt to merge a no-segments merge
---
.../core/src/java/org/apache/lucene/index/IndexWriter.java | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java b/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
index 13e0443..d7e5c9a 100644
--- a/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
+++ b/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
@@ -3178,12 +3178,14 @@ public class IndexWriter implements Closeable, TwoPhaseCommit, Accountable,
deleter.decRef(sci.files());
}
}
- // Construct a OneMerge that applies to toCommit
- MergePolicy.OneMerge applicableMerge = new MergePolicy.OneMerge(toCommitMergedAwaySegments);
- applicableMerge.info = this.info.clone();
- long segmentCounter = Long.parseLong(this.info.info.name.substring(1), Character.MAX_RADIX);
- toCommit.counter = Math.max(toCommit.counter, segmentCounter + 1);
- toCommit.applyMergeChanges(applicableMerge, false);
+ if (toCommitMergedAwaySegments.size() > 0) {
+ // Construct a OneMerge that applies to toCommit
+ MergePolicy.OneMerge applicableMerge = new MergePolicy.OneMerge(toCommitMergedAwaySegments);
+ applicableMerge.info = this.info.clone();
+ long segmentCounter = Long.parseLong(this.info.info.name.substring(1), Character.MAX_RADIX);
+ toCommit.counter = Math.max(toCommit.counter, segmentCounter + 1);
+ toCommit.applyMergeChanges(applicableMerge, false);
+ }
}
mergeAwaitLatch.countDown();
}