IJPL-797 intellij.platform.util: fix exposures of private indexing/storage APIs

GitOrigin-RevId: 72f00c9aedb6c0d1fef020108a64cae90c57943e

platform/indexing-impl/api-dump-unreviewed.txt

@@ -558,8 +558,8 @@ com.intellij.util.indexing.impl.storage.TransientChangesIndexStorage$BufferingSt
 - a:bufferingStateChanged(Z):V
 - a:memoryStorageCleared():V
 c:com.intellij.util.indexing.impl.storage.VfsAwareMapIndexStorage
-- com.intellij.util.indexing.impl.MapIndexStorage
 - com.intellij.util.indexing.VfsAwareIndexStorage
+- com.intellij.util.indexing.impl.IndexStorage
 - <init>(java.nio.file.Path,com.intellij.util.io.KeyDescriptor,com.intellij.util.io.DataExternalizer,I,Z):V
 - <init>(java.nio.file.Path,com.intellij.util.io.KeyDescriptor,com.intellij.util.io.DataExternalizer,I,Z,Z,Z):V
 - addValue(java.lang.Object,I,java.lang.Object):V
@@ -570,7 +570,7 @@ c:com.intellij.util.indexing.impl.storage.VfsAwareMapIndexStorage
 - processKeys(com.intellij.util.Processor,com.intellij.psi.search.GlobalSearchScope,com.intellij.util.indexing.IdFilter):Z
 - removeAllValues(java.lang.Object,I):V
 *a:com.intellij.util.indexing.storage.MapReduceIndexBase
-- com.intellij.util.indexing.impl.MapReduceIndex
+- com.intellij.util.indexing.InvertedIndex
 - com.intellij.util.indexing.UpdatableIndex
 - p:<init>(com.intellij.util.indexing.IndexExtension,com.intellij.openapi.util.ThrowableComputable,com.intellij.openapi.util.ThrowableComputable,com.intellij.util.indexing.impl.forward.ForwardIndexAccessor):V
 - checkCanceled():V

platform/lvcs-impl/api-dump-unreviewed.txt

@@ -119,7 +119,7 @@ f:com.intellij.history.core.LocalHistoryRecordsTable
 - setPrevRecord(I,I):V
 - setTimestamp(I,J):V
 f:com.intellij.history.core.LocalHistoryStorage
-- com.intellij.util.io.storage.AbstractStorage
+- com.intellij.util.io.storage.IStorage
 - <init>(java.nio.file.Path):V
 - createNextRecord():I
 - deleteRecordsUpTo(I):V

platform/platform-impl/api-dump-unreviewed.txt

@@ -19958,149 +19958,6 @@ f:com.intellij.openapi.vfs.newvfs.persistent.VFSHealthChecker$VFSHealthCheckRepo
 - toString():java.lang.String
 f:com.intellij.openapi.vfs.newvfs.persistent.VFSHealthCheckerKt
 - sf:main(java.lang.String[]):V
-f:com.intellij.openapi.vfs.newvfs.persistent.dev.blobstorage.RecordAlreadyDeletedException
-- java.io.IOException
-- <init>():V
-- <init>(java.lang.String):V
-- <init>(java.lang.String,java.lang.Throwable):V
-- <init>(java.lang.Throwable):V
-a:com.intellij.openapi.vfs.newvfs.persistent.dev.blobstorage.StreamlinedBlobStorageHelper
-- com.intellij.openapi.Forceable
-- com.intellij.util.io.CleanableStorage
-- java.io.Closeable
-- java.lang.AutoCloseable
-- psf:FILE_STATUS_OPENED:I
-- psf:FILE_STATUS_PROPERLY_CLOSED:I
-- psf:MAGIC_WORD:I
-- sf:MAX_CAPACITY:I
-- psf:MAX_FILE_LENGTH:J
-- psf:MAX_REDIRECTS:I
-- pf:allocationStrategy:com.intellij.util.io.blobstorage.SpaceAllocationStrategy
-- pf:byteOrder:java.nio.ByteOrder
-- pf:closed:java.util.concurrent.atomic.AtomicBoolean
-- pf:maxCapacityForPageSize:I
-- pf:pageSize:I
-- pf:recordsAllocated:java.util.concurrent.atomic.AtomicInteger
-- pf:recordsDeleted:java.util.concurrent.atomic.AtomicInteger
-- pf:recordsRelocated:java.util.concurrent.atomic.AtomicInteger
-- pf:totalLiveRecordsCapacityBytes:java.util.concurrent.atomic.AtomicLong
-- pf:totalLiveRecordsPayloadBytes:java.util.concurrent.atomic.AtomicLong
-- pf:wasClosedProperly:java.util.concurrent.atomic.AtomicBoolean
-- p:<init>(com.intellij.util.io.blobstorage.SpaceAllocationStrategy,I,java.nio.ByteOrder):V
-- p:acquireTemporaryBuffer(I):java.nio.ByteBuffer
-- p:allocateSlotForRecord(I,I,com.intellij.openapi.util.IntRef):I
-- ps:checkCapacityHardLimit(I):V
-- ps:checkLengthHardLimit(I):V
-- p:checkNotClosed():V
-- p:checkRecordIdExists(I):V
-- ps:checkRecordIdValid(I):V
-- p:checkRedirectToId(I,I,I):V
-- closeAndClean():V
-- hasRecord(I):Z
-- p:headerSize():I
-- p:idToOffset(I):J
-- isClosed():Z
-- ps:isCorrectCapacity(I):Z
-- ps:isCorrectLength(I):Z
-- p:isExistingRecordId(I):Z
-- isRecordActual(I):Z
-- p:isRecordIdAllocated(I):Z
-- ps:isValidRecordId(I):Z
-- liveRecordsCount():I
-- maxPayloadSupported():I
-- p:nextRecordId():I
-- p:nextRecordOffset(J,com.intellij.openapi.vfs.newvfs.persistent.dev.blobstorage.RecordLayout,I):J
-- p:offsetToId(J):I
-- pa:putSpaceFillerRecord(J,I):V
-- readRecord(I,com.intellij.util.io.blobstorage.ByteBufferReader):java.lang.Object
-- recordsAllocated():I
-- recordsDeleted():I
-- recordsRelocated():I
-- p:recordsStartOffset():J
-- p:releaseTemporaryBuffer(java.nio.ByteBuffer):V
-- ps:roundSizeUpToBucket(I,I,I):I
-- s:setupReportingToOpenTelemetry(java.nio.file.Path,com.intellij.openapi.vfs.newvfs.persistent.dev.blobstorage.StreamlinedBlobStorageHelper):io.opentelemetry.api.metrics.BatchCallback
-- pa:storagePath():java.nio.file.Path
-- p:toOffsetOnPage(J):I
-- toString():java.lang.String
-- totalLiveRecordsCapacityBytes():J
-- totalLiveRecordsPayloadBytes():J
-- p:updateNextRecordId(I):V
-- wasClosedProperly():Z
-- writeToRecord(I,com.intellij.util.io.blobstorage.ByteBufferWriter):I
-- writeToRecord(I,com.intellij.util.io.blobstorage.ByteBufferWriter,I):I
-f:com.intellij.openapi.vfs.newvfs.persistent.dev.blobstorage.StreamlinedBlobStorageHelper$HeaderLayout
-- sf:DATA_FORMAT_VERSION_OFFSET:I
-- sf:FILE_STATUS_OFFSET:I
-- sf:FIRST_UNUSED_FIELD_OFFSET:I
-- sf:HEADER_SIZE:I
-- sf:MAGIC_WORD_OFFSET:I
-- sf:NEXT_RECORD_ID_OFFSET:I
-- sf:PAGE_SIZE_OFFSET:I
-- sf:RECORDS_ALLOCATED_OFFSET:I
-- sf:RECORDS_DELETED_OFFSET:I
-- sf:RECORDS_LIVE_TOTAL_CAPACITY_SIZE_OFFSET:I
-- sf:RECORDS_LIVE_TOTAL_PAYLOAD_SIZE_OFFSET:I
-- sf:RECORDS_RELOCATED_OFFSET:I
-- sf:STORAGE_VERSION_OFFSET:I
-- <init>():V
-f:com.intellij.openapi.vfs.newvfs.persistent.dev.blobstorage.StreamlinedBlobStorageOverLockFreePagedStorage
-- com.intellij.openapi.Forceable
-- com.intellij.openapi.vfs.newvfs.persistent.dev.blobstorage.StreamlinedBlobStorageHelper
-- com.intellij.util.io.CleanableStorage
-- java.io.Closeable
-- java.lang.AutoCloseable
-- sf:STORAGE_VERSION_CURRENT:I
-- <init>(com.intellij.util.io.PagedFileStorageWithRWLockedPageContent,com.intellij.util.io.blobstorage.SpaceAllocationStrategy):V
-- close():V
-- deleteRecord(I):V
-- forEach(com.intellij.util.io.blobstorage.StreamlinedBlobStorage$Processor):I
-- force():V
-- getDataFormatVersion():I
-- getStorageVersion():I
-- hasRecord(I,com.intellij.openapi.util.IntRef):Z
-- isDirty():Z
-- readRecord(I,com.intellij.util.io.blobstorage.ByteBufferReader,com.intellij.openapi.util.IntRef):java.lang.Object
-- setDataFormatVersion(I):V
-- sizeInBytes():J
-- writeToRecord(I,com.intellij.util.io.blobstorage.ByteBufferWriter,I,Z):I
-f:com.intellij.openapi.vfs.newvfs.persistent.dev.blobstorage.StreamlinedBlobStorageOverMMappedFile
-- com.intellij.openapi.Forceable
-- com.intellij.openapi.vfs.newvfs.persistent.dev.blobstorage.StreamlinedBlobStorageHelper
-- com.intellij.util.io.CleanableStorage
-- java.io.Closeable
-- java.lang.AutoCloseable
-- sf:STORAGE_VERSION_CURRENT:I
-- <init>(com.intellij.platform.util.io.storages.mmapped.MMappedFileStorage,com.intellij.util.io.blobstorage.SpaceAllocationStrategy):V
-- close():V
-- closeAndClean():V
-- deleteRecord(I):V
-- forEach(com.intellij.util.io.blobstorage.StreamlinedBlobStorage$Processor):I
-- force():V
-- getDataFormatVersion():I
-- getStorageVersion():I
-- hasRecord(I,com.intellij.openapi.util.IntRef):Z
-- isDirty():Z
-- readRecord(I,com.intellij.util.io.blobstorage.ByteBufferReader,com.intellij.openapi.util.IntRef):java.lang.Object
-- setDataFormatVersion(I):V
-- sizeInBytes():J
-- writeToRecord(I,com.intellij.util.io.blobstorage.ByteBufferWriter,I,Z):I
-f:com.intellij.openapi.vfs.newvfs.persistent.dev.blobstorage.StreamlinedBlobStorageOverPagedStorage
-- com.intellij.openapi.vfs.newvfs.persistent.dev.blobstorage.StreamlinedBlobStorageHelper
-- sf:STORAGE_VERSION_CURRENT:I
-- <init>(com.intellij.util.io.PagedFileStorage,com.intellij.util.io.blobstorage.SpaceAllocationStrategy):V
-- close():V
-- deleteRecord(I):V
-- forEach(com.intellij.util.io.blobstorage.StreamlinedBlobStorage$Processor):I
-- force():V
-- getDataFormatVersion():I
-- getStorageVersion():I
-- hasRecord(I,com.intellij.openapi.util.IntRef):Z
-- isDirty():Z
-- readRecord(I,com.intellij.util.io.blobstorage.ByteBufferReader,com.intellij.openapi.util.IntRef):java.lang.Object
-- setDataFormatVersion(I):V
-- sizeInBytes():J
-- writeToRecord(I,com.intellij.util.io.blobstorage.ByteBufferWriter,I,Z):I
 com.intellij.openapi.vfs.newvfs.persistent.intercept.AttributesInterceptor
 - com.intellij.openapi.vfs.newvfs.persistent.intercept.ConnectionInterceptor
 - onDeleteAttributes(kotlin.jvm.functions.Function2):kotlin.jvm.functions.Function2

