Apache Solr open-source search software
LUCENE-9510: Don't pull a merge instance when flushing stored fields out-of-order. (#1872)
Adrien Grand97a4af6890d3
diff --git a/lucene/core/src/java/org/apache/lucene/index/SortingStoredFieldsConsumer.java b/lucene/core/src/java/org/apache/lucene/index/SortingStoredFieldsConsumer.javaindex 69f00b2c3aa..5753ba48bd2 100644--- a/lucene/core/src/java/org/apache/lucene/index/SortingStoredFieldsConsumer.java+++ b/lucene/core/src/java/org/apache/lucene/index/SortingStoredFieldsConsumer.java@@ -60,7 +60,8 @@ final class SortingStoredFieldsConsumer extends StoredFieldsConsumer {}StoredFieldsReader reader = codec.storedFieldsFormat().fieldsReader(tmpDirectory, state.segmentInfo, state.fieldInfos, IOContext.DEFAULT);- StoredFieldsReader mergeReader = reader.getMergeInstance();+ // Don't pull a merge instance, since merge instances optimize for+ // sequential access while we consume stored fields in random order here.StoredFieldsWriter sortWriter = codec.storedFieldsFormat().fieldsWriter(state.directory, state.segmentInfo, IOContext.DEFAULT);try {@@ -68,7 +69,7 @@ final class SortingStoredFieldsConsumer extends StoredFieldsConsumer {CopyVisitor visitor = new CopyVisitor(sortWriter);for (int docID = 0; docID < state.segmentInfo.maxDoc(); docID++) {sortWriter.startDocument();- mergeReader.visitDocument(sortMap.newToOld(docID), visitor);+ reader.visitDocument(sortMap.newToOld(docID), visitor);sortWriter.finishDocument();}sortWriter.finish(state.fieldInfos, state.segmentInfo.maxDoc());