You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by tk...@apache.org on 2023/08/21 10:47:31 UTC
[ignite-3] branch catalog-feature updated (39b34d9ef5 -> 0417539df0)
This is an automated email from the ASF dual-hosted git repository.
tkalkirill pushed a change to branch catalog-feature
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
from 39b34d9ef5 IGNITE-20215 DistributionZoneRebalanceEngine should listen CatalogService events instead of configuration (#2448)
add bb2c93aa6b IGNITE-20243 Introduce a Matcher for BinaryRows (#2457)
add 2c22342bb1 IGNITE-20082 Fix ODBC DEB\RPM packages (#2376)
add 641b340d76 IGNITE-16700 Fix flaky ItTxDistributedTestThreeNodesThreeReplicas#testBalance (#2439)
add bb382455ea IGNITE-20183 Fix testNonNullTxDisablesPartitionAwareness flakiness (#2458)
add b04aee524e IGNITE-19096 Sql. Replace placeholder values from ModifyNode (#2446)
add 0e680321e1 IGNITE-20251 NPE in ItTxDistributedTestThreeNodesThreeReplicas (#2464)
add db52d5016d IGNITE-20159 Add README for the project (#2409)
add 5295cd0d5e IGNITE-20249 Refactoring some tests to make it easier to switch to catalog (#2465)
new 0e265b5ddd Merge branch 'ai-main' into catalog-feature
new 0417539df0 catalog-feature after merge ai-main
The 2 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.
Summary of changes:
README.md | 103 +++++-
.../ignite/client/PartitionAwarenessTest.java | 11 +-
.../distributionzones/rebalance/RebalanceUtil.java | 5 +-
.../DistributionZonesTestUtil.java | 2 +-
modules/platforms/build.gradle | 3 +
.../storage/ItRebalanceDistributedTest.java | 366 ++++++++++-----------
...niteDistributionZoneManagerNodeRestartTest.java | 287 ++++++++--------
.../ignite/internal/sql/engine/ItDmlTest.java | 49 +--
.../ignite/internal/table/ItRoReadsTest.java | 44 +--
modules/schema/build.gradle | 2 +
.../ignite/internal/schema/BinaryRowMatcher.java | 62 ++++
.../sql/engine/exec/UpdatableTableImpl.java | 4 -
.../sql/engine/exec/exp/ExpressionFactoryImpl.java | 6 -
.../internal/sql/engine/exec/exp/RexImpTable.java | 13 +-
.../internal/sql/engine/exec/rel/ModifyNode.java | 51 +--
.../engine/prepare/IgniteSqlToRelConvertor.java | 119 ++++++-
.../sql/engine/util/HashFunctionFactoryImpl.java | 13 +-
.../sql/engine/planner/ImplicitCastsTest.java | 2 +-
.../AbstractMvPartitionStorageConcurrencyTest.java | 19 +-
.../storage/AbstractMvPartitionStorageGcTest.java | 21 +-
.../storage/AbstractMvPartitionStorageTest.java | 117 +++----
.../storage/AbstractMvTableStorageTest.java | 4 +-
.../internal/storage/BaseMvStoragesTest.java | 36 +-
.../AbstractPageMemoryMvPartitionStorageTest.java | 11 +-
...PersistentPageMemoryMvPartitionStorageTest.java | 3 +-
.../distributed/ItTxDistributedTestSingleNode.java | 6 +-
.../apache/ignite/internal/table/TxLocalTest.java | 6 +
.../internal/table/distributed/IndexBaseTest.java | 10 +-
.../table/distributed/TableManagerTest.java | 207 ++++++------
.../replication/PartitionReplicaListenerTest.java | 41 +--
.../ignite/internal/table/TxAbstractTest.java | 18 +-
packaging/odbc/build.gradle | 4 +-
32 files changed, 909 insertions(+), 736 deletions(-)
create mode 100644 modules/schema/src/testFixtures/java/org/apache/ignite/internal/schema/BinaryRowMatcher.java
[ignite-3] 01/02: Merge branch 'ai-main' into catalog-feature
Posted by tk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tkalkirill pushed a commit to branch catalog-feature
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 0e265b5ddd7a11e1836dd7895778682e778bcd9a
Merge: 39b34d9ef5 5295cd0d5e
Author: Kirill Tkalenko <tk...@yandex.ru>
AuthorDate: Mon Aug 21 13:31:59 2023 +0300
Merge branch 'ai-main' into catalog-feature
README.md | 103 +++++-
.../ignite/client/PartitionAwarenessTest.java | 11 +-
.../distributionzones/rebalance/RebalanceUtil.java | 5 +-
.../DistributionZonesTestUtil.java | 2 +-
modules/platforms/build.gradle | 3 +
.../storage/ItRebalanceDistributedTest.java | 361 ++++++++++-----------
...niteDistributionZoneManagerNodeRestartTest.java | 284 ++++++++--------
.../ignite/internal/sql/engine/ItDmlTest.java | 49 +--
.../ignite/internal/table/ItRoReadsTest.java | 44 +--
modules/schema/build.gradle | 2 +
.../ignite/internal/schema/BinaryRowMatcher.java | 62 ++++
.../sql/engine/exec/UpdatableTableImpl.java | 4 -
.../sql/engine/exec/exp/ExpressionFactoryImpl.java | 6 -
.../internal/sql/engine/exec/exp/RexImpTable.java | 13 +-
.../internal/sql/engine/exec/rel/ModifyNode.java | 51 +--
.../engine/prepare/IgniteSqlToRelConvertor.java | 119 ++++++-
.../sql/engine/util/HashFunctionFactoryImpl.java | 13 +-
.../sql/engine/planner/ImplicitCastsTest.java | 2 +-
.../AbstractMvPartitionStorageConcurrencyTest.java | 19 +-
.../storage/AbstractMvPartitionStorageGcTest.java | 21 +-
.../storage/AbstractMvPartitionStorageTest.java | 117 +++----
.../storage/AbstractMvTableStorageTest.java | 4 +-
.../internal/storage/BaseMvStoragesTest.java | 36 +-
.../AbstractPageMemoryMvPartitionStorageTest.java | 11 +-
...PersistentPageMemoryMvPartitionStorageTest.java | 3 +-
.../distributed/ItTxDistributedTestSingleNode.java | 6 +-
.../apache/ignite/internal/table/TxLocalTest.java | 6 +
.../internal/table/distributed/IndexBaseTest.java | 10 +-
.../table/distributed/TableManagerTest.java | 206 ++++++------
.../replication/PartitionReplicaListenerTest.java | 41 +--
.../ignite/internal/table/TxAbstractTest.java | 18 +-
packaging/odbc/build.gradle | 4 +-
32 files changed, 907 insertions(+), 729 deletions(-)
diff --cc modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/storage/ItRebalanceDistributedTest.java
index 8707d8a073,810e372d28..cc873cedb9
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/storage/ItRebalanceDistributedTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/storage/ItRebalanceDistributedTest.java
@@@ -19,11 -19,10 +19,12 @@@ package org.apache.ignite.internal.conf
import static java.util.concurrent.CompletableFuture.allOf;
import static java.util.function.Function.identity;
+ import static java.util.stream.Collectors.toSet;
+ import static org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
+import static org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
import static org.apache.ignite.internal.distributionzones.DistributionZonesTestUtil.alterZoneReplicas;
+import static org.apache.ignite.internal.distributionzones.DistributionZonesTestUtil.createZoneWithDataStorage;
import static org.apache.ignite.internal.distributionzones.rebalance.RebalanceUtil.partitionAssignments;
- import static org.apache.ignite.internal.testframework.IgniteTestUtils.await;
import static org.apache.ignite.internal.testframework.IgniteTestUtils.testNodeName;
import static org.apache.ignite.internal.testframework.IgniteTestUtils.waitForCondition;
import static org.apache.ignite.internal.testframework.matchers.CompletableFutureExceptionMatcher.willThrowFast;
@@@ -186,14 -185,13 +188,14 @@@ import org.mockito.Mockito
*/
@ExtendWith(WorkDirectoryExtension.class)
@ExtendWith(ConfigurationExtension.class)
+ @Timeout(120)
+@Disabled("https://issues.apache.org/jira/browse/IGNITE-20114")
public class ItRebalanceDistributedTest extends BaseIgniteAbstractTest {
- /** Ignite logger. */
private static final IgniteLogger LOG = Loggers.forClass(ItRebalanceDistributedTest.class);
- private static final String TABLE_1_NAME = "TBL1";
+ private static final String TABLE_NAME = "TBL1";
- private static final String ZONE_1_NAME = "zone1";
+ private static final String ZONE_NAME = "zone1";
private static final int BASE_PORT = 20_000;
@@@ -511,15 -490,15 +494,15 @@@
waitPartitionAssignmentsSyncedToExpected(0, 3);
- Set<Assignment> assignmentsBeforeChangeReplicas = getPartitionClusterNodes(0, 0);
+ Set<Assignment> assignmentsBeforeChangeReplicas = getPartitionClusterNodes(node, 0);
- nodes.forEach(n -> {
- prepareFinishHandleChangeStableAssignmentEventFuture(n, TABLE_NAME, 0);
+ nodes.forEach(node -> {
+ prepareFinishHandleChangeStableAssignmentEventFuture(node, TABLE_1_NAME, 0);
- throwExceptionOnInvokeDestroyPartitionStorages(node, TABLE_1_NAME, 0);
+ throwExceptionOnInvokeDestroyPartitionStorages(n, TABLE_NAME, 0);
});
- changeTableReplicasForSinglePartition(ZONE_1_NAME, 2);
+ changeTableReplicasForSinglePartition(node, ZONE_NAME, 2);
waitPartitionAssignmentsSyncedToExpected(0, 2);
diff --cc modules/runner/src/integrationTest/java/org/apache/ignite/internal/distribution/zones/ItIgniteDistributionZoneManagerNodeRestartTest.java
index ad7b561cc7,06482bb2c9..aee723e92b
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/distribution/zones/ItIgniteDistributionZoneManagerNodeRestartTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/distribution/zones/ItIgniteDistributionZoneManagerNodeRestartTest.java
@@@ -52,11 -52,8 +52,12 @@@ import java.util.Set
import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;
import java.util.function.LongFunction;
+ import java.util.stream.Stream;
import org.apache.ignite.internal.BaseIgniteRestartTest;
+import org.apache.ignite.internal.catalog.CatalogManager;
+import org.apache.ignite.internal.catalog.CatalogManagerImpl;
+import org.apache.ignite.internal.catalog.ClockWaiter;
+import org.apache.ignite.internal.catalog.storage.UpdateLogImpl;
import org.apache.ignite.internal.cluster.management.ClusterManagementGroupManager;
import org.apache.ignite.internal.cluster.management.raft.TestClusterStateStorage;
import org.apache.ignite.internal.cluster.management.topology.LogicalTopologyImpl;
@@@ -226,10 -215,10 +227,10 @@@ public class ItIgniteDistributionZoneMa
revisionUpdater,
zonesConfiguration,
tablesConfiguration,
- metaStorageMgr,
+ metastore,
logicalTopologyService,
vault,
- name
+ catalogManager
);
// Preparing the result map.
@@@ -250,10 -239,8 +251,10 @@@
clusterSvc,
clusterStateStorage,
cmgManager,
- metaStorageMgr,
+ metastore,
clusterCfgMgr,
+ clockWaiter,
+ catalogManager,
distributionZoneManager
);
diff --cc modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/ItRoReadsTest.java
index 6124bea1c9,8b89bf2a37..0cf52ecb97
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/ItRoReadsTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/ItRoReadsTest.java
@@@ -17,7 -17,11 +17,8 @@@
package org.apache.ignite.internal.table;
-import static org.apache.ignite.internal.distributionzones.DistributionZoneManager.DEFAULT_REPLICA_COUNT;
-import static org.apache.ignite.internal.distributionzones.DistributionZonesTestUtil.createZone;
-import static org.apache.ignite.internal.runner.app.ItTablesApiTest.SCHEMA;
+ import static org.apache.ignite.internal.schema.BinaryRowMatcher.equalToRow;
-import static org.apache.ignite.internal.schema.testutils.SchemaConfigurationConverter.convert;
+import static org.apache.ignite.internal.sql.engine.util.CursorUtils.getAllFromCursor;
import static org.apache.ignite.internal.testframework.IgniteTestUtils.testNodeName;
import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully;
import static org.hamcrest.MatcherAssert.assertThat;
@@@ -545,27 -540,4 +532,22 @@@ public class ItRoReadsTest extends Base
protected static IgniteImpl node() {
return (IgniteImpl) NODE;
}
+
- private static void assertRowEquals(BinaryRow row1, BinaryRow row2) {
- assertThat(row1.schemaVersion(), is(row2.schemaVersion()));
- assertThat(row1.tupleSlice(), is(row2.tupleSlice()));
- }
-
+ private static List<List<Object>> sql(String sql, Object... args) {
+ var queryEngine = new TestQueryProcessor(node());
+
+ SessionId sessionId = queryEngine.createSession(PropertiesHelper.emptyHolder());
+
+ try {
+ var context = QueryContext.create(SqlQueryType.ALL);
+
+ CompletableFuture<AsyncSqlCursor<List<Object>>> queryFuture = queryEngine.querySingleAsync(sessionId, context, sql, args);
+
+ assertThat(queryFuture, willCompleteSuccessfully());
+
+ return getAllFromCursor(queryFuture.join());
+ } finally {
+ queryEngine.closeSession(sessionId);
+ }
+ }
}
diff --cc modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/AbstractMvTableStorageTest.java
index dacaf293ef,852958372a..acd98389f5
--- 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
@@@ -19,8 -19,11 +19,9 @@@ package org.apache.ignite.internal.stor
import static java.util.concurrent.TimeUnit.SECONDS;
import static java.util.stream.Collectors.toList;
+ import static org.apache.ignite.internal.schema.BinaryRowMatcher.equalToRow;
-import static org.apache.ignite.internal.schema.CatalogDescriptorUtils.toHashIndexDescriptor;
-import static org.apache.ignite.internal.schema.CatalogDescriptorUtils.toSortedIndexDescriptor;
-import static org.apache.ignite.internal.schema.CatalogDescriptorUtils.toTableDescriptor;
-import static org.apache.ignite.internal.schema.configuration.SchemaConfigurationUtils.findTableView;
+import static org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
+import static org.apache.ignite.internal.catalog.CatalogService.DEFAULT_ZONE_NAME;
import static org.apache.ignite.internal.storage.MvPartitionStorage.REBALANCE_IN_PROGRESS;
import static org.apache.ignite.internal.testframework.matchers.CompletableFutureExceptionMatcher.willThrowFast;
import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully;
diff --cc modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvPartitionStorageTest.java
index a7b37e7764,cd55784a08..ae68cf7dbe
--- a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvPartitionStorageTest.java
+++ b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvPartitionStorageTest.java
@@@ -17,8 -17,9 +17,9 @@@
package org.apache.ignite.internal.storage.pagememory.mv;
-import static org.apache.ignite.internal.distributionzones.DistributionZoneManager.DEFAULT_PARTITION_COUNT;
+import static org.apache.ignite.internal.catalog.commands.CatalogUtils.DEFAULT_PARTITION_COUNT;
import static org.apache.ignite.internal.pagememory.persistence.checkpoint.CheckpointState.FINISHED;
+ import static org.apache.ignite.internal.schema.BinaryRowMatcher.equalToRow;
import static org.apache.ignite.internal.storage.pagememory.configuration.schema.BasePageMemoryStorageEngineConfigurationSchema.DEFAULT_DATA_REGION_NAME;
import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully;
import static org.hamcrest.MatcherAssert.assertThat;
diff --cc modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerTest.java
index be1db66f43,57fef6fb39..0a6771f260
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerTest.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerTest.java
@@@ -19,13 -19,11 +19,12 @@@ package org.apache.ignite.internal.tabl
import static java.util.Collections.emptySet;
import static java.util.concurrent.CompletableFuture.completedFuture;
+ import static org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
-import static org.apache.ignite.internal.distributionzones.DistributionZoneManager.DEFAULT_ZONE_NAME;
+import static org.apache.ignite.internal.catalog.CatalogService.DEFAULT_ZONE_NAME;
+import static org.apache.ignite.internal.distributionzones.DistributionZonesUtil.getZoneById;
import static org.apache.ignite.internal.testframework.IgniteTestUtils.await;
import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully;
- import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willSucceedFast;
import static org.hamcrest.MatcherAssert.assertThat;
- import static org.hamcrest.Matchers.equalTo;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --cc modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerTest.java
index 2e01e19958,83d5e31a09..874719551d
--- 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
@@@ -17,10 -17,12 +17,12 @@@
package org.apache.ignite.internal.table.distributed.replication;
+ import static java.util.Collections.singletonList;
import static java.util.concurrent.CompletableFuture.completedFuture;
import static java.util.stream.Collectors.toList;
-import static org.apache.ignite.internal.distributionzones.DistributionZoneManager.DEFAULT_PARTITION_COUNT;
+import static org.apache.ignite.internal.catalog.commands.CatalogUtils.DEFAULT_PARTITION_COUNT;
import static org.apache.ignite.internal.hlc.HybridTimestamp.hybridTimestampToLong;
+ import static org.apache.ignite.internal.schema.BinaryRowMatcher.equalToRow;
import static org.apache.ignite.internal.testframework.asserts.CompletableFutureAssert.assertWillThrowFast;
import static org.apache.ignite.internal.testframework.matchers.CompletableFutureExceptionMatcher.willThrowFast;
import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully;
[ignite-3] 02/02: catalog-feature after merge ai-main
Posted by tk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tkalkirill pushed a commit to branch catalog-feature
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 0417539df0d289ea31dfebe4cb2e7545418eae73
Author: Kirill Tkalenko <tk...@yandex.ru>
AuthorDate: Mon Aug 21 13:47:25 2023 +0300
catalog-feature after merge ai-main
---
.../internal/configuration/storage/ItRebalanceDistributedTest.java | 7 ++-----
.../zones/ItIgniteDistributionZoneManagerNodeRestartTest.java | 3 +--
.../apache/ignite/internal/storage/AbstractMvTableStorageTest.java | 2 +-
.../apache/ignite/internal/table/distributed/TableManagerTest.java | 1 -
4 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/storage/ItRebalanceDistributedTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/storage/ItRebalanceDistributedTest.java
index cc873cedb9..814681226b 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/storage/ItRebalanceDistributedTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/storage/ItRebalanceDistributedTest.java
@@ -21,9 +21,7 @@ import static java.util.concurrent.CompletableFuture.allOf;
import static java.util.function.Function.identity;
import static java.util.stream.Collectors.toSet;
import static org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
-import static org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
import static org.apache.ignite.internal.distributionzones.DistributionZonesTestUtil.alterZoneReplicas;
-import static org.apache.ignite.internal.distributionzones.DistributionZonesTestUtil.createZoneWithDataStorage;
import static org.apache.ignite.internal.distributionzones.rebalance.RebalanceUtil.partitionAssignments;
import static org.apache.ignite.internal.testframework.IgniteTestUtils.testNodeName;
import static org.apache.ignite.internal.testframework.IgniteTestUtils.waitForCondition;
@@ -137,7 +135,6 @@ import org.apache.ignite.internal.storage.DataStorageManager;
import org.apache.ignite.internal.storage.DataStorageModules;
import org.apache.ignite.internal.storage.StorageException;
import org.apache.ignite.internal.storage.impl.TestDataStorageModule;
-import org.apache.ignite.internal.storage.impl.TestStorageEngine;
import org.apache.ignite.internal.storage.impl.schema.TestDataStorageChange;
import org.apache.ignite.internal.storage.impl.schema.TestDataStorageConfigurationSchema;
import org.apache.ignite.internal.storage.pagememory.PersistentPageMemoryDataStorageModule;
@@ -496,8 +493,8 @@ public class ItRebalanceDistributedTest extends BaseIgniteAbstractTest {
Set<Assignment> assignmentsBeforeChangeReplicas = getPartitionClusterNodes(node, 0);
- nodes.forEach(node -> {
- prepareFinishHandleChangeStableAssignmentEventFuture(node, TABLE_1_NAME, 0);
+ nodes.forEach(n -> {
+ prepareFinishHandleChangeStableAssignmentEventFuture(n, TABLE_NAME, 0);
throwExceptionOnInvokeDestroyPartitionStorages(n, TABLE_NAME, 0);
});
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/distribution/zones/ItIgniteDistributionZoneManagerNodeRestartTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/distribution/zones/ItIgniteDistributionZoneManagerNodeRestartTest.java
index aee723e92b..029946c3ba 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/distribution/zones/ItIgniteDistributionZoneManagerNodeRestartTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/distribution/zones/ItIgniteDistributionZoneManagerNodeRestartTest.java
@@ -54,7 +54,6 @@ import java.util.function.Consumer;
import java.util.function.LongFunction;
import java.util.stream.Stream;
import org.apache.ignite.internal.BaseIgniteRestartTest;
-import org.apache.ignite.internal.catalog.CatalogManager;
import org.apache.ignite.internal.catalog.CatalogManagerImpl;
import org.apache.ignite.internal.catalog.ClockWaiter;
import org.apache.ignite.internal.catalog.storage.UpdateLogImpl;
@@ -220,7 +219,7 @@ public class ItIgniteDistributionZoneManagerNodeRestartTest extends BaseIgniteRe
var clockWaiter = new ClockWaiter(name, clock);
- var catalogManager = new CatalogManagerImpl(new UpdateLogImpl(metaStorageMgr), clockWaiter);
+ var catalogManager = new CatalogManagerImpl(new UpdateLogImpl(metastore), clockWaiter);
DistributionZoneManager distributionZoneManager = new DistributionZoneManager(
name,
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 acd98389f5..5f887de789 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
@@ -19,9 +19,9 @@ package org.apache.ignite.internal.storage;
import static java.util.concurrent.TimeUnit.SECONDS;
import static java.util.stream.Collectors.toList;
-import static org.apache.ignite.internal.schema.BinaryRowMatcher.equalToRow;
import static org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
import static org.apache.ignite.internal.catalog.CatalogService.DEFAULT_ZONE_NAME;
+import static org.apache.ignite.internal.schema.BinaryRowMatcher.equalToRow;
import static org.apache.ignite.internal.storage.MvPartitionStorage.REBALANCE_IN_PROGRESS;
import static org.apache.ignite.internal.testframework.matchers.CompletableFutureExceptionMatcher.willThrowFast;
import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully;
diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerTest.java
index 0a6771f260..afbdf4056f 100644
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerTest.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerTest.java
@@ -21,7 +21,6 @@ import static java.util.Collections.emptySet;
import static java.util.concurrent.CompletableFuture.completedFuture;
import static org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
import static org.apache.ignite.internal.catalog.CatalogService.DEFAULT_ZONE_NAME;
-import static org.apache.ignite.internal.distributionzones.DistributionZonesUtil.getZoneById;
import static org.apache.ignite.internal.testframework.IgniteTestUtils.await;
import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully;
import static org.hamcrest.MatcherAssert.assertThat;