platform/platform-impl/exposed-private-api.txt

@@ -77,7 +77,6 @@ com/intellij/openapi/vfs/newvfs/persistent/PersistentFSLoader
 com/intellij/openapi/vfs/newvfs/persistent/PersistentFSRecordsStorage
 com/intellij/openapi/vfs/newvfs/persistent/VFSAttributesStorage
 com/intellij/openapi/vfs/newvfs/persistent/VfsRecoveryUtils$RecoveryPoint
-com/intellij/openapi/vfs/newvfs/persistent/dev/blobstorage/RecordLayout
 com/intellij/openapi/vfs/newvfs/persistent/log/VfsLogCompactionContext
 com/intellij/openapi/vfs/newvfs/persistent/log/VfsLogImpl$ContextImpl
 com/intellij/openapi/vfs/newvfs/persistent/log/VfsLogOperationTrackingContext
@@ -96,7 +95,6 @@ com/intellij/openapi/wm/impl/welcomeScreen/WelcomeScreenComponentFactory$JAction
 com/intellij/patterns/compiler/PatternCompilerImpl$Node
 com/intellij/platform/diagnostic/telemetry/Scope
 com/intellij/platform/ide/menu/ActionAwareIdeMenuBar
-com/intellij/platform/util/io/storages/mmapped/MMappedFileStorage
 com/intellij/platform/workspace/jps/serialization/impl/FileInDirectorySourceNames
 com/intellij/platform/workspace/jps/serialization/impl/JpsFileContentReader
 com/intellij/platform/workspace/jps/serialization/impl/JpsFileContentWriter
@@ -115,8 +113,5 @@ com/intellij/ui/wizard/WizardCallback
 com/intellij/util/SVGLoader$SvgElementColorPatcherProvider
 com/intellij/util/concurrency/ChildContext
 com/intellij/util/io/SimpleStringPersistentEnumerator
-com/intellij/util/io/blobstorage/ByteBufferReader
-com/intellij/util/io/blobstorage/ByteBufferWriter
-com/intellij/util/io/blobstorage/StreamlinedBlobStorage$Processor
 com/intellij/util/io/storage/VFSContentStorage
 com/intellij/xml/breadcrumbs/BreadcrumbsComponent$Crumb

platform/platform-impl/exposed-third-party-api.txt

@@ -29,7 +29,6 @@ com/sun/jna/platform/win32/WinDef$UINT
 com/sun/jna/platform/win32/WinDef$UINTByReference
 com/sun/jna/win32/StdCallLibrary
 io/netty/buffer/ByteBuf
-io/opentelemetry/api/metrics/BatchCallback
 io/opentelemetry/api/metrics/Meter
 it/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap
 it/unimi/dsi/fastutil/ints/IntArrayList

platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/dev/blobstorage/package-info.java

@@ -0,0 +1,5 @@
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+@Internal
+package com.intellij.openapi.vfs.newvfs.persistent.dev.blobstorage;
+
+import org.jetbrains.annotations.ApiStatus.Internal;

platform/util/api-dump-unreviewed.txt

@@ -4774,22 +4774,6 @@ a:com.intellij.util.indexing.impl.AbstractUpdateData
 - getInputId():I
 - pa:iterateKeys(com.intellij.util.indexing.impl.KeyValueUpdateProcessor,com.intellij.util.indexing.impl.KeyValueUpdateProcessor,com.intellij.util.indexing.impl.RemovedKeyProcessor):Z
 - p:updateForwardIndex():V
-c:com.intellij.util.indexing.impl.ChangeTrackingValueContainer
-- com.intellij.util.indexing.impl.UpdatableValueContainer
-- p:myAdded:com.intellij.util.indexing.impl.ValueContainerImpl
-- p:myInvalidated:it.unimi.dsi.fastutil.ints.IntSet
-- <init>(com.intellij.openapi.util.Computable):V
-- addValue(I,java.lang.Object):V
-- containsCachedMergedData():Z
-- containsOnlyInvalidatedChange():Z
-- dropMergedData():V
-- getValueIterator():com.intellij.util.indexing.ValueContainer$ValueIterator
-- isDirty():Z
-- removeAssociatedValue(I):Z
-- p:removeFromAdded(I):Z
-- saveTo(java.io.DataOutput,com.intellij.util.io.DataExternalizer):V
-- setNeedsCompacting(Z):V
-- size():I
 f:com.intellij.util.indexing.impl.CollectionDataExternalizer
 - com.intellij.util.io.DataExternalizer
 - <init>(com.intellij.util.io.DataExternalizer):V
@@ -4836,83 +4820,15 @@ f:com.intellij.util.indexing.impl.InputIndexDataExternalizer
 - save(java.io.DataOutput,java.util.Collection):V
 com.intellij.util.indexing.impl.KeyValueUpdateProcessor
 - a:process(java.lang.Object,java.lang.Object,I):V
-c:com.intellij.util.indexing.impl.MapIndexStorage
-- com.intellij.util.indexing.impl.IndexStorage
-- pf:myBaseStorageFile:java.nio.file.Path
-- pf:myKeyDescriptor:com.intellij.util.io.KeyDescriptor
-- p:myMap:com.intellij.util.indexing.impl.ValueContainerMap
-- <init>(java.nio.file.Path,com.intellij.util.io.KeyDescriptor,com.intellij.util.io.DataExternalizer,I,Z):V
-- <init>(java.nio.file.Path,com.intellij.util.io.KeyDescriptor,com.intellij.util.io.DataExternalizer,I,Z,Z,Z,Z,com.intellij.util.indexing.impl.ValueContainerInputRemapping):V
-- addValue(java.lang.Object,I,java.lang.Object):V
-- clear():V
-- clearCaches():V
-- close():V
-- p:compactOnClose():Z
-- p:createPersistentMap(com.intellij.util.io.KeyDescriptor,com.intellij.util.io.DataExternalizer,Z,Z,Z):com.intellij.util.io.PersistentMapBase
-- p:doProcessKeys(com.intellij.util.Processor):Z
-- flush():V
-- getIndexMap():com.intellij.util.io.PersistentMapBase
-- s:getIndexStorageFile(java.nio.file.Path):java.nio.file.Path
-- p:initMapAndCache():V
-- isDirty():Z
-- keysCountApproximately():I
-- processKeys(com.intellij.util.Processor):Z
-- read(java.lang.Object):com.intellij.util.indexing.impl.ChangeTrackingValueContainer
-- removeAllValues(java.lang.Object,I):V
-- ps:unwrapCauseAndRethrow(java.lang.RuntimeException):java.lang.Object
-- updateValue(java.lang.Object,I,java.lang.Object):V
 c:com.intellij.util.indexing.impl.MapInputDataDiffBuilder
 - com.intellij.util.indexing.impl.DirectInputDataDiffBuilder
 - <init>(I,java.util.Map):V
 - differentiate(java.util.Map,com.intellij.util.indexing.impl.KeyValueUpdateProcessor,com.intellij.util.indexing.impl.KeyValueUpdateProcessor,com.intellij.util.indexing.impl.RemovedKeyProcessor):Z
 - getKeys():java.util.Collection
-a:com.intellij.util.indexing.impl.MapReduceIndex
-- com.intellij.util.indexing.InvertedIndex
-- pf:myIndexId:com.intellij.util.indexing.IndexId
-- pf:myIndexer:com.intellij.util.indexing.DataIndexer
-- pf:myModificationStamp:java.util.concurrent.atomic.AtomicLong
-- pf:myStorage:com.intellij.util.indexing.impl.IndexStorage
-- p:<init>(com.intellij.util.indexing.IndexExtension,com.intellij.openapi.util.ThrowableComputable,com.intellij.openapi.util.ThrowableComputable,com.intellij.util.indexing.impl.forward.ForwardIndexAccessor):V
-- p:<init>(com.intellij.util.indexing.IndexExtension,com.intellij.util.indexing.impl.IndexStorage,com.intellij.util.indexing.impl.forward.ForwardIndex,com.intellij.util.indexing.impl.forward.ForwardIndexAccessor):V
-- p:<init>(com.intellij.util.indexing.IndexExtension,com.intellij.util.indexing.impl.IndexStorageLayout):V
-- a:checkCanceled():V
-- clear():V
-- clearCaches():V
-- dispose():V
-- p:doClear():V
-- p:doDispose():V
-- p:doFlush():V
-- flush():V
-- getData(java.lang.Object):com.intellij.util.indexing.ValueContainer
-- getExtension():com.intellij.util.indexing.IndexExtension
-- getForwardIndex():com.intellij.util.indexing.impl.forward.ForwardIndex
-- getForwardIndexAccessor():com.intellij.util.indexing.impl.forward.ForwardIndexAccessor
-- p:getKeysDiffBuilder(I):com.intellij.util.indexing.impl.InputDataDiffBuilder
-- f:getLock():java.util.concurrent.locks.ReadWriteLock
-- getModificationStamp():J
-- p:getSerializationProblemReporter():com.intellij.util.indexing.impl.ValueSerializationProblemReporter
-- getStorage():com.intellij.util.indexing.impl.IndexStorage
-- p:incrementModificationStamp():V
-- isDirty():Z
-- p:isDisposed():Z
-- keysCountApproximately():I
-- p:mapByIndexer(I,java.lang.Object):java.util.Map
-- p:mapInput(I,java.lang.Object):com.intellij.util.indexing.impl.InputData
-- mapInputAndPrepareUpdate(I,java.lang.Object):com.intellij.openapi.util.Computable
-- prepareUpdate(I,com.intellij.util.indexing.impl.InputData):com.intellij.util.indexing.impl.MapReduceIndex$IndexUpdateComputable
-- pa:requestRebuild(java.lang.Throwable):V
-- p:tryDispose():V
-- p:updateForwardIndex(I,com.intellij.util.indexing.impl.InputData):V
-- updateWithMap(com.intellij.util.indexing.impl.AbstractUpdateData):V
 *f:com.intellij.util.indexing.impl.MapReduceIndexMappingException
 - java.lang.RuntimeException
 - <init>(java.lang.Throwable,java.lang.Class):V
 - getClassToBlame():java.lang.Class
