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/29 12:10:45 UTC
[ignite-3] branch catalog-feature updated (d569920d10 -> 69b65cb061)
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 d569920d10 IGNITE-20114 DistributionZoneManager should listen CatalogService events instead of configuration (#2415)
add 2c1b153a22 IGNITE-20283: IDEA gradle run configurations improvements (#2502)
add 4fd6b984d5 IGNITE-19898 Sql. Added ability to use different transaction facades to start an implicit transaction (#2449)
add 5f5d592494 IGNITE-20054 Disabled tests in ItIgniteDistributionZoneManagerNodeRestartTest were fixed. (#2425)
add 98a4c28bba IGNITE-20289: IDEA gradle run configurations fix (#2505)
add 59107180be IGNITE-19788 Sql. Change QueryBatchMessage serialization (#2476)
add cba48c77ea IGNITE-20272 Clean up of DistributionZoneManagerWatchListenerTest (#2490)
add acded3fc66 IGNITE-19227 Wait for schema availability outside JRaft threads (#2450)
add e6d97f5b25 IGNITE-20291 Fix in-flight counts for backpressure (#2509)
new 9ff6c35a55 Merge branch 'ai-main' into catalog-feature
new 69b65cb061 catalog-feature after ai-merge
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:
...l checks [PMD, modernizer, checkstyle].run.xml} | 12 +-
.run/All checks [check].run.xml | 4 +-
...check].run.xml => Fast build only java.run.xml} | 8 +-
.../ignite/internal/catalog/CatalogService.java | 2 -
.../internal/cli/CliIntegrationTestBase.java | 7 +-
.../client/handler/JdbcQueryEventHandlerImpl.java | 2 +
.../requests/sql/ClientSqlExecuteRequest.java | 4 +-
.../handler/JdbcQueryEventHandlerImplTest.java | 8 +-
.../requests/jdbc/JdbcQueryCursorSelfTest.java | 15 +-
.../internal/client/table/ClientDataStreamer.java | 5 -
.../client/fakes/FakeIgniteQueryProcessor.java | 3 +-
.../ignite/internal/streamer/StreamerBuffer.java | 38 +---
.../ignite/internal/streamer/StreamerOptions.java | 8 -
.../internal/streamer/StreamerSubscriber.java | 53 +++--
.../org/apache/ignite/internal/util/ByteUtils.java | 2 +-
.../apache/ignite/internal/util/VarIntUtils.java | 103 ++++++++++
.../internal/streamer/StreamerSubscriberTest.java | 179 +++++++++++++++++
.../ignite/internal/util/VarIntUtilsTest.java | 94 +++++++++
.../testframework/TestIgnitionManager.java | 37 +++-
...butionZoneManagerLogicalTopologyEventsTest.java | 28 +++
.../DistributionZoneManagerWatchListenerTest.java | 109 ----------
.../apache/ignite/raft/jraft/core/ItNodeTest.java | 2 +
.../java/org/apache/ignite/internal/raft/Loza.java | 13 +-
.../internal/raft/server/RaftGroupOptions.java | 23 +++
.../internal/raft/server/impl/JraftServerImpl.java | 30 ++-
.../internal/raft/util/OptimizedMarshaller.java | 14 +-
.../ignite/internal/raft/util/OptimizedStream.java | 2 +-
.../apache/ignite/raft/jraft/core/NodeImpl.java | 1 +
.../ignite/raft/jraft/option/NodeOptions.java | 14 ++
.../jraft/rpc/impl/ActionRequestProcessor.java | 12 +-
.../raft/jraft/rpc/impl/IgniteRpcServer.java | 11 +-
...r.java => AppendEntriesRequestInterceptor.java} | 37 ++--
...InterceptingAppendEntriesRequestProcessor.java} | 39 ++--
...va => NullAppendEntriesRequestInterceptor.java} | 28 +--
.../apache/ignite/raft/jraft/core/TestCluster.java | 7 +
.../ignite/raft/jraft/rpc/TestIgniteRpcServer.java | 4 +-
.../replicator/message/ReplicaMessageGroup.java | 5 +-
.../internal/ClusterPerTestIntegrationTest.java | 2 +-
.../benchmark/AbstractOneNodeBenchmark.java | 2 +-
.../storage/ItRebalanceDistributedTest.java | 10 +-
...niteDistributionZoneManagerNodeRestartTest.java | 64 ++++--
.../raftsnapshot/ItTableRaftSnapshotsTest.java | 79 +-------
.../app/ItIgniteInMemoryNodeRestartTest.java | 2 +
.../runner/app/ItIgniteNodeRestartTest.java | 14 +-
.../schemasync/ItSchemaSyncAndReplicationTest.java | 177 ++++++++++++++++
.../internal/sql/api/ItSqlAsynchronousApiTest.java | 48 +++--
.../internal/sql/api/ItSqlSynchronousApiTest.java | 22 +-
.../sql/engine/ClusterPerClassIntegrationTest.java | 7 +-
.../engine/datatypes/tests/BaseDataTypeTest.java | 6 +
.../ignite/internal/table/ItRoReadsTest.java | 8 +-
.../src/integrationTest/sql/sqlite/join/join1.test | 4 +-
.../org/apache/ignite/internal/app/IgniteImpl.java | 16 +-
.../java/org/apache/ignite/internal/Cluster.java | 88 +++++++-
.../ignite/internal/ReplicationGroupsUtils.java} | 33 ++-
.../sql/engine/util/TestQueryProcessor.java | 13 +-
.../ignite/internal/sql/api/IgniteSqlImpl.java | 9 +-
.../internal/sql/api/SessionBuilderImpl.java | 8 +-
.../ignite/internal/sql/api/SessionImpl.java | 12 +-
.../internal/sql/engine/AsyncSqlCursorImpl.java | 21 +-
.../ignite/internal/sql/engine/QueryProcessor.java | 6 +-
.../sql/engine/QueryTransactionWrapper.java} | 45 +++--
.../internal/sql/engine/SqlQueryProcessor.java | 198 +++++++++---------
.../internal/sql/engine/exec/ArrayRowHandler.java | 14 ++
.../internal/sql/engine/exec/ExchangeService.java | 6 +-
.../sql/engine/exec/ExchangeServiceImpl.java | 11 +-
.../sql/engine/exec/LogicalRelImplementor.java | 8 +-
.../internal/sql/engine/exec/RowHandler.java | 43 +++-
.../sql/engine/exec/exp/ExpressionFactoryImpl.java | 4 +-
.../engine/exec/exp/agg/AccumulatorsFactory.java | 2 +-
.../ignite/internal/sql/engine/exec/rel/Inbox.java | 16 +-
.../internal/sql/engine/exec/rel/Outbox.java | 12 +-
.../internal/sql/engine/externalize/RelJson.java | 4 +-
.../sql/engine/message/QueryBatchMessage.java | 5 +-
.../sql/engine/AsyncSqlCursorImplTest.java | 51 +++--
.../engine/QueryTransactionWrapperSelfTest.java | 131 ++++++++++++
.../sql/engine/exec/rel/AbstractExecutionTest.java | 7 +
.../sql/engine/exec/rel/ExchangeExecutionTest.java | 3 +-
.../sql/engine/exec/rel/ExecutionTest.java | 27 +++
.../internal/sql/engine/util/QueryChecker.java | 9 +-
modules/table/build.gradle | 1 +
.../distributed/ItTxDistributedTestSingleNode.java | 4 +
.../ignite/internal/table/AbstractTableView.java | 2 +-
.../apache/ignite/internal/table/DataStreamer.java | 5 -
.../internal/table/distributed/TableManager.java | 38 ++--
.../distributed/command/CatalogVersionAware.java} | 16 +-
.../distributed/command/PartitionCommand.java | 8 +-
.../replicator/PartitionReplicaListener.java | 222 +++++++++++++--------
.../distributed/replicator/action/RequestType.java | 38 +---
.../schema/CheckCatalogVersionOnAppendEntries.java | 105 ++++++++++
...-info.java => PartitionCommandsMarshaller.java} | 19 +-
.../schema/PartitionCommandsMarshallerImpl.java | 73 +++++++
.../distributed/schema/SchemaSyncService.java | 8 -
.../distributed/schema/SchemaSyncServiceImpl.java | 11 +-
.../ThreadLocalPartitionCommandsMarshaller.java} | 18 +-
.../table/distributed/TableManagerTest.java | 2 +
.../PartitionReplicaListenerIndexLockingTest.java | 9 +-
.../replication/PartitionReplicaListenerTest.java | 182 ++++++++++++-----
.../PartitionCommandsMarshallerImplTest.java | 116 +++++++++++
.../schema/SchemaSyncServiceImplTest.java | 14 +-
.../replicator/action/RequestTypes.java} | 95 +++++----
.../table/impl/DummyInternalTableImpl.java | 4 +
101 files changed, 2281 insertions(+), 919 deletions(-)
copy .run/{All checks [check].run.xml => All checks [PMD, modernizer, checkstyle].run.xml} (61%)
copy .run/{All checks [check].run.xml => Fast build only java.run.xml} (60%)
create mode 100644 modules/core/src/main/java/org/apache/ignite/internal/util/VarIntUtils.java
create mode 100644 modules/core/src/test/java/org/apache/ignite/internal/streamer/StreamerSubscriberTest.java
create mode 100644 modules/core/src/test/java/org/apache/ignite/internal/util/VarIntUtilsTest.java
delete mode 100644 modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/DistributionZoneManagerWatchListenerTest.java
copy modules/raft/src/main/java/org/apache/ignite/raft/jraft/rpc/impl/core/{GetFileRequestProcessor.java => AppendEntriesRequestInterceptor.java} (51%)
copy modules/raft/src/main/java/org/apache/ignite/raft/jraft/rpc/impl/core/{TimeoutNowRequestProcessor.java => InterceptingAppendEntriesRequestProcessor.java} (55%)
copy modules/raft/src/main/java/org/apache/ignite/raft/jraft/rpc/impl/core/{GetFileRequestProcessor.java => NullAppendEntriesRequestInterceptor.java} (55%)
create mode 100644 modules/runner/src/integrationTest/java/org/apache/ignite/internal/schemasync/ItSchemaSyncAndReplicationTest.java
copy modules/{table/src/main/java/org/apache/ignite/internal/table/distributed/replication/request/ReadWriteMultiRowReplicaRequest.java => runner/src/testFixtures/java/org/apache/ignite/internal/ReplicationGroupsUtils.java} (54%)
copy modules/{cli/src/main/java/org/apache/ignite/internal/cli/decorators/SqlQueryResultDecorator.java => sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/QueryTransactionWrapper.java} (50%)
create mode 100644 modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/QueryTransactionWrapperSelfTest.java
copy modules/{sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/message/MessageListener.java => table/src/main/java/org/apache/ignite/internal/table/distributed/command/CatalogVersionAware.java} (70%)
create mode 100644 modules/table/src/main/java/org/apache/ignite/internal/table/distributed/schema/CheckCatalogVersionOnAppendEntries.java
copy modules/table/src/main/java/org/apache/ignite/internal/table/distributed/schema/{package-info.java => PartitionCommandsMarshaller.java} (63%)
create mode 100644 modules/table/src/main/java/org/apache/ignite/internal/table/distributed/schema/PartitionCommandsMarshallerImpl.java
copy modules/{raft/src/main/java/org/apache/ignite/internal/raft/util/ThreadLocalOptimizedMarshaller.java => table/src/main/java/org/apache/ignite/internal/table/distributed/schema/ThreadLocalPartitionCommandsMarshaller.java} (67%)
create mode 100644 modules/table/src/test/java/org/apache/ignite/internal/table/distributed/schema/PartitionCommandsMarshallerImplTest.java
copy modules/table/src/{main/java/org/apache/ignite/internal/table/distributed/replicator/action/RequestType.java => testFixtures/java/org/apache/ignite/distributed/replicator/action/RequestTypes.java} (51%)
[ignite-3] 02/02: catalog-feature after ai-merge
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 69b65cb061ef3a0cd68efcb83415c7f640646d8a
Author: Kirill Tkalenko <tk...@yandex.ru>
AuthorDate: Tue Aug 29 15:10:36 2023 +0300
catalog-feature after ai-merge
---
...butionZoneManagerLogicalTopologyEventsTest.java | 2 +-
.../ignite/internal/table/ItRoReadsTest.java | 8 +-
.../internal/sql/engine/SqlQueryProcessor.java | 109 +--------------------
.../table/distributed/TableManagerTest.java | 1 -
4 files changed, 9 insertions(+), 111 deletions(-)
diff --git a/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/DistributionZoneManagerLogicalTopologyEventsTest.java b/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/DistributionZoneManagerLogicalTopologyEventsTest.java
index 009d7dac36..9f58aca736 100644
--- a/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/DistributionZoneManagerLogicalTopologyEventsTest.java
+++ b/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/DistributionZoneManagerLogicalTopologyEventsTest.java
@@ -17,8 +17,8 @@
package org.apache.ignite.internal.distributionzones;
+import static org.apache.ignite.internal.catalog.CatalogService.DEFAULT_ZONE_NAME;
import static org.apache.ignite.internal.cluster.management.topology.LogicalTopologyImpl.LOGICAL_TOPOLOGY_KEY;
-import static org.apache.ignite.internal.distributionzones.DistributionZoneManager.DEFAULT_ZONE_NAME;
import static org.apache.ignite.internal.distributionzones.DistributionZonesTestUtil.assertDataNodesForZone;
import static org.apache.ignite.internal.distributionzones.DistributionZonesTestUtil.assertLogicalTopology;
import static org.apache.ignite.internal.distributionzones.DistributionZonesTestUtil.assertLogicalTopologyVersion;
diff --git 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
index 0cf52ecb97..d981474209 100644
--- 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
@@ -541,7 +541,13 @@ public class ItRoReadsTest extends BaseIgniteAbstractTest {
try {
var context = QueryContext.create(SqlQueryType.ALL);
- CompletableFuture<AsyncSqlCursor<List<Object>>> queryFuture = queryEngine.querySingleAsync(sessionId, context, sql, args);
+ CompletableFuture<AsyncSqlCursor<List<Object>>> queryFuture = queryEngine.querySingleAsync(
+ sessionId,
+ context,
+ node().transactions(),
+ sql,
+ args
+ );
assertThat(queryFuture, willCompleteSuccessfully());
diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/SqlQueryProcessor.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/SqlQueryProcessor.java
index ac63f66327..ca0c8c6b5e 100644
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/SqlQueryProcessor.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/SqlQueryProcessor.java
@@ -101,7 +101,7 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
/**
- * SqlQueryProcessor.
+ * SqlQueryProcessor.
* TODO Documentation https://issues.apache.org/jira/browse/IGNITE-15859
*/
public class SqlQueryProcessor implements QueryProcessor {
@@ -510,113 +510,6 @@ public class SqlQueryProcessor implements QueryProcessor {
return metricManager;
}
- private abstract static class AbstractTableEventListener implements EventListener<TableEventParameters> {
- protected final SqlSchemaManagerImpl schemaHolder;
-
- private AbstractTableEventListener(SqlSchemaManagerImpl schemaHolder) {
- this.schemaHolder = schemaHolder;
- }
- }
-
- private abstract static class AbstractIndexEventListener implements EventListener<IndexEventParameters> {
- protected final SqlSchemaManagerImpl schemaHolder;
-
- private AbstractIndexEventListener(SqlSchemaManagerImpl schemaHolder) {
- this.schemaHolder = schemaHolder;
- }
- }
-
- private static class TableCreatedListener extends AbstractTableEventListener {
- private TableCreatedListener(SqlSchemaManagerImpl schemaHolder) {
- super(schemaHolder);
- }
-
- /** {@inheritDoc} */
- @Override
- public CompletableFuture<Boolean> notify(TableEventParameters parameters, @Nullable Throwable exception) {
- return schemaHolder.onTableCreated(
- // TODO: https://issues.apache.org/jira/browse/IGNITE-17694 Hardcoded schemas
- DEFAULT_SCHEMA_NAME,
- parameters.tableId(),
- parameters.causalityToken()
- )
- .thenApply(v -> false);
- }
- }
-
- private static class TableUpdatedListener extends AbstractTableEventListener {
- private TableUpdatedListener(SqlSchemaManagerImpl schemaHolder) {
- super(schemaHolder);
- }
-
- /** {@inheritDoc} */
- @Override
- public CompletableFuture<Boolean> notify(TableEventParameters parameters, @Nullable Throwable exception) {
- return schemaHolder.onTableUpdated(
- // TODO: https://issues.apache.org/jira/browse/IGNITE-17694 Hardcoded schemas
- DEFAULT_SCHEMA_NAME,
- parameters.tableId(),
- parameters.causalityToken()
- )
- .thenApply(v -> false);
- }
- }
-
- private static class TableDroppedListener extends AbstractTableEventListener {
- private TableDroppedListener(SqlSchemaManagerImpl schemaHolder) {
- super(schemaHolder);
- }
-
- /** {@inheritDoc} */
- @Override
- public CompletableFuture<Boolean> notify(TableEventParameters parameters, @Nullable Throwable exception) {
- return schemaHolder.onTableDropped(
- // TODO: https://issues.apache.org/jira/browse/IGNITE-17694 Hardcoded schemas
- DEFAULT_SCHEMA_NAME,
- parameters.tableId(),
- parameters.causalityToken()
- )
- .thenApply(v -> false);
- }
- }
-
- private static class IndexDroppedListener extends AbstractIndexEventListener {
- private IndexDroppedListener(SqlSchemaManagerImpl schemaHolder) {
- super(schemaHolder);
- }
-
- /** {@inheritDoc} */
- @Override
- public CompletableFuture<Boolean> notify(IndexEventParameters parameters, @Nullable Throwable exception) {
- return schemaHolder.onIndexDropped(
- // TODO: https://issues.apache.org/jira/browse/IGNITE-17694 Hardcoded schemas
- DEFAULT_SCHEMA_NAME,
- parameters.tableId(),
- parameters.indexId(),
- parameters.causalityToken()
- )
- .thenApply(v -> false);
- }
- }
-
- private static class IndexCreatedListener extends AbstractIndexEventListener {
- private IndexCreatedListener(SqlSchemaManagerImpl schemaHolder) {
- super(schemaHolder);
- }
-
- /** {@inheritDoc} */
- @Override
- public CompletableFuture<Boolean> notify(IndexEventParameters parameters, @Nullable Throwable exception) {
- return schemaHolder.onIndexCreated(
- parameters.tableId(),
- parameters.indexId(),
- parameters.indexDescriptor(),
- parameters.causalityToken()
- )
- .thenApply(v -> false);
- }
- }
-
/** Performs additional validation of a parsed statement. **/
private static void validateParsedStatement(
QueryContext context,
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 92f92345af..5883804874 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
@@ -62,7 +62,6 @@ import java.util.function.LongFunction;
import org.apache.ignite.configuration.NamedListView;
import org.apache.ignite.internal.affinity.AffinityUtils;
import org.apache.ignite.internal.baseline.BaselineManager;
-import org.apache.ignite.internal.catalog.CatalogService;
import org.apache.ignite.internal.catalog.CatalogManager;
import org.apache.ignite.internal.catalog.CatalogTestUtils;
import org.apache.ignite.internal.catalog.descriptors.CatalogTableDescriptor;
[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 9ff6c35a55be8235c7418ab33467ca0630d92bf8
Merge: d569920d10 e6d97f5b25
Author: Kirill Tkalenko <tk...@yandex.ru>
AuthorDate: Tue Aug 29 14:05:47 2023 +0300
Merge branch 'ai-main' into catalog-feature
...l checks [PMD, modernizer, checkstyle].run.xml} | 12 +-
.run/All checks [check].run.xml | 4 +-
...check].run.xml => Fast build only java.run.xml} | 8 +-
.../ignite/internal/catalog/CatalogService.java | 2 -
.../internal/cli/CliIntegrationTestBase.java | 7 +-
.../client/handler/JdbcQueryEventHandlerImpl.java | 2 +
.../requests/sql/ClientSqlExecuteRequest.java | 4 +-
.../handler/JdbcQueryEventHandlerImplTest.java | 8 +-
.../requests/jdbc/JdbcQueryCursorSelfTest.java | 15 +-
.../internal/client/table/ClientDataStreamer.java | 5 -
.../client/fakes/FakeIgniteQueryProcessor.java | 3 +-
.../ignite/internal/streamer/StreamerBuffer.java | 38 +--
.../ignite/internal/streamer/StreamerOptions.java | 8 -
.../internal/streamer/StreamerSubscriber.java | 53 ++--
.../org/apache/ignite/internal/util/ByteUtils.java | 2 +-
.../apache/ignite/internal/util/VarIntUtils.java | 103 +++++++
.../internal/streamer/StreamerSubscriberTest.java | 179 ++++++++++++
.../ignite/internal/util/VarIntUtilsTest.java | 94 +++++++
.../testframework/TestIgnitionManager.java | 37 ++-
...butionZoneManagerLogicalTopologyEventsTest.java | 28 ++
.../DistributionZoneManagerWatchListenerTest.java | 109 --------
.../apache/ignite/raft/jraft/core/ItNodeTest.java | 2 +
.../java/org/apache/ignite/internal/raft/Loza.java | 13 +-
.../internal/raft/server/RaftGroupOptions.java | 23 ++
.../internal/raft/server/impl/JraftServerImpl.java | 30 +-
.../internal/raft/util/OptimizedMarshaller.java | 14 +-
.../ignite/internal/raft/util/OptimizedStream.java | 2 +-
.../apache/ignite/raft/jraft/core/NodeImpl.java | 1 +
.../ignite/raft/jraft/option/NodeOptions.java | 14 +
.../jraft/rpc/impl/ActionRequestProcessor.java | 12 +-
.../raft/jraft/rpc/impl/IgniteRpcServer.java | 11 +-
.../impl/core/AppendEntriesRequestInterceptor.java | 40 +++
.../InterceptingAppendEntriesRequestProcessor.java | 55 ++++
.../core/NullAppendEntriesRequestInterceptor.java} | 41 +--
.../apache/ignite/raft/jraft/core/TestCluster.java | 7 +
.../ignite/raft/jraft/rpc/TestIgniteRpcServer.java | 4 +-
.../replicator/message/ReplicaMessageGroup.java | 5 +-
.../internal/ClusterPerTestIntegrationTest.java | 2 +-
.../benchmark/AbstractOneNodeBenchmark.java | 2 +-
.../storage/ItRebalanceDistributedTest.java | 10 +-
...niteDistributionZoneManagerNodeRestartTest.java | 64 ++++-
.../raftsnapshot/ItTableRaftSnapshotsTest.java | 79 +-----
.../app/ItIgniteInMemoryNodeRestartTest.java | 2 +
.../runner/app/ItIgniteNodeRestartTest.java | 14 +-
.../schemasync/ItSchemaSyncAndReplicationTest.java | 177 ++++++++++++
.../internal/sql/api/ItSqlAsynchronousApiTest.java | 48 ++--
.../internal/sql/api/ItSqlSynchronousApiTest.java | 22 +-
.../sql/engine/ClusterPerClassIntegrationTest.java | 7 +-
.../engine/datatypes/tests/BaseDataTypeTest.java | 6 +
.../src/integrationTest/sql/sqlite/join/join1.test | 4 +-
.../org/apache/ignite/internal/app/IgniteImpl.java | 16 +-
.../java/org/apache/ignite/internal/Cluster.java | 88 +++++-
.../ignite/internal/ReplicationGroupsUtils.java} | 41 ++-
.../sql/engine/util/TestQueryProcessor.java | 13 +-
.../ignite/internal/sql/api/IgniteSqlImpl.java | 9 +-
.../internal/sql/api/SessionBuilderImpl.java | 8 +-
.../ignite/internal/sql/api/SessionImpl.java | 12 +-
.../internal/sql/engine/AsyncSqlCursorImpl.java | 21 +-
.../ignite/internal/sql/engine/QueryProcessor.java | 6 +-
.../sql/engine/QueryTransactionWrapper.java | 59 ++++
.../internal/sql/engine/SqlQueryProcessor.java | 303 +++++++++++++++------
.../internal/sql/engine/exec/ArrayRowHandler.java | 14 +
.../internal/sql/engine/exec/ExchangeService.java | 6 +-
.../sql/engine/exec/ExchangeServiceImpl.java | 11 +-
.../sql/engine/exec/LogicalRelImplementor.java | 8 +-
.../internal/sql/engine/exec/RowHandler.java | 43 ++-
.../sql/engine/exec/exp/ExpressionFactoryImpl.java | 4 +-
.../engine/exec/exp/agg/AccumulatorsFactory.java | 2 +-
.../ignite/internal/sql/engine/exec/rel/Inbox.java | 16 +-
.../internal/sql/engine/exec/rel/Outbox.java | 12 +-
.../internal/sql/engine/externalize/RelJson.java | 4 +-
.../sql/engine/message/QueryBatchMessage.java | 5 +-
.../sql/engine/AsyncSqlCursorImplTest.java | 51 ++--
.../engine/QueryTransactionWrapperSelfTest.java | 131 +++++++++
.../sql/engine/exec/rel/AbstractExecutionTest.java | 7 +
.../sql/engine/exec/rel/ExchangeExecutionTest.java | 3 +-
.../sql/engine/exec/rel/ExecutionTest.java | 27 ++
.../internal/sql/engine/util/QueryChecker.java | 9 +-
modules/table/build.gradle | 1 +
.../distributed/ItTxDistributedTestSingleNode.java | 4 +
.../ignite/internal/table/AbstractTableView.java | 2 +-
.../apache/ignite/internal/table/DataStreamer.java | 5 -
.../internal/table/distributed/TableManager.java | 38 ++-
...titionCommand.java => CatalogVersionAware.java} | 16 +-
.../distributed/command/PartitionCommand.java | 8 +-
.../replicator/PartitionReplicaListener.java | 222 +++++++++------
.../distributed/replicator/action/RequestType.java | 38 +--
.../schema/CheckCatalogVersionOnAppendEntries.java | 105 +++++++
.../PartitionCommandsMarshaller.java} | 23 +-
.../schema/PartitionCommandsMarshallerImpl.java | 73 +++++
.../distributed/schema/SchemaSyncService.java | 8 -
.../distributed/schema/SchemaSyncServiceImpl.java | 11 +-
.../ThreadLocalPartitionCommandsMarshaller.java | 53 ++++
.../table/distributed/TableManagerTest.java | 3 +
.../PartitionReplicaListenerIndexLockingTest.java | 9 +-
.../replication/PartitionReplicaListenerTest.java | 182 +++++++++----
.../PartitionCommandsMarshallerImplTest.java | 116 ++++++++
.../schema/SchemaSyncServiceImplTest.java | 14 +-
.../replicator/action/RequestTypes.java} | 95 ++++---
.../table/impl/DummyInternalTableImpl.java | 4 +
100 files changed, 2507 insertions(+), 884 deletions(-)
diff --cc modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/storage/ItRebalanceDistributedTest.java
index a653bfe821,928a08df45..fedc0bfd0b
--- 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
@@@ -765,18 -770,23 +767,23 @@@ public class ItRebalanceDistributedTes
metaStorageManager,
clusterService);
- clockWaiter = new ClockWaiter("test", hybridClock);
+ clockWaiter = new ClockWaiter(name, hybridClock);
+ LongSupplier delayDurationMsSupplier = () -> 10L;
+
catalogManager = new CatalogManagerImpl(
new UpdateLogImpl(metaStorageManager),
- clockWaiter
+ clockWaiter,
+ delayDurationMsSupplier
);
schemaManager = new SchemaManager(registry, tablesCfg, metaStorageManager);
+ var schemaSyncService = new SchemaSyncServiceImpl(metaStorageManager.clusterTime(), delayDurationMsSupplier);
+
distributionZoneManager = new DistributionZoneManager(
+ name,
registry,
- zonesCfg,
tablesCfg,
metaStorageManager,
logicalTopologyService,
diff --cc modules/runner/src/integrationTest/java/org/apache/ignite/internal/distribution/zones/ItIgniteDistributionZoneManagerNodeRestartTest.java
index 8e35cff82f,c0d289fd47..499079f797
--- 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
@@@ -17,11 -17,12 +17,12 @@@
package org.apache.ignite.internal.distribution.zones;
+ import static java.util.Collections.emptySet;
import static java.util.concurrent.CompletableFuture.completedFuture;
import static java.util.stream.Collectors.toSet;
-import static org.apache.ignite.internal.distributionzones.DistributionZoneManager.DEFAULT_ZONE_NAME;
-import static org.apache.ignite.internal.distributionzones.DistributionZoneManager.IMMEDIATE_TIMER_VALUE;
-import static org.apache.ignite.internal.distributionzones.DistributionZoneManager.INFINITE_TIMER_VALUE;
+import static org.apache.ignite.internal.catalog.CatalogService.DEFAULT_ZONE_NAME;
+import static org.apache.ignite.internal.catalog.commands.CatalogUtils.IMMEDIATE_TIMER_VALUE;
+import static org.apache.ignite.internal.catalog.commands.CatalogUtils.INFINITE_TIMER_VALUE;
import static org.apache.ignite.internal.distributionzones.DistributionZonesTestUtil.assertDataNodesFromManager;
import static org.apache.ignite.internal.distributionzones.DistributionZonesTestUtil.assertValueInStorage;
import static org.apache.ignite.internal.distributionzones.DistributionZonesUtil.zoneDataNodesKey;
diff --cc modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java
index 4bd43933d4,80ec993d48..4ec6ec43a9
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java
@@@ -337,20 -344,31 +339,28 @@@ public class ItIgniteNodeRestartTest ex
SchemaManager schemaManager = new SchemaManager(registry, tablesConfig, metaStorageMgr);
- Consumer<LongFunction<CompletableFuture<?>>> revisionUpdater = (LongFunction<CompletableFuture<?>> function) ->
- metaStorageMgr.registerRevisionUpdateListener(function::apply);
-
- DistributionZoneManager distributionZoneManager = new DistributionZoneManager(
- null,
- zonesConfig,
- tablesConfig,
- metaStorageMgr,
- logicalTopologyService,
- vault,
- name
- );
-
- var clockWaiter = new ClockWaiter("test", hybridClock);
+ var clockWaiter = new ClockWaiter(name, clock);
- var catalogManager = new CatalogManagerImpl(new UpdateLogImpl(metaStorageMgr), clockWaiter);
+ LongSupplier delayDurationMsSupplier = () -> 100L;
+
+ var catalogManager = new CatalogManagerImpl(
+ new UpdateLogImpl(metaStorageMgr),
+ clockWaiter,
+ delayDurationMsSupplier
+ );
+ DistributionZoneManager distributionZoneManager = new DistributionZoneManager(
+ name,
+ registry,
+ tablesConfig,
+ metaStorageMgr,
+ logicalTopologyService,
+ vault,
+ catalogManager
+ );
+
+ var schemaSyncService = new SchemaSyncServiceImpl(metaStorageMgr.clusterTime(), delayDurationMsSupplier);
+
TableManager tableManager = new TableManager(
name,
registry,
@@@ -389,10 -409,10 +400,9 @@@
indexManager,
schemaManager,
dataStorageManager,
- txManager,
- distributionZoneManager,
() -> dataStorageModules.collectSchemasFields(modules.distributed().polymorphicSchemaExtensions()),
replicaSvc,
- hybridClock,
+ clock,
catalogManager,
metricManager
);
diff --cc modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java
index 1cfffb1357,44cf8a6945..108ddcdda1
--- a/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java
+++ b/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java
@@@ -503,19 -522,13 +509,23 @@@ public class IgniteImpl implements Igni
catalogManager = new CatalogManagerImpl(
new UpdateLogImpl(metaStorageMgr),
clockWaiter,
- () -> schemaSyncConfig.delayDuration().value()
+ delayDurationMsSupplier
);
+ raftMgr.appendEntriesRequestInterceptor(new CheckCatalogVersionOnAppendEntries(catalogManager));
+
+ SchemaSyncService schemaSyncService = new SchemaSyncServiceImpl(metaStorageMgr.clusterTime(), delayDurationMsSupplier);
+
+ distributionZoneManager = new DistributionZoneManager(
+ name,
+ registry,
+ tablesConfig,
+ metaStorageMgr,
+ logicalTopologyService,
+ vaultMgr,
+ catalogManager
+ );
+
distributedTblMgr = new TableManager(
name,
registry,
@@@ -552,7 -567,7 +563,6 @@@
indexManager,
schemaManager,
dataStorageMgr,
- txManager,
- distributionZoneManager,
() -> dataStorageModules.collectSchemasFields(modules.distributed().polymorphicSchemaExtensions()),
replicaSvc,
clock,
diff --cc modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/SqlQueryProcessor.java
index bf60f6439a,33445d9aac..ac63f66327
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/SqlQueryProcessor.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/SqlQueryProcessor.java
@@@ -67,10 -68,11 +66,11 @@@ import org.apache.ignite.internal.sql.e
import org.apache.ignite.internal.sql.engine.message.MessageServiceImpl;
import org.apache.ignite.internal.sql.engine.prepare.PrepareService;
import org.apache.ignite.internal.sql.engine.prepare.PrepareServiceImpl;
+ import org.apache.ignite.internal.sql.engine.prepare.QueryPlan;
import org.apache.ignite.internal.sql.engine.property.PropertiesHelper;
import org.apache.ignite.internal.sql.engine.property.PropertiesHolder;
+import org.apache.ignite.internal.sql.engine.schema.CatalogSqlSchemaManager;
import org.apache.ignite.internal.sql.engine.schema.SqlSchemaManager;
-import org.apache.ignite.internal.sql.engine.schema.SqlSchemaManagerImpl;
import org.apache.ignite.internal.sql.engine.session.Session;
import org.apache.ignite.internal.sql.engine.session.SessionId;
import org.apache.ignite.internal.sql.engine.session.SessionInfo;
@@@ -87,8 -89,8 +87,7 @@@ import org.apache.ignite.internal.sql.m
import org.apache.ignite.internal.storage.DataStorageManager;
import org.apache.ignite.internal.table.distributed.TableManager;
import org.apache.ignite.internal.table.event.TableEvent;
-import org.apache.ignite.internal.table.event.TableEventParameters;
import org.apache.ignite.internal.tx.InternalTransaction;
- import org.apache.ignite.internal.tx.TxManager;
import org.apache.ignite.internal.util.IgniteSpinBusyLock;
import org.apache.ignite.internal.util.IgniteUtils;
import org.apache.ignite.lang.IgniteInternalException;
@@@ -170,9 -173,9 +171,6 @@@ public class SqlQueryProcessor implemen
private volatile SqlSchemaManager sqlSchemaManager;
- /** Transaction manager. */
- private final TxManager txManager;
- /** Distribution zones manager. */
- private final DistributionZoneManager distributionZoneManager;
--
/** Clock. */
private final HybridClock clock;
@@@ -193,7 -196,7 +191,6 @@@
IndexManager indexManager,
SchemaManager schemaManager,
DataStorageManager dataStorageManager,
- TxManager txManager,
- DistributionZoneManager distributionZoneManager,
Supplier<Map<String, Map<String, Class<?>>>> dataStorageFieldsSupplier,
ReplicaService replicaService,
HybridClock clock,
@@@ -205,7 -209,7 +202,6 @@@
this.indexManager = indexManager;
this.schemaManager = schemaManager;
this.dataStorageManager = dataStorageManager;
- this.txManager = txManager;
- this.distributionZoneManager = distributionZoneManager;
this.dataStorageFieldsSupplier = dataStorageFieldsSupplier;
this.replicaService = replicaService;
this.clock = clock;
diff --cc modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
index dd7a55a346,de1d6766bc..a0c7b44a88
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
@@@ -367,11 -381,8 +374,11 @@@ public class TableManager extends Produ
private final ConfiguredTablesCache configuredTablesCache;
- private final CatalogManager catalogManager;
+ private final Marshaller raftCommandsMarshaller;
+ /** Versioned value used only at manager startup to correctly fire table creation events. */
+ private final IncrementalVersionedValue<Void> startVv;
+
/**
* Creates a new table manager.
*
@@@ -417,9 -429,11 +423,10 @@@
VaultManager vaultManager,
ClusterManagementGroupManager cmgMgr,
DistributionZoneManager distributionZoneManager,
- CatalogManager catalogManager
+ SchemaSyncService schemaSyncService,
+ CatalogService catalogService
) {
this.tablesCfg = tablesCfg;
- this.zonesConfig = zonesConfig;
this.gcConfig = gcConfig;
this.clusterService = clusterService;
this.raftMgr = raftMgr;
@@@ -496,7 -511,7 +504,9 @@@
configuredTablesCache = new ConfiguredTablesCache(tablesCfg, getMetadataLocallyOnly);
+ raftCommandsMarshaller = new ThreadLocalPartitionCommandsMarshaller(clusterService.serializationRegistry());
++
+ startVv = new IncrementalVersionedValue<>(registry);
}
@Override
@@@ -597,9 -610,7 +607,9 @@@
try {
CatalogTableDescriptor tableDescriptor = toTableDescriptor(ctx.newValue());
- CatalogZoneDescriptor zoneDescriptor = getZoneDescriptor(tableDescriptor.zoneId());
+ // TODO: IGNITE-19499 It is now safe to get the latest version of the catalog since we are in the metasore thread, we need to
+ // change to the version from the catalog listener
- CatalogZoneDescriptor zoneDescriptor = getZoneDescriptor(tableDescriptor.zoneId(), catalogManager.latestCatalogVersion());
++ CatalogZoneDescriptor zoneDescriptor = getZoneDescriptor(tableDescriptor.zoneId(), catalogService.latestCatalogVersion());
CompletableFuture<List<Set<Assignment>>> assignmentsFuture;
@@@ -682,9 -695,7 +692,9 @@@
try {
CatalogTableDescriptor tableDescriptor = toTableDescriptor(ctx.oldValue());
- CatalogZoneDescriptor zoneDescriptor = getZoneDescriptor(tableDescriptor.zoneId());
+ // TODO: IGNITE-19499 It is now safe to get the latest version of the catalog since we are in the metasore thread, we need to
+ // change to the version from the catalog listener
- CatalogZoneDescriptor zoneDescriptor = getZoneDescriptor(tableDescriptor.zoneId(), catalogManager.latestCatalogVersion());
++ CatalogZoneDescriptor zoneDescriptor = getZoneDescriptor(tableDescriptor.zoneId(), catalogService.latestCatalogVersion());
dropTableLocally(ctx.storageRevision(), tableDescriptor, zoneDescriptor);
} finally {
@@@ -1304,7 -1321,7 +1318,7 @@@
MvTableStorage tableStorage = engine.createMvTable(
new StorageTableDescriptor(tableDescriptor.id(), zoneDescriptor.partitions(), dataStorage.dataRegion()),
- new StorageIndexDescriptorSupplier(catalogManager)
- new StorageIndexDescriptorSupplier(tablesCfg)
++ new StorageIndexDescriptorSupplier(catalogService)
);
tableStorage.start();
@@@ -1456,7 -1473,7 +1470,7 @@@
// TODO: https://issues.apache.org/jira/browse/IGNITE-19425 we must use distribution zone keys here
baselineMgr.nodes().stream().map(ClusterNode::name).collect(toList()),
tablePartitionId.partitionId(),
- getZoneDescriptor(tableDescriptor.zoneId(), catalogManager.latestCatalogVersion()).replicas()
- getZoneDescriptor(tableDescriptor.zoneId()).replicas()
++ getZoneDescriptor(tableDescriptor.zoneId(), catalogService.latestCatalogVersion()).replicas()
);
}
@@@ -1509,44 -1526,55 +1523,44 @@@
}
try {
- distributionZoneManager.zoneIdAsyncInternal(zoneName).handle((zoneId, zoneIdEx) -> {
- if (zoneId == null) {
- tblFut.completeExceptionally(new DistributionZoneNotFoundException(zoneName));
- } else if (zoneIdEx != null) {
- tblFut.completeExceptionally(zoneIdEx);
- } else {
- if (!busyLock.enterBusy()) {
- NodeStoppingException nodeStoppingException = new NodeStoppingException();
+ // TODO: IGNITE-19499 Should listen to event CreateTableEventParameters and get the zone ID from it
- CatalogZoneDescriptor zoneDescriptor = catalogManager.zone(zoneName, clock.nowLong());
++ CatalogZoneDescriptor zoneDescriptor = catalogService.zone(zoneName, clock.nowLong());
- tblFut.completeExceptionally(nodeStoppingException);
+ if (zoneDescriptor == null) {
+ tblFut.completeExceptionally(new DistributionZoneNotFoundException(zoneName));
- throw new IgniteException(nodeStoppingException);
- }
+ return null;
+ }
- try {
- cmgMgr.logicalTopology()
- .handle((cmgTopology, e) -> {
- if (e == null) {
- if (!busyLock.enterBusy()) {
- NodeStoppingException nodeStoppingException = new NodeStoppingException();
-
- tblFut.completeExceptionally(nodeStoppingException);
-
- throw new IgniteException(nodeStoppingException);
- }
-
- try {
- changeTablesConfigurationOnTableCreate(
- name,
- zoneId,
- tableInitChange,
- tblFut
- );
- } finally {
- busyLock.leaveBusy();
- }
- } else {
- tblFut.completeExceptionally(e);
- }
-
- return null;
- });
- } finally {
- busyLock.leaveBusy();
- }
- }
+ cmgMgr.logicalTopology()
+ .handle((cmgTopology, e) -> {
+ if (e == null) {
+ if (!busyLock.enterBusy()) {
+ NodeStoppingException nodeStoppingException = new NodeStoppingException();
+
+ tblFut.completeExceptionally(nodeStoppingException);
+
+ throw new IgniteException(nodeStoppingException);
+ }
+
+ try {
+ changeTablesConfigurationOnTableCreate(
+ name,
+ zoneDescriptor.id(),
+ tableInitChange,
+ tblFut
+ );
+ } finally {
+ busyLock.leaveBusy();
+ }
+ } else {
+ tblFut.completeExceptionally(e);
+ }
- return null;
- });
+ return null;
+ });
+ } catch (Throwable t) {
+ tblFut.completeExceptionally(t);
} finally {
busyLock.leaveBusy();
}
@@@ -2417,9 -2434,6 +2431,9 @@@
TablePartitionId replicaGrpId = new TablePartitionId(tableId, partitionId);
+ // It's safe to get the latest version of the catalog since we're in the metastore thread.
- int catalogVersion = catalogManager.latestCatalogVersion();
++ int catalogVersion = catalogService.latestCatalogVersion();
+
return tablesById(evt.revision())
.thenCompose(tables -> {
if (!busyLock.enterBusy()) {
@@@ -2730,42 -2733,7 +2744,42 @@@
return tableView == null ? null : toTableDescriptor(tableView);
}
- private CatalogZoneDescriptor getZoneDescriptor(int id) {
- return toZoneDescriptor(getZoneById(zonesConfig, id).value());
+ private @Nullable CatalogZoneDescriptor getZoneDescriptor(int zoneId, int catalogVersion) {
- return catalogManager.zone(zoneId, catalogVersion);
++ return catalogService.zone(zoneId, catalogVersion);
+ }
+
+ private static @Nullable TableImpl findTableImplByName(Collection<TableImpl> tables, String name) {
+ return tables.stream().filter(table -> table.name().equals(name)).findAny().orElse(null);
+ }
+
+ /**
+ * Fires table creation events so that indexes can be correctly created at IndexManager startup.
+ *
+ * <p>NOTE: This is a temporary solution that must be get rid/remake/change.
+ */
+ // TODO: IGNITE-19499 Need to get rid/remake/change
+ private void fireCreateTablesOnManagerStart() {
+ CompletableFuture<Long> recoveryFinishFuture = metaStorageMgr.recoveryFinishedFuture();
+
+ assert recoveryFinishFuture.isDone();
+
+ long causalityToken = recoveryFinishFuture.join();
+
+ List<CompletableFuture<?>> fireEventFutures = new ArrayList<>();
+
+ for (TableView tableView : tablesCfg.tables().value()) {
+ fireEventFutures.add(fireEvent(TableEvent.CREATE, new TableEventParameters(causalityToken, tableView.id())));
+ }
+
+ startVv.update(causalityToken, (unused, throwable) -> allOf(fireEventFutures.toArray(CompletableFuture[]::new)))
+ .whenComplete((unused, throwable) -> {
+ if (throwable != null) {
+ LOG.error("Error when firing table creation events at manager start", throwable);
+ } else {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Manager successfully fired table creation events at manager start");
+ }
+ }
+ });
}
}
diff --cc modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerTest.java
index 31193447d9,e41f562587..92f92345af
--- 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
@@@ -62,8 -64,8 +62,9 @@@ import java.util.function.LongFunction
import org.apache.ignite.configuration.NamedListView;
import org.apache.ignite.internal.affinity.AffinityUtils;
import org.apache.ignite.internal.baseline.BaselineManager;
+ import org.apache.ignite.internal.catalog.CatalogService;
+import org.apache.ignite.internal.catalog.CatalogManager;
+import org.apache.ignite.internal.catalog.CatalogTestUtils;
import org.apache.ignite.internal.catalog.descriptors.CatalogTableDescriptor;
import org.apache.ignite.internal.catalog.descriptors.CatalogZoneDescriptor;
import org.apache.ignite.internal.cluster.management.ClusterManagementGroupManager;
@@@ -828,7 -833,8 +830,8 @@@ public class TableManagerTest extends I
vaultManager,
cmgMgr,
distributionZoneManager,
+ mock(SchemaSyncService.class),
- mock(CatalogService.class)
+ catalogManager
) {
@Override
diff --cc modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerIndexLockingTest.java
index 8aadeae88c,d0c250122f..d0dd6dcb35
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerIndexLockingTest.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerIndexLockingTest.java
@@@ -17,8 -17,9 +17,9 @@@
package org.apache.ignite.internal.table.distributed.replication;
+ 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.testframework.IgniteTestUtils.await;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.allOf;