IGNITE-21999 Merge partition free-lists into one

apache · Apr 16, 2024 · 65c7857 · 65c7857
1 parent 821998c
commit 65c7857
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/...age-memory/src/main/java/org/apache/ignite/internal/pagememory/freelist/FreeListImpl.java b/...age-memory/src/main/java/org/apache/ignite/internal/pagememory/freelist/FreeListImpl.java
@@ -705,7 +705,7 @@ private long takePage(int size, Storable row, IoStatisticsHolder statHolder) thr
      * @return Prepared page id.
      * @see PagesList#initReusedPage(long, long, int, byte, PageIo)
      */
-    private long initReusedPage( Storable row, long reusedPageId, IoStatisticsHolder statHolder) throws IgniteInternalCheckedException {
+    private long initReusedPage(Storable row, long reusedPageId, IoStatisticsHolder statHolder) throws IgniteInternalCheckedException {
         long reusedPage = acquirePage(reusedPageId, statHolder);
         try {
             long reusedPageAddr = writeLock(reusedPageId, reusedPage);

diff --git a/.../apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvPartitionStorage.java b/.../apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvPartitionStorage.java
@@ -47,7 +47,6 @@
 import org.apache.ignite.internal.storage.index.StorageSortedIndexDescriptor;
 import org.apache.ignite.internal.storage.pagememory.PersistentPageMemoryTableStorage;
 import org.apache.ignite.internal.storage.pagememory.configuration.schema.PersistentPageMemoryStorageEngineView;
-import org.apache.ignite.internal.storage.pagememory.index.freelist.IndexColumns;
 import org.apache.ignite.internal.storage.pagememory.index.hash.PageMemoryHashIndexStorage;
 import org.apache.ignite.internal.storage.pagememory.index.meta.IndexMetaTree;
 import org.apache.ignite.internal.storage.pagememory.index.sorted.PageMemorySortedIndexStorage;
@@ -82,8 +81,7 @@ public class PersistentPageMemoryMvPartitionStorage extends AbstractPageMemoryMv
      * @param tableStorage Table storage.
      * @param partitionId Partition id.
      * @param meta Partition meta.
-     * @param freeList Free list for {@link RowVersion}.
-     * @param reuseList Free list fot {@link IndexColumns}.
+     * @param freeList Free list.
      * @param versionChainTree Table tree for {@link VersionChain}.
      * @param indexMetaTree Tree that contains SQL indexes' metadata.
      * @param gcQueue Garbage collection queue.

diff --git a/...a/org/apache/ignite/internal/storage/pagememory/VolatilePageMemoryMvTableStorageTest.java b/...a/org/apache/ignite/internal/storage/pagememory/VolatilePageMemoryMvTableStorageTest.java
@@ -201,7 +201,7 @@ void partitionDestructionFreesSortedIndexPages() throws Exception {
 
         indexStorage.put(nonInlinableIndexRow());
 
-        long emptyIndexPagesBeforeDestroy = dataRegion().freeList().emptyDataPages();;
+        long emptyIndexPagesBeforeDestroy = dataRegion().freeList().emptyDataPages();
 
         assertThat(tableStorage.destroyPartition(0), willSucceedFast());