This is an automated email from the ASF dual-hosted git repository.
tkalkirill pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new 6178f00920 IGNITE-22799 Add partition ID to BplusTree names to make
debugging easier (#4126)
6178f00920 is described below
commit 6178f0092091c24dec266ef26f1a8a64aecf8f56
Author: Kirill Tkalenko <[email protected]>
AuthorDate: Wed Jul 24 07:13:06 2024 +0300
IGNITE-22799 Add partition ID to BplusTree names to make debugging easier
(#4126)
---
.../tree/AbstractBplusTreeReusePageMemoryTest.java | 2 +-
.../internal/pagememory/datastructure/DataStructure.java | 13 ++++++-------
.../ignite/internal/pagememory/freelist/FreeListImpl.java | 5 +++--
.../ignite/internal/pagememory/freelist/PagesList.java | 6 +++---
.../apache/ignite/internal/pagememory/tree/BplusTree.java | 12 ++++++------
.../internal/pagememory/freelist/FreeListImplTest.java | 3 +--
.../pagememory/PersistentPageMemoryTableStorage.java | 3 +--
.../storage/pagememory/VolatilePageMemoryDataRegion.java | 2 +-
.../storage/pagememory/index/hash/HashIndexRow.java | 6 ++++++
.../storage/pagememory/index/hash/HashIndexRowKey.java | 6 ++++++
.../storage/pagememory/index/hash/HashIndexTree.java | 4 ++--
.../storage/pagememory/index/meta/IndexMetaKey.java | 7 +++++++
.../storage/pagememory/index/meta/IndexMetaTree.java | 2 +-
.../storage/pagememory/index/sorted/SortedIndexRow.java | 6 ++++++
.../storage/pagememory/index/sorted/SortedIndexTree.java | 4 ++--
.../internal/storage/pagememory/mv/VersionChainTree.java | 2 +-
.../ignite/internal/storage/pagememory/mv/gc/GcQueue.java | 2 +-
17 files changed, 54 insertions(+), 31 deletions(-)
diff --git
a/modules/page-memory/src/integrationTest/java/org/apache/ignite/internal/pagememory/tree/AbstractBplusTreeReusePageMemoryTest.java
b/modules/page-memory/src/integrationTest/java/org/apache/ignite/internal/pagememory/tree/AbstractBplusTreeReusePageMemoryTest.java
index 794cfb51e3..03b9be2564 100644
---
a/modules/page-memory/src/integrationTest/java/org/apache/ignite/internal/pagememory/tree/AbstractBplusTreeReusePageMemoryTest.java
+++
b/modules/page-memory/src/integrationTest/java/org/apache/ignite/internal/pagememory/tree/AbstractBplusTreeReusePageMemoryTest.java
@@ -88,7 +88,7 @@ public abstract class AbstractBplusTreeReusePageMemoryTest
extends AbstractBplus
long metaPageId,
boolean initNew
) throws IgniteInternalCheckedException {
- super(grpId, partId, name, pageMem, lockLsnr, metaPageId, initNew,
null, IoStatisticsHolderNoOp.INSTANCE);
+ super(name, grpId, partId, pageMem, lockLsnr, metaPageId, initNew,
null, IoStatisticsHolderNoOp.INSTANCE);
}
static boolean checkNoLocks() {
diff --git
a/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/datastructure/DataStructure.java
b/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/datastructure/DataStructure.java
index b768a4f5c8..88659f9c58 100644
---
a/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/datastructure/DataStructure.java
+++
b/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/datastructure/DataStructure.java
@@ -61,14 +61,13 @@ public abstract class DataStructure implements
ManuallyCloseable {
protected final int grpId;
/** Group name. */
- protected final String grpName;
+ protected final @Nullable String grpName;
/** Page memory. */
protected final PageMemory pageMem;
/** Reuse list. */
- @Nullable
- protected ReuseList reuseList;
+ protected @Nullable ReuseList reuseList;
/** Default flag value for allocated pages. One of {@link
PageIdAllocator#FLAG_DATA} or {@link PageIdAllocator#FLAG_AUX}. */
protected final byte defaultPageFlag;
@@ -79,7 +78,7 @@ public abstract class DataStructure implements
ManuallyCloseable {
/**
* Constructor.
*
- * @param name Structure name (for debugging purposes).
+ * @param structureNamePrefix Structure name prefix (for debugging
purposes).
* @param grpId Group ID.
* @param grpName Group name.
* @param partId Partition ID.
@@ -89,7 +88,7 @@ public abstract class DataStructure implements
ManuallyCloseable {
* PageIdAllocator#FLAG_AUX}.
*/
public DataStructure(
- String name,
+ String structureNamePrefix,
int grpId,
@Nullable String grpName,
int partId,
@@ -97,11 +96,11 @@ public abstract class DataStructure implements
ManuallyCloseable {
PageLockListener lockLsnr,
byte defaultPageFlag
) {
- assert !StringUtils.nullOrEmpty(name);
+ assert !StringUtils.nullOrEmpty(structureNamePrefix);
assert pageMem != null;
assert partId >= 0 && partId <= MAX_PARTITION_ID : partId;
- this.name = name;
+ this.name = structureNamePrefix + "_" + grpId + "_" + partId;
this.grpId = grpId;
this.grpName = grpName;
this.partId = partId;
diff --git
a/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/freelist/FreeListImpl.java
b/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/freelist/FreeListImpl.java
index 45e2c42cec..f929c0a3ed 100644
---
a/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/freelist/FreeListImpl.java
+++
b/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/freelist/FreeListImpl.java
@@ -327,6 +327,7 @@ public class FreeListImpl extends PagesList implements
FreeList, ReuseList {
/**
* Constructor.
*
+ * @param freeListNamePrefix Free list name prefix (for debugging
purposes).
* @param grpId Group ID.
* @param partId Partition ID.
* @param pageMem Page memory.
@@ -337,9 +338,9 @@ public class FreeListImpl extends PagesList implements
FreeList, ReuseList {
* @throws IgniteInternalCheckedException If failed.
*/
public FreeListImpl(
+ String freeListNamePrefix,
int grpId,
int partId,
- String name,
PageMemory pageMem,
PageLockListener lockLsnr,
long metaPageId,
@@ -348,7 +349,7 @@ public class FreeListImpl extends PagesList implements
FreeList, ReuseList {
IoStatisticsHolder statHolder
) throws IgniteInternalCheckedException {
super(
- name,
+ freeListNamePrefix,
grpId,
partId,
pageMem,
diff --git
a/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/freelist/PagesList.java
b/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/freelist/PagesList.java
index 1393ff0f9a..2e4d9bed75 100644
---
a/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/freelist/PagesList.java
+++
b/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/freelist/PagesList.java
@@ -179,7 +179,7 @@ public abstract class PagesList extends DataStructure {
/**
* Constructor.
*
- * @param name Structure name (for debug purpose).
+ * @param pageListNamePrefix Structure name prefix (for debugging
purposes).
* @param grpId Group ID.
* @param partId Partition ID.
* @param pageMem Page memory.
@@ -189,7 +189,7 @@ public abstract class PagesList extends DataStructure {
* @param metaPageId Metadata page ID.
*/
protected PagesList(
- String name,
+ String pageListNamePrefix,
int grpId,
int partId,
PageMemory pageMem,
@@ -198,7 +198,7 @@ public abstract class PagesList extends DataStructure {
int buckets,
long metaPageId
) {
- super(name, grpId, null, partId, pageMem, lockLsnr, FLAG_AUX);
+ super(pageListNamePrefix, grpId, null, partId, pageMem, lockLsnr,
FLAG_AUX);
this.log = log;
diff --git
a/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/tree/BplusTree.java
b/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/tree/BplusTree.java
index d7077cbf6b..ab39e0bf26 100644
---
a/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/tree/BplusTree.java
+++
b/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/tree/BplusTree.java
@@ -906,7 +906,7 @@ public abstract class BplusTree<L, T extends L> extends
DataStructure implements
/**
* Constructor.
*
- * @param name Tree name.
+ * @param treeNamePrefix Tree name prefix (for debugging purposes).
* @param grpId Group ID.
* @param grpName Group name.
* @param partId Partition ID.
@@ -920,7 +920,7 @@ public abstract class BplusTree<L, T extends L> extends
DataStructure implements
* @param metaIos Meta IO versions.
*/
protected BplusTree(
- String name,
+ String treeNamePrefix,
int grpId,
@Nullable String grpName,
int partId,
@@ -933,7 +933,7 @@ public abstract class BplusTree<L, T extends L> extends
DataStructure implements
IoVersions<? extends BplusLeafIo<L>> leafIos,
IoVersions<? extends BplusMetaIo> metaIos
) {
- this(name, grpId, grpName, partId, pageMem, lockLsnr, globalRmvId,
metaPageId, reuseList);
+ this(treeNamePrefix, grpId, grpName, partId, pageMem, lockLsnr,
globalRmvId, metaPageId, reuseList);
setIos(innerIos, leafIos, metaIos);
}
@@ -941,7 +941,7 @@ public abstract class BplusTree<L, T extends L> extends
DataStructure implements
/**
* Constructor.
*
- * @param name Tree name.
+ * @param treeNamePrefix Tree name prefix (for debugging purposes).
* @param grpId Group ID.
* @param grpName Group name.
* @param pageMem Page memory.
@@ -951,7 +951,7 @@ public abstract class BplusTree<L, T extends L> extends
DataStructure implements
* @param reuseList Reuse list.
*/
protected BplusTree(
- String name,
+ String treeNamePrefix,
int grpId,
@Nullable String grpName,
int partId,
@@ -961,7 +961,7 @@ public abstract class BplusTree<L, T extends L> extends
DataStructure implements
long metaPageId,
@Nullable ReuseList reuseList
) {
- super(name, grpId, grpName, partId, pageMem, lockLsnr, FLAG_AUX);
+ super(treeNamePrefix, grpId, grpName, partId, pageMem, lockLsnr,
FLAG_AUX);
// TODO: IGNITE-16350 Move to config.
minFill = 0.0f; // Testing worst case when merge happens only on empty
page.
diff --git
a/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/freelist/FreeListImplTest.java
b/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/freelist/FreeListImplTest.java
index 4c0fba0099..3587d26855 100644
---
a/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/freelist/FreeListImplTest.java
+++
b/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/freelist/FreeListImplTest.java
@@ -143,9 +143,8 @@ public class FreeListImplTest extends
BaseIgniteAbstractTest {
long metaPageId = pageMemory.allocatePageNoReuse(1, 1, FLAG_DATA);
return new FreeListImpl(
- 0,
+ "TestFreeList", 0,
1,
- "TestFreeList",
pageMemory,
PageLockListenerNoOp.INSTANCE,
metaPageId,
diff --git
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/PersistentPageMemoryTableStorage.java
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/PersistentPageMemoryTableStorage.java
index 116ad06015..8529bc3ad7 100644
---
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/PersistentPageMemoryTableStorage.java
+++
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/PersistentPageMemoryTableStorage.java
@@ -172,9 +172,8 @@ public class PersistentPageMemoryTableStorage extends
AbstractPageMemoryTableSto
}
return new FreeListImpl(
- getTableId(),
+ String.format(FREE_LIST_NAME, getTableId(), partId),
getTableId(),
partId,
- String.format(FREE_LIST_NAME, getTableId(), partId),
dataRegion.pageMemory(),
PageLockListenerNoOp.INSTANCE,
meta.freeListRootPageId(),
diff --git
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/VolatilePageMemoryDataRegion.java
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/VolatilePageMemoryDataRegion.java
index efb0a0a0c7..024919800d 100644
---
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/VolatilePageMemoryDataRegion.java
+++
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/VolatilePageMemoryDataRegion.java
@@ -90,9 +90,9 @@ public class VolatilePageMemoryDataRegion implements
DataRegion<VolatilePageMemo
long metaPageId = pageMemory.allocatePageNoReuse(FREE_LIST_GROUP_ID,
FREE_LIST_PARTITION_ID, FLAG_AUX);
return new FreeListImpl(
+ FREE_LIST_NAME,
FREE_LIST_GROUP_ID,
FREE_LIST_PARTITION_ID,
- FREE_LIST_NAME,
pageMemory,
PageLockListenerNoOp.INSTANCE,
metaPageId,
diff --git
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/hash/HashIndexRow.java
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/hash/HashIndexRow.java
index 0f40774757..1162329589 100644
---
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/hash/HashIndexRow.java
+++
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/hash/HashIndexRow.java
@@ -20,6 +20,7 @@ package
org.apache.ignite.internal.storage.pagememory.index.hash;
import org.apache.ignite.internal.storage.RowId;
import org.apache.ignite.internal.storage.index.IndexRow;
import
org.apache.ignite.internal.storage.pagememory.index.freelist.IndexColumns;
+import org.apache.ignite.internal.tostring.S;
import org.apache.ignite.internal.util.HashUtils;
/**
@@ -58,4 +59,9 @@ public class HashIndexRow extends HashIndexRowKey {
public RowId rowId() {
return rowId;
}
+
+ @Override
+ public String toString() {
+ return S.toString(HashIndexRow.class, this, super.toString());
+ }
}
diff --git
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/hash/HashIndexRowKey.java
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/hash/HashIndexRowKey.java
index ed1e0068d7..3e3566f251 100644
---
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/hash/HashIndexRowKey.java
+++
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/hash/HashIndexRowKey.java
@@ -19,6 +19,7 @@ package
org.apache.ignite.internal.storage.pagememory.index.hash;
import org.apache.ignite.internal.storage.pagememory.index.common.IndexRowKey;
import
org.apache.ignite.internal.storage.pagememory.index.freelist.IndexColumns;
+import org.apache.ignite.internal.tostring.S;
/**
* Key to search for a {@link HashIndexRow} in the {@link HashIndexTree}.
@@ -51,4 +52,9 @@ public class HashIndexRowKey implements IndexRowKey {
public IndexColumns indexColumns() {
return indexColumns;
}
+
+ @Override
+ public String toString() {
+ return S.toString(HashIndexRowKey.class, this);
+ }
}
diff --git
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/hash/HashIndexTree.java
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/hash/HashIndexTree.java
index a9bae35495..0815b0aaea 100644
---
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/hash/HashIndexTree.java
+++
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/hash/HashIndexTree.java
@@ -68,7 +68,7 @@ public class HashIndexTree extends BplusTree<HashIndexRowKey,
HashIndexRow> {
long metaPageId,
@Nullable ReuseList reuseList
) throws IgniteInternalCheckedException {
- super("HashIndexTree_" + grpId, grpId, grpName, partId, pageMem,
lockLsnr, globalRmvId, metaPageId, reuseList);
+ super("HashIndexTree", grpId, grpName, partId, pageMem, lockLsnr,
globalRmvId, metaPageId, reuseList);
this.inlineSize = readInlineSizeFromMetaIo();
this.dataPageReader = new DataPageReader(pageMem, grpId,
statisticsHolder());
@@ -101,7 +101,7 @@ public class HashIndexTree extends
BplusTree<HashIndexRowKey, HashIndexRow> {
@Nullable ReuseList reuseList,
StorageHashIndexDescriptor indexDescriptor
) throws IgniteInternalCheckedException {
- super("HashIndexTree_" + grpId, grpId, grpName, partId, pageMem,
lockLsnr, globalRmvId, metaPageId, reuseList);
+ super("HashIndexTree", grpId, grpName, partId, pageMem, lockLsnr,
globalRmvId, metaPageId, reuseList);
this.inlineSize = binaryTupleInlineSize(pageSize(),
ITEM_SIZE_WITHOUT_COLUMNS, indexDescriptor);
this.dataPageReader = new DataPageReader(pageMem, grpId,
statisticsHolder());
diff --git
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/meta/IndexMetaKey.java
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/meta/IndexMetaKey.java
index 6c14888575..675e9d6a7f 100644
---
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/meta/IndexMetaKey.java
+++
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/meta/IndexMetaKey.java
@@ -17,6 +17,8 @@
package org.apache.ignite.internal.storage.pagememory.index.meta;
+import org.apache.ignite.internal.tostring.S;
+
/**
* Index meta key.
*/
@@ -57,4 +59,9 @@ public class IndexMetaKey {
public int hashCode() {
return indexId;
}
+
+ @Override
+ public String toString() {
+ return S.toString(this);
+ }
}
diff --git
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/meta/IndexMetaTree.java
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/meta/IndexMetaTree.java
index 6dc21e5277..7cd1c134c7 100644
---
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/meta/IndexMetaTree.java
+++
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/meta/IndexMetaTree.java
@@ -59,7 +59,7 @@ public class IndexMetaTree extends BplusTree<IndexMetaKey,
IndexMeta> {
@Nullable ReuseList reuseList,
boolean initNew
) throws IgniteInternalCheckedException {
- super("IndexMetaTree_" + grpId, grpId, grpName, partId, pageMem,
lockLsnr, globalRmvId, metaPageId, reuseList);
+ super("IndexMetaTree", grpId, grpName, partId, pageMem, lockLsnr,
globalRmvId, metaPageId, reuseList);
setIos(IndexMetaInnerIo.VERSIONS, IndexMetaLeafIo.VERSIONS,
IndexMetaTreeMetaIo.VERSIONS);
diff --git
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/sorted/SortedIndexRow.java
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/sorted/SortedIndexRow.java
index 71349fe524..31b9fe9c15 100644
---
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/sorted/SortedIndexRow.java
+++
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/sorted/SortedIndexRow.java
@@ -20,6 +20,7 @@ package
org.apache.ignite.internal.storage.pagememory.index.sorted;
import org.apache.ignite.internal.storage.RowId;
import org.apache.ignite.internal.storage.index.IndexRow;
import
org.apache.ignite.internal.storage.pagememory.index.freelist.IndexColumns;
+import org.apache.ignite.internal.tostring.S;
/**
* {@link IndexRow} implementation used in the {@link SortedIndexTree}.
@@ -46,4 +47,9 @@ public class SortedIndexRow extends SortedIndexRowKey {
public RowId rowId() {
return rowId;
}
+
+ @Override
+ public String toString() {
+ return S.toString(this);
+ }
}
diff --git
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/sorted/SortedIndexTree.java
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/sorted/SortedIndexTree.java
index 89b75c1247..db9cb3f855 100644
---
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/sorted/SortedIndexTree.java
+++
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/sorted/SortedIndexTree.java
@@ -82,7 +82,7 @@ public class SortedIndexTree extends
BplusTree<SortedIndexRowKey, SortedIndexRow
StorageSortedIndexDescriptor indexDescriptor,
boolean initNew
) throws IgniteInternalCheckedException {
- super("SortedIndexTree_" + grpId, grpId, grpName, partId, pageMem,
lockLsnr, globalRmvId, metaPageId, reuseList);
+ super("SortedIndexTree", grpId, grpName, partId, pageMem, lockLsnr,
globalRmvId, metaPageId, reuseList);
this.inlineSize = initNew
? binaryTupleInlineSize(pageSize(), ITEM_SIZE_WITHOUT_COLUMNS,
indexDescriptor)
@@ -116,7 +116,7 @@ public class SortedIndexTree extends
BplusTree<SortedIndexRowKey, SortedIndexRow
long metaPageId,
@Nullable ReuseList reuseList
) throws IgniteInternalCheckedException {
- super("SortedIndexTree_" + grpId, grpId, grpName, partId, pageMem,
lockLsnr, globalRmvId, metaPageId, reuseList);
+ super("SortedIndexTree", grpId, grpName, partId, pageMem, lockLsnr,
globalRmvId, metaPageId, reuseList);
this.inlineSize = readInlineSizeFromMetaIo();
this.dataPageReader = new DataPageReader(pageMem, grpId,
statisticsHolder());
diff --git
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/VersionChainTree.java
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/VersionChainTree.java
index 9e39010909..013b6febcd 100644
---
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/VersionChainTree.java
+++
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/VersionChainTree.java
@@ -60,7 +60,7 @@ public class VersionChainTree extends
BplusTree<VersionChainKey, VersionChain> {
boolean initNew
) throws IgniteInternalCheckedException {
super(
- "VersionChainTree_" + grpId,
+ "VersionChainTree",
grpId,
grpName,
partId,
diff --git
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/gc/GcQueue.java
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/gc/GcQueue.java
index 11288328cb..0ed685d3aa 100644
---
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/gc/GcQueue.java
+++
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/gc/GcQueue.java
@@ -63,7 +63,7 @@ public class GcQueue extends BplusTree<GcRowVersion,
GcRowVersion> {
boolean initNew
) throws IgniteInternalCheckedException {
super(
- "GarbageCollectionTree_" + grpId,
+ "GarbageCollectionTree",
grpId,
grpName,
partId,