-f:com.intellij.util.indexing.impl.MergedValueContainer
-- com.intellij.util.indexing.ValueContainer
-- <init>(java.util.List):V
-- getValueIterator():com.intellij.util.indexing.impl.InvertedIndexValueIterator
-- size():I
 com.intellij.util.indexing.impl.RemovedKeyProcessor
 - a:process(java.lang.Object,I):V
 a:com.intellij.util.indexing.impl.UpdatableValueContainer
@@ -4999,34 +4915,6 @@ c:com.intellij.util.indexing.impl.forward.MapForwardIndexAccessor
 - convertToDataType(com.intellij.util.indexing.impl.InputData):java.util.Map
 - p:convertToMap(I,java.util.Map):java.util.Map
 - p:getBufferInitialSize(java.util.Map):I
-f:com.intellij.util.indexing.impl.forward.PersistentMapBasedForwardIndex
-- com.intellij.util.indexing.impl.forward.ForwardIndex
-- <init>(java.nio.file.Path,Z):V
-- <init>(java.nio.file.Path,Z,Z,com.intellij.util.io.StorageLockContext):V
-- clear():V
-- close():V
-- containsMapping(I):Z
-- force():V
-- get(java.lang.Integer):com.intellij.openapi.util.io.ByteArraySequence
-- getUnderlyingMap():com.intellij.util.io.PersistentMap
-- isDirty():Z
-- keysCountApproximately():I
-- put(java.lang.Integer,com.intellij.openapi.util.io.ByteArraySequence):V
-a:com.intellij.util.io.AbstractIntToIntBtree
-- <init>():V
-- a:doClose():V
-- a:doFlush():V
-- a:get(I,I[]):Z
-- a:getStatistics():com.intellij.util.io.stats.BTreeStatistics
-- a:persistVars(com.intellij.util.io.AbstractIntToIntBtree$BtreeDataStorage,Z):V
-- a:processMappings(com.intellij.util.io.AbstractIntToIntBtree$KeyValueProcessor):Z
-- a:put(I,I):V
-- s:version():I
-com.intellij.util.io.AbstractIntToIntBtree$BtreeDataStorage
-- a:persistInt(I,I,Z):I
-a:com.intellij.util.io.AbstractIntToIntBtree$KeyValueProcessor
-- <init>():V
-- a:process(I,I):Z
 com.intellij.util.io.AbstractStringEnumerator
 - com.intellij.openapi.Forceable
 - com.intellij.util.io.DataEnumerator
@@ -5488,16 +5376,6 @@ f:com.intellij.util.io.InMemoryDataEnumerator
 - enumerate(java.lang.Object):I
 - tryEnumerate(java.lang.Object):I
 - valueOf(I):java.lang.Object
-f:com.intellij.util.io.InMemoryEnumerator
-- com.intellij.util.io.DataEnumeratorEx
-- <init>():V
-- enumerate(java.lang.Object):I
-- enumeratedValues():java.lang.Iterable
-- forEach(com.intellij.util.io.ScannableDataEnumeratorEx$ValueReader):Z
-- recordsCount():I
-- registerValueWithGivenId(I,java.lang.Object,Z):V
-- tryEnumerate(java.lang.Object):I
-- valueOf(I):java.lang.Object
 a:com.intellij.util.io.InlineKeyDescriptor
 - com.intellij.util.io.KeyDescriptor
 - <init>():V
@@ -5518,26 +5396,6 @@ c:com.intellij.util.io.IntInlineKeyDescriptor
 - <init>():V
 - fromInt(I):java.lang.Integer
 - toInt(java.lang.Integer):I
-f:com.intellij.util.io.IntToIntBtree
-- com.intellij.util.io.AbstractIntToIntBtree
-- <init>(I,java.nio.file.Path,com.intellij.util.io.StorageLockContext,Z):V
-- doClose():V
-- doFlush():V
-- get(I,I[]):Z
-- getStatistics():com.intellij.util.io.stats.BTreeStatistics
-- persistVars(com.intellij.util.io.AbstractIntToIntBtree$BtreeDataStorage,Z):V
-- processMappings(com.intellij.util.io.AbstractIntToIntBtree$KeyValueProcessor):Z
-- put(I,I):V
-f:com.intellij.util.io.IntToIntBtreeLockFree
-- com.intellij.util.io.AbstractIntToIntBtree
-- <init>(I,java.nio.file.Path,com.intellij.util.io.StorageLockContext,Z,com.intellij.util.io.pagecache.impl.PageContentLockingStrategy$SharedLockLockingStrategy):V
-- doClose():V
-- doFlush():V
-- get(I,I[]):Z
-- getStatistics():com.intellij.util.io.stats.BTreeStatistics
-- persistVars(com.intellij.util.io.AbstractIntToIntBtree$BtreeDataStorage,Z):V
-- processMappings(com.intellij.util.io.AbstractIntToIntBtree$KeyValueProcessor):Z
-- put(I,I):V
 f:com.intellij.util.io.IoKt
 - *sf:copyToAsync(java.io.InputStream,java.io.OutputStream,I,J,kotlin.coroutines.Continuation):java.lang.Object
 - *bs:copyToAsync$default(java.io.InputStream,java.io.OutputStream,I,J,kotlin.coroutines.Continuation,I,java.lang.Object):java.lang.Object
@@ -5572,182 +5430,6 @@ f:com.intellij.util.io.NullableDataExternalizer
 - <init>(com.intellij.util.io.DataExternalizer):V
 - read(java.io.DataInput):java.lang.Object
 - save(java.io.DataOutput,java.lang.Object):V
-f:com.intellij.util.io.PagedFileStorage
-- com.intellij.openapi.Forceable
-- java.io.Closeable
-- sf:THREAD_LOCAL_STORAGE_LOCK_CONTEXT:java.lang.ThreadLocal
-- <init>(java.nio.file.Path,com.intellij.util.io.StorageLockContext,I,Z,Z):V
-- close():V
-- ensureCachedSizeAtLeast(J):V
-- force():V
-- get(J,Z):B
-- get(J,B[],I,I,Z):V
-- getByteBuffer(J,Z):com.intellij.util.io.DirectBufferWrapper
-- getFile():java.nio.file.Path
-- getInt(J):I
-- getLong(J):J
-- getOffsetInPage(J):I
-- getPageSize():I
-- getStorageLockContext():com.intellij.util.io.StorageLockContext
-- isDirty():Z
-- isNativeBytesOrder():Z
-- isReadOnly():Z
-- length():J
-- lockRead():V
-- lockWrite():V
-- s:lookupStorageContext(com.intellij.util.io.StorageLockContext):com.intellij.util.io.StorageLockContext
-- put(J,B):V
-- put(J,B[],I,I):V
-- putBuffer(J,java.nio.ByteBuffer):V
-- putInt(J,I):V
-- putLong(J,J):V
-- readChannel(com.intellij.openapi.util.ThrowableNotNullFunction):java.lang.Object
-- readInputStream(com.intellij.openapi.util.ThrowableNotNullFunction):java.lang.Object
-- resize(J):V
-- toString():java.lang.String
-- unlockRead():V
-- unlockWrite():V
-f:com.intellij.util.io.PagedFileStorageWithRWLockedPageContent
-- com.intellij.openapi.Forceable
-- java.lang.AutoCloseable
-- sf:DEFAULT_PAGE_SIZE:I
-- sf:THREAD_LOCAL_STORAGE_LOCK_CONTEXT:java.lang.ThreadLocal
-- <init>(java.nio.file.Path,com.intellij.util.io.StorageLockContext,I,com.intellij.util.io.pagecache.impl.PageContentLockingStrategy):V
-- <init>(java.nio.file.Path,com.intellij.util.io.StorageLockContext,I,Z,com.intellij.util.io.pagecache.impl.PageContentLockingStrategy):V
-- <init>(java.nio.file.Path,com.intellij.util.io.StorageLockContext,I,Z,Z,com.intellij.util.io.pagecache.impl.PageContentLockingStrategy):V
-- clear():V
-- close():V
-- closeAndRemoveAllFiles():V
-- closeAsync():java.util.concurrent.Future
-- s:createWithDefaults(java.nio.file.Path,com.intellij.util.io.StorageLockContext,I,Z,com.intellij.util.io.pagecache.impl.PageContentLockingStrategy):com.intellij.util.io.PagedFileStorageWithRWLockedPageContent
-- force():V
-- get(J):B
-- get(J,B[],I,I):V
-- getFile():java.nio.file.Path
-- getInt(J):I
-- getLong(J):J
-- getPageSize():I
-- isClosed():Z
-- isDirty():Z
-- isNativeBytesOrder():Z
-- isReadOnly():Z
-- length():J
-- pageByIndex(I,Z):com.intellij.util.io.pagecache.Page
-- pageByOffset(J,Z):com.intellij.util.io.pagecache.Page
-- put(J,B):V
-- put(J,B[],I,I):V
-- putBuffer(J,java.nio.ByteBuffer):V
-- putInt(J,I):V
-- putLong(J,J):V
-- toOffsetInPage(J):I
-- toString():java.lang.String
-c:com.intellij.util.io.PersistentBTreeEnumerator
-- com.intellij.util.io.CleanableStorage
-- com.intellij.util.io.DataEnumeratorEx
-- com.intellij.util.io.DurableDataEnumerator
-- com.intellij.util.io.PersistentEnumeratorBase
-- sf:DO_SELF_HEAL_PROP:java.lang.String
-- <init>(java.nio.file.Path,com.intellij.util.io.KeyDescriptor,I):V
-- <init>(java.nio.file.Path,com.intellij.util.io.KeyDescriptor,I,com.intellij.util.io.StorageLockContext):V
-- <init>(java.nio.file.Path,com.intellij.util.io.KeyDescriptor,I,com.intellij.util.io.StorageLockContext,I):V
-- p:addrToIndex(I):I
-- s:baseVersion():I
-- close():V
-- closeAndClean():V
-- diagnose():V
-- p:doClose():V
-- p:doFlush():V
-- p:dumpKeysOnCorruption():V
-- p:enumerateImpl(java.lang.Object,Z,Z):I
-- forEach(com.intellij.util.io.ScannableDataEnumeratorEx$ValueReader,com.intellij.util.io.PersistentEnumeratorBase$DataFilter):Z
-- force():V
-- getStatistics():com.intellij.util.io.stats.PersistentEnumeratorStatistics
-- getValue(I,I):java.lang.Object
-- p:indexToAddr(I):I
-- processAllDataObject(com.intellij.util.Processor,com.intellij.util.io.PersistentEnumeratorBase$DataFilter):Z
-- recordsCount():I
-- setRecordHandler(com.intellij.util.io.PersistentEnumeratorBase$RecordBufferHandler):V
-- p:setupEmptyFile():V
-- p:setupValueId(I,I):I
-- p:shouldLockOnValueOf():Z
-- traverseAllRecords(com.intellij.util.io.PersistentEnumeratorBase$RecordsProcessor):Z
-- p:trySelfHeal():Z
-- valueOf(I):java.lang.Object
-c:com.intellij.util.io.PersistentEnumerator
-- com.intellij.util.io.DataEnumeratorEx
-- com.intellij.util.io.DurableDataEnumerator
-- pf:myEnumerator:com.intellij.util.io.PersistentEnumeratorBase
-- <init>(java.io.File,com.intellij.util.io.KeyDescriptor,I,com.intellij.util.io.StorageLockContext,I):V
-- <init>(java.nio.file.Path,com.intellij.util.io.KeyDescriptor,I):V
-- <init>(java.nio.file.Path,com.intellij.util.io.KeyDescriptor,I,com.intellij.util.io.StorageLockContext):V
-- <init>(java.nio.file.Path,com.intellij.util.io.KeyDescriptor,I,com.intellij.util.io.StorageLockContext,I):V
-- close():V
-- enumerate(java.lang.Object):I
-- forEach(com.intellij.util.io.ScannableDataEnumeratorEx$ValueReader):Z
-- force():V
-- isClosed():Z
-- isCorrupted():Z
-- isDirty():Z
-- markCorrupted():V
-- f:markDirty():V
-- recordsCount():I
-- tryEnumerate(java.lang.Object):I
-- valueOf(I):java.lang.Object
-a:com.intellij.util.io.PersistentEnumeratorBase
-- com.intellij.openapi.Forceable
-- com.intellij.util.io.DataEnumeratorEx
-- java.io.Closeable
-- psf:LOG:com.intellij.openapi.diagnostic.Logger
-- psf:USE_RW_LOCK:Z
-- pf:myCollisionResolutionStorage:com.intellij.util.io.ResizeableMappedFile
-- pf:myFile:java.nio.file.Path
-- pf:myKeyStorage:com.intellij.util.io.keyStorage.AppendableObjectStorage
-- p:<init>(java.nio.file.Path,com.intellij.util.io.ResizeableMappedFile,com.intellij.util.io.KeyDescriptor,I,com.intellij.util.io.PersistentEnumeratorBase$Version,com.intellij.util.io.PersistentEnumeratorBase$RecordBufferHandler,Z):V
-- p:catchCorruption(com.intellij.openapi.util.ThrowableComputable):java.lang.Object
-- close():V
-- p:doClose():V
-- p:doFlush():V
-- p:doWriteData(java.lang.Object):I
-- p:dumpKeysOnCorruption():V
-- enumerate(java.lang.Object):I
-- pa:enumerateImpl(java.lang.Object,Z,Z):I
-- forEach(com.intellij.util.io.ScannableDataEnumeratorEx$ValueReader):Z
-- forEach(com.intellij.util.io.ScannableDataEnumeratorEx$ValueReader,com.intellij.util.io.PersistentEnumeratorBase$DataFilter):Z
-- force():V
-- getAllDataObjects(com.intellij.util.io.PersistentEnumeratorBase$DataFilter):java.util.Collection
-- getLargestId():I
-- p:getMetaData():J
-- p:getReadLock():java.util.concurrent.locks.Lock
-- getValue(I,I):java.lang.Object
-- p:getWriteLock():java.util.concurrent.locks.Lock
-- pa:indexToAddr(I):I
-- isClosed():Z
-- isCorrupted():Z
-- isDirty():Z
-- p:isKeyAtIndex(java.lang.Object,I):Z
-- iterateData(com.intellij.util.Processor):Z
-- p:markCorrupted():V
-- pf:markDirty(Z):V
-- processAllDataObject(com.intellij.util.Processor,com.intellij.util.io.PersistentEnumeratorBase$DataFilter):Z
-- p:putMetaData(J):V
-- setRecordHandler(com.intellij.util.io.PersistentEnumeratorBase$RecordBufferHandler):V
-- pa:setupEmptyFile():V
-- p:setupValueId(I,I):I
-- pa:shouldLockOnValueOf():Z
-- a:traverseAllRecords(com.intellij.util.io.PersistentEnumeratorBase$RecordsProcessor):Z
-- tryEnumerate(java.lang.Object):I
-- p:trySelfHeal():Z
-- valueOf(I):java.lang.Object
-- p:writeData(java.lang.Object,I):I
-com.intellij.util.io.PersistentEnumeratorBase$DataFilter
-- a:accept(I):Z
-pa:com.intellij.util.io.PersistentEnumeratorBase$RecordBufferHandler
-- p:<init>():V
-a:com.intellij.util.io.PersistentEnumeratorBase$RecordsProcessor
-- <init>():V
-- a:process(I):Z
-f:com.intellij.util.io.PersistentEnumeratorBase$Version
-- <init>(I):V
 f:com.intellij.util.io.PersistentHashMap
 - com.intellij.util.io.AppendablePersistentMap
 - <init>(com.intellij.util.io.PersistentMapBase):V
@@ -5755,7 +5437,6 @@ f:com.intellij.util.io.PersistentHashMap
 - <init>(java.nio.file.Path,com.intellij.util.io.KeyDescriptor,com.intellij.util.io.DataExternalizer):V
 - <init>(java.nio.file.Path,com.intellij.util.io.KeyDescriptor,com.intellij.util.io.DataExternalizer,I):V
 - <init>(java.nio.file.Path,com.intellij.util.io.KeyDescriptor,com.intellij.util.io.DataExternalizer,I,I):V
-- <init>(java.nio.file.Path,com.intellij.util.io.KeyDescriptor,com.intellij.util.io.DataExternalizer,I,I,com.intellij.util.io.StorageLockContext):V
 - appendData(java.lang.Object,com.intellij.util.io.AppendablePersistentMap$ValueDataAppender):V
 - appendData(java.lang.Object,com.intellij.util.io.PersistentHashMap$ValueDataAppender):V
 - s:canonicalize(com.intellij.util.io.PersistentHashMap,com.intellij.util.io.PersistentHashMap,java.util.function.Function,java.util.function.Function):com.intellij.util.io.PersistentHashMap
@@ -5780,28 +5461,6 @@ f:com.intellij.util.io.PersistentHashMap
 - toString():java.lang.String
 com.intellij.util.io.PersistentHashMap$ValueDataAppender
 - com.intellij.util.io.AppendablePersistentMap$ValueDataAppender
-f:com.intellij.util.io.PersistentHashMapValueStorage
-- sf:COMPRESSION_ENABLED:Z
-- appendBytes(com.intellij.openapi.util.io.ByteArraySequence,J):J
-- appendBytes(B[],I,I,J):J
-- s:create(java.nio.file.Path,com.intellij.util.io.PersistentHashMapValueStorage$CreationTimeOptions):com.intellij.util.io.PersistentHashMapValueStorage
-- dispose():V
-- force():V
-- getSize():J
-- isReadOnly():Z
-- readBytes(J):com.intellij.util.io.PersistentHashMapValueStorage$ReadResult
-f:com.intellij.util.io.PersistentHashMapValueStorage$CreationTimeOptions
-- sf:COMPACT_CHUNKS_WITH_VALUE_DESERIALIZATION:java.lang.ThreadLocal
-- sf:HAS_NO_CHUNKS:java.lang.ThreadLocal
-- sf:READONLY:java.lang.ThreadLocal
-- <init>(Z,Z,Z,Z):V
-- readOnly(Z):com.intellij.util.io.PersistentHashMapValueStorage$CreationTimeOptions
-- setCompactChunksWithValueDeserialization():com.intellij.util.io.PersistentHashMapValueStorage$CreationTimeOptions
-- setHasNoChunks():com.intellij.util.io.PersistentHashMapValueStorage$CreationTimeOptions
-- setReadOnly():com.intellij.util.io.PersistentHashMapValueStorage$CreationTimeOptions
-- s:setThreadLocalOptions(com.intellij.util.io.PersistentHashMapValueStorage$CreationTimeOptions):com.intellij.util.io.PersistentHashMapValueStorage$CreationTimeOptions
-- s:threadLocalOptions():com.intellij.util.io.PersistentHashMapValueStorage$CreationTimeOptions
-- with(com.intellij.openapi.util.ThrowableComputable):java.lang.Object
 com.intellij.util.io.PersistentMap
 - com.intellij.util.io.KeyValueStore
 - *:closeAndClean():V
@@ -5841,7 +5500,6 @@ com.intellij.util.io.PersistentMap
 - getInitialSize(I):I
 - getInlineValues(Z):Z
 - getKeyDescriptor():com.intellij.util.io.KeyDescriptor
-- getLockContext():com.intellij.util.io.StorageLockContext
 - getReadOnly(Z):Z
 - getValueExternalizer():com.intellij.util.io.DataExternalizer
 - getVersion(I):I
@@ -5856,43 +5514,9 @@ com.intellij.util.io.PersistentMap
 - withCompactOnClose(Z):com.intellij.util.io.PersistentMapBuilder
 - withInitialSize(I):com.intellij.util.io.PersistentMapBuilder
 - withReadonly(Z):com.intellij.util.io.PersistentMapBuilder
-- withStorageLockContext(com.intellij.util.io.StorageLockContext):com.intellij.util.io.PersistentMapBuilder
 - withVersion(I):com.intellij.util.io.PersistentMapBuilder
 - withWal(Z):com.intellij.util.io.PersistentMapBuilder
 - withWalExecutor(java.util.concurrent.ExecutorService):com.intellij.util.io.PersistentMapBuilder
-f:com.intellij.util.io.PersistentMapImpl
-- com.intellij.util.io.PersistentMapBase
-- <init>(com.intellij.util.io.PersistentMapBuilder):V
-- <init>(com.intellij.util.io.PersistentMapBuilder,com.intellij.util.io.PersistentHashMapValueStorage$CreationTimeOptions):V
-- appendData(java.lang.Object,com.intellij.util.io.AppendablePersistentMap$ValueDataAppender):V
-- builder():com.intellij.util.io.PersistentMapBuilder
-- close():V
-- closeAndDelete():V
-- containsKey(java.lang.Object):Z
-- deriveEmptyMap(java.nio.file.Path):com.intellij.util.io.PersistentMapImpl
-- force():V
-- get(java.lang.Object):java.lang.Object
-- getBaseFile():java.nio.file.Path
-- getGarbageSize():I
-- getKeyDescriptor():com.intellij.util.io.KeyDescriptor
-- getReadOnly():Z
-- getSize():I
-- getStatistics():com.intellij.util.io.stats.PersistentHashMapStatistics
-- getValueStorage():com.intellij.util.io.PersistentHashMapValueStorage
-- getValuesExternalizer():com.intellij.util.io.DataExternalizer
-- isClosed():Z
-- isCorrupted():Z
-- isDirty():Z
-- keysCount():I
-- makesSenseToCompact():Z
-- markCorrupted():V
-- markDirty():V
-- processExistingKeys(com.intellij.util.Processor):Z
-- processKeys(com.intellij.util.Processor):Z
-- put(java.lang.Object,java.lang.Object):V
-- remove(java.lang.Object):V
-- toString():java.lang.String
-- s:unwrap(com.intellij.util.io.PersistentHashMap):com.intellij.util.io.PersistentMapImpl
 f:com.intellij.util.io.PersistentMapInMemory
 - com.intellij.util.io.PersistentMapBase
 - <init>(com.intellij.util.io.PersistentMapBuilder):V
@@ -5918,13 +5542,11 @@ f:com.intellij.util.io.PersistentMapWalPlayer
 - f:getVersion():I
 - f:readWal():kotlin.sequences.Sequence
 c:com.intellij.util.io.PersistentStringEnumerator
-- com.intellij.util.io.PersistentEnumerator
 - com.intellij.util.io.AbstractStringEnumerator
+- com.intellij.util.io.DataEnumeratorEx
+- com.intellij.util.io.DurableDataEnumerator
 - <init>(java.nio.file.Path):V
 - <init>(java.nio.file.Path,I):V
-- <init>(java.nio.file.Path,I,com.intellij.util.io.StorageLockContext):V
-- <init>(java.nio.file.Path,I,Z,com.intellij.util.io.StorageLockContext):V
-- <init>(java.nio.file.Path,com.intellij.util.io.StorageLockContext):V
 - <init>(java.nio.file.Path,Z):V
 - close():V
 - enumerate(java.lang.String):I
@@ -5954,37 +5576,6 @@ c:com.intellij.util.io.ReplicatorInputStream
 - skip(J):J
 com.intellij.util.io.RepresentableAsByteArraySequence
 - a:asByteArraySequence():com.intellij.openapi.util.io.ByteArraySequence
-f:com.intellij.util.io.ResizeableMappedFile
-- com.intellij.openapi.Forceable
-- java.io.Closeable
-- <init>(java.nio.file.Path,I,com.intellij.util.io.StorageLockContext,I,Z):V
-- <init>(java.nio.file.Path,I,com.intellij.util.io.StorageLockContext,I,Z,Z):V
-- clear():V
-- close():V
-- closeAndRemoveAllFiles():V
-- force():V
-- get(J):B
-- get(J,Z):B
-- get(J,B[],I,I,Z):V
-- getInt(J):I
-- getLong(J):J
-- getPagedFileStorage():com.intellij.util.io.PagedFileStorage
-- getStorageLockContext():com.intellij.util.io.StorageLockContext
-- isDirty():Z
-- isNativeBytesOrder():Z
-- length():J
-- lockRead():V
-- lockWrite():V
-- put(J,java.nio.ByteBuffer):V
-- put(J,B[],I,I):V
-- putInt(J,I):V
-- putLong(J,J):V
-- readChannel(com.intellij.openapi.util.ThrowableNotNullFunction):java.lang.Object
-- readInputStream(com.intellij.openapi.util.ThrowableNotNullFunction):java.lang.Object
-- setRoundFactor(I):V
-- toString():java.lang.String
-- unlockRead():V
-- unlockWrite():V
 a:com.intellij.util.io.ResourceHandle
 - java.io.Closeable
 - <init>():V
@@ -6156,7 +5747,6 @@ f:com.intellij.util.io.WriteAheadLogKt
 - sf:getDebugWalRecords():Z
 - sf:restoreHashMapFromWal(java.nio.file.Path,com.intellij.util.io.KeyDescriptor,com.intellij.util.io.DataExternalizer):java.util.Map
 - sf:restoreMemoryEnumeratorFromWal(java.nio.file.Path,com.intellij.util.io.KeyDescriptor):java.util.List
-- sf:restorePersistentEnumeratorFromWal(java.nio.file.Path,java.nio.file.Path,com.intellij.util.io.KeyDescriptor):com.intellij.util.io.PersistentEnumerator
 - sf:restorePersistentMapFromWal(java.nio.file.Path,java.nio.file.Path,com.intellij.util.io.KeyDescriptor,com.intellij.util.io.DataExternalizer):com.intellij.util.io.PersistentMap
 - sf:setDebugWalRecords(Z):V
 f:com.intellij.util.io.ZipUtil
@@ -6198,94 +5788,11 @@ f:com.intellij.util.io.externalizer.StringCollectionExternalizer
 - isEqual(java.util.Collection,java.util.Collection):Z
 - read(java.io.DataInput):java.util.Collection
 - save(java.io.DataOutput,java.util.Collection):V
-f:com.intellij.util.io.pagecache.impl.ConfinedIntValue
-- java.util.function.IntSupplier
-- <init>(I,I,I):V
-- dec():V
-- equals(java.lang.Object):Z
-- getAsInt():I
-- hashCode():I
-- inc():V
-- toString():java.lang.String
-- update(I):V
-- value():I
-f:com.intellij.util.io.pagecache.impl.DefaultMemoryManager
-- com.intellij.util.io.pagecache.impl.IMemoryManager
-- <init>(J,J,com.intellij.util.io.pagecache.FilePageCacheStatistics):V
-- hasFreeNativeCapacity(I):Z
-- hasOverflow():Z
-- heapBytesUsed():J
-- heapCapacityBytes():J
-- nativeBytesUsed():J
-- nativeCapacityBytes():J
-- releaseBuffer(I,java.nio.ByteBuffer):V
-- toString():java.lang.String
-- tryAllocate(I,Z):java.nio.ByteBuffer
-f:com.intellij.util.io.pagecache.impl.FrugalQuantileEstimator
-- <init>(I,D):V
-- <init>(I,D,D):V
-- currentEstimation():D
-- percentileToEstimate():I
-- toString():java.lang.String
-- updateEstimation(I):D
-- updateTargetPercentile(I):V
-com.intellij.util.io.pagecache.impl.IMemoryManager
-- a:hasFreeNativeCapacity(I):Z
-- a:hasOverflow():Z
-- a:heapBytesUsed():J
-- a:heapCapacityBytes():J
-- a:nativeBytesUsed():J
-- a:nativeCapacityBytes():J
-- a:releaseBuffer(I,java.nio.ByteBuffer):V
-- totalMemoryUsed():J
-- a:tryAllocate(I,Z):java.nio.ByteBuffer
-com.intellij.util.io.pagecache.impl.PageContentLoader
-- a:loadPageContent(com.intellij.util.io.pagecache.impl.PageImpl):java.nio.ByteBuffer
-com.intellij.util.io.pagecache.impl.PageContentLockingStrategy
-- sf:LOCK_PER_PAGE:com.intellij.util.io.pagecache.impl.PageContentLockingStrategy
-- a:lockForPage(com.intellij.util.io.pagecache.PagedStorage,I):java.util.concurrent.locks.ReentrantReadWriteLock
-f:com.intellij.util.io.pagecache.impl.PageContentLockingStrategy$SharedLockLockingStrategy
-- com.intellij.util.io.pagecache.impl.PageContentLockingStrategy
-- <init>():V
-- <init>(java.util.concurrent.locks.ReentrantReadWriteLock):V
-- lockForPage(com.intellij.util.io.pagecache.PagedStorage,I):java.util.concurrent.locks.ReentrantReadWriteLock
-- toString():java.lang.String
-com.intellij.util.io.pagecache.impl.PageToStorageHandle
-- a:flushBytes(java.nio.ByteBuffer,J):V
-- a:modifiedRegionUpdated(J,I):V
-- a:pageBecomeClean():V
-- a:pageBecomeDirty():V
-a:com.intellij.util.io.pagecache.impl.PageToStorageHandleHelper
-- com.intellij.util.io.pagecache.impl.PageToStorageHandle
-- <init>():V
-- flushBytes(java.nio.ByteBuffer,J):V
-- modifiedRegionUpdated(J,I):V
-- pageBecomeClean():V
-- pageBecomeDirty():V
-f:com.intellij.util.io.pagecache.impl.RWLockProtectedPageImpl
-- java.io.Flushable
-- java.lang.AutoCloseable
-- <init>(I,I,com.intellij.util.io.pagecache.impl.PageToStorageHandle,java.util.concurrent.locks.ReentrantReadWriteLock):V
-- s:createBlankWithExplicitLock(I,I,com.intellij.util.io.pagecache.impl.PageToStorageHandle,java.util.concurrent.locks.ReentrantReadWriteLock):com.intellij.util.io.pagecache.impl.RWLockProtectedPageImpl
-- s:createBlankWithOwnLock(I,I,com.intellij.util.io.pagecache.impl.PageToStorageHandle):com.intellij.util.io.pagecache.impl.RWLockProtectedPageImpl
-- flush():V
-- isDirty():Z
-- lockPageForRead():V
-- lockPageForWrite():V
-- read(I,I,com.intellij.openapi.util.ThrowableNotNullFunction):java.lang.Object
-- regionModified(I,I):V
-- toString():java.lang.String
-- tryFlush():Z
-- unlockPageForRead():V
-- unlockPageForWrite():V
-- write(I,I,com.intellij.openapi.util.ThrowableNotNullFunction):java.lang.Object
 a:com.intellij.util.io.storage.AbstractRecordsTable
 - com.intellij.util.io.storage.IRecordsTable
 - psf:DEFAULT_HEADER_SIZE:I
 - psf:DEFAULT_RECORD_SIZE:I
 - psf:SPECIAL_NEGATIVE_SIZE_FOR_REMOVED_RECORD:I
-- pf:myStorage:com.intellij.util.io.PagedFileStorage
-- <init>(java.nio.file.Path,com.intellij.util.io.StorageLockContext):V
 - close():V
 - createNewRecord():I
 - createRecordIdIterator():com.intellij.util.io.storage.RecordIdIterator
@@ -6310,56 +5817,6 @@ a:com.intellij.util.io.storage.AbstractRecordsTable
 - setCapacity(I,I):V
 - setSize(I,I):V
 - setVersion(I):V
-a:com.intellij.util.io.storage.AbstractStorage
-- com.intellij.util.io.storage.IStorage
-- sf:DATA_EXTENSION:java.lang.String
-- sf:INDEX_EXTENSION:java.lang.String
-- psf:LOG:com.intellij.openapi.diagnostic.Logger
-- sf:PAGE_SIZE:I
-- sf:SHARED:com.intellij.util.io.StorageLockContext
-- p:myContext:com.intellij.util.io.StorageLockContext
-- p:myDataTable:com.intellij.util.io.storage.DataTable
-- p:myRecordsTable:com.intellij.util.io.storage.AbstractRecordsTable
-- p:<init>(java.nio.file.Path):V
-- p:<init>(java.nio.file.Path,com.intellij.util.io.StorageLockContext):V
-- p:<init>(java.nio.file.Path,com.intellij.util.io.StorageLockContext,com.intellij.util.io.storage.CapacityAllocationPolicy):V
-- p:<init>(java.nio.file.Path,com.intellij.util.io.storage.CapacityAllocationPolicy):V
-- p:appendBytes(I,com.intellij.openapi.util.io.ByteArraySequence):V
-- appendStream(I):com.intellij.util.io.storage.AbstractStorage$AppenderStream
-- checkSanity(I):V
-- closeAndClean():V
-- createRecordIdIterator():com.intellij.util.io.storage.RecordIdIterator
-- pa:createRecordsTable(com.intellij.util.io.StorageLockContext,java.nio.file.Path):com.intellij.util.io.storage.AbstractRecordsTable
-- s:deleteFiles(java.lang.String):Z
-- s:deleteFiles(java.nio.file.Path):Z
-- dispose():V
-- p:doDeleteRecord(I):V
-- force():V
-- getLiveRecordsCount():I
-- getVersion():I
-- isDirty():Z
-- p:readBytes(I):B[]
-- readStream(I):java.io.DataInputStream
-- replaceBytes(I,I,com.intellij.openapi.util.io.ByteArraySequence):V
-- setVersion(I):V
-- p:withReadLock(com.intellij.openapi.util.ThrowableComputable):java.lang.Object
-- p:withReadLock(com.intellij.util.ThrowableRunnable):V
-- p:withWriteLock(com.intellij.openapi.util.ThrowableComputable):java.lang.Object
-- p:withWriteLock(com.intellij.util.ThrowableRunnable):V
-- writeBytes(I,com.intellij.openapi.util.io.ByteArraySequence,Z):V
-- writeStream(I):com.intellij.util.io.storage.AbstractStorage$StorageDataOutput
-- writeStream(I,Z):com.intellij.util.io.storage.AbstractStorage$StorageDataOutput
-f:com.intellij.util.io.storage.AbstractStorage$AppenderStream
-- com.intellij.util.io.DataOutputStream
-- com.intellij.util.io.storage.IAppenderStream
-- asByteArraySequence():com.intellij.openapi.util.io.ByteArraySequence
-- close():V
-f:com.intellij.util.io.storage.AbstractStorage$StorageDataOutput
-- com.intellij.util.io.DataOutputStream
-- com.intellij.util.io.storage.IStorageDataOutput
-- asByteArraySequence():com.intellij.openapi.util.io.ByteArraySequence
-- close():V
-- getRecordId():I
 a:com.intellij.util.io.storage.CapacityAllocationPolicy
 - sf:DEFAULT:com.intellij.util.io.storage.CapacityAllocationPolicy
 - sf:FIVE_PERCENT_FOR_GROWTH:com.intellij.util.io.storage.CapacityAllocationPolicy
@@ -6468,108 +5925,11 @@ com.intellij.util.io.storage.RefCountingContentStorage
 - a:getRefCount(I):I
 - a:releaseRecord(I):V
 c:com.intellij.util.io.storage.Storage
-- com.intellij.util.io.storage.AbstractStorage
+- com.intellij.util.io.storage.IStorage
 - <init>(java.nio.file.Path):V
 - <init>(java.nio.file.Path,com.intellij.util.io.storage.CapacityAllocationPolicy):V
 - createNewRecord():I
-- p:createRecordsTable(com.intellij.util.io.StorageLockContext,java.nio.file.Path):com.intellij.util.io.storage.AbstractRecordsTable
 - deleteRecord(I):V
-a:com.intellij.util.io.storage.lf.AbstractRecordsTableLF
-- com.intellij.util.io.storage.IRecordsTable
-- psf:DEFAULT_HEADER_SIZE:I
-- psf:DEFAULT_RECORD_SIZE:I
-- psf:SPECIAL_NEGATIVE_SIZE_FOR_REMOVED_RECORD:I
-- pf:storage:com.intellij.util.io.pagecache.PagedStorage
-- <init>(java.nio.file.Path,com.intellij.util.io.StorageLockContext):V
-- close():V
-- createNewRecord():I
-- createRecordIdIterator():com.intellij.util.io.storage.RecordIdIterator
-- deleteRecord(I):V
-- force():V
-- getAddress(I):J
-- getCapacity(I):I
-- p:getHeaderSize():I
-- pa:getImplVersion():I
-- getLiveRecordsCount():I
-- p:getOffset(I,I):I
-- pa:getRecordSize():I
-- getRecordsCount():I
-- getSize(I):I
-- getVersion():I
-- pa:getZeros():B[]
-- isDirty():Z
-- ps:isSizeOfLiveRecord(I):Z
-- ps:isSizeOfRemovedRecord(I):Z
-- markDirty():V
-- setAddress(I,J):V
-- setCapacity(I,I):V
-- setSize(I,I):V
-- setVersion(I):V
-a:com.intellij.util.io.storage.lf.AbstractStorageLF
-- com.intellij.util.io.CleanableStorage
-- com.intellij.util.io.storage.IStorage
-- sf:DATA_EXTENSION:java.lang.String
-- sf:INDEX_EXTENSION:java.lang.String
-- psf:LOG:com.intellij.openapi.diagnostic.Logger
-- sf:PAGE_SIZE:I
-- sf:SHARED:com.intellij.util.io.StorageLockContext
-- p:context:com.intellij.util.io.StorageLockContext
-- p:dataTable:com.intellij.util.io.storage.IDataTable
-- p:recordsTable:com.intellij.util.io.storage.IRecordsTable
-- p:<init>(java.nio.file.Path):V
-- p:<init>(java.nio.file.Path,com.intellij.util.io.StorageLockContext):V
-- p:<init>(java.nio.file.Path,com.intellij.util.io.StorageLockContext,com.intellij.util.io.storage.CapacityAllocationPolicy):V
-- p:<init>(java.nio.file.Path,com.intellij.util.io.storage.CapacityAllocationPolicy):V
-- p:appendBytes(I,com.intellij.openapi.util.io.ByteArraySequence):V
-- appendStream(I):com.intellij.util.io.storage.lf.AbstractStorageLF$AppenderStream
-- checkSanity(I):V
-- closeAndClean():V
-- createRecordIdIterator():com.intellij.util.io.storage.RecordIdIterator
-- pa:createRecordsTable(com.intellij.util.io.StorageLockContext,java.nio.file.Path):com.intellij.util.io.storage.IRecordsTable
-- s:deleteFiles(java.lang.String):Z
-- s:deleteFiles(java.nio.file.Path):Z
-- dispose():V
-- p:doDeleteRecord(I):V
-- force():V
-- getLiveRecordsCount():I
-- getVersion():I
-- isDirty():Z
-- p:readBytes(I):B[]
-- readStream(I):java.io.DataInputStream
-- replaceBytes(I,I,com.intellij.openapi.util.io.ByteArraySequence):V
-- setVersion(I):V
-- p:withReadLock(com.intellij.openapi.util.ThrowableComputable):java.lang.Object
-- p:withReadLock(com.intellij.util.ThrowableRunnable):V
-- p:withWriteLock(com.intellij.openapi.util.ThrowableComputable):java.lang.Object
-- p:withWriteLock(com.intellij.util.ThrowableRunnable):V
-- writeBytes(I,com.intellij.openapi.util.io.ByteArraySequence,Z):V
-- writeStream(I):com.intellij.util.io.storage.lf.AbstractStorageLF$StorageDataOutput
-- writeStream(I,Z):com.intellij.util.io.storage.lf.AbstractStorageLF$StorageDataOutput
-f:com.intellij.util.io.storage.lf.AbstractStorageLF$AppenderStream
-- com.intellij.util.io.DataOutputStream
-- com.intellij.util.io.storage.IAppenderStream
-- asByteArraySequence():com.intellij.openapi.util.io.ByteArraySequence
-- close():V
-f:com.intellij.util.io.storage.lf.AbstractStorageLF$StorageDataOutput
-- com.intellij.util.io.DataOutputStream
-- com.intellij.util.io.storage.IStorageDataOutput
-- asByteArraySequence():com.intellij.openapi.util.io.ByteArraySequence
-- close():V
-- getRecordId():I
-f:com.intellij.util.io.storage.lf.DataTableLF
-- com.intellij.util.io.storage.IDataTable
-- <init>(java.nio.file.Path,com.intellij.util.io.StorageLockContext):V
-- allocateSpace(I):J
-- close():V
-- force():V
-- getFileSize():J
-- getWaste():I
-- isCompactNecessary():Z
-- isDirty():Z
-- readBytes(J,B[]):V
-- reclaimSpace(I):V
-- writeBytes(J,B[]):V
-- writeBytes(J,B[],I,I):V
 f:com.intellij.util.io.zip.DosTime
 - s:dosToJavaTime(J):J
 - s:javaToDosTime(J):J

platform/util/exposed-private-api.txt

@@ -1,23 +1,4 @@
 com/intellij/serialization/MutableAccessor
 com/intellij/ui/PlatformIcons
-com/intellij/util/indexing/impl/IndexStorageLayout
-com/intellij/util/indexing/impl/InvertedIndexValueIterator
-com/intellij/util/indexing/impl/MapReduceIndex$IndexUpdateComputable
-com/intellij/util/indexing/impl/ValueContainerImpl
-com/intellij/util/indexing/impl/ValueContainerInputRemapping
-com/intellij/util/indexing/impl/ValueContainerMap
-com/intellij/util/io/DirectBufferWrapper
-com/intellij/util/io/PersistentHashMapValueStorage$ReadResult
-com/intellij/util/io/ScannableDataEnumeratorEx$ValueReader
-com/intellij/util/io/StorageLockContext
-com/intellij/util/io/keyStorage/AppendableObjectStorage
-com/intellij/util/io/pagecache/FilePageCacheStatistics
-com/intellij/util/io/pagecache/Page
-com/intellij/util/io/pagecache/PagedStorage
-com/intellij/util/io/pagecache/impl/PageImpl
-com/intellij/util/io/stats/BTreeStatistics
-com/intellij/util/io/stats/PersistentEnumeratorStatistics
-com/intellij/util/io/stats/PersistentHashMapStatistics
-com/intellij/util/io/storage/DataTable
 com/intellij/util/xml/dom/XmlElement
 com/intellij/util/xmlb/DomAdapter

platform/util/src/com/intellij/util/indexing/impl/ChangeTrackingValueContainer.java

@@ -8,6 +8,7 @@ import com.intellij.util.io.DataExternalizer;
 import com.intellij.util.io.DataInputOutputUtil;
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
 import it.unimi.dsi.fastutil.ints.IntSet;
+import org.jetbrains.annotations.ApiStatus.Internal;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -17,6 +18,7 @@ import java.io.IOException;
 /**
  * @author Eugene Zhuravlev
  */
+@Internal
 public class ChangeTrackingValueContainer<Value> extends UpdatableValueContainer<Value> {
   // there is no volatile as we modify under write lock and read under read lock
   protected ValueContainerImpl<Value> myAdded;

platform/util/src/com/intellij/util/indexing/impl/MapIndexStorage.java

@@ -9,7 +9,7 @@ import com.intellij.util.concurrency.SequentialTaskExecutor;
 import com.intellij.util.indexing.StorageException;
 import com.intellij.util.io.*;
 import com.intellij.util.io.PersistentHashMapValueStorage.CreationTimeOptions;
-import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.ApiStatus.Internal;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
@@ -17,6 +17,7 @@ import org.jetbrains.annotations.TestOnly;
 import java.io.IOException;
 import java.nio.file.Path;
 
+@Internal
 public class MapIndexStorage<Key, Value> implements IndexStorage<Key, Value>, MeasurableIndexStore {
   private static final Logger LOG = Logger.getInstance(MapIndexStorage.class);
   private static final boolean ENABLE_WAL = SystemProperties.getBooleanProperty("idea.index.enable.wal", false);
@@ -336,7 +337,7 @@ public class MapIndexStorage<Key, Value> implements IndexStorage<Key, Value>, Me
     }
   }
 
-  @ApiStatus.Internal
+  @Internal
   public final void clearCachedMappings() {
     myCache.invalidateAll();
   }

platform/util/src/com/intellij/util/indexing/impl/MapReduceIndex.java

@@ -1,4 +1,4 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.util.indexing.impl;
 
 import com.intellij.openapi.diagnostic.Logger;
@@ -15,6 +15,7 @@ import com.intellij.util.indexing.impl.forward.IntForwardIndex;
 import com.intellij.util.indexing.impl.forward.IntForwardIndexAccessor;
 import com.intellij.util.io.MeasurableIndexStore;
 import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.ApiStatus.Internal;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -27,6 +28,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import static com.intellij.util.io.MeasurableIndexStore.keysCountApproximatelyIfPossible;
 
+@Internal
 public abstract class MapReduceIndex<Key,Value, Input> implements InvertedIndex<Key, Value, Input>,
                                                                   MeasurableIndexStore {
   private static final Logger LOG = Logger.getInstance(MapReduceIndex.class);
@@ -367,7 +369,6 @@ public abstract class MapReduceIndex<Key,Value, Input> implements InvertedIndex<
     });
   }
 
-  @ApiStatus.Internal
   public final class IndexUpdateComputable implements Computable<Boolean> {
     private final UpdateData<Key, Value> myUpdateData;
     private final InputData<Key, Value> myInputData;

platform/util/src/com/intellij/util/indexing/impl/MergedValueContainer.java

@@ -1,13 +1,15 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.util.indexing.impl;
 
 import com.intellij.util.indexing.ValueContainer;
+import org.jetbrains.annotations.ApiStatus.Internal;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 import java.util.function.IntPredicate;
 
+@Internal
 public final class MergedValueContainer<Value> extends ValueContainer<Value> {
   private final @NotNull List<? extends ValueContainer<Value>> myContainers;
   private int mySize;

platform/util/src/com/intellij/util/indexing/impl/forward/PersistentMapBasedForwardIndex.java

@@ -1,14 +1,16 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.util.indexing.impl.forward;
 
 import com.intellij.openapi.util.io.ByteArraySequence;
 import com.intellij.util.io.*;
+import org.jetbrains.annotations.ApiStatus.Internal;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
 import java.nio.file.Path;
 
+@Internal
 public final class PersistentMapBasedForwardIndex implements ForwardIndex, MeasurableIndexStore {
   private volatile @NotNull PersistentMap<Integer, ByteArraySequence> myPersistentMap;
   private final @NotNull Path myMapFile;

platform/util/src/com/intellij/util/io/AbstractIntToIntBtree.java

@@ -1,7 +1,8 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.util.io;
 
 import com.intellij.util.io.stats.BTreeStatistics;
+import org.jetbrains.annotations.ApiStatus.Internal;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
@@ -9,6 +10,7 @@ import java.io.IOException;
 /**
  *
  */
+@Internal
 public abstract class AbstractIntToIntBtree {
 
   public static int version() {

platform/util/src/com/intellij/util/io/InMemoryEnumerator.java

@@ -1,10 +1,11 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.util.io;
 
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
+import org.jetbrains.annotations.ApiStatus.Internal;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -17,6 +18,7 @@ import java.util.ArrayList;
  * <br/>
  * <b>Not thread safe</b> -- external synchronization required for use in multithreaded environment.
  */
+@Internal
 public final class InMemoryEnumerator<Data> implements ScannableDataEnumeratorEx<Data> {
 
   private final Object2IntMap<Data> idByValue = new Object2IntOpenHashMap<>();

platform/util/src/com/intellij/util/io/IntToIntBtree.java

@@ -1,4 +1,4 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.util.io;
 
 import com.intellij.util.BitUtil;
@@ -7,6 +7,7 @@ import com.intellij.util.SystemProperties;
 import com.intellij.util.io.stats.BTreeStatistics;
 import it.unimi.dsi.fastutil.ints.Int2IntMap;
 import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
+import org.jetbrains.annotations.ApiStatus.Internal;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.Closeable;
@@ -16,6 +17,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Arrays;
 
+@Internal
 public final class IntToIntBtree extends AbstractIntToIntBtree {
   private static final boolean CACHE_ROOT_NODE_BUFFER = SystemProperties.getBooleanProperty("idea.btree.cache.root.node.buffer", true);
 

platform/util/src/com/intellij/util/io/IntToIntBtreeLockFree.java

@@ -1,4 +1,4 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.util.io;
 
 import com.intellij.util.BitUtil;
@@ -10,6 +10,7 @@ import com.intellij.util.io.pagecache.impl.PageContentLockingStrategy.SharedLock
 import com.intellij.util.io.stats.BTreeStatistics;
 import it.unimi.dsi.fastutil.ints.Int2IntMap;
 import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
+import org.jetbrains.annotations.ApiStatus.Internal;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.Closeable;
@@ -23,6 +24,7 @@ import java.util.Arrays;
  * Implementation is not lock-free, it just uses {@link FilePageCacheLockFree} for page management.
  * Actually, the implementation expects to be guarded by a single lock
  */
+@Internal
 public final class IntToIntBtreeLockFree extends AbstractIntToIntBtree {
   private static final boolean CACHE_ROOT_NODE_BUFFER = SystemProperties.getBooleanProperty("idea.btree.cache.root.node.buffer", true);
 

platform/util/src/com/intellij/util/io/PagedFileStorage.java

@@ -1,4 +1,4 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.util.io;
 
 import com.intellij.openapi.Forceable;
@@ -9,6 +9,7 @@ import com.intellij.util.ExceptionUtil;
 import com.intellij.util.io.FileChannelInterruptsRetryer.FileChannelIdempotentOperation;
 import com.intellij.util.io.OpenChannelsCache.FileChannelOperation;
 import com.intellij.util.io.storage.AbstractStorage;
+import org.jetbrains.annotations.ApiStatus.Internal;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -25,6 +26,7 @@ import java.nio.file.Path;
 
 import static com.intellij.util.io.PageCacheUtils.CHANNELS_CACHE;
 
+@Internal
 public final class PagedFileStorage implements Forceable/*, PagedStorage*/, Closeable {
   static final Logger LOG = Logger.getInstance(PagedFileStorage.class);
 

platform/util/src/com/intellij/util/io/PagedFileStorageWithRWLockedPageContent.java

@@ -1,4 +1,4 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.util.io;
 
 import com.intellij.openapi.diagnostic.Logger;
@@ -10,6 +10,7 @@ import com.intellij.util.io.pagecache.Page;
 import com.intellij.util.io.pagecache.PagedStorage;
 import com.intellij.util.io.pagecache.impl.*;
 import com.intellij.util.io.storage.AbstractStorage;
+import org.jetbrains.annotations.ApiStatus.Internal;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -29,6 +30,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
 import static com.intellij.util.SystemProperties.getIntProperty;
 import static java.nio.ByteOrder.BIG_ENDIAN;
 
+@Internal
 public final class PagedFileStorageWithRWLockedPageContent implements PagedStorage {
   private static final Logger LOG = Logger.getInstance(PagedFileStorageWithRWLockedPageContent.class);
 

platform/util/src/com/intellij/util/io/PersistentBTreeEnumerator.java

@@ -1,4 +1,4 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.util.io;
 
 import com.intellij.util.ArrayUtilRt;
@@ -7,6 +7,7 @@ import com.intellij.util.Processor;
 import com.intellij.util.SystemProperties;
 import com.intellij.util.io.stats.PersistentEnumeratorStatistics;
 import com.intellij.util.io.stats.StorageStatsRegistrar;
+import org.jetbrains.annotations.ApiStatus.Internal;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.VisibleForTesting;
@@ -41,6 +42,7 @@ import java.util.List;
  * be serialized to an integer, so there is a bijection between {@link Data} and its hashcode. In such
  * cases {@link #myInlineKeysNoMapping} param allows to skip collision resolution paths altogether.
  */
+@Internal
 public class PersistentBTreeEnumerator<Data> extends PersistentEnumeratorBase<Data> implements DurableDataEnumerator<Data>,
                                                                                                ScannableDataEnumeratorEx<Data>,
                                                                                                CleanableStorage {

platform/util/src/com/intellij/util/io/PersistentEnumerator.java

@@ -1,7 +1,7 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.util.io;
 
-import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.ApiStatus.Internal;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.Range;
@@ -12,6 +12,7 @@ import java.nio.file.Path;
 import java.util.Collection;
 import java.util.concurrent.locks.Lock;
 
+@Internal
 public class PersistentEnumerator<Data> implements DurableDataEnumerator<Data>,
                                                    ScannableDataEnumeratorEx<Data> {
   protected final @NotNull PersistentEnumeratorBase<Data> myEnumerator;
@@ -52,7 +53,6 @@ public class PersistentEnumerator<Data> implements DurableDataEnumerator<Data>,
     return new PersistentBTreeEnumerator<>(file, dataDescriptor, initialSize, lockContext, version, false, registerForStats);
   }
 
-  @ApiStatus.Internal
   public static int getVersion() {
     return PersistentBTreeEnumerator.baseVersion();
   }
@@ -114,7 +114,6 @@ public class PersistentEnumerator<Data> implements DurableDataEnumerator<Data>,
     return myEnumerator.tryEnumerate(name);
   }
 
-  @ApiStatus.Internal
   public Collection<Data> getAllDataObjects(final @Nullable PersistentEnumeratorBase.DataFilter filter) throws IOException {
     return myEnumerator.getAllDataObjects(filter);
   }

platform/util/src/com/intellij/util/io/PersistentEnumeratorBase.java

@@ -10,6 +10,7 @@ import com.intellij.util.io.keyStorage.AppendableObjectStorage;
 import com.intellij.util.io.keyStorage.AppendableStorageBackedByResizableMappedFile;
 import com.intellij.util.io.keyStorage.InlinedKeyStorage;
 import com.intellij.util.io.keyStorage.NoDataException;
+import org.jetbrains.annotations.ApiStatus.Internal;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.Range;
@@ -30,6 +31,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
  * @author max
  * @author jeka
  */
+@Internal
 public abstract class PersistentEnumeratorBase<Data> implements DataEnumeratorEx<Data>,
                                                                 ScannableDataEnumeratorEx<Data>,
                                                                 Forceable, Closeable, SelfDiagnosing {

platform/util/src/com/intellij/util/io/PersistentHashMap.java

@@ -1,9 +1,10 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.util.io;
 
 import com.intellij.util.CommonProcessors;
 import com.intellij.util.Processor;
 import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.ApiStatus.Internal;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -87,6 +88,7 @@ public final class PersistentHashMap<Key, Value> implements AppendablePersistent
     this(newBuilder(file, keyDescriptor, valueExternalizer).withInitialSize(initialSize).withVersion(version), true);
   }
 
+  @Internal
   public PersistentHashMap(@NotNull Path file,
                            @NotNull KeyDescriptor<Key> keyDescriptor,
                            @NotNull DataExternalizer<Value> valueExternalizer,

platform/util/src/com/intellij/util/io/PersistentHashMapValueStorage.java

@@ -1,4 +1,4 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.util.io;
 
 import com.intellij.openapi.diagnostic.Logger;
@@ -10,6 +10,7 @@ import com.intellij.util.MathUtil;
 import com.intellij.util.SystemProperties;
 import com.intellij.util.io.AppendablePersistentMap.ValueDataAppender;
 import com.intellij.util.io.PersistentMapImpl.CompactionRecordInfo;
+import org.jetbrains.annotations.ApiStatus.Internal;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
@@ -25,6 +26,7 @@ import java.util.PriorityQueue;
 
 import static java.nio.file.StandardOpenOption.READ;
 
+@Internal
 public final class PersistentHashMapValueStorage {
   private @Nullable RAReader myCompactionModeReader;
   private volatile long mySize;

platform/util/src/com/intellij/util/io/PersistentMapBuilder.java

@@ -1,9 +1,10 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.util.io;
 
 import com.intellij.util.ConcurrencyUtil;
 import com.intellij.util.SystemProperties;
 import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.ApiStatus.Internal;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -15,6 +16,8 @@ import java.util.concurrent.ExecutorService;
  * A builder helper for {@link PersistentHashMap}
  *
  * @see PersistentHashMap
+ *
+ * TODO expose this as an interface
  */
 @ApiStatus.Experimental
 public final class PersistentMapBuilder<Key, Value> {
@@ -154,6 +157,7 @@ public final class PersistentMapBuilder<Key, Value> {
     return inlineValues(true);
   }
 
+  @Internal
   public @NotNull PersistentMapBuilder<Key, Value> withStorageLockContext(@Nullable StorageLockContext context) {
     myLockContext = context;
     return this;
@@ -211,6 +215,7 @@ public final class PersistentMapBuilder<Key, Value> {
     return myWalExecutor;
   }
 
+  @Internal
   public @Nullable StorageLockContext getLockContext() {
     return myLockContext;
   }

platform/util/src/com/intellij/util/io/PersistentMapImpl.java

@@ -1,4 +1,4 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.util.io;
 
 import com.intellij.openapi.diagnostic.Logger;
@@ -13,6 +13,7 @@ import com.intellij.util.containers.SLRUCache;
 import com.intellij.util.io.PersistentHashMapValueStorage.CreationTimeOptions;
 import com.intellij.util.io.stats.PersistentHashMapStatistics;
 import com.intellij.util.io.stats.StorageStatsRegistrar;
+import org.jetbrains.annotations.ApiStatus.Internal;
 import org.jetbrains.annotations.*;
 
 import java.io.DataInputStream;
@@ -54,6 +55,7 @@ import java.util.stream.Stream;
  * e.g., in case Value is non-negative integer the value can be stored
  * directly in storage used for offset and in case of btree enumerator directly in btree leaf.
  **/
+@Internal
 public final class PersistentMapImpl<Key, Value> implements PersistentMapBase<Key, Value> {
   private static final Logger LOG = Logger.getInstance(PersistentMapImpl.class);
 
@@ -916,7 +918,7 @@ public final class PersistentMapImpl<Key, Value> implements PersistentMapBase<Ke
   }
 
   // make it visible for tests
-  @ApiStatus.Internal
+  @Internal
   public void compact() throws IOException {
     if (!isCompactionSupported()) throw new IncorrectOperationException();
     getWriteLock().lock();
@@ -997,7 +999,7 @@ public final class PersistentMapImpl<Key, Value> implements PersistentMapBase<Ke
     }
   }
 
-  @ApiStatus.Internal
+  @Internal
   public boolean isCompactionSupported() {
     return !myIsReadOnly && !myIntMapping;
   }

platform/util/src/com/intellij/util/io/PersistentStringEnumerator.java

@@ -1,6 +1,7 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.util.io;
 
+import org.jetbrains.annotations.ApiStatus.Internal;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -14,6 +15,7 @@ public class PersistentStringEnumerator extends PersistentEnumerator<String> imp
     this(file, null);
   }
 
+  @Internal
   public PersistentStringEnumerator(@NotNull Path file, @Nullable StorageLockContext storageLockContext) throws IOException {
     this(file, 1024 * 4, storageLockContext);
   }
@@ -26,12 +28,14 @@ public class PersistentStringEnumerator extends PersistentEnumerator<String> imp
     this(file, initialSize, null);
   }
 
+  @Internal
   public PersistentStringEnumerator(@NotNull Path file,
                                     final int initialSize,
                                     @Nullable StorageLockContext lockContext) throws IOException {
     this(file, initialSize, false, lockContext);
   }
 
+  @Internal
   public PersistentStringEnumerator(@NotNull Path file,
                                      final int initialSize,
                                      boolean cacheLastMappings,

platform/util/src/com/intellij/util/io/ResizeableMappedFile.java

@@ -15,6 +15,7 @@ import com.intellij.util.SmartList;
 import com.intellij.util.SystemProperties;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.lang.CompoundRuntimeException;
+import org.jetbrains.annotations.ApiStatus.Internal;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -31,6 +32,7 @@ import java.util.List;
 
 import static java.nio.file.StandardOpenOption.READ;
 
+@Internal
 public final class ResizeableMappedFile implements Forceable, Closeable {
   private static final Logger LOG = Logger.getInstance(ResizeableMappedFile.class);
 

platform/util/src/com/intellij/util/io/pagecache/impl/package-info.java

@@ -0,0 +1,5 @@
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+@Internal
+package com.intellij.util.io.pagecache.impl;
+
+import org.jetbrains.annotations.ApiStatus.Internal;

platform/util/src/com/intellij/util/io/storage/AbstractRecordsTable.java

@@ -1,4 +1,4 @@
-// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.util.io.storage;
 
 import com.intellij.openapi.diagnostic.Logger;
@@ -7,6 +7,7 @@ import com.intellij.util.io.PagedFileStorage;
 import com.intellij.util.io.StorageLockContext;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.ints.IntList;
+import org.jetbrains.annotations.ApiStatus.Internal;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.TestOnly;
 
@@ -39,12 +40,14 @@ public abstract class AbstractRecordsTable implements IRecordsTable {
 
   protected static final int DEFAULT_RECORD_SIZE = CAPACITY_OFFSET + 4;
 
+  @Internal
   protected final PagedFileStorage myStorage;
 
   private IntList myFreeRecordsList = null;
   private boolean myIsDirty = false;
   protected static final int SPECIAL_NEGATIVE_SIZE_FOR_REMOVED_RECORD = -1;
 
+  @Internal
   public AbstractRecordsTable(@NotNull Path storageFilePath, @NotNull StorageLockContext context) throws IOException {
     myStorage = new PagedFileStorage(storageFilePath, context, getPageSize(), areDataAlignedToPage(), false);
     myStorage.lockWrite();

platform/util/src/com/intellij/util/io/storage/AbstractStorage.java

@@ -1,4 +1,4 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.util.io.storage;
 
 import com.intellij.openapi.diagnostic.Logger;
@@ -15,6 +15,7 @@ import com.intellij.util.io.DataOutputStream;
 import com.intellij.util.io.IOUtil;
 import com.intellij.util.io.StorageLockContext;
 import com.intellij.util.io.UnsyncByteArrayInputStream;
+import org.jetbrains.annotations.ApiStatus.Internal;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -28,6 +29,7 @@ import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
 import java.nio.file.StandardOpenOption;
 
+@Internal
 public abstract class AbstractStorage implements IStorage {
   public static final StorageLockContext SHARED = new StorageLockContext(true, true);
   public static final int PAGE_SIZE = SystemProperties.getIntProperty("idea.io.page.size", 8 * 1024);

platform/util/src/com/intellij/util/io/storage/Storage.java

@@ -1,7 +1,8 @@
-// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.util.io.storage;
 
 import com.intellij.util.io.StorageLockContext;
+import org.jetbrains.annotations.ApiStatus.Internal;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
@@ -16,6 +17,7 @@ public class Storage extends AbstractStorage {
     super(path, capacityAllocationPolicy);
   }
 
+  @Internal
   @Override
   protected AbstractRecordsTable createRecordsTable(@NotNull StorageLockContext pool, @NotNull Path recordsFile) throws IOException {
     return new RecordsTable(recordsFile, pool);

platform/util/src/com/intellij/util/io/storage/lf/package-info.java

@@ -1,6 +1,9 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 
 /**
  * Re-implementation of {@link com.intellij.util.io.storage} on top of {@link com.intellij.util.io.FilePageCacheLockFree}
  */
-package com.intellij.util.io.storage.lf;
+@Internal
+package com.intellij.util.io.storage.lf;
+
+import org.jetbrains.annotations.ApiStatus.Internal;

platform/util/src/com/intellij/util/io/writeAheadLog.kt

@@ -11,6 +11,7 @@ import com.intellij.util.ConcurrencyUtil
 import com.intellij.util.indexing.impl.IndexStorageUtil
 import it.unimi.dsi.fastutil.ints.IntLinkedOpenHashSet
 import it.unimi.dsi.fastutil.ints.IntSet
+import org.jetbrains.annotations.ApiStatus.Internal
 import java.io.*
 import java.nio.file.FileAlreadyExistsException
 import java.nio.file.Files
@@ -231,6 +232,7 @@ fun <Data> restoreMemoryEnumeratorFromWal(walFile: Path,
   }).toList()
 }
 
+@Internal
 @Throws(IOException::class)
 fun <Data> restorePersistentEnumeratorFromWal(walFile: Path,
                                               outputMapFile: Path,