Apache Lucene open-source search software
flush segments in addIndexes, not in addIndexesReaderMerge; fixes #14994 (#15025)
Michael Sokoloveef59141ae6b
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txtindex d340d12bddf..1ef8181fef9 100644--- a/lucene/CHANGES.txt+++ b/lucene/CHANGES.txt@@ -237,6 +237,9 @@ Changes in Runtime BehaviorBug Fixes---------------------+* GITHUB*15025: flush segments in addIndexes, not in addIndexesReaderMerge;+ reduces extra needless merge activity+* GITHUB#14880: NPE exception could occur in Luke on Windows when using network shares (wuth)* GITHUB#14654: ValueSource.fromDoubleValuesSource(dvs).getSortField() would throw errors whendiff --git a/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java b/lucene/core/src/java/org/apache/lucene/index/IndexWriter.javaindex 94f4253c679..5c1509af82a 100644--- a/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java+++ b/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java@@ -3156,6 +3156,11 @@ public class IndexWriterlong seqNo;try {+ if (infoStream.isEnabled("IW")) {+ infoStream.message("IW", "flush at addIndexes(CodecReader...)");+ }+ flush(false, true);+// Best effort up front validationsfor (CodecReader leaf : readers) {validateMergeReader(leaf);@@ -3354,11 +3359,6 @@ public class IndexWriter// long so we can detect int overflow:long numDocs = 0;- if (infoStream.isEnabled("IW")) {- infoStream.message("IW", "flush at addIndexes(CodecReader...)");- }- flush(false, true);-String mergedName = newSegmentName();Directory mergeDirectory = mergeScheduler.wrapForMerge(merge, directory);int numSoftDeleted = 0;