Apache Lucene open-source search software
Replace (IO)Context#READ with (IO)Context.DEFAULT. (#13242)
Adrien Grand32d692049fc4
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txtindex dcce957ff54..36f858ea5b2 100644--- a/lucene/CHANGES.txt+++ b/lucene/CHANGES.txt@@ -92,6 +92,8 @@ API Changes* GITHUB#13219: The `readOnce`, `load` and `random` flags on `IOContext` havebeen replaced with a new `ReadAdvice` enum. (Adrien Grand)+* GITHUB#13242: Replace `IOContext.READ` with `IOContext.DEFAULT`. (Adrien Grand)+New Features---------------------diff --git a/lucene/MIGRATE.md b/lucene/MIGRATE.mdindex 9c52d01c8ad..c7270ee822c 100644--- a/lucene/MIGRATE.md+++ b/lucene/MIGRATE.md@@ -185,10 +185,12 @@ access the members using method calls instead of field accesses. Affected classeThe `readOnce`, `load` and `random` flags on `IOContext` have been replaced with a new `ReadAdvice`enum.-### IOContext.LOAD removed+### IOContext.LOAD and IOContext.READ removed`IOContext#LOAD` has been removed, it should be replaced with-`ioContext.toReadAdvice(ReadAdvice.RANDOM_PRELOAD)`.+`ioContext.withReadAdvice(ReadAdvice.RANDOM_PRELOAD)`.++`IOContext.READ` has been removed, it should be replaced with `IOContext.DEFAULT`.## Migration from Lucene 9.0 to Lucene 9.1diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene50/compressing/FieldsIndexReader.java b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene50/compressing/FieldsIndexReader.javaindex 133acbcd581..a2b153ae04e 100644--- a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene50/compressing/FieldsIndexReader.java+++ b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene50/compressing/FieldsIndexReader.java@@ -67,7 +67,7 @@ final class FieldsIndexReader extends FieldsIndex {indexInput =EndiannessReverserUtil.openInput(- dir, IndexFileNames.segmentFileName(name, suffix, extension), IOContext.READ);+ dir, IndexFileNames.segmentFileName(name, suffix, extension), IOContext.DEFAULT);boolean success = false;try {CodecUtil.checkIndexHeader(diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/packed/TestLegacyDirectMonotonic.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/packed/TestLegacyDirectMonotonic.javaindex ba988afa614..60e7c00c885 100644--- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/packed/TestLegacyDirectMonotonic.java+++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/packed/TestLegacyDirectMonotonic.java@@ -259,7 +259,7 @@ public class TestLegacyDirectMonotonic extends LuceneTestCase {}try (IndexInput metaIn = EndiannessReverserUtil.openInput(dir, "meta", IOContext.READONCE);- IndexInput dataIn = EndiannessReverserUtil.openInput(dir, "data", IOContext.READ)) {+ IndexInput dataIn = EndiannessReverserUtil.openInput(dir, "data", IOContext.DEFAULT)) {LegacyDirectMonotonicReader.Meta meta =LegacyDirectMonotonicReader.loadMeta(metaIn, array.length, blockShift);LegacyDirectMonotonicReader reader =diff --git a/lucene/core/src/java/org/apache/lucene/index/BufferedUpdatesStream.java b/lucene/core/src/java/org/apache/lucene/index/BufferedUpdatesStream.javaindex cf7bcf08a38..06c54d30b0e 100644--- a/lucene/core/src/java/org/apache/lucene/index/BufferedUpdatesStream.java+++ b/lucene/core/src/java/org/apache/lucene/index/BufferedUpdatesStream.java@@ -282,7 +282,7 @@ final class BufferedUpdatesStream implements Accountable {ReadersAndUpdates rld, IOConsumer<ReadersAndUpdates> onClose, SegmentCommitInfo info)throws IOException {this.rld = rld;- reader = rld.getReader(IOContext.READ);+ reader = rld.getReader(IOContext.DEFAULT);startDelCount = rld.getDelCount();delGen = info.getBufferedDeletesGen();this.onClose = onClose;diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java b/lucene/core/src/java/org/apache/lucene/index/IndexWriter.javaindex 2634281d0fd..1f20cbd169a 100644--- a/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java+++ b/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java@@ -538,7 +538,7 @@ public class IndexWriterfinal ReadersAndUpdates rld = getPooledInstance(sci, true);try {assert Thread.holdsLock(IndexWriter.this);- SegmentReader segmentReader = rld.getReadOnlyClone(IOContext.READ);+ SegmentReader segmentReader = rld.getReadOnlyClone(IOContext.DEFAULT);// only track this if we actually do fullFlush mergesif (maxFullFlushMergeWaitMillis > 0) {openedReadOnlyClones.put(sci.info.name, segmentReader);@@ -5447,7 +5447,7 @@ public class IndexWriterfinal IndexReaderWarmer mergedSegmentWarmer = config.getMergedSegmentWarmer();if (readerPool.isReaderPoolingEnabled() && mergedSegmentWarmer != null) {final ReadersAndUpdates rld = getPooledInstance(merge.info, true);- final SegmentReader sr = rld.getReader(IOContext.READ);+ final SegmentReader sr = rld.getReader(IOContext.DEFAULT);try {mergedSegmentWarmer.warm(sr);} finally {diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexingChain.java b/lucene/core/src/java/org/apache/lucene/index/IndexingChain.javaindex 560807d6973..b7ce860e462 100644--- a/lucene/core/src/java/org/apache/lucene/index/IndexingChain.java+++ b/lucene/core/src/java/org/apache/lucene/index/IndexingChain.java@@ -284,7 +284,7 @@ final class IndexingChain implements Accountable {state.directory,state.segmentInfo,state.fieldInfos,- IOContext.READ,+ IOContext.DEFAULT,state.segmentSuffix);t0 = System.nanoTime();diff --git a/lucene/core/src/java/org/apache/lucene/index/ReadersAndUpdates.java b/lucene/core/src/java/org/apache/lucene/index/ReadersAndUpdates.javaindex 737149446c1..ed635c68038 100644--- a/lucene/core/src/java/org/apache/lucene/index/ReadersAndUpdates.java+++ b/lucene/core/src/java/org/apache/lucene/index/ReadersAndUpdates.java@@ -192,7 +192,7 @@ final class ReadersAndUpdates {public synchronized boolean delete(int docID) throws IOException {if (reader == null && pendingDeletes.mustInitOnDelete()) {- getReader(IOContext.READ).decRef(); // pass a reader to initialize the pending deletes+ getReader(IOContext.DEFAULT).decRef(); // pass a reader to initialize the pending deletes}return pendingDeletes.delete(docID);}@@ -241,7 +241,7 @@ final class ReadersAndUpdates {private synchronized CodecReader getLatestReader() throws IOException {if (this.reader == null) {// get a reader and dec the ref right away we just make sure we have a reader- getReader(IOContext.READ).decRef();+ getReader(IOContext.DEFAULT).decRef();}if (pendingDeletes.needsRefresh(reader)) {// we have a reader but its live-docs are out of sync. let's create a temporary one that wediff --git a/lucene/core/src/java/org/apache/lucene/index/SegmentDocValues.java b/lucene/core/src/java/org/apache/lucene/index/SegmentDocValues.javaindex caeadf0c97f..42e3daa3944 100644--- a/lucene/core/src/java/org/apache/lucene/index/SegmentDocValues.java+++ b/lucene/core/src/java/org/apache/lucene/index/SegmentDocValues.java@@ -46,7 +46,7 @@ final class SegmentDocValues {// set SegmentReadState to list only the fields that are relevant to that genSegmentReadState srs =- new SegmentReadState(dvDir, si.info, infos, IOContext.READ, segmentSuffix);+ new SegmentReadState(dvDir, si.info, infos, IOContext.DEFAULT, segmentSuffix);DocValuesFormat dvFormat = si.info.getCodec().docValuesFormat();return new RefCount<DocValuesProducer>(dvFormat.fieldsProducer(srs)) {@SuppressWarnings("synthetic-access")diff --git a/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java b/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.javaindex 7caf2dbda8c..f047e795dd4 100644--- a/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java+++ b/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java@@ -395,7 +395,7 @@ public final class SegmentInfos implements Cloneable, Iterable<SegmentCommitInfoinput.readBytes(segmentID, 0, segmentID.length);Codec codec = readCodec(input);SegmentInfo info =- codec.segmentInfoFormat().read(directory, segName, segmentID, IOContext.READ);+ codec.segmentInfoFormat().read(directory, segName, segmentID, IOContext.DEFAULT);info.setCodec(codec);totalDocs += info.maxDoc();long delGen = CodecUtil.readBELong(input);diff --git a/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java b/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.javaindex af4c87e72d8..c2299427fa2 100644--- a/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java+++ b/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java@@ -132,7 +132,7 @@ final class SegmentMerger {directory,mergeState.segmentInfo,mergeState.mergeFieldInfos,- IOContext.READ,+ IOContext.DEFAULT,segmentWriteState.segmentSuffix);TaskExecutor taskExecutor = new TaskExecutor(mergeState.intraMergeTaskExecutor);diff --git a/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java b/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.javaindex 614c6c306e0..a0f17a4b074 100644--- a/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java+++ b/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java@@ -91,7 +91,8 @@ public final class StandardDirectoryReader extends DirectoryReader {try {for (int i = sis.size() - 1; i >= 0; i--) {readers[i] =- new SegmentReader(sis.info(i), sis.getIndexCreatedVersionMajor(), IOContext.READ);+ new SegmentReader(+ sis.info(i), sis.getIndexCreatedVersionMajor(), IOContext.DEFAULT);}// This may throw CorruptIndexException if there are too many docs, so// it must be inside try clause so we close readers in that case:@@ -229,7 +230,7 @@ public final class StandardDirectoryReader extends DirectoryReader {!= oldReader.getSegmentInfo().info.getUseCompoundFile()) {// this is a new reader; in case we hit an exception we can decRef it safelynewReader =- new SegmentReader(commitInfo, infos.getIndexCreatedVersionMajor(), IOContext.READ);+ new SegmentReader(commitInfo, infos.getIndexCreatedVersionMajor(), IOContext.DEFAULT);newReaders[i] = newReader;} else {if (oldReader.isNRT) {diff --git a/lucene/core/src/java/org/apache/lucene/store/BufferedIndexInput.java b/lucene/core/src/java/org/apache/lucene/store/BufferedIndexInput.javaindex dc6a6139a07..13151692bc0 100644--- a/lucene/core/src/java/org/apache/lucene/store/BufferedIndexInput.java+++ b/lucene/core/src/java/org/apache/lucene/store/BufferedIndexInput.java@@ -374,7 +374,6 @@ public abstract class BufferedIndexInput extends IndexInput implements RandomAccreturn MERGE_BUFFER_SIZE;case DEFAULT:case FLUSH:- case READ:default:return BUFFER_SIZE;}diff --git a/lucene/core/src/java/org/apache/lucene/store/IOContext.java b/lucene/core/src/java/org/apache/lucene/store/IOContext.javaindex e9dac3d1e10..860c5f9f6e5 100644--- a/lucene/core/src/java/org/apache/lucene/store/IOContext.java+++ b/lucene/core/src/java/org/apache/lucene/store/IOContext.java@@ -36,9 +36,11 @@ public record IOContext(* Context is a enumerator which specifies the context in which the Directory is being used for.*/public enum Context {+ /** Context for reads and writes that are associated with a merge. */MERGE,- READ,+ /** Context for writes that are associated with a segment flush. */FLUSH,+ /** Default context, can be used for reading or writing. */DEFAULT};@@ -47,8 +49,6 @@ public record IOContext(public static final IOContext READONCE = new IOContext(ReadAdvice.SEQUENTIAL);- public static final IOContext READ = new IOContext(ReadAdvice.NORMAL);-@SuppressWarnings("incomplete-switch")public IOContext {Objects.requireNonNull(context, "context must not be null");@@ -63,15 +63,14 @@ public record IOContext(throw new IllegalArgumentException("The MERGE context must use the SEQUENTIAL read access advice");}- if ((context == Context.FLUSH || context == Context.DEFAULT)- && readAdvice != ReadAdvice.NORMAL) {+ if (context == Context.FLUSH && readAdvice != ReadAdvice.NORMAL) {throw new IllegalArgumentException(- "The FLUSH and DEFAULT contexts must use the NORMAL read access advice");+ "The FLUSH context must use the NORMAL read access advice");}}private IOContext(ReadAdvice accessAdvice) {- this(Context.READ, null, null, accessAdvice);+ this(Context.DEFAULT, null, null, accessAdvice);}/** Creates an IOContext for flushing. */@@ -87,12 +86,13 @@ public record IOContext(/*** Return an updated {@link IOContext} that has the provided {@link ReadAdvice} if the {@link- * Context} is a {@link Context#READ} context, otherwise return this existing instance. This helps- * preserve a {@link ReadAdvice#SEQUENTIAL} advice for merging, which is always the right choice,- * while allowing {@link IndexInput}s open for searching to use arbitrary {@link ReadAdvice}s.+ * Context} is a {@link Context#DEFAULT} context, otherwise return this existing instance. This+ * helps preserve a {@link ReadAdvice#SEQUENTIAL} advice for merging, which is always the right+ * choice, while allowing {@link IndexInput}s open for searching to use arbitrary {@link+ * ReadAdvice}s.*/public IOContext withReadAdvice(ReadAdvice advice) {- if (context == Context.READ) {+ if (context == Context.DEFAULT) {return new IOContext(advice);} else {return this;diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.javaindex 142c4ae66c8..4cee1635c42 100644--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java@@ -3029,7 +3029,7 @@ public class TestIndexWriter extends LuceneTestCase {writer.commit();assertEquals(1, writer.getDocStats().maxDoc);// now check that we moved to 3- dir.openInput("segments_3", IOContext.READ).close();+ dir.openInput("segments_3", IOContext.DEFAULT).close();}reader.close();in.close();diff --git a/lucene/core/src/test/org/apache/lucene/index/TestReaderPool.java b/lucene/core/src/test/org/apache/lucene/index/TestReaderPool.javaindex 338cf0fb2b2..3c59c696763 100644--- a/lucene/core/src/test/org/apache/lucene/index/TestReaderPool.java+++ b/lucene/core/src/test/org/apache/lucene/index/TestReaderPool.java@@ -118,7 +118,7 @@ public class TestReaderPool extends LuceneTestCase {}for (SegmentCommitInfo commitInfo : segmentInfos) {ReadersAndUpdates readersAndUpdates = pool.get(commitInfo, true);- SegmentReader readOnlyClone = readersAndUpdates.getReadOnlyClone(IOContext.READ);+ SegmentReader readOnlyClone = readersAndUpdates.getReadOnlyClone(IOContext.DEFAULT);PostingsEnum postings = readOnlyClone.postings(new Term("id", "" + id));boolean expectUpdate = false;int doc = -1;@@ -162,7 +162,7 @@ public class TestReaderPool extends LuceneTestCase {assertEquals(expectUpdate, writtenToDisk);if (expectUpdate) {readersAndUpdates = pool.get(commitInfo, true);- SegmentReader updatedReader = readersAndUpdates.getReadOnlyClone(IOContext.READ);+ SegmentReader updatedReader = readersAndUpdates.getReadOnlyClone(IOContext.DEFAULT);assertNotSame(-1, doc);NumericDocValues number = updatedReader.getNumericDocValues("number");assertEquals(doc, number.advance(doc));@@ -195,7 +195,7 @@ public class TestReaderPool extends LuceneTestCase {}for (SegmentCommitInfo commitInfo : segmentInfos) {ReadersAndUpdates readersAndUpdates = pool.get(commitInfo, true);- SegmentReader readOnlyClone = readersAndUpdates.getReadOnlyClone(IOContext.READ);+ SegmentReader readOnlyClone = readersAndUpdates.getReadOnlyClone(IOContext.DEFAULT);PostingsEnum postings = readOnlyClone.postings(new Term("id", "" + id));boolean expectUpdate = false;int doc = -1;@@ -217,7 +217,7 @@ public class TestReaderPool extends LuceneTestCase {assertEquals(expectUpdate, writtenToDisk);if (expectUpdate) {readersAndUpdates = pool.get(commitInfo, true);- SegmentReader updatedReader = readersAndUpdates.getReadOnlyClone(IOContext.READ);+ SegmentReader updatedReader = readersAndUpdates.getReadOnlyClone(IOContext.DEFAULT);assertNotSame(-1, doc);assertFalse(updatedReader.getLiveDocs().get(doc));readersAndUpdates.release(updatedReader);@@ -255,7 +255,7 @@ public class TestReaderPool extends LuceneTestCase {while (isDone.get() == false) {for (SegmentCommitInfo commitInfo : segmentInfos) {ReadersAndUpdates readersAndUpdates = pool.get(commitInfo, true);- SegmentReader segmentReader = readersAndUpdates.getReader(IOContext.READ);+ SegmentReader segmentReader = readersAndUpdates.getReader(IOContext.DEFAULT);readersAndUpdates.release(segmentReader);pool.release(readersAndUpdates, random().nextBoolean());}@@ -279,7 +279,7 @@ public class TestReaderPool extends LuceneTestCase {for (int i = 0; i < reader.maxDoc(); i++) {for (SegmentCommitInfo commitInfo : segmentInfos) {ReadersAndUpdates readersAndUpdates = pool.get(commitInfo, true);- SegmentReader sr = readersAndUpdates.getReadOnlyClone(IOContext.READ);+ SegmentReader sr = readersAndUpdates.getReadOnlyClone(IOContext.DEFAULT);PostingsEnum postings = sr.postings(new Term("id", "" + i));sr.decRef();if (postings != null) {diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java b/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.javaindex e42d0deb3fa..71bb8b167b1 100644--- a/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java+++ b/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java@@ -42,7 +42,7 @@ public class TestSegmentReader extends LuceneTestCase {dir = newDirectory();DocHelper.setupDoc(testDoc);SegmentCommitInfo info = DocHelper.writeDoc(random(), dir, testDoc);- reader = new SegmentReader(info, Version.LATEST.major, IOContext.READ);+ reader = new SegmentReader(info, Version.LATEST.major, IOContext.DEFAULT);}@Overridediff --git a/lucene/core/src/test/org/apache/lucene/store/TestMMapDirectory.java b/lucene/core/src/test/org/apache/lucene/store/TestMMapDirectory.javaindex 40c1eb80f5c..b13f4f3cf34 100644--- a/lucene/core/src/test/org/apache/lucene/store/TestMMapDirectory.java+++ b/lucene/core/src/test/org/apache/lucene/store/TestMMapDirectory.java@@ -110,7 +110,7 @@ public class TestMMapDirectory extends BaseDirectoryTestCase {}try (final IndexInput in =- dir.openInput("test", IOContext.READ.withReadAdvice(ReadAdvice.RANDOM))) {+ dir.openInput("test", IOContext.DEFAULT.withReadAdvice(ReadAdvice.RANDOM))) {final byte[] readBytes = new byte[size];in.readBytes(readBytes, 0, readBytes.length);assertArrayEquals(bytes, readBytes);diff --git a/lucene/core/src/test/org/apache/lucene/util/packed/TestDirectMonotonic.java b/lucene/core/src/test/org/apache/lucene/util/packed/TestDirectMonotonic.javaindex 62a8f41b011..a10af31835a 100644--- a/lucene/core/src/test/org/apache/lucene/util/packed/TestDirectMonotonic.java+++ b/lucene/core/src/test/org/apache/lucene/util/packed/TestDirectMonotonic.java@@ -296,7 +296,7 @@ public class TestDirectMonotonic extends LuceneTestCase {}try (IndexInput metaIn = dir.openInput("meta", IOContext.READONCE);- IndexInput dataIn = dir.openInput("data", IOContext.READ)) {+ IndexInput dataIn = dir.openInput("data", IOContext.DEFAULT)) {DirectMonotonicReader.Meta meta =DirectMonotonicReader.loadMeta(metaIn, array.length, blockShift);DirectMonotonicReader reader =diff --git a/lucene/demo/src/java/org/apache/lucene/demo/knn/KnnVectorDict.java b/lucene/demo/src/java/org/apache/lucene/demo/knn/KnnVectorDict.javaindex 30c813e5c5a..cfc55cc0a7d 100644--- a/lucene/demo/src/java/org/apache/lucene/demo/knn/KnnVectorDict.java+++ b/lucene/demo/src/java/org/apache/lucene/demo/knn/KnnVectorDict.java@@ -59,11 +59,11 @@ public class KnnVectorDict implements Closeable {* '.bin' file.*/public KnnVectorDict(Directory directory, String dictName) throws IOException {- try (IndexInput fstIn = directory.openInput(dictName + ".fst", IOContext.READ)) {+ try (IndexInput fstIn = directory.openInput(dictName + ".fst", IOContext.DEFAULT)) {fst = new FST<>(readMetadata(fstIn, PositiveIntOutputs.getSingleton()), fstIn);}- vectors = directory.openInput(dictName + ".bin", IOContext.READ);+ vectors = directory.openInput(dictName + ".bin", IOContext.DEFAULT);long size = vectors.length();vectors.seek(size - Integer.BYTES);dimension = vectors.readInt();diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestAlwaysRefreshDirectoryTaxonomyReader.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestAlwaysRefreshDirectoryTaxonomyReader.javaindex f7226be7a93..aedd0764751 100644--- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestAlwaysRefreshDirectoryTaxonomyReader.java+++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestAlwaysRefreshDirectoryTaxonomyReader.java@@ -67,7 +67,7 @@ public class TestAlwaysRefreshDirectoryTaxonomyReader extends FacetTestCase {for (String file : dir1.listAll()) {if (isExtra(file) == false) {// the test framework creates these devious extra files just to chaos test the edge cases- commit1.copyFrom(dir1, file, file, IOContext.READ);+ commit1.copyFrom(dir1, file, file, IOContext.DEFAULT);}}@@ -103,7 +103,7 @@ public class TestAlwaysRefreshDirectoryTaxonomyReader extends FacetTestCase {// copy all index files from commit1for (String file : commit1.listAll()) {if (isExtra(file) == false) {- dir1.copyFrom(commit1, file, file, IOContext.READ);+ dir1.copyFrom(commit1, file, file, IOContext.DEFAULT);}}diff --git a/lucene/luke/src/java/org/apache/lucene/luke/models/util/IndexUtils.java b/lucene/luke/src/java/org/apache/lucene/luke/models/util/IndexUtils.javaindex 95dbea6cafb..735fc6db818 100644--- a/lucene/luke/src/java/org/apache/lucene/luke/models/util/IndexUtils.java+++ b/lucene/luke/src/java/org/apache/lucene/luke/models/util/IndexUtils.java@@ -341,7 +341,7 @@ public final class IndexUtils {@Overrideprotected String doBody(String segmentFileName) throws IOException {String format = "unknown";- try (IndexInput in = dir.openInput(segmentFileName, IOContext.READ)) {+ try (IndexInput in = dir.openInput(segmentFileName, IOContext.DEFAULT)) {if (CodecUtil.CODEC_MAGIC == CodecUtil.readBEInt(in)) {int actualVersion =CodecUtil.checkHeaderNoMagic(diff --git a/lucene/misc/src/java/org/apache/lucene/misc/index/BPIndexReorderer.java b/lucene/misc/src/java/org/apache/lucene/misc/index/BPIndexReorderer.javaindex e34567bff48..43b6c7b9c04 100644--- a/lucene/misc/src/java/org/apache/lucene/misc/index/BPIndexReorderer.java+++ b/lucene/misc/src/java/org/apache/lucene/misc/index/BPIndexReorderer.java@@ -817,8 +817,8 @@ public final class BPIndexReorderer {});}- IndexInput termIDsInput = tempDir.openInput(termIDsFileName, IOContext.READ);- IndexInput startOffsets = tempDir.openInput(startOffsetsFileName, IOContext.READ);+ IndexInput termIDsInput = tempDir.openInput(termIDsFileName, IOContext.DEFAULT);+ IndexInput startOffsets = tempDir.openInput(startOffsetsFileName, IOContext.DEFAULT);return new ForwardIndex(startOffsets, termIDsInput, maxTerm);}diff --git a/lucene/misc/src/java/org/apache/lucene/misc/store/ByteWritesTrackingDirectoryWrapper.java b/lucene/misc/src/java/org/apache/lucene/misc/store/ByteWritesTrackingDirectoryWrapper.javaindex 073ea7224f0..dda0a2dee2c 100644--- a/lucene/misc/src/java/org/apache/lucene/misc/store/ByteWritesTrackingDirectoryWrapper.java+++ b/lucene/misc/src/java/org/apache/lucene/misc/store/ByteWritesTrackingDirectoryWrapper.java@@ -65,7 +65,6 @@ public final class ByteWritesTrackingDirectoryWrapper extends FilterDirectory {case MERGE:return new ByteTrackingIndexOutput(output, mergedBytes);case DEFAULT:- case READ:default:return output;}diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseCompoundFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseCompoundFormatTestCase.javaindex 786a4c0c80a..b0e30ef2272 100644--- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseCompoundFormatTestCase.java+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseCompoundFormatTestCase.java@@ -899,7 +899,7 @@ public abstract class BaseCompoundFormatTestCase extends BaseIndexFileFormatTestReadBytesDirectoryWrapper readTrackingDir = new ReadBytesDirectoryWrapper(dir);CompoundDirectory compoundDir =- si.getCodec().compoundFormat().getCompoundReader(readTrackingDir, si, IOContext.READ);+ si.getCodec().compoundFormat().getCompoundReader(readTrackingDir, si, IOContext.DEFAULT);compoundDir.checkIntegrity();Map<String, FixedBitSet> readBytes = readTrackingDir.getReadBytes();assertEquals(createdFiles, readBytes.keySet());diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseIndexFileFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseIndexFileFormatTestCase.javaindex 17aa522bdf6..2dcb713128e 100644--- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseIndexFileFormatTestCase.java+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseIndexFileFormatTestCase.java@@ -374,7 +374,8 @@ abstract class BaseIndexFileFormatTestCase extends LuceneTestCase {new SegmentWriteState(null, dir, segmentInfo, fieldInfos, null, new IOContext(new FlushInfo(1, 20)));- SegmentReadState readState = new SegmentReadState(dir, segmentInfo, fieldInfos, IOContext.READ);+ SegmentReadState readState =+ new SegmentReadState(dir, segmentInfo, fieldInfos, IOContext.DEFAULT);// PostingsFormatNormsProducer fakeNorms =diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/RandomPostingsTester.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/RandomPostingsTester.javaindex 806888e13cd..f8fe88b5cf2 100644--- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/RandomPostingsTester.java+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/RandomPostingsTester.java@@ -839,7 +839,7 @@ public class RandomPostingsTester {currentFieldInfos = newFieldInfos;SegmentReadState readState =- new SegmentReadState(dir, segmentInfo, newFieldInfos, IOContext.READ);+ new SegmentReadState(dir, segmentInfo, newFieldInfos, IOContext.DEFAULT);return codec.postingsFormat().fieldsProducer(readState);}diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.javaindex 37fc92185d0..9b96eb1ca03 100644--- a/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java@@ -1798,20 +1798,17 @@ public abstract class LuceneTestCase extends Assert {} else {// Make a totally random IOContext:final IOContext context;- switch (random.nextInt(5)) {+ switch (random.nextInt(4)) {case 0:context = IOContext.DEFAULT;break;case 1:- context = IOContext.READ;- break;- case 2:context = IOContext.READONCE;break;- case 3:+ case 2:context = new IOContext(new MergeInfo(randomNumDocs, size, true, -1));break;- case 4:+ case 3:context = new IOContext(new FlushInfo(randomNumDocs, size));break;default: