You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by am...@apache.org on 2026/03/17 13:12:14 UTC
(ignite-3) branch ignite-28273 created (now e6c99ab2b24)
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a change to branch ignite-28273
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
at e6c99ab2b24 wip
This branch includes the following new commits:
new e6c99ab2b24 wip
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(ignite-3) 01/01: wip
Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch ignite-28273
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit e6c99ab2b24e6b81391a955d1b8c868a7edacb0b
Author: AMashenkov <am...@apache.org>
AuthorDate: Tue Mar 17 15:55:59 2026 +0300
wip
---
.../java/org/apache/ignite/internal/binarytuple}/BinaryTuple.java | 5 +----
.../apache/ignite/internal/binarytuple}/BinaryTuplePrefix.java | 8 ++------
.../org/apache/ignite/internal/binarytuple}/InternalTupleEx.java | 3 +--
.../java/org/apache/ignite/client/fakes/FakeInternalTable.java | 2 +-
.../main/java/org/apache/ignite/internal/lang/InternalTuple.java | 4 ++++
.../src/main/resources/marshallable.blacklist | 4 ++--
.../replicator/network/replication/BinaryTupleMessage.java | 4 ++--
.../internal/placementdriver/ItPrimaryReplicaChoiceTest.java | 2 +-
.../org/apache/ignite/internal/runner/app/ItIndexNodeTest.java | 4 ++--
.../java/org/apache/ignite/internal/table/ItTableScanTest.java | 4 ++--
.../org/apache/ignite/internal/schema/BinaryRowConverter.java | 1 +
.../java/org/apache/ignite/internal/schema/BinaryRowImpl.java | 1 +
.../org/apache/ignite/internal/schema/BinaryTupleComparator.java | 2 ++
.../java/org/apache/ignite/internal/schema/ColumnsExtractor.java | 2 ++
.../apache/ignite/internal/schema/PartialBinaryTupleMatcher.java | 2 ++
.../ignite/internal/schema/registry/UpgradingRowAdapter.java | 2 +-
.../src/main/java/org/apache/ignite/internal/schema/row/Row.java | 2 +-
.../main/java/org/apache/ignite/internal/schema/row/RowImpl.java | 2 +-
.../org/apache/ignite/internal/schema/BinaryRowConverterTest.java | 1 +
.../org/apache/ignite/internal/schema/BinaryTuplePrefixTest.java | 2 ++
.../org/apache/ignite/internal/sql/engine/InternalSqlRow.java | 2 +-
.../org/apache/ignite/internal/sql/engine/InternalSqlRowImpl.java | 2 +-
.../ignite/internal/sql/engine/InternalSqlRowSingleBoolean.java | 2 +-
.../ignite/internal/sql/engine/InternalSqlRowSingleLong.java | 2 +-
.../ignite/internal/sql/engine/InternalSqlRowSingleString.java | 2 +-
.../internal/sql/engine/exec/ProjectedTableRowConverterImpl.java | 4 ++--
.../org/apache/ignite/internal/sql/engine/exec/RowHandler.java | 2 +-
.../ignite/internal/sql/engine/exec/ScannableTableImpl.java | 4 ++--
.../org/apache/ignite/internal/sql/engine/exec/SqlRowHandler.java | 2 +-
.../ignite/internal/sql/engine/exec/TableRowConverterImpl.java | 2 +-
.../ignite/internal/sql/engine/util/ExtendedProjectedTuple.java | 4 ++--
.../sql/engine/util/FieldDeserializingProjectedTuple.java | 2 +-
.../apache/ignite/internal/sql/engine/util/ProjectedTuple.java | 4 ++--
.../internal/sql/engine/exec/TableRowConverterSelfTest.java | 2 +-
.../internal/sql/engine/exec/rel/AbstractExecutionTest.java | 2 +-
.../ignite/internal/sql/engine/exec/rel/AsyncRootNodeTest.java | 2 +-
.../internal/sql/engine/exec/rel/ScannableTableSelfTest.java | 4 ++--
.../ignite/internal/sql/engine/exec/row/SqlRowHandlerTest.java | 2 +-
.../ignite/internal/sql/engine/framework/ArrayRowHandler.java | 2 +-
.../ignite/internal/sql/engine/util/ProjectedTupleTest.java | 2 +-
.../internal/sql/engine/util/ListToInternalSqlRowAdapter.java | 2 +-
.../java/org/apache/ignite/internal/storage/index/IndexRow.java | 2 +-
.../org/apache/ignite/internal/storage/index/IndexRowImpl.java | 2 +-
.../org/apache/ignite/internal/storage/index/IndexStorage.java | 2 +-
.../apache/ignite/internal/storage/index/SortedIndexStorage.java | 2 +-
.../internal/storage/index/ThreadAssertingIndexStorage.java | 2 +-
.../internal/storage/index/ThreadAssertingSortedIndexStorage.java | 2 +-
.../ignite/internal/storage/AbstractMvTableStorageTest.java | 2 +-
.../storage/engine/AbstractPersistentStorageEngineTest.java | 2 +-
.../ignite/internal/storage/index/AbstractIndexStorageTest.java | 2 +-
.../internal/storage/index/AbstractSortedIndexStorageTest.java | 2 +-
.../internal/storage/index/impl/AbstractTestIndexStorage.java | 2 +-
.../internal/storage/index/impl/BinaryTupleRowSerializer.java | 4 ++--
.../ignite/internal/storage/index/impl/TestHashIndexStorage.java | 2 +-
.../apache/ignite/internal/storage/index/impl/TestIndexRow.java | 4 ++--
.../internal/storage/index/impl/TestSortedIndexStorage.java | 4 ++--
.../ignite/internal/storage/pagememory/index/InlineUtils.java | 2 +-
.../storage/pagememory/index/hash/PageMemoryHashIndexStorage.java | 2 +-
.../storage/pagememory/index/hash/io/HashIndexTreeLeafIo.java | 2 +-
.../pagememory/index/sorted/PageMemorySortedIndexStorage.java | 4 ++--
.../internal/storage/pagememory/index/sorted/SortedIndexTree.java | 2 +-
.../pagememory/index/sorted/io/SortedIndexTreeInnerIo.java | 2 +-
.../storage/pagememory/index/sorted/io/SortedIndexTreeIo.java | 2 +-
.../storage/pagememory/index/sorted/io/SortedIndexTreeLeafIo.java | 2 +-
.../ignite/internal/storage/pagememory/mv/FindRowVersion.java | 2 +-
.../ignite/internal/storage/pagememory/mv/ReadRowVersion.java | 2 +-
.../storage/pagememory/VolatilePageMemoryMvTableStorageTest.java | 2 +-
.../internal/storage/pagememory/mv/WiLinkableRowVersionTest.java | 2 +-
.../ignite/internal/storage/rocksdb/PartitionDataHelper.java | 2 +-
.../storage/rocksdb/index/RocksDbBinaryTupleComparator.java | 2 +-
.../internal/storage/rocksdb/index/RocksDbHashIndexStorage.java | 2 +-
.../internal/storage/rocksdb/index/RocksDbSortedIndexStorage.java | 4 ++--
.../java/org/apache/ignite/internal/table/IndexScanCriteria.java | 4 ++--
.../apache/ignite/internal/table/distributed/HashIndexLocker.java | 2 +-
.../org/apache/ignite/internal/table/distributed/IndexLocker.java | 2 +-
.../ignite/internal/table/distributed/SortedIndexLocker.java | 4 ++--
.../internal/table/distributed/TableSchemaAwareIndexStorage.java | 2 +-
.../internal/table/distributed/index/IndexUpdateHandler.java | 2 +-
.../table/distributed/index/TableRowToIndexKeyConverter.java | 2 +-
.../internal/table/distributed/index/VersionedConverter.java | 2 +-
.../table/distributed/replicator/PartitionReplicaListener.java | 4 ++--
.../internal/table/distributed/storage/InternalTableImpl.java | 4 ++--
.../apache/ignite/internal/table/distributed/IndexBaseTest.java | 2 +-
.../ignite/internal/table/distributed/SortedIndexLockerTest.java | 2 +-
.../internal/table/distributed/index/IndexUpdateHandlerTest.java | 2 +-
.../table/distributed/raft/PartitionCommandListenerTest.java | 2 +-
.../distributed/replication/PartitionReplicaListenerTest.java | 2 +-
.../internal/table/distributed/storage/InternalTableImplTest.java | 4 ++--
.../java/org/apache/ignite/internal/table/TxAbstractTest.java | 2 +-
...nCoordinatorOnWriteIntentResolutionWhenPrimaryExpiredTest.java | 2 +-
90 files changed, 117 insertions(+), 110 deletions(-)
diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/BinaryTuple.java b/modules/binary-tuple/src/main/java/org/apache/ignite/internal/binarytuple/BinaryTuple.java
similarity index 90%
rename from modules/schema/src/main/java/org/apache/ignite/internal/schema/BinaryTuple.java
rename to modules/binary-tuple/src/main/java/org/apache/ignite/internal/binarytuple/BinaryTuple.java
index a0a4be21e34..581bf47848b 100644
--- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/BinaryTuple.java
+++ b/modules/binary-tuple/src/main/java/org/apache/ignite/internal/binarytuple/BinaryTuple.java
@@ -15,13 +15,10 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.schema;
+package org.apache.ignite.internal.binarytuple;
import java.nio.ByteBuffer;
import java.util.function.Function;
-import org.apache.ignite.internal.binarytuple.BinaryTupleBuilder;
-import org.apache.ignite.internal.binarytuple.BinaryTupleReader;
-import org.apache.ignite.internal.binarytuple.ByteBufferAccessor;
/**
* Utility for access to binary tuple elements as typed values and with schema knowledge that allows to read
diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/BinaryTuplePrefix.java b/modules/binary-tuple/src/main/java/org/apache/ignite/internal/binarytuple/BinaryTuplePrefix.java
similarity index 94%
rename from modules/schema/src/main/java/org/apache/ignite/internal/schema/BinaryTuplePrefix.java
rename to modules/binary-tuple/src/main/java/org/apache/ignite/internal/binarytuple/BinaryTuplePrefix.java
index 041d46a135a..b6169e3cb0b 100644
--- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/BinaryTuplePrefix.java
+++ b/modules/binary-tuple/src/main/java/org/apache/ignite/internal/binarytuple/BinaryTuplePrefix.java
@@ -15,22 +15,18 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.schema;
+package org.apache.ignite.internal.binarytuple;
import static org.apache.ignite.internal.binarytuple.BinaryTupleCommon.PREFIX_FLAG;
import java.nio.ByteBuffer;
-import org.apache.ignite.internal.binarytuple.BinaryTupleCommon;
-import org.apache.ignite.internal.binarytuple.BinaryTuplePrefixBuilder;
-import org.apache.ignite.internal.binarytuple.BinaryTupleReader;
-import org.apache.ignite.internal.lang.InternalTuple;
/**
* Class that represents a Binary Tuple Prefix.
*
* @see BinaryTuplePrefixBuilder BinaryTuplePrefixBuilder for information about the Binary Tuple Prefix format.
*/
-public class BinaryTuplePrefix extends BinaryTupleReader implements InternalTuple {
+public class BinaryTuplePrefix extends BinaryTupleReader {
/**
* Constructor.
diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/InternalTupleEx.java b/modules/binary-tuple/src/main/java/org/apache/ignite/internal/binarytuple/InternalTupleEx.java
similarity index 92%
rename from modules/schema/src/main/java/org/apache/ignite/internal/schema/InternalTupleEx.java
rename to modules/binary-tuple/src/main/java/org/apache/ignite/internal/binarytuple/InternalTupleEx.java
index 335524c5d46..e452c4bc0e5 100644
--- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/InternalTupleEx.java
+++ b/modules/binary-tuple/src/main/java/org/apache/ignite/internal/binarytuple/InternalTupleEx.java
@@ -15,9 +15,8 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.schema;
+package org.apache.ignite.internal.binarytuple;
-import org.apache.ignite.internal.binarytuple.BinaryTupleBuilder;
import org.apache.ignite.internal.lang.InternalTuple;
/**
diff --git a/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeInternalTable.java b/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeInternalTable.java
index 967d68e5bed..9b71eb4f2e3 100644
--- a/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeInternalTable.java
+++ b/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeInternalTable.java
@@ -41,6 +41,7 @@ import org.apache.ignite.compute.JobDescriptor;
import org.apache.ignite.compute.JobExecutionOptions;
import org.apache.ignite.compute.JobTarget;
import org.apache.ignite.deployment.DeploymentUnit;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.compute.streamer.StreamerReceiverJob;
import org.apache.ignite.internal.hlc.HybridTimestamp;
import org.apache.ignite.internal.lang.IgniteBiTuple;
@@ -51,7 +52,6 @@ import org.apache.ignite.internal.placementdriver.ReplicaMeta;
import org.apache.ignite.internal.replicator.ZonePartitionId;
import org.apache.ignite.internal.schema.BinaryRow;
import org.apache.ignite.internal.schema.BinaryRowEx;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.schema.ColumnsExtractor;
import org.apache.ignite.internal.storage.engine.MvTableStorage;
import org.apache.ignite.internal.table.IndexScanCriteria;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/lang/InternalTuple.java b/modules/core/src/main/java/org/apache/ignite/internal/lang/InternalTuple.java
index 5dfda99ab79..96eaef2b956 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/lang/InternalTuple.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/lang/InternalTuple.java
@@ -240,6 +240,10 @@ public interface InternalTuple {
/**
* Returns the representation of this tuple as a Byte Buffer.
+ *
+ * @deprecated The method must be moved to another interface. This interface is not assumed the instance must be backed by raw bytes.
+ * Also, in general, a tuple is schemaless, and schema is external here and can't be used implicitly inside the method.
*/
+ @Deprecated(forRemoval = true)
ByteBuffer byteBuffer();
}
diff --git a/modules/network-annotation-processor/src/main/resources/marshallable.blacklist b/modules/network-annotation-processor/src/main/resources/marshallable.blacklist
index 64d6b9e9313..dca5f774c7a 100644
--- a/modules/network-annotation-processor/src/main/resources/marshallable.blacklist
+++ b/modules/network-annotation-processor/src/main/resources/marshallable.blacklist
@@ -1,5 +1,5 @@
org.apache.ignite.internal.schema.BinaryRow
-org.apache.ignite.internal.schema.BinaryTuple
-org.apache.ignite.internal.schema.BinaryTuplePrefix
+org.apache.ignite.internal.binarytuple.BinaryTuple
+org.apache.ignite.internal.binarytuple.BinaryTuplePrefix
org.apache.ignite.internal.hlc.HybridTimestamp
org.apache.ignite.internal.replicator.TablePartitionId
diff --git a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/network/replication/BinaryTupleMessage.java b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/network/replication/BinaryTupleMessage.java
index a6175df76f2..18b425e0548 100644
--- a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/network/replication/BinaryTupleMessage.java
+++ b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/network/replication/BinaryTupleMessage.java
@@ -18,11 +18,11 @@
package org.apache.ignite.internal.partition.replicator.network.replication;
import java.nio.ByteBuffer;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
+import org.apache.ignite.internal.binarytuple.BinaryTuplePrefix;
import org.apache.ignite.internal.network.NetworkMessage;
import org.apache.ignite.internal.network.annotations.Transferable;
import org.apache.ignite.internal.partition.replicator.network.PartitionReplicationMessageGroup;
-import org.apache.ignite.internal.schema.BinaryTuple;
-import org.apache.ignite.internal.schema.BinaryTuplePrefix;
/**
* Message for transferring a {@link BinaryTuple} or a {@link BinaryTuplePrefix}.
diff --git a/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/ItPrimaryReplicaChoiceTest.java b/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/ItPrimaryReplicaChoiceTest.java
index 6d15570a1c3..0dd1905754a 100644
--- a/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/ItPrimaryReplicaChoiceTest.java
+++ b/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/ItPrimaryReplicaChoiceTest.java
@@ -47,6 +47,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.ignite.internal.ClusterPerTestIntegrationTest;
import org.apache.ignite.internal.TestWrappers;
import org.apache.ignite.internal.app.IgniteImpl;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.binarytuple.BinaryTupleBuilder;
import org.apache.ignite.internal.catalog.descriptors.CatalogObjectDescriptor;
import org.apache.ignite.internal.lang.IgniteStringFormatter;
@@ -58,7 +59,6 @@ import org.apache.ignite.internal.raft.service.RaftGroupService;
import org.apache.ignite.internal.replicator.ReplicaTestUtils;
import org.apache.ignite.internal.replicator.ZonePartitionId;
import org.apache.ignite.internal.schema.BinaryRow;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.storage.impl.TestMvPartitionStorage;
import org.apache.ignite.internal.storage.impl.schema.TestProfileConfigurationSchema;
import org.apache.ignite.internal.storage.index.impl.TestHashIndexStorage;
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIndexNodeTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIndexNodeTest.java
index b53c23fbd88..541be3bae91 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIndexNodeTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIndexNodeTest.java
@@ -37,14 +37,14 @@ import java.util.stream.Collectors;
import org.apache.ignite.Ignite;
import org.apache.ignite.internal.ClusterPerClassIntegrationTest;
import org.apache.ignite.internal.app.IgniteImpl;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.binarytuple.BinaryTupleBuilder;
+import org.apache.ignite.internal.binarytuple.BinaryTuplePrefix;
import org.apache.ignite.internal.binarytuple.BinaryTupleReader;
import org.apache.ignite.internal.catalog.Catalog;
import org.apache.ignite.internal.catalog.CatalogManager;
import org.apache.ignite.internal.catalog.descriptors.CatalogIndexDescriptor;
import org.apache.ignite.internal.schema.BinaryRow;
-import org.apache.ignite.internal.schema.BinaryTuple;
-import org.apache.ignite.internal.schema.BinaryTuplePrefix;
import org.apache.ignite.internal.schema.Column;
import org.apache.ignite.internal.schema.SchemaDescriptor;
import org.apache.ignite.internal.sql.SqlCommon;
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/ItTableScanTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/ItTableScanTest.java
index 5a32edb2726..a3165cc0acd 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/ItTableScanTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/ItTableScanTest.java
@@ -56,7 +56,9 @@ import java.util.stream.IntStream;
import org.apache.ignite.InitParametersBuilder;
import org.apache.ignite.internal.TestWrappers;
import org.apache.ignite.internal.app.IgniteImpl;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.binarytuple.BinaryTupleBuilder;
+import org.apache.ignite.internal.binarytuple.BinaryTuplePrefix;
import org.apache.ignite.internal.catalog.descriptors.CatalogObjectDescriptor;
import org.apache.ignite.internal.lang.IgniteStringFormatter;
import org.apache.ignite.internal.lang.RunnableX;
@@ -67,8 +69,6 @@ import org.apache.ignite.internal.placementdriver.PlacementDriver;
import org.apache.ignite.internal.placementdriver.ReplicaMeta;
import org.apache.ignite.internal.replicator.ZonePartitionId;
import org.apache.ignite.internal.schema.BinaryRow;
-import org.apache.ignite.internal.schema.BinaryTuple;
-import org.apache.ignite.internal.schema.BinaryTuplePrefix;
import org.apache.ignite.internal.schema.SchemaDescriptor;
import org.apache.ignite.internal.schema.row.Row;
import org.apache.ignite.internal.schema.row.RowAssembler;
diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/BinaryRowConverter.java b/modules/schema/src/main/java/org/apache/ignite/internal/schema/BinaryRowConverter.java
index 2cd3a4c4881..b7e27eb66a1 100644
--- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/BinaryRowConverter.java
+++ b/modules/schema/src/main/java/org/apache/ignite/internal/schema/BinaryRowConverter.java
@@ -24,6 +24,7 @@ import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.UUID;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.binarytuple.BinaryTupleBuilder;
import org.apache.ignite.internal.binarytuple.BinaryTupleFormatException;
import org.apache.ignite.internal.binarytuple.BinaryTupleParser;
diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/BinaryRowImpl.java b/modules/schema/src/main/java/org/apache/ignite/internal/schema/BinaryRowImpl.java
index 0683e8abd27..d2b7c67372c 100644
--- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/BinaryRowImpl.java
+++ b/modules/schema/src/main/java/org/apache/ignite/internal/schema/BinaryRowImpl.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.schema;
import java.nio.ByteBuffer;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
/**
* Binary row implementation that stores the schema version as a separate field.
diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/BinaryTupleComparator.java b/modules/schema/src/main/java/org/apache/ignite/internal/schema/BinaryTupleComparator.java
index 13629dba36f..90fb7c4340b 100644
--- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/BinaryTupleComparator.java
+++ b/modules/schema/src/main/java/org/apache/ignite/internal/schema/BinaryTupleComparator.java
@@ -26,6 +26,8 @@ import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.Comparator;
import java.util.List;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
+import org.apache.ignite.internal.binarytuple.BinaryTuplePrefix;
import org.apache.ignite.internal.binarytuple.BinaryTupleReader;
import org.apache.ignite.internal.catalog.descriptors.CatalogColumnCollation;
import org.apache.ignite.internal.type.NativeType;
diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/ColumnsExtractor.java b/modules/schema/src/main/java/org/apache/ignite/internal/schema/ColumnsExtractor.java
index dc5315317f5..15ae0df55bf 100644
--- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/ColumnsExtractor.java
+++ b/modules/schema/src/main/java/org/apache/ignite/internal/schema/ColumnsExtractor.java
@@ -17,6 +17,8 @@
package org.apache.ignite.internal.schema;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
+
/**
* Class for extracting a subset of columns from {@code BinaryRow}s.
*/
diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/PartialBinaryTupleMatcher.java b/modules/schema/src/main/java/org/apache/ignite/internal/schema/PartialBinaryTupleMatcher.java
index bb83a80f758..f691b833b43 100644
--- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/PartialBinaryTupleMatcher.java
+++ b/modules/schema/src/main/java/org/apache/ignite/internal/schema/PartialBinaryTupleMatcher.java
@@ -29,7 +29,9 @@ import static org.apache.ignite.internal.schema.BinaryTupleComparatorUtils.isFla
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.List;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.binarytuple.BinaryTupleParser.Readability;
+import org.apache.ignite.internal.binarytuple.BinaryTuplePrefix;
import org.apache.ignite.internal.binarytuple.BinaryTupleReader;
import org.apache.ignite.internal.catalog.descriptors.CatalogColumnCollation;
import org.apache.ignite.internal.type.NativeType;
diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/registry/UpgradingRowAdapter.java b/modules/schema/src/main/java/org/apache/ignite/internal/schema/registry/UpgradingRowAdapter.java
index 6845752f644..41995c10829 100644
--- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/registry/UpgradingRowAdapter.java
+++ b/modules/schema/src/main/java/org/apache/ignite/internal/schema/registry/UpgradingRowAdapter.java
@@ -29,9 +29,9 @@ import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.Period;
import java.util.UUID;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.binarytuple.BinaryTupleBuilder;
import org.apache.ignite.internal.schema.BinaryRowConverter;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.schema.BinaryTupleSchema;
import org.apache.ignite.internal.schema.Column;
import org.apache.ignite.internal.schema.InvalidTypeException;
diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/row/Row.java b/modules/schema/src/main/java/org/apache/ignite/internal/schema/row/Row.java
index 67e09fcdd15..c98f207a248 100644
--- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/row/Row.java
+++ b/modules/schema/src/main/java/org/apache/ignite/internal/schema/row/Row.java
@@ -19,10 +19,10 @@ package org.apache.ignite.internal.schema.row;
import java.math.BigDecimal;
import org.apache.ignite.internal.binarytuple.BinaryTupleContainer;
+import org.apache.ignite.internal.binarytuple.InternalTupleEx;
import org.apache.ignite.internal.schema.BinaryRow;
import org.apache.ignite.internal.schema.BinaryRowEx;
import org.apache.ignite.internal.schema.BinaryTupleSchema;
-import org.apache.ignite.internal.schema.InternalTupleEx;
import org.apache.ignite.internal.schema.SchemaAware;
import org.apache.ignite.internal.schema.SchemaDescriptor;
diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/row/RowImpl.java b/modules/schema/src/main/java/org/apache/ignite/internal/schema/row/RowImpl.java
index 181c256d3cc..fcd2ab8562b 100644
--- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/row/RowImpl.java
+++ b/modules/schema/src/main/java/org/apache/ignite/internal/schema/row/RowImpl.java
@@ -19,10 +19,10 @@ package org.apache.ignite.internal.schema.row;
import java.math.BigDecimal;
import java.nio.ByteBuffer;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.binarytuple.BinaryTupleBuilder;
import org.apache.ignite.internal.binarytuple.BinaryTupleReader;
import org.apache.ignite.internal.schema.BinaryRow;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.schema.BinaryTupleSchema;
import org.apache.ignite.internal.schema.Column;
import org.apache.ignite.internal.schema.SchemaDescriptor;
diff --git a/modules/schema/src/test/java/org/apache/ignite/internal/schema/BinaryRowConverterTest.java b/modules/schema/src/test/java/org/apache/ignite/internal/schema/BinaryRowConverterTest.java
index 3919406ca29..19dc07c2f41 100644
--- a/modules/schema/src/test/java/org/apache/ignite/internal/schema/BinaryRowConverterTest.java
+++ b/modules/schema/src/test/java/org/apache/ignite/internal/schema/BinaryRowConverterTest.java
@@ -25,6 +25,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import java.util.Random;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.binarytuple.BinaryTupleBuilder;
import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.type.NativeTypes;
diff --git a/modules/schema/src/test/java/org/apache/ignite/internal/schema/BinaryTuplePrefixTest.java b/modules/schema/src/test/java/org/apache/ignite/internal/schema/BinaryTuplePrefixTest.java
index ceb4a3a6922..e17c512662d 100644
--- a/modules/schema/src/test/java/org/apache/ignite/internal/schema/BinaryTuplePrefixTest.java
+++ b/modules/schema/src/test/java/org/apache/ignite/internal/schema/BinaryTuplePrefixTest.java
@@ -26,8 +26,10 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import java.nio.ByteBuffer;
import java.time.LocalDate;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.binarytuple.BinaryTupleBuilder;
import org.apache.ignite.internal.binarytuple.BinaryTupleCommon;
+import org.apache.ignite.internal.binarytuple.BinaryTuplePrefix;
import org.apache.ignite.internal.binarytuple.BinaryTuplePrefixBuilder;
import org.junit.jupiter.api.Test;
diff --git a/modules/sql-engine-api/src/main/java/org/apache/ignite/internal/sql/engine/InternalSqlRow.java b/modules/sql-engine-api/src/main/java/org/apache/ignite/internal/sql/engine/InternalSqlRow.java
index 77f1760442c..ae572ca394d 100644
--- a/modules/sql-engine-api/src/main/java/org/apache/ignite/internal/sql/engine/InternalSqlRow.java
+++ b/modules/sql-engine-api/src/main/java/org/apache/ignite/internal/sql/engine/InternalSqlRow.java
@@ -17,7 +17,7 @@
package org.apache.ignite.internal.sql.engine;
-import org.apache.ignite.internal.schema.BinaryTuple;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.jetbrains.annotations.Nullable;
/**
diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/InternalSqlRowImpl.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/InternalSqlRowImpl.java
index 5fc8bb4dc66..35c6b523e8e 100644
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/InternalSqlRowImpl.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/InternalSqlRowImpl.java
@@ -17,7 +17,7 @@
package org.apache.ignite.internal.sql.engine;
-import org.apache.ignite.internal.schema.BinaryTuple;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.sql.engine.exec.RowHandler;
import org.jetbrains.annotations.Nullable;
diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/InternalSqlRowSingleBoolean.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/InternalSqlRowSingleBoolean.java
index 82efe1e976a..01d95291be4 100644
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/InternalSqlRowSingleBoolean.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/InternalSqlRowSingleBoolean.java
@@ -17,8 +17,8 @@
package org.apache.ignite.internal.sql.engine;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.binarytuple.BinaryTupleBuilder;
-import org.apache.ignite.internal.schema.BinaryTuple;
/**
* Implementation of {@code InternalSqlRow} allowing to represent a SQL row with a single boolean column.
diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/InternalSqlRowSingleLong.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/InternalSqlRowSingleLong.java
index 3d798daf169..d8459eca1d1 100644
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/InternalSqlRowSingleLong.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/InternalSqlRowSingleLong.java
@@ -17,8 +17,8 @@
package org.apache.ignite.internal.sql.engine;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.binarytuple.BinaryTupleBuilder;
-import org.apache.ignite.internal.schema.BinaryTuple;
/**
* Implementation of {@code InternalSqlRow} allowing to represent a SQL row with a single long column.
diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/InternalSqlRowSingleString.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/InternalSqlRowSingleString.java
index 051522bc73d..d63ed67ae51 100644
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/InternalSqlRowSingleString.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/InternalSqlRowSingleString.java
@@ -18,8 +18,8 @@
package org.apache.ignite.internal.sql.engine;
import java.nio.ByteBuffer;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.binarytuple.BinaryTupleBuilder;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.jetbrains.annotations.Nullable;
/**
diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/ProjectedTableRowConverterImpl.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/ProjectedTableRowConverterImpl.java
index 7234448c56c..39e87144bba 100644
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/ProjectedTableRowConverterImpl.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/ProjectedTableRowConverterImpl.java
@@ -18,10 +18,10 @@
package org.apache.ignite.internal.sql.engine.exec;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
+import org.apache.ignite.internal.binarytuple.InternalTupleEx;
import org.apache.ignite.internal.lang.InternalTuple;
import org.apache.ignite.internal.schema.BinaryRow;
-import org.apache.ignite.internal.schema.BinaryTuple;
-import org.apache.ignite.internal.schema.InternalTupleEx;
import org.apache.ignite.internal.schema.SchemaDescriptor;
import org.apache.ignite.internal.schema.SchemaRegistry;
import org.apache.ignite.internal.sql.engine.api.expressions.RowFactory;
diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/RowHandler.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/RowHandler.java
index 59fae8e206e..d8a16754371 100644
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/RowHandler.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/RowHandler.java
@@ -18,7 +18,7 @@
package org.apache.ignite.internal.sql.engine.exec;
import java.nio.ByteBuffer;
-import org.apache.ignite.internal.schema.BinaryTuple;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.sql.engine.api.expressions.RowAccessor;
/**
diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/ScannableTableImpl.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/ScannableTableImpl.java
index 3e9605a20dd..44cb6a12946 100644
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/ScannableTableImpl.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/ScannableTableImpl.java
@@ -26,12 +26,12 @@ import static org.apache.ignite.internal.storage.index.SortedIndexStorage.LESS_O
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Flow.Publisher;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
+import org.apache.ignite.internal.binarytuple.BinaryTuplePrefix;
import org.apache.ignite.internal.hlc.HybridTimestamp;
import org.apache.ignite.internal.replicator.ZonePartitionId;
import org.apache.ignite.internal.schema.BinaryRow;
import org.apache.ignite.internal.schema.BinaryRowEx;
-import org.apache.ignite.internal.schema.BinaryTuple;
-import org.apache.ignite.internal.schema.BinaryTuplePrefix;
import org.apache.ignite.internal.sql.engine.api.expressions.RowFactory;
import org.apache.ignite.internal.sql.engine.exec.exp.RangeCondition;
import org.apache.ignite.internal.table.IndexScanCriteria;
diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/SqlRowHandler.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/SqlRowHandler.java
index aac8ff4588f..3cad52c7550 100644
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/SqlRowHandler.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/SqlRowHandler.java
@@ -30,10 +30,10 @@ import java.time.LocalTime;
import java.time.Period;
import java.util.UUID;
import org.apache.calcite.avatica.util.ByteString;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.binarytuple.BinaryTupleBuilder;
import org.apache.ignite.internal.lang.IgniteStringBuilder;
import org.apache.ignite.internal.lang.InternalTuple;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.sql.engine.api.expressions.RowFactory;
import org.apache.ignite.internal.sql.engine.api.expressions.RowFactory.RowBuilder;
import org.apache.ignite.internal.sql.engine.api.expressions.RowFactoryFactory;
diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/TableRowConverterImpl.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/TableRowConverterImpl.java
index 01a9676ba94..9d92adb3c12 100644
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/TableRowConverterImpl.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/TableRowConverterImpl.java
@@ -17,10 +17,10 @@
package org.apache.ignite.internal.sql.engine.exec;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.lang.InternalTuple;
import org.apache.ignite.internal.schema.BinaryRow;
import org.apache.ignite.internal.schema.BinaryRowEx;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.schema.SchemaDescriptor;
import org.apache.ignite.internal.schema.SchemaRegistry;
import org.apache.ignite.internal.sql.engine.api.expressions.RowFactory;
diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/util/ExtendedProjectedTuple.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/util/ExtendedProjectedTuple.java
index 8d3d96f5c90..db3a3a13ea9 100644
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/util/ExtendedProjectedTuple.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/util/ExtendedProjectedTuple.java
@@ -25,11 +25,11 @@ import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.UUID;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.binarytuple.BinaryTupleBuilder;
import org.apache.ignite.internal.binarytuple.BinaryTupleParser.Sink;
+import org.apache.ignite.internal.binarytuple.InternalTupleEx;
import org.apache.ignite.internal.schema.BinaryRowConverter;
-import org.apache.ignite.internal.schema.BinaryTuple;
-import org.apache.ignite.internal.schema.InternalTupleEx;
import org.apache.ignite.internal.sql.engine.exec.VirtualColumn;
/**
diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/util/FieldDeserializingProjectedTuple.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/util/FieldDeserializingProjectedTuple.java
index 115858f6c24..3b60143b166 100644
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/util/FieldDeserializingProjectedTuple.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/util/FieldDeserializingProjectedTuple.java
@@ -17,10 +17,10 @@
package org.apache.ignite.internal.sql.engine.util;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.binarytuple.BinaryTupleBuilder;
import org.apache.ignite.internal.lang.InternalTuple;
import org.apache.ignite.internal.schema.BinaryRowConverter;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.schema.BinaryTupleSchema;
import org.apache.ignite.internal.schema.BinaryTupleSchema.Element;
diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/util/ProjectedTuple.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/util/ProjectedTuple.java
index 67e38bd09c7..6fc13f07e02 100644
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/util/ProjectedTuple.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/util/ProjectedTuple.java
@@ -17,10 +17,10 @@
package org.apache.ignite.internal.sql.engine.util;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.binarytuple.BinaryTupleBuilder;
import org.apache.ignite.internal.binarytuple.BinaryTupleParser.Sink;
-import org.apache.ignite.internal.schema.BinaryTuple;
-import org.apache.ignite.internal.schema.InternalTupleEx;
+import org.apache.ignite.internal.binarytuple.InternalTupleEx;
/**
* A projected tuple wrapper that is best effort to avoiding unnecessary (de-)serialization during tuple normalization.
diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/TableRowConverterSelfTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/TableRowConverterSelfTest.java
index 7ccbe58a4fb..40554a7e70e 100644
--- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/TableRowConverterSelfTest.java
+++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/TableRowConverterSelfTest.java
@@ -26,12 +26,12 @@ import java.nio.ByteBuffer;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.binarytuple.BinaryTupleBuilder;
import org.apache.ignite.internal.binarytuple.BinaryTupleReader;
import org.apache.ignite.internal.schema.BinaryRow;
import org.apache.ignite.internal.schema.BinaryRowEx;
import org.apache.ignite.internal.schema.BinaryRowImpl;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.schema.Column;
import org.apache.ignite.internal.schema.SchemaDescriptor;
import org.apache.ignite.internal.schema.SchemaRegistry;
diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/rel/AbstractExecutionTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/rel/AbstractExecutionTest.java
index 3c95ef4bfa0..9f23d8e02ec 100644
--- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/rel/AbstractExecutionTest.java
+++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/rel/AbstractExecutionTest.java
@@ -43,6 +43,7 @@ import java.util.stream.Stream;
import org.apache.calcite.rel.core.JoinRelType;
import org.apache.calcite.rel.type.RelDataType;
import org.apache.calcite.rel.type.RelDataTypeField;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.binarytuple.BinaryTupleBuilder;
import org.apache.ignite.internal.failure.FailureManager;
import org.apache.ignite.internal.failure.handlers.NoOpFailureHandler;
@@ -51,7 +52,6 @@ import org.apache.ignite.internal.metrics.NoOpMetricManager;
import org.apache.ignite.internal.network.ClusterNodeImpl;
import org.apache.ignite.internal.network.InternalClusterNode;
import org.apache.ignite.internal.schema.BinaryRowConverter;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.schema.BinaryTupleSchema;
import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.sql.engine.api.expressions.RowFactoryFactory;
diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/rel/AsyncRootNodeTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/rel/AsyncRootNodeTest.java
index d4e1adc4d5a..9bf8adcbf6a 100644
--- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/rel/AsyncRootNodeTest.java
+++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/rel/AsyncRootNodeTest.java
@@ -35,9 +35,9 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Function;
import java.util.stream.IntStream;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.binarytuple.BinaryTupleBuilder;
import org.apache.ignite.internal.lang.InternalTuple;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.schema.BinaryTupleSchema;
import org.apache.ignite.internal.schema.BinaryTupleSchema.Element;
import org.apache.ignite.internal.sql.engine.api.expressions.RowFactory;
diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/rel/ScannableTableSelfTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/rel/ScannableTableSelfTest.java
index 7b33c59ac0b..420d3aad04e 100644
--- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/rel/ScannableTableSelfTest.java
+++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/rel/ScannableTableSelfTest.java
@@ -56,11 +56,11 @@ import org.apache.calcite.rel.type.RelDataTypeFactory.Builder;
import org.apache.calcite.rel.type.RelDataTypeField;
import org.apache.calcite.sql.type.SqlTypeName;
import org.apache.calcite.util.ImmutableIntList;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
+import org.apache.ignite.internal.binarytuple.BinaryTuplePrefix;
import org.apache.ignite.internal.network.InternalClusterNode;
import org.apache.ignite.internal.schema.BinaryRow;
import org.apache.ignite.internal.schema.BinaryRowEx;
-import org.apache.ignite.internal.schema.BinaryTuple;
-import org.apache.ignite.internal.schema.BinaryTuplePrefix;
import org.apache.ignite.internal.sql.engine.api.expressions.RowFactory;
import org.apache.ignite.internal.sql.engine.exec.ExecutionContext;
import org.apache.ignite.internal.sql.engine.exec.PartitionWithConsistencyToken;
diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/row/SqlRowHandlerTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/row/SqlRowHandlerTest.java
index eb1be21cdab..1d142e0a711 100644
--- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/row/SqlRowHandlerTest.java
+++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/row/SqlRowHandlerTest.java
@@ -34,7 +34,7 @@ import java.util.List;
import java.util.Random;
import java.util.Set;
import java.util.concurrent.ThreadLocalRandom;
-import org.apache.ignite.internal.schema.BinaryTuple;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.sql.engine.api.expressions.RowFactory;
import org.apache.ignite.internal.sql.engine.api.expressions.RowFactory.RowBuilder;
import org.apache.ignite.internal.sql.engine.exec.SqlRowHandler;
diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/ArrayRowHandler.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/ArrayRowHandler.java
index 632824c7a02..05f2c2b738e 100644
--- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/ArrayRowHandler.java
+++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/ArrayRowHandler.java
@@ -26,9 +26,9 @@ import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.Arrays;
import java.util.UUID;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.binarytuple.BinaryTupleBuilder;
import org.apache.ignite.internal.lang.InternalTuple;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.schema.InvalidTypeException;
import org.apache.ignite.internal.sql.engine.api.expressions.RowFactory;
import org.apache.ignite.internal.sql.engine.api.expressions.RowFactory.RowBuilder;
diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/util/ProjectedTupleTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/util/ProjectedTupleTest.java
index fe8ce210614..4b8e708aa91 100644
--- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/util/ProjectedTupleTest.java
+++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/util/ProjectedTupleTest.java
@@ -30,12 +30,12 @@ import java.util.Random;
import java.util.concurrent.ThreadLocalRandom;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.binarytuple.BinaryTupleBuilder;
import org.apache.ignite.internal.lang.InternalTuple;
import org.apache.ignite.internal.logger.IgniteLogger;
import org.apache.ignite.internal.logger.Loggers;
import org.apache.ignite.internal.schema.BinaryRowConverter;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.schema.BinaryTupleSchema;
import org.apache.ignite.internal.schema.BinaryTupleSchema.Element;
import org.apache.ignite.internal.schema.SchemaTestUtils;
diff --git a/modules/sql-engine/src/testFixtures/java/org/apache/ignite/internal/sql/engine/util/ListToInternalSqlRowAdapter.java b/modules/sql-engine/src/testFixtures/java/org/apache/ignite/internal/sql/engine/util/ListToInternalSqlRowAdapter.java
index 7efd4e86ec6..87dff2ccc35 100644
--- a/modules/sql-engine/src/testFixtures/java/org/apache/ignite/internal/sql/engine/util/ListToInternalSqlRowAdapter.java
+++ b/modules/sql-engine/src/testFixtures/java/org/apache/ignite/internal/sql/engine/util/ListToInternalSqlRowAdapter.java
@@ -26,8 +26,8 @@ import java.time.LocalTime;
import java.time.Period;
import java.util.List;
import java.util.UUID;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.binarytuple.BinaryTupleBuilder;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.sql.engine.InternalSqlRow;
import org.jetbrains.annotations.Nullable;
diff --git a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/IndexRow.java b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/IndexRow.java
index cc440307433..b41ef17b325 100644
--- a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/IndexRow.java
+++ b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/IndexRow.java
@@ -17,7 +17,7 @@
package org.apache.ignite.internal.storage.index;
-import org.apache.ignite.internal.schema.BinaryTuple;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.storage.MvPartitionStorage;
import org.apache.ignite.internal.storage.RowId;
diff --git a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/IndexRowImpl.java b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/IndexRowImpl.java
index aeeccd9dcc1..16485e05436 100644
--- a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/IndexRowImpl.java
+++ b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/IndexRowImpl.java
@@ -17,7 +17,7 @@
package org.apache.ignite.internal.storage.index;
-import org.apache.ignite.internal.schema.BinaryTuple;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.storage.RowId;
/**
diff --git a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/IndexStorage.java b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/IndexStorage.java
index 24cf73edf9a..a4efa9aeef5 100644
--- a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/IndexStorage.java
+++ b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/IndexStorage.java
@@ -17,7 +17,7 @@
package org.apache.ignite.internal.storage.index;
-import org.apache.ignite.internal.schema.BinaryTuple;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.storage.MvPartitionStorage;
import org.apache.ignite.internal.storage.RowId;
import org.apache.ignite.internal.storage.StorageException;
diff --git a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/SortedIndexStorage.java b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/SortedIndexStorage.java
index 86057b59841..7f16680d77a 100644
--- a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/SortedIndexStorage.java
+++ b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/SortedIndexStorage.java
@@ -17,7 +17,7 @@
package org.apache.ignite.internal.storage.index;
-import org.apache.ignite.internal.schema.BinaryTuplePrefix;
+import org.apache.ignite.internal.binarytuple.BinaryTuplePrefix;
import org.apache.ignite.internal.storage.RowId;
import org.apache.ignite.internal.storage.StorageException;
import org.apache.ignite.internal.util.Cursor;
diff --git a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/ThreadAssertingIndexStorage.java b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/ThreadAssertingIndexStorage.java
index 1b8c9a97ff2..e99f42f60b6 100644
--- a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/ThreadAssertingIndexStorage.java
+++ b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/ThreadAssertingIndexStorage.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.storage.index;
import static org.apache.ignite.internal.worker.ThreadAssertions.assertThreadAllowsToRead;
import static org.apache.ignite.internal.worker.ThreadAssertions.assertThreadAllowsToWrite;
-import org.apache.ignite.internal.schema.BinaryTuple;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.storage.RowId;
import org.apache.ignite.internal.storage.StorageException;
import org.apache.ignite.internal.util.Cursor;
diff --git a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/ThreadAssertingSortedIndexStorage.java b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/ThreadAssertingSortedIndexStorage.java
index 556579c71e5..ebfb21ed61d 100644
--- a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/ThreadAssertingSortedIndexStorage.java
+++ b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/ThreadAssertingSortedIndexStorage.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.storage.index;
import static org.apache.ignite.internal.worker.ThreadAssertions.assertThreadAllowsToRead;
-import org.apache.ignite.internal.schema.BinaryTuplePrefix;
+import org.apache.ignite.internal.binarytuple.BinaryTuplePrefix;
import org.apache.ignite.internal.util.Cursor;
import org.apache.ignite.internal.worker.ThreadAssertingCursor;
import org.apache.ignite.internal.worker.ThreadAssertions;
diff --git a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/AbstractMvTableStorageTest.java b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/AbstractMvTableStorageTest.java
index 26937ec879f..d2b6146135d 100644
--- a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/AbstractMvTableStorageTest.java
+++ b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/AbstractMvTableStorageTest.java
@@ -59,6 +59,7 @@ import java.util.Random;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.stream.IntStream;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.binarytuple.BinaryTupleBuilder;
import org.apache.ignite.internal.catalog.descriptors.CatalogHashIndexDescriptor;
import org.apache.ignite.internal.catalog.descriptors.CatalogIndexColumnDescriptor;
@@ -66,7 +67,6 @@ import org.apache.ignite.internal.catalog.descriptors.CatalogSortedIndexDescript
import org.apache.ignite.internal.catalog.descriptors.CatalogTableDescriptor;
import org.apache.ignite.internal.hlc.HybridTimestamp;
import org.apache.ignite.internal.schema.BinaryRow;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.schema.BinaryTupleSchema;
import org.apache.ignite.internal.schema.BinaryTupleSchema.Element;
import org.apache.ignite.internal.storage.engine.MvPartitionMeta;
diff --git a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/engine/AbstractPersistentStorageEngineTest.java b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/engine/AbstractPersistentStorageEngineTest.java
index 6611c861181..664024d156e 100644
--- a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/engine/AbstractPersistentStorageEngineTest.java
+++ b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/engine/AbstractPersistentStorageEngineTest.java
@@ -42,8 +42,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.stream.IntStream;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.binarytuple.BinaryTupleBuilder;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.schema.BinaryTupleSchema;
import org.apache.ignite.internal.schema.BinaryTupleSchema.Element;
import org.apache.ignite.internal.storage.AbstractMvTableStorageTest;
diff --git a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/AbstractIndexStorageTest.java b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/AbstractIndexStorageTest.java
index 439ede71095..6aab771d8e4 100644
--- a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/AbstractIndexStorageTest.java
+++ b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/AbstractIndexStorageTest.java
@@ -47,6 +47,7 @@ import java.util.List;
import java.util.Random;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Stream;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.catalog.Catalog;
import org.apache.ignite.internal.catalog.CatalogService;
import org.apache.ignite.internal.catalog.commands.CatalogUtils;
@@ -57,7 +58,6 @@ import org.apache.ignite.internal.catalog.descriptors.CatalogTableColumnDescript
import org.apache.ignite.internal.catalog.descriptors.CatalogTableDescriptor;
import org.apache.ignite.internal.hlc.HybridClock;
import org.apache.ignite.internal.hlc.HybridClockImpl;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.storage.MvPartitionStorage;
import org.apache.ignite.internal.storage.RowId;
diff --git a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/AbstractSortedIndexStorageTest.java b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/AbstractSortedIndexStorageTest.java
index 8c5ddcc0095..06ca02659de 100644
--- a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/AbstractSortedIndexStorageTest.java
+++ b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/AbstractSortedIndexStorageTest.java
@@ -57,13 +57,13 @@ import java.util.function.Function;
import java.util.function.Predicate;
import java.util.stream.IntStream;
import java.util.stream.Stream;
+import org.apache.ignite.internal.binarytuple.BinaryTuplePrefix;
import org.apache.ignite.internal.catalog.commands.ColumnParams;
import org.apache.ignite.internal.catalog.descriptors.CatalogIndexColumnDescriptor;
import org.apache.ignite.internal.catalog.descriptors.CatalogSortedIndexDescriptor;
import org.apache.ignite.internal.catalog.descriptors.CatalogTableDescriptor;
import org.apache.ignite.internal.logger.IgniteLogger;
import org.apache.ignite.internal.logger.Loggers;
-import org.apache.ignite.internal.schema.BinaryTuplePrefix;
import org.apache.ignite.internal.schema.SchemaTestUtils;
import org.apache.ignite.internal.storage.RowId;
import org.apache.ignite.internal.storage.index.StorageSortedIndexDescriptor.StorageSortedIndexColumnDescriptor;
diff --git a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/impl/AbstractTestIndexStorage.java b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/impl/AbstractTestIndexStorage.java
index 4ef746c9ed1..65201c15ec5 100644
--- a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/impl/AbstractTestIndexStorage.java
+++ b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/impl/AbstractTestIndexStorage.java
@@ -19,8 +19,8 @@ package org.apache.ignite.internal.storage.index.impl;
import java.util.Iterator;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.lang.IgniteStringFormatter;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.storage.RowId;
import org.apache.ignite.internal.storage.StorageDestroyedException;
import org.apache.ignite.internal.storage.StorageRebalanceException;
diff --git a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/impl/BinaryTupleRowSerializer.java b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/impl/BinaryTupleRowSerializer.java
index b4d1f9d927d..5ac8bee98da 100644
--- a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/impl/BinaryTupleRowSerializer.java
+++ b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/impl/BinaryTupleRowSerializer.java
@@ -20,11 +20,11 @@ package org.apache.ignite.internal.storage.index.impl;
import static java.util.stream.Collectors.toUnmodifiableList;
import java.util.List;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.binarytuple.BinaryTupleBuilder;
+import org.apache.ignite.internal.binarytuple.BinaryTuplePrefix;
import org.apache.ignite.internal.binarytuple.BinaryTuplePrefixBuilder;
import org.apache.ignite.internal.schema.BinaryRowConverter;
-import org.apache.ignite.internal.schema.BinaryTuple;
-import org.apache.ignite.internal.schema.BinaryTuplePrefix;
import org.apache.ignite.internal.schema.BinaryTupleSchema;
import org.apache.ignite.internal.schema.BinaryTupleSchema.Element;
import org.apache.ignite.internal.storage.RowId;
diff --git a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/impl/TestHashIndexStorage.java b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/impl/TestHashIndexStorage.java
index 7b503ab25ce..2a80031a372 100644
--- a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/impl/TestHashIndexStorage.java
+++ b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/impl/TestHashIndexStorage.java
@@ -27,7 +27,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ConcurrentSkipListSet;
import java.util.stream.Collectors;
-import org.apache.ignite.internal.schema.BinaryTuple;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.storage.RowId;
import org.apache.ignite.internal.storage.index.HashIndexStorage;
import org.apache.ignite.internal.storage.index.IndexRow;
diff --git a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/impl/TestIndexRow.java b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/impl/TestIndexRow.java
index 609db3d1398..c79f9278ca7 100644
--- a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/impl/TestIndexRow.java
+++ b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/impl/TestIndexRow.java
@@ -27,8 +27,8 @@ import java.util.Comparator;
import java.util.concurrent.ThreadLocalRandom;
import java.util.function.Function;
import java.util.stream.IntStream;
-import org.apache.ignite.internal.schema.BinaryTuple;
-import org.apache.ignite.internal.schema.BinaryTuplePrefix;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
+import org.apache.ignite.internal.binarytuple.BinaryTuplePrefix;
import org.apache.ignite.internal.schema.SchemaTestUtils;
import org.apache.ignite.internal.storage.RowId;
import org.apache.ignite.internal.storage.index.IndexRow;
diff --git a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/impl/TestSortedIndexStorage.java b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/impl/TestSortedIndexStorage.java
index d375bc9ee7b..159b2c9383e 100644
--- a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/impl/TestSortedIndexStorage.java
+++ b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/impl/TestSortedIndexStorage.java
@@ -29,10 +29,10 @@ import java.util.NoSuchElementException;
import java.util.Set;
import java.util.concurrent.ConcurrentSkipListSet;
import java.util.stream.Collectors;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.binarytuple.BinaryTupleCommon;
-import org.apache.ignite.internal.schema.BinaryTuple;
+import org.apache.ignite.internal.binarytuple.BinaryTuplePrefix;
import org.apache.ignite.internal.schema.BinaryTupleComparator;
-import org.apache.ignite.internal.schema.BinaryTuplePrefix;
import org.apache.ignite.internal.storage.RowId;
import org.apache.ignite.internal.storage.index.IndexRow;
import org.apache.ignite.internal.storage.index.IndexRowImpl;
diff --git a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/InlineUtils.java b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/InlineUtils.java
index d91767d8e89..d6df589b09c 100644
--- a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/InlineUtils.java
+++ b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/InlineUtils.java
@@ -24,12 +24,12 @@ import static org.apache.ignite.internal.util.Constants.KiB;
import java.math.BigDecimal;
import java.util.List;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.binarytuple.BinaryTupleCommon;
import org.apache.ignite.internal.pagememory.freelist.FreeList;
import org.apache.ignite.internal.pagememory.tree.BplusTree;
import org.apache.ignite.internal.pagememory.tree.io.BplusInnerIo;
import org.apache.ignite.internal.pagememory.tree.io.BplusLeafIo;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.storage.index.StorageIndexDescriptor;
import org.apache.ignite.internal.storage.index.StorageIndexDescriptor.StorageColumnDescriptor;
import org.apache.ignite.internal.type.NativeType;
diff --git a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/hash/PageMemoryHashIndexStorage.java b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/hash/PageMemoryHashIndexStorage.java
index da3d4ba5072..69d0662dc6e 100644
--- a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/hash/PageMemoryHashIndexStorage.java
+++ b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/hash/PageMemoryHashIndexStorage.java
@@ -19,11 +19,11 @@ package org.apache.ignite.internal.storage.pagememory.index.hash;
import static org.apache.ignite.internal.storage.util.StorageUtils.throwExceptionIfStorageInProgressOfRebalance;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.lang.IgniteInternalCheckedException;
import org.apache.ignite.internal.pagememory.freelist.FreeListImpl;
import org.apache.ignite.internal.pagememory.util.GradualTask;
import org.apache.ignite.internal.pagememory.util.PageIdUtils;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.storage.RowId;
import org.apache.ignite.internal.storage.StorageException;
import org.apache.ignite.internal.storage.index.HashIndexStorage;
diff --git a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/hash/io/HashIndexTreeLeafIo.java b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/hash/io/HashIndexTreeLeafIo.java
index 3c19fac2266..01b6312624b 100644
--- a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/hash/io/HashIndexTreeLeafIo.java
+++ b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/hash/io/HashIndexTreeLeafIo.java
@@ -24,13 +24,13 @@ import static org.apache.ignite.internal.storage.pagememory.index.InlineUtils.MA
import java.util.List;
import java.util.function.Consumer;
import java.util.stream.IntStream;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.lang.IgniteInternalCheckedException;
import org.apache.ignite.internal.lang.IgniteInternalException;
import org.apache.ignite.internal.pagememory.io.IoVersions;
import org.apache.ignite.internal.pagememory.tree.BplusTree;
import org.apache.ignite.internal.pagememory.tree.io.BplusIo;
import org.apache.ignite.internal.pagememory.tree.io.BplusLeafIo;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.storage.pagememory.index.InlineUtils;
import org.apache.ignite.internal.storage.pagememory.index.hash.HashIndexRow;
import org.apache.ignite.internal.storage.pagememory.index.hash.HashIndexRowKey;
diff --git a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/sorted/PageMemorySortedIndexStorage.java b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/sorted/PageMemorySortedIndexStorage.java
index d34f63a2f71..d3c3d2c3c64 100644
--- a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/sorted/PageMemorySortedIndexStorage.java
+++ b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/sorted/PageMemorySortedIndexStorage.java
@@ -22,13 +22,13 @@ import static org.apache.ignite.internal.storage.util.StorageUtils.throwExceptio
import java.nio.ByteBuffer;
import java.util.Comparator;
import java.util.Objects;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.binarytuple.BinaryTupleCommon;
+import org.apache.ignite.internal.binarytuple.BinaryTuplePrefix;
import org.apache.ignite.internal.lang.IgniteInternalCheckedException;
import org.apache.ignite.internal.pagememory.freelist.FreeListImpl;
import org.apache.ignite.internal.pagememory.util.GradualTask;
import org.apache.ignite.internal.pagememory.util.PageIdUtils;
-import org.apache.ignite.internal.schema.BinaryTuple;
-import org.apache.ignite.internal.schema.BinaryTuplePrefix;
import org.apache.ignite.internal.storage.RowId;
import org.apache.ignite.internal.storage.StorageException;
import org.apache.ignite.internal.storage.index.IndexRow;
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 739532c10d1..3c6087d6e33 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
@@ -21,13 +21,13 @@ import static org.apache.ignite.internal.storage.pagememory.index.InlineUtils.bi
import static org.apache.ignite.internal.storage.pagememory.index.sorted.io.SortedIndexTreeIo.ITEM_SIZE_WITHOUT_COLUMNS;
import java.util.concurrent.atomic.AtomicLong;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.lang.IgniteInternalCheckedException;
import org.apache.ignite.internal.pagememory.PageMemory;
import org.apache.ignite.internal.pagememory.datapage.DataPageReader;
import org.apache.ignite.internal.pagememory.reuse.ReuseList;
import org.apache.ignite.internal.pagememory.tree.BplusTree;
import org.apache.ignite.internal.pagememory.tree.io.BplusIo;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.schema.BinaryTupleComparator;
import org.apache.ignite.internal.schema.PartialBinaryTupleMatcher;
import org.apache.ignite.internal.storage.index.StorageSortedIndexDescriptor;
diff --git a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/sorted/io/SortedIndexTreeInnerIo.java b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/sorted/io/SortedIndexTreeInnerIo.java
index 81898e2d119..ff5743d7273 100644
--- a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/sorted/io/SortedIndexTreeInnerIo.java
+++ b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/sorted/io/SortedIndexTreeInnerIo.java
@@ -23,12 +23,12 @@ import static org.apache.ignite.internal.storage.pagememory.index.InlineUtils.MA
import java.util.List;
import java.util.stream.IntStream;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.lang.IgniteInternalCheckedException;
import org.apache.ignite.internal.pagememory.io.IoVersions;
import org.apache.ignite.internal.pagememory.tree.BplusTree;
import org.apache.ignite.internal.pagememory.tree.io.BplusInnerIo;
import org.apache.ignite.internal.pagememory.tree.io.BplusIo;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.storage.pagememory.index.InlineUtils;
import org.apache.ignite.internal.storage.pagememory.index.sorted.SortedIndexRowKey;
import org.apache.ignite.internal.storage.pagememory.index.sorted.SortedIndexTree;
diff --git a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/sorted/io/SortedIndexTreeIo.java b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/sorted/io/SortedIndexTreeIo.java
index 57af57a7188..289ee73bf5b 100644
--- a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/sorted/io/SortedIndexTreeIo.java
+++ b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/sorted/io/SortedIndexTreeIo.java
@@ -34,11 +34,11 @@ import static org.apache.ignite.internal.util.GridUnsafe.wrapPointer;
import java.nio.ByteBuffer;
import java.util.Comparator;
import java.util.UUID;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.lang.IgniteInternalCheckedException;
import org.apache.ignite.internal.pagememory.datapage.DataPageReader;
import org.apache.ignite.internal.pagememory.tree.io.BplusIo;
import org.apache.ignite.internal.pagememory.util.PageUtils;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.schema.PartialBinaryTupleMatcher;
import org.apache.ignite.internal.schema.UnsafeByteBufferAccessor;
import org.apache.ignite.internal.storage.RowId;
diff --git a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/sorted/io/SortedIndexTreeLeafIo.java b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/sorted/io/SortedIndexTreeLeafIo.java
index 1ff6c28942a..a7a075836f1 100644
--- a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/sorted/io/SortedIndexTreeLeafIo.java
+++ b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/sorted/io/SortedIndexTreeLeafIo.java
@@ -24,13 +24,13 @@ import static org.apache.ignite.internal.storage.pagememory.index.InlineUtils.MA
import java.util.List;
import java.util.function.Consumer;
import java.util.stream.IntStream;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.lang.IgniteInternalCheckedException;
import org.apache.ignite.internal.lang.IgniteInternalException;
import org.apache.ignite.internal.pagememory.io.IoVersions;
import org.apache.ignite.internal.pagememory.tree.BplusTree;
import org.apache.ignite.internal.pagememory.tree.io.BplusIo;
import org.apache.ignite.internal.pagememory.tree.io.BplusLeafIo;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.storage.pagememory.index.InlineUtils;
import org.apache.ignite.internal.storage.pagememory.index.sorted.SortedIndexRow;
import org.apache.ignite.internal.storage.pagememory.index.sorted.SortedIndexRowKey;
diff --git a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/FindRowVersion.java b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/FindRowVersion.java
index 032b6abde04..724b48d8bcd 100644
--- a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/FindRowVersion.java
+++ b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/FindRowVersion.java
@@ -22,6 +22,7 @@ import static org.apache.ignite.internal.pagememory.util.PartitionlessLinks.read
import java.nio.ByteBuffer;
import java.util.Objects;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.hlc.HybridTimestamp;
import org.apache.ignite.internal.pagememory.Storable;
import org.apache.ignite.internal.pagememory.datapage.PageMemoryTraversal;
@@ -29,7 +30,6 @@ import org.apache.ignite.internal.pagememory.io.DataPagePayload;
import org.apache.ignite.internal.pagememory.util.PageUtils;
import org.apache.ignite.internal.schema.BinaryRow;
import org.apache.ignite.internal.schema.BinaryRowImpl;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.storage.pagememory.mv.FindRowVersion.RowVersionFilter;
import org.jetbrains.annotations.Nullable;
diff --git a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/ReadRowVersion.java b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/ReadRowVersion.java
index 33f9c1ca554..5306113c29d 100644
--- a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/ReadRowVersion.java
+++ b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/ReadRowVersion.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.storage.pagememory.mv;
import java.nio.ByteBuffer;
import java.util.function.Predicate;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.hlc.HybridTimestamp;
import org.apache.ignite.internal.pagememory.Storable;
import org.apache.ignite.internal.pagememory.datapage.PageMemoryTraversal;
@@ -26,7 +27,6 @@ import org.apache.ignite.internal.pagememory.io.DataPagePayload;
import org.apache.ignite.internal.pagememory.util.PageUtils;
import org.apache.ignite.internal.schema.BinaryRow;
import org.apache.ignite.internal.schema.BinaryRowImpl;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.jetbrains.annotations.Nullable;
/**
diff --git a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/VolatilePageMemoryMvTableStorageTest.java b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/VolatilePageMemoryMvTableStorageTest.java
index 64b388d6f30..9c5620c2bbb 100644
--- a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/VolatilePageMemoryMvTableStorageTest.java
+++ b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/VolatilePageMemoryMvTableStorageTest.java
@@ -27,6 +27,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import java.nio.ByteBuffer;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.binarytuple.BinaryTupleBuilder;
import org.apache.ignite.internal.configuration.SystemLocalConfiguration;
import org.apache.ignite.internal.configuration.testframework.InjectConfiguration;
@@ -34,7 +35,6 @@ import org.apache.ignite.internal.failure.FailureProcessor;
import org.apache.ignite.internal.lang.IgniteInternalCheckedException;
import org.apache.ignite.internal.pagememory.io.PageIoRegistry;
import org.apache.ignite.internal.schema.BinaryRow;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.schema.BinaryTupleSchema;
import org.apache.ignite.internal.schema.BinaryTupleSchema.Element;
import org.apache.ignite.internal.storage.AbstractMvTableStorageTest;
diff --git a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/WiLinkableRowVersionTest.java b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/WiLinkableRowVersionTest.java
index e9e2d82f11e..2e565db6117 100644
--- a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/WiLinkableRowVersionTest.java
+++ b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/WiLinkableRowVersionTest.java
@@ -25,9 +25,9 @@ import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
import java.nio.ByteBuffer;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.hlc.HybridTimestamp;
import org.apache.ignite.internal.pagememory.io.DataPagePayload;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.storage.RowId;
import org.apache.ignite.internal.util.GridUnsafe;
import org.junit.jupiter.api.Test;
diff --git a/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/PartitionDataHelper.java b/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/PartitionDataHelper.java
index 9beeaf560d8..0097962e8c4 100644
--- a/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/PartitionDataHelper.java
+++ b/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/PartitionDataHelper.java
@@ -30,12 +30,12 @@ import static org.apache.ignite.internal.storage.rocksdb.RocksDbStorageUtils.put
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.close.ManuallyCloseable;
import org.apache.ignite.internal.hlc.HybridTimestamp;
import org.apache.ignite.internal.rocksdb.RocksUtils;
import org.apache.ignite.internal.schema.BinaryRow;
import org.apache.ignite.internal.schema.BinaryRowImpl;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.storage.MvPartitionStorage;
import org.apache.ignite.internal.storage.MvPartitionStorage.WriteClosure;
import org.apache.ignite.internal.storage.RowId;
diff --git a/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/index/RocksDbBinaryTupleComparator.java b/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/index/RocksDbBinaryTupleComparator.java
index a70162fccd7..605595d487d 100644
--- a/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/index/RocksDbBinaryTupleComparator.java
+++ b/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/index/RocksDbBinaryTupleComparator.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.storage.rocksdb.index;
import java.nio.ByteBuffer;
import java.util.Comparator;
import java.util.List;
-import org.apache.ignite.internal.schema.BinaryTuple;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.storage.index.StorageSortedIndexDescriptor.StorageSortedIndexColumnDescriptor;
import org.apache.ignite.internal.storage.util.StorageUtils;
import org.rocksdb.AbstractComparator;
diff --git a/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/index/RocksDbHashIndexStorage.java b/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/index/RocksDbHashIndexStorage.java
index b2fddb38103..4d89b2ff06e 100644
--- a/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/index/RocksDbHashIndexStorage.java
+++ b/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/index/RocksDbHashIndexStorage.java
@@ -25,8 +25,8 @@ import static org.apache.ignite.internal.storage.util.StorageUtils.throwExceptio
import static org.apache.ignite.internal.util.ArrayUtils.BYTE_EMPTY_ARRAY;
import java.nio.ByteBuffer;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.rocksdb.ColumnFamily;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.storage.RowId;
import org.apache.ignite.internal.storage.index.HashIndexStorage;
import org.apache.ignite.internal.storage.index.IndexRow;
diff --git a/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/index/RocksDbSortedIndexStorage.java b/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/index/RocksDbSortedIndexStorage.java
index a7820a317ef..d50857221a7 100644
--- a/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/index/RocksDbSortedIndexStorage.java
+++ b/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/index/RocksDbSortedIndexStorage.java
@@ -28,10 +28,10 @@ import static org.apache.ignite.internal.util.IgniteUtils.closeAll;
import java.nio.ByteBuffer;
import java.util.NoSuchElementException;
import java.util.function.Function;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.binarytuple.BinaryTupleCommon;
+import org.apache.ignite.internal.binarytuple.BinaryTuplePrefix;
import org.apache.ignite.internal.rocksdb.ColumnFamily;
-import org.apache.ignite.internal.schema.BinaryTuple;
-import org.apache.ignite.internal.schema.BinaryTuplePrefix;
import org.apache.ignite.internal.storage.RowId;
import org.apache.ignite.internal.storage.StorageException;
import org.apache.ignite.internal.storage.index.IndexRow;
diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/IndexScanCriteria.java b/modules/table/src/main/java/org/apache/ignite/internal/table/IndexScanCriteria.java
index 08a658e07b0..b62656f5325 100644
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/IndexScanCriteria.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/IndexScanCriteria.java
@@ -17,8 +17,8 @@
package org.apache.ignite.internal.table;
-import org.apache.ignite.internal.schema.BinaryTuple;
-import org.apache.ignite.internal.schema.BinaryTuplePrefix;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
+import org.apache.ignite.internal.binarytuple.BinaryTuplePrefix;
import org.jetbrains.annotations.Nullable;
/**
diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/HashIndexLocker.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/HashIndexLocker.java
index e9b3dcd524b..1e6c88b8d48 100644
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/HashIndexLocker.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/HashIndexLocker.java
@@ -19,8 +19,8 @@ package org.apache.ignite.internal.table.distributed;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.schema.BinaryRow;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.schema.ColumnsExtractor;
import org.apache.ignite.internal.storage.RowId;
import org.apache.ignite.internal.tx.Lock;
diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/IndexLocker.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/IndexLocker.java
index 5cf3fb4a0d4..a03c9eb5963 100644
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/IndexLocker.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/IndexLocker.java
@@ -19,8 +19,8 @@ package org.apache.ignite.internal.table.distributed;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.schema.BinaryRow;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.storage.RowId;
import org.apache.ignite.internal.tx.Lock;
import org.jetbrains.annotations.Nullable;
diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/SortedIndexLocker.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/SortedIndexLocker.java
index ad586aa3577..f7177800891 100644
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/SortedIndexLocker.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/SortedIndexLocker.java
@@ -21,9 +21,9 @@ import static org.apache.ignite.internal.util.CompletableFutures.nullCompletedFu
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
+import org.apache.ignite.internal.binarytuple.BinaryTuplePrefix;
import org.apache.ignite.internal.schema.BinaryRow;
-import org.apache.ignite.internal.schema.BinaryTuple;
-import org.apache.ignite.internal.schema.BinaryTuplePrefix;
import org.apache.ignite.internal.schema.ColumnsExtractor;
import org.apache.ignite.internal.storage.RowId;
import org.apache.ignite.internal.storage.StorageDestroyedException;
diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableSchemaAwareIndexStorage.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableSchemaAwareIndexStorage.java
index 6198a9bbfbf..ac4e0bd1b1f 100644
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableSchemaAwareIndexStorage.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableSchemaAwareIndexStorage.java
@@ -18,8 +18,8 @@
package org.apache.ignite.internal.table.distributed;
import java.nio.ByteBuffer;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.schema.BinaryRow;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.schema.ColumnsExtractor;
import org.apache.ignite.internal.storage.RowId;
import org.apache.ignite.internal.storage.StorageException;
diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/index/IndexUpdateHandler.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/index/IndexUpdateHandler.java
index 4ffc1593cea..9d956b09a92 100644
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/index/IndexUpdateHandler.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/index/IndexUpdateHandler.java
@@ -22,8 +22,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Stream;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.schema.BinaryRow;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.storage.BinaryRowAndRowId;
import org.apache.ignite.internal.storage.MvPartitionStorage;
import org.apache.ignite.internal.storage.MvPartitionStorage.WriteClosure;
diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/index/TableRowToIndexKeyConverter.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/index/TableRowToIndexKeyConverter.java
index 8500ffa68cf..ded1f73e331 100644
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/index/TableRowToIndexKeyConverter.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/index/TableRowToIndexKeyConverter.java
@@ -17,9 +17,9 @@
package org.apache.ignite.internal.table.distributed.index;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.schema.BinaryRow;
import org.apache.ignite.internal.schema.BinaryRowConverter;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.schema.Column;
import org.apache.ignite.internal.schema.ColumnsExtractor;
import org.apache.ignite.internal.schema.SchemaDescriptor;
diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/index/VersionedConverter.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/index/VersionedConverter.java
index d3478e65079..717fd28195a 100644
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/index/VersionedConverter.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/index/VersionedConverter.java
@@ -17,8 +17,8 @@
package org.apache.ignite.internal.table.distributed.index;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.schema.BinaryRow;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.schema.ColumnsExtractor;
/**
diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java
index 3f638568886..5c7276e53dd 100644
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java
@@ -86,7 +86,9 @@ import java.util.concurrent.atomic.AtomicReference;
import java.util.function.BiConsumer;
import java.util.function.Predicate;
import java.util.function.Supplier;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.binarytuple.BinaryTupleCommon;
+import org.apache.ignite.internal.binarytuple.BinaryTuplePrefix;
import org.apache.ignite.internal.catalog.Catalog;
import org.apache.ignite.internal.catalog.CatalogService;
import org.apache.ignite.internal.catalog.descriptors.CatalogTableDescriptor;
@@ -159,9 +161,7 @@ import org.apache.ignite.internal.replicator.message.SchemaVersionAwareReplicaRe
import org.apache.ignite.internal.replicator.message.ZonePartitionIdMessage;
import org.apache.ignite.internal.schema.BinaryRow;
import org.apache.ignite.internal.schema.BinaryRowUpgrader;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.schema.BinaryTupleComparator;
-import org.apache.ignite.internal.schema.BinaryTuplePrefix;
import org.apache.ignite.internal.schema.NullBinaryRow;
import org.apache.ignite.internal.schema.SchemaRegistry;
import org.apache.ignite.internal.schema.SchemaSyncService;
diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/storage/InternalTableImpl.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/storage/InternalTableImpl.java
index c671f0778c4..0108cc1531b 100644
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/storage/InternalTableImpl.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/storage/InternalTableImpl.java
@@ -84,6 +84,8 @@ import java.util.function.BiFunction;
import java.util.function.BiPredicate;
import java.util.function.Function;
import java.util.function.Supplier;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
+import org.apache.ignite.internal.binarytuple.BinaryTuplePrefix;
import org.apache.ignite.internal.binarytuple.BinaryTupleReader;
import org.apache.ignite.internal.hlc.ClockService;
import org.apache.ignite.internal.hlc.HybridTimestamp;
@@ -113,8 +115,6 @@ import org.apache.ignite.internal.replicator.message.TimestampAware;
import org.apache.ignite.internal.replicator.message.ZonePartitionIdMessage;
import org.apache.ignite.internal.schema.BinaryRow;
import org.apache.ignite.internal.schema.BinaryRowEx;
-import org.apache.ignite.internal.schema.BinaryTuple;
-import org.apache.ignite.internal.schema.BinaryTuplePrefix;
import org.apache.ignite.internal.storage.engine.MvTableStorage;
import org.apache.ignite.internal.table.IndexScanCriteria;
import org.apache.ignite.internal.table.InternalTable;
diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/IndexBaseTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/IndexBaseTest.java
index 7560d799711..bcfacaeaece 100644
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/IndexBaseTest.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/IndexBaseTest.java
@@ -24,6 +24,7 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
import org.apache.ignite.distributed.TestPartitionDataStorage;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.configuration.testframework.InjectConfiguration;
import org.apache.ignite.internal.hlc.HybridTimestamp;
import org.apache.ignite.internal.partition.replicator.network.PartitionReplicationMessagesFactory;
@@ -33,7 +34,6 @@ import org.apache.ignite.internal.replicator.TablePartitionId;
import org.apache.ignite.internal.replicator.configuration.ReplicationConfiguration;
import org.apache.ignite.internal.schema.BinaryRow;
import org.apache.ignite.internal.schema.BinaryRowConverter;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.schema.BinaryTupleSchema;
import org.apache.ignite.internal.schema.ColumnsExtractor;
import org.apache.ignite.internal.storage.BaseMvStoragesTest;
diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/SortedIndexLockerTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/SortedIndexLockerTest.java
index 5e109760d10..19bf511db19 100644
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/SortedIndexLockerTest.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/SortedIndexLockerTest.java
@@ -25,6 +25,7 @@ import static org.mockito.Mockito.mock;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.binarytuple.BinaryTupleBuilder;
import org.apache.ignite.internal.configuration.SystemLocalConfiguration;
import org.apache.ignite.internal.configuration.testframework.ConfigurationExtension;
@@ -32,7 +33,6 @@ import org.apache.ignite.internal.configuration.testframework.InjectConfiguratio
import org.apache.ignite.internal.hlc.HybridClock;
import org.apache.ignite.internal.hlc.HybridClockImpl;
import org.apache.ignite.internal.schema.BinaryRow;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.storage.RowId;
import org.apache.ignite.internal.storage.index.StorageSortedIndexDescriptor;
import org.apache.ignite.internal.storage.index.StorageSortedIndexDescriptor.StorageSortedIndexColumnDescriptor;
diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/index/IndexUpdateHandlerTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/index/IndexUpdateHandlerTest.java
index ab3f1918f91..86e57ef806e 100644
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/index/IndexUpdateHandlerTest.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/index/IndexUpdateHandlerTest.java
@@ -33,8 +33,8 @@ import static org.mockito.Mockito.when;
import java.util.List;
import java.util.Map;
import java.util.stream.Stream;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.schema.BinaryRow;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.schema.ColumnsExtractor;
import org.apache.ignite.internal.storage.BinaryRowAndRowId;
import org.apache.ignite.internal.storage.RowId;
diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/PartitionCommandListenerTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/PartitionCommandListenerTest.java
index 54eb7e8ee5f..76d866fb0cf 100644
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/PartitionCommandListenerTest.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/PartitionCommandListenerTest.java
@@ -58,6 +58,7 @@ import java.util.function.BooleanSupplier;
import java.util.function.Function;
import java.util.stream.Stream;
import org.apache.ignite.distributed.TestPartitionDataStorage;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.binarytuple.BinaryTupleBuilder;
import org.apache.ignite.internal.catalog.Catalog;
import org.apache.ignite.internal.catalog.CatalogService;
@@ -91,7 +92,6 @@ import org.apache.ignite.internal.replicator.message.ReplicaMessagesFactory;
import org.apache.ignite.internal.replicator.message.TablePartitionIdMessage;
import org.apache.ignite.internal.schema.BinaryRow;
import org.apache.ignite.internal.schema.BinaryRowConverter;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.schema.Column;
import org.apache.ignite.internal.schema.SchemaDescriptor;
import org.apache.ignite.internal.schema.SchemaRegistry;
diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerTest.java
index 0cb8249f84c..6a3cbe3db71 100644
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerTest.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerTest.java
@@ -115,6 +115,7 @@ import java.util.stream.IntStream;
import java.util.stream.Stream;
import org.apache.ignite.distributed.TestPartitionDataStorage;
import org.apache.ignite.distributed.replicator.action.RequestTypes;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.binarytuple.BinaryTupleBuilder;
import org.apache.ignite.internal.binarytuple.BinaryTuplePrefixBuilder;
import org.apache.ignite.internal.catalog.Catalog;
@@ -185,7 +186,6 @@ import org.apache.ignite.internal.replicator.message.ZonePartitionIdMessage;
import org.apache.ignite.internal.schema.AlwaysSyncedSchemaSyncService;
import org.apache.ignite.internal.schema.BinaryRow;
import org.apache.ignite.internal.schema.BinaryRowConverter;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.schema.Column;
import org.apache.ignite.internal.schema.ColumnsExtractor;
import org.apache.ignite.internal.schema.SchemaDescriptor;
diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/storage/InternalTableImplTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/storage/InternalTableImplTest.java
index 05c5718bbd7..e43bb7b60a6 100644
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/storage/InternalTableImplTest.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/storage/InternalTableImplTest.java
@@ -76,7 +76,9 @@ import java.util.concurrent.TimeUnit;
import java.util.function.BiFunction;
import java.util.function.Function;
import java.util.function.Supplier;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.binarytuple.BinaryTupleBuilder;
+import org.apache.ignite.internal.binarytuple.BinaryTuplePrefix;
import org.apache.ignite.internal.hlc.ClockService;
import org.apache.ignite.internal.hlc.HybridClock;
import org.apache.ignite.internal.hlc.HybridClockImpl;
@@ -101,8 +103,6 @@ import org.apache.ignite.internal.replicator.ZonePartitionId;
import org.apache.ignite.internal.replicator.message.ReplicaRequest;
import org.apache.ignite.internal.schema.BinaryRow;
import org.apache.ignite.internal.schema.BinaryRowEx;
-import org.apache.ignite.internal.schema.BinaryTuple;
-import org.apache.ignite.internal.schema.BinaryTuplePrefix;
import org.apache.ignite.internal.schema.NullBinaryRow;
import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.storage.engine.MvTableStorage;
diff --git a/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/TxAbstractTest.java b/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/TxAbstractTest.java
index ebcaa642849..dee1239e313 100644
--- a/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/TxAbstractTest.java
+++ b/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/TxAbstractTest.java
@@ -67,6 +67,7 @@ import java.util.function.BiConsumer;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Supplier;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.configuration.testframework.ConfigurationExtension;
import org.apache.ignite.internal.hlc.HybridClockImpl;
import org.apache.ignite.internal.hlc.HybridTimestamp;
@@ -77,7 +78,6 @@ import org.apache.ignite.internal.replicator.ReplicaManager;
import org.apache.ignite.internal.replicator.ReplicaTestUtils;
import org.apache.ignite.internal.replicator.ReplicationGroupId;
import org.apache.ignite.internal.schema.BinaryRow;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.schema.SchemaRegistry;
import org.apache.ignite.internal.schema.row.Row;
import org.apache.ignite.internal.storage.RowId;
diff --git a/modules/transactions/src/integrationTest/java/org/apache/ignite/tx/distributed/ItTxAbortOnCoordinatorOnWriteIntentResolutionWhenPrimaryExpiredTest.java b/modules/transactions/src/integrationTest/java/org/apache/ignite/tx/distributed/ItTxAbortOnCoordinatorOnWriteIntentResolutionWhenPrimaryExpiredTest.java
index 48f3f569a4a..e7091682498 100644
--- a/modules/transactions/src/integrationTest/java/org/apache/ignite/tx/distributed/ItTxAbortOnCoordinatorOnWriteIntentResolutionWhenPrimaryExpiredTest.java
+++ b/modules/transactions/src/integrationTest/java/org/apache/ignite/tx/distributed/ItTxAbortOnCoordinatorOnWriteIntentResolutionWhenPrimaryExpiredTest.java
@@ -46,11 +46,11 @@ import org.apache.ignite.client.IgniteClient;
import org.apache.ignite.internal.ClusterPerTestIntegrationTest;
import org.apache.ignite.internal.TestWrappers;
import org.apache.ignite.internal.app.IgniteImpl;
+import org.apache.ignite.internal.binarytuple.BinaryTuple;
import org.apache.ignite.internal.client.tx.ClientLazyTransaction;
import org.apache.ignite.internal.hlc.HybridClock;
import org.apache.ignite.internal.placementdriver.ReplicaMeta;
import org.apache.ignite.internal.replicator.ZonePartitionId;
-import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.schema.marshaller.TupleMarshallerImpl;
import org.apache.ignite.internal.schema.row.Row;
import org.apache.ignite.internal.storage.MvPartitionStorage;