This is an automated email from the ASF dual-hosted git repository.
rpuch pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new 404006a3de6 IGNITE-22490 Move storageUpdate.batchByteLength config
value to replication.batchSizeBytes (#5518)
404006a3de6 is described below
commit 404006a3de6137a1b50b4da5f4f00502275e88bc
Author: Roman Puchkovskiy <roman.puchkovs...@gmail.com>
AuthorDate: Mon Mar 31 16:54:54 2025 +0400
IGNITE-22490 Move storageUpdate.batchByteLength config value to
replication.batchSizeBytes (#5518)
---
.../repl/executor/ItIgnitePicocliCommandsTest.java | 1 -
.../rebalance/ItRebalanceDistributedTest.java | 11 ++-----
.../partition/replicator/fixtures/Node.java | 11 ++-----
.../ReplicationConfigurationSchema.java | 7 +++++
.../runner/app/ItIgniteNodeRestartTest.java | 6 +---
.../org/apache/ignite/internal/app/IgniteImpl.java | 7 +----
.../SchemaDistributedConfigurationModule.java | 2 +-
.../StorageUpdateConfigurationSchema.java | 36 ----------------------
.../StorageUpdateExtensionConfigurationSchema.java | 31 -------------------
.../ItAbstractInternalTableScanTest.java | 6 ++--
.../ItInternalTableReadOnlyOperationsTest.java | 6 ++--
.../apache/ignite/distributed/ItLockTableTest.java | 5 ---
.../ItTxDistributedCleanupRecoveryTest.java | 1 -
...xDistributedTestSingleNodeNoCleanupMessage.java | 1 -
.../ignite/distributed/ItTxStateLocalMapTest.java | 5 ---
.../table/distributed/StorageUpdateHandler.java | 14 ++++-----
.../internal/table/distributed/TableManager.java | 19 ++++++------
.../internal/table/InteropOperationsTest.java | 6 ++--
.../table/TableKvOperationsMockedTest.java | 6 ++--
.../internal/table/distributed/IndexBaseTest.java | 6 ++--
.../table/distributed/StorageCleanupTest.java | 6 ++--
.../distributed/StorageUpdateHandlerTest.java | 6 ++--
.../distributed/TableManagerRecoveryTest.java | 6 ++--
.../table/distributed/TableManagerTest.java | 6 ++--
.../raft/PartitionCommandListenerTest.java | 8 ++---
.../PartitionReplicaListenerIndexLockingTest.java | 6 ++--
...itionReplicaListenerSortedIndexLockingTest.java | 6 ++--
.../replication/PartitionReplicaListenerTest.java | 6 ++--
.../apache/ignite/distributed/ItTxTestCluster.java | 7 +----
.../internal/table/TxInfrastructureTest.java | 5 ---
.../table/impl/DummyInternalTableImpl.java | 20 ++++++------
31 files changed, 83 insertions(+), 186 deletions(-)
diff --git
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/core/repl/executor/ItIgnitePicocliCommandsTest.java
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/core/repl/executor/ItIgnitePicocliCommandsTest.java
index ab3ea9a81ce..b5e2287617e 100644
---
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/core/repl/executor/ItIgnitePicocliCommandsTest.java
+++
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/core/repl/executor/ItIgnitePicocliCommandsTest.java
@@ -76,7 +76,6 @@ public class ItIgnitePicocliCommandsTest extends
CliIntegrationTest {
"ignite.schemaSync",
"ignite.security",
"ignite.sql",
- "ignite.storageUpdate",
"ignite.transaction",
"ignite.system"
};
diff --git
a/modules/distribution-zones/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceDistributedTest.java
b/modules/distribution-zones/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceDistributedTest.java
index 76b58935232..2fef230a773 100644
---
a/modules/distribution-zones/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceDistributedTest.java
+++
b/modules/distribution-zones/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceDistributedTest.java
@@ -204,15 +204,13 @@ import
org.apache.ignite.internal.replicator.ReplicaTestUtils;
import org.apache.ignite.internal.replicator.ReplicationGroupId;
import org.apache.ignite.internal.replicator.TablePartitionId;
import
org.apache.ignite.internal.replicator.configuration.ReplicationConfiguration;
+import
org.apache.ignite.internal.replicator.configuration.ReplicationExtensionConfigurationSchema;
import
org.apache.ignite.internal.rest.configuration.RestExtensionConfigurationSchema;
import org.apache.ignite.internal.schema.SchemaManager;
import org.apache.ignite.internal.schema.SchemaSyncService;
import org.apache.ignite.internal.schema.configuration.GcConfiguration;
import
org.apache.ignite.internal.schema.configuration.GcExtensionConfiguration;
import
org.apache.ignite.internal.schema.configuration.GcExtensionConfigurationSchema;
-import
org.apache.ignite.internal.schema.configuration.StorageUpdateConfiguration;
-import
org.apache.ignite.internal.schema.configuration.StorageUpdateExtensionConfiguration;
-import
org.apache.ignite.internal.schema.configuration.StorageUpdateExtensionConfigurationSchema;
import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.storage.DataStorageManager;
import org.apache.ignite.internal.storage.DataStorageModules;
@@ -1368,7 +1366,7 @@ public class ItRebalanceDistributedTest extends
BaseIgniteAbstractTest {
List.of(ClusterConfiguration.KEY),
List.of(
GcExtensionConfigurationSchema.class,
- StorageUpdateExtensionConfigurationSchema.class,
+ ReplicationExtensionConfigurationSchema.class,
SystemDistributedExtensionConfigurationSchema.class
),
List.of()
@@ -1487,9 +1485,6 @@ public class ItRebalanceDistributedTest extends
BaseIgniteAbstractTest {
clockService
);
- StorageUpdateConfiguration storageUpdateConfiguration =
clusterConfigRegistry
-
.getConfiguration(StorageUpdateExtensionConfiguration.KEY).storageUpdate();
-
MinimumRequiredTimeCollectorService minTimeCollectorService = new
MinimumRequiredTimeCollectorServiceImpl();
sharedTxStateStorage = new TxStateRocksDbSharedStorage(
@@ -1527,7 +1522,7 @@ public class ItRebalanceDistributedTest extends
BaseIgniteAbstractTest {
registry,
gcConfig,
txConfiguration,
- storageUpdateConfiguration,
+ replicationConfiguration,
clusterService.messagingService(),
clusterService.topologyService(),
clusterService.serializationRegistry(),
diff --git
a/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/fixtures/Node.java
b/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/fixtures/Node.java
index 84c2395fd50..86d0a323847 100644
---
a/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/fixtures/Node.java
+++
b/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/fixtures/Node.java
@@ -139,13 +139,11 @@ import
org.apache.ignite.internal.replicator.ReplicaManager;
import org.apache.ignite.internal.replicator.ReplicaService;
import org.apache.ignite.internal.replicator.ZonePartitionId;
import
org.apache.ignite.internal.replicator.configuration.ReplicationConfiguration;
+import
org.apache.ignite.internal.replicator.configuration.ReplicationExtensionConfigurationSchema;
import org.apache.ignite.internal.schema.SchemaManager;
import org.apache.ignite.internal.schema.SchemaSyncService;
import org.apache.ignite.internal.schema.configuration.GcConfiguration;
import
org.apache.ignite.internal.schema.configuration.GcExtensionConfigurationSchema;
-import
org.apache.ignite.internal.schema.configuration.StorageUpdateConfiguration;
-import
org.apache.ignite.internal.schema.configuration.StorageUpdateExtensionConfiguration;
-import
org.apache.ignite.internal.schema.configuration.StorageUpdateExtensionConfigurationSchema;
import org.apache.ignite.internal.sql.api.IgniteSqlImpl;
import org.apache.ignite.internal.sql.api.PublicApiThreadingIgniteSql;
import
org.apache.ignite.internal.sql.configuration.distributed.SqlDistributedConfiguration;
@@ -530,7 +528,7 @@ public class Node {
List.of(ClusterConfiguration.KEY),
List.of(
GcExtensionConfigurationSchema.class,
- StorageUpdateExtensionConfigurationSchema.class,
+ ReplicationExtensionConfigurationSchema.class,
SystemDistributedExtensionConfigurationSchema.class
),
List.of()
@@ -703,9 +701,6 @@ public class Node {
outgoingSnapshotsManager
);
- StorageUpdateConfiguration storageUpdateConfiguration =
clusterConfigRegistry
-
.getConfiguration(StorageUpdateExtensionConfiguration.KEY).storageUpdate();
-
resourceVacuumManager = new ResourceVacuumManager(
name,
resourcesRegistry,
@@ -721,7 +716,7 @@ public class Node {
registry,
gcConfiguration,
transactionConfiguration,
- storageUpdateConfiguration,
+ replicationConfiguration,
clusterService.messagingService(),
clusterService.topologyService(),
clusterService.serializationRegistry(),
diff --git
a/modules/replicator/src/main/java/org/apache/ignite/internal/replicator/configuration/ReplicationConfigurationSchema.java
b/modules/replicator/src/main/java/org/apache/ignite/internal/replicator/configuration/ReplicationConfigurationSchema.java
index de6316a2c60..4580363c408 100644
---
a/modules/replicator/src/main/java/org/apache/ignite/internal/replicator/configuration/ReplicationConfigurationSchema.java
+++
b/modules/replicator/src/main/java/org/apache/ignite/internal/replicator/configuration/ReplicationConfigurationSchema.java
@@ -54,4 +54,11 @@ public class ReplicationConfigurationSchema {
@Value(hasDefault = true)
@Range(max = 10_000)
public int replicaOperationRetryInterval = 10;
+
+ /**
+ * Maximum allowed length (in bytes) of a batch to write into physical
storage when replicating multi-writes.
+ **/
+ @Range(min = 1)
+ @Value(hasDefault = true)
+ public int batchSizeBytes = 8192;
}
diff --git
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
index a7eb9d7af48..ec092a5b837 100644
---
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
@@ -191,7 +191,6 @@ import
org.apache.ignite.internal.replicator.configuration.ReplicationExtensionC
import org.apache.ignite.internal.schema.SchemaManager;
import org.apache.ignite.internal.schema.configuration.GcConfiguration;
import
org.apache.ignite.internal.schema.configuration.GcExtensionConfiguration;
-import
org.apache.ignite.internal.schema.configuration.StorageUpdateConfiguration;
import org.apache.ignite.internal.sql.api.IgniteSqlImpl;
import
org.apache.ignite.internal.sql.configuration.distributed.SqlClusterExtensionConfiguration;
import
org.apache.ignite.internal.sql.configuration.local.SqlNodeExtensionConfiguration;
@@ -298,9 +297,6 @@ public class ItIgniteNodeRestartTest extends
BaseIgniteRestartTest {
@InjectConfiguration
private static TransactionConfiguration txConfiguration;
- @InjectConfiguration
- private static StorageUpdateConfiguration storageUpdateConfiguration;
-
@InjectConfiguration
private CriticalWorkersConfiguration workersConfiguration;
@@ -752,7 +748,7 @@ public class ItIgniteNodeRestartTest extends
BaseIgniteRestartTest {
registry,
gcConfig,
txConfiguration,
- storageUpdateConfiguration,
+ replicationConfiguration,
messagingServiceReturningToStorageOperationsPool,
clusterSvc.topologyService(),
clusterSvc.serializationRegistry(),
diff --git
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
index 958a0460366..a7891f52922 100644
---
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
@@ -232,8 +232,6 @@ import org.apache.ignite.internal.schema.SchemaManager;
import org.apache.ignite.internal.schema.SchemaSyncService;
import org.apache.ignite.internal.schema.configuration.GcConfiguration;
import
org.apache.ignite.internal.schema.configuration.GcExtensionConfiguration;
-import
org.apache.ignite.internal.schema.configuration.StorageUpdateConfiguration;
-import
org.apache.ignite.internal.schema.configuration.StorageUpdateExtensionConfiguration;
import
org.apache.ignite.internal.security.authentication.AuthenticationManager;
import
org.apache.ignite.internal.security.authentication.AuthenticationManagerImpl;
import org.apache.ignite.internal.security.configuration.SecurityConfiguration;
@@ -1048,15 +1046,12 @@ public class IgniteImpl implements Ignite {
lowWatermark
);
- StorageUpdateConfiguration storageUpdateConfiguration =
clusterConfigRegistry
-
.getConfiguration(StorageUpdateExtensionConfiguration.KEY).storageUpdate();
-
distributedTblMgr = new TableManager(
name,
registry,
gcConfig,
txConfig,
- storageUpdateConfiguration,
+ replicationConfig,
messagingServiceReturningToStorageOperationsPool,
clusterSvc.topologyService(),
clusterSvc.serializationRegistry(),
diff --git
a/modules/schema/src/main/java/org/apache/ignite/internal/schema/configuration/SchemaDistributedConfigurationModule.java
b/modules/schema/src/main/java/org/apache/ignite/internal/schema/configuration/SchemaDistributedConfigurationModule.java
index 8d43ac448df..13bb3745614 100644
---
a/modules/schema/src/main/java/org/apache/ignite/internal/schema/configuration/SchemaDistributedConfigurationModule.java
+++
b/modules/schema/src/main/java/org/apache/ignite/internal/schema/configuration/SchemaDistributedConfigurationModule.java
@@ -35,6 +35,6 @@ public class SchemaDistributedConfigurationModule implements
ConfigurationModule
@Override
public Collection<Class<?>> schemaExtensions() {
- return List.of(GcExtensionConfigurationSchema.class,
StorageUpdateExtensionConfigurationSchema.class);
+ return List.of(GcExtensionConfigurationSchema.class);
}
}
diff --git
a/modules/schema/src/main/java/org/apache/ignite/internal/schema/configuration/StorageUpdateConfigurationSchema.java
b/modules/schema/src/main/java/org/apache/ignite/internal/schema/configuration/StorageUpdateConfigurationSchema.java
deleted file mode 100644
index 6dbfd4afccc..00000000000
---
a/modules/schema/src/main/java/org/apache/ignite/internal/schema/configuration/StorageUpdateConfigurationSchema.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.schema.configuration;
-
-import org.apache.ignite.configuration.annotation.Config;
-import org.apache.ignite.configuration.annotation.Value;
-import org.apache.ignite.configuration.validation.Range;
-
-/**
- * Configuration schema for StorageUpdateHandler.
- */
-@Config
-public class StorageUpdateConfigurationSchema {
-
- /**
- * Maximum allowed length (in bytes) of a batch to write into physical
storage.
- **/
- @Range(min = 1)
- @Value(hasDefault = true)
- public int batchByteLength = 8192;
-}
diff --git
a/modules/schema/src/main/java/org/apache/ignite/internal/schema/configuration/StorageUpdateExtensionConfigurationSchema.java
b/modules/schema/src/main/java/org/apache/ignite/internal/schema/configuration/StorageUpdateExtensionConfigurationSchema.java
deleted file mode 100644
index 076cae16e26..00000000000
---
a/modules/schema/src/main/java/org/apache/ignite/internal/schema/configuration/StorageUpdateExtensionConfigurationSchema.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.schema.configuration;
-
-import org.apache.ignite.configuration.annotation.ConfigValue;
-import org.apache.ignite.configuration.annotation.ConfigurationExtension;
-import org.apache.ignite.internal.configuration.ClusterConfigurationSchema;
-
-/**
- * Extension for StorageUpdateHandler configuration schema.
- */
-@ConfigurationExtension
-public class StorageUpdateExtensionConfigurationSchema extends
ClusterConfigurationSchema {
- @ConfigValue
- public StorageUpdateConfigurationSchema storageUpdate;
-}
diff --git
a/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItAbstractInternalTableScanTest.java
b/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItAbstractInternalTableScanTest.java
index 079eca5cfac..1a67509ceb0 100644
---
a/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItAbstractInternalTableScanTest.java
+++
b/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItAbstractInternalTableScanTest.java
@@ -52,10 +52,10 @@ import
org.apache.ignite.internal.placementdriver.ReplicaMeta;
import org.apache.ignite.internal.placementdriver.TestPlacementDriver;
import org.apache.ignite.internal.replicator.ReplicaService;
import org.apache.ignite.internal.replicator.ReplicationGroupId;
+import
org.apache.ignite.internal.replicator.configuration.ReplicationConfiguration;
import org.apache.ignite.internal.schema.BinaryRow;
import org.apache.ignite.internal.schema.Column;
import org.apache.ignite.internal.schema.SchemaDescriptor;
-import
org.apache.ignite.internal.schema.configuration.StorageUpdateConfiguration;
import org.apache.ignite.internal.schema.row.RowAssembler;
import org.apache.ignite.internal.storage.MvPartitionStorage;
import org.apache.ignite.internal.storage.PartitionTimestampCursor;
@@ -93,7 +93,7 @@ public abstract class ItAbstractInternalTableScanTest extends
IgniteAbstractTest
private TransactionConfiguration txConfiguration;
@InjectConfiguration
- private StorageUpdateConfiguration storageUpdateConfiguration;
+ private ReplicationConfiguration replicationConfiguration;
/** Mock partition storage. */
@Mock
@@ -140,7 +140,7 @@ public abstract class ItAbstractInternalTableScanTest
extends IgniteAbstractTest
mockStorage,
ROW_SCHEMA,
txConfiguration,
- storageUpdateConfiguration
+ replicationConfiguration
);
}
diff --git
a/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItInternalTableReadOnlyOperationsTest.java
b/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItInternalTableReadOnlyOperationsTest.java
index 20553e25a81..8603f5da67e 100644
---
a/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItInternalTableReadOnlyOperationsTest.java
+++
b/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItInternalTableReadOnlyOperationsTest.java
@@ -49,13 +49,13 @@ import
org.apache.ignite.internal.partition.replicator.network.replication.ReadO
import org.apache.ignite.internal.placementdriver.PlacementDriver;
import org.apache.ignite.internal.placementdriver.TestPlacementDriver;
import org.apache.ignite.internal.replicator.ReplicaService;
+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.BinaryRowEx;
import org.apache.ignite.internal.schema.Column;
import org.apache.ignite.internal.schema.ColumnsExtractor;
import org.apache.ignite.internal.schema.SchemaDescriptor;
-import
org.apache.ignite.internal.schema.configuration.StorageUpdateConfiguration;
import org.apache.ignite.internal.schema.row.Row;
import org.apache.ignite.internal.schema.row.RowAssembler;
import org.apache.ignite.internal.storage.MvPartitionStorage;
@@ -90,7 +90,7 @@ public class ItInternalTableReadOnlyOperationsTest extends
IgniteAbstractTest {
private TransactionConfiguration txConfiguration;
@InjectConfiguration
- private StorageUpdateConfiguration storageUpdateConfiguration;
+ private ReplicationConfiguration replicationConfiguration;
private static final HybridClock CLOCK = new HybridClockImpl();
@@ -132,7 +132,7 @@ public class ItInternalTableReadOnlyOperationsTest extends
IgniteAbstractTest {
mockStorage,
SCHEMA,
txConfiguration,
- storageUpdateConfiguration
+ replicationConfiguration
);
lenient().when(readOnlyTx.isReadOnly()).thenReturn(true);
diff --git
a/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItLockTableTest.java
b/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItLockTableTest.java
index 052ead2cbec..cdbf2665a75 100644
---
a/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItLockTableTest.java
+++
b/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItLockTableTest.java
@@ -39,7 +39,6 @@ import org.apache.ignite.internal.replicator.ReplicaService;
import
org.apache.ignite.internal.replicator.configuration.ReplicationConfiguration;
import org.apache.ignite.internal.schema.Column;
import org.apache.ignite.internal.schema.SchemaDescriptor;
-import
org.apache.ignite.internal.schema.configuration.StorageUpdateConfiguration;
import org.apache.ignite.internal.table.TableViewInternal;
import org.apache.ignite.internal.testframework.ExecutorServiceExtension;
import org.apache.ignite.internal.testframework.IgniteAbstractTest;
@@ -99,9 +98,6 @@ public class ItLockTableTest extends IgniteAbstractTest {
@InjectConfiguration
protected static ReplicationConfiguration replicationConfiguration;
- @InjectConfiguration
- protected static StorageUpdateConfiguration storageUpdateConfiguration;
-
@InjectConfiguration("mock.properties: { lockMapSize: \"" + CACHE_SIZE +
"\" }")
private static SystemLocalConfiguration systemLocalConfiguration;
@@ -127,7 +123,6 @@ public class ItLockTableTest extends IgniteAbstractTest {
testInfo,
raftConfiguration,
txConfiguration,
- storageUpdateConfiguration,
workDir,
1,
1,
diff --git
a/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItTxDistributedCleanupRecoveryTest.java
b/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItTxDistributedCleanupRecoveryTest.java
index a1fa4e0e1dc..206bb1d7155 100644
---
a/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItTxDistributedCleanupRecoveryTest.java
+++
b/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItTxDistributedCleanupRecoveryTest.java
@@ -54,7 +54,6 @@ public class ItTxDistributedCleanupRecoveryTest extends
TxAbstractTest {
testInfo,
raftConfiguration,
txConfiguration,
- storageUpdateConfiguration,
workDir,
nodes(),
replicas(),
diff --git
a/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItTxDistributedTestSingleNodeNoCleanupMessage.java
b/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItTxDistributedTestSingleNodeNoCleanupMessage.java
index b086837cb49..ee0fd972ee3 100644
---
a/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItTxDistributedTestSingleNodeNoCleanupMessage.java
+++
b/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItTxDistributedTestSingleNodeNoCleanupMessage.java
@@ -108,7 +108,6 @@ public class ItTxDistributedTestSingleNodeNoCleanupMessage
extends TxAbstractTes
testInfo,
raftConfiguration,
txConfiguration,
- storageUpdateConfiguration,
workDir,
nodes(),
replicas(),
diff --git
a/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItTxStateLocalMapTest.java
b/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItTxStateLocalMapTest.java
index d59c90dad2e..36659e3dc01 100644
---
a/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItTxStateLocalMapTest.java
+++
b/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItTxStateLocalMapTest.java
@@ -37,7 +37,6 @@ import
org.apache.ignite.internal.raft.configuration.RaftConfiguration;
import
org.apache.ignite.internal.replicator.configuration.ReplicationConfiguration;
import org.apache.ignite.internal.schema.Column;
import org.apache.ignite.internal.schema.SchemaDescriptor;
-import
org.apache.ignite.internal.schema.configuration.StorageUpdateConfiguration;
import org.apache.ignite.internal.table.TableViewInternal;
import org.apache.ignite.internal.testframework.IgniteAbstractTest;
import org.apache.ignite.internal.tx.TxStateMeta;
@@ -69,9 +68,6 @@ public class ItTxStateLocalMapTest extends IgniteAbstractTest
{
@InjectConfiguration
private TransactionConfiguration txConfiguration;
- @InjectConfiguration
- private StorageUpdateConfiguration storageUpdateConfiguration;
-
@InjectConfiguration
private ReplicationConfiguration replicationConfiguration;
@@ -102,7 +98,6 @@ public class ItTxStateLocalMapTest extends
IgniteAbstractTest {
testInfo,
raftConfig,
txConfiguration,
- storageUpdateConfiguration,
workDir,
NODES,
NODES,
diff --git
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/StorageUpdateHandler.java
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/StorageUpdateHandler.java
index 3f0d7e84da9..d05df5adc07 100644
---
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/StorageUpdateHandler.java
+++
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/StorageUpdateHandler.java
@@ -31,8 +31,8 @@ import
org.apache.ignite.internal.partition.replicator.network.TimedBinaryRow;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionDataStorage;
import org.apache.ignite.internal.replicator.PartitionGroupId;
import org.apache.ignite.internal.replicator.ReplicationGroupId;
+import
org.apache.ignite.internal.replicator.configuration.ReplicationConfiguration;
import org.apache.ignite.internal.schema.BinaryRow;
-import
org.apache.ignite.internal.schema.configuration.StorageUpdateConfiguration;
import org.apache.ignite.internal.storage.MvPartitionStorage.Locker;
import org.apache.ignite.internal.storage.ReadResult;
import org.apache.ignite.internal.storage.RowId;
@@ -55,8 +55,8 @@ public class StorageUpdateHandler {
/** A container for rows that were inserted, updated or removed. */
private final PendingRows pendingRows = new PendingRows();
- /** Storage updater configuration. */
- private final StorageUpdateConfiguration storageUpdateConfiguration;
+ /** Replication configuration. */
+ private final ReplicationConfiguration replicationConfiguration;
/**
* The constructor.
@@ -64,18 +64,18 @@ public class StorageUpdateHandler {
* @param partitionId Partition id.
* @param storage Partition data storage.
* @param indexUpdateHandler Partition index update handler.
- * @param storageUpdateConfiguration Configuration for the storage update
handler.
+ * @param replicationConfiguration Configuration for the replication.
*/
public StorageUpdateHandler(
int partitionId,
PartitionDataStorage storage,
IndexUpdateHandler indexUpdateHandler,
- StorageUpdateConfiguration storageUpdateConfiguration
+ ReplicationConfiguration replicationConfiguration
) {
this.partitionId = partitionId;
this.storage = storage;
this.indexUpdateHandler = indexUpdateHandler;
- this.storageUpdateConfiguration = storageUpdateConfiguration;
+ this.replicationConfiguration = replicationConfiguration;
}
/** Returns partition ID of the storage. */
@@ -208,7 +208,7 @@ public class StorageUpdateHandler {
(PartitionGroupId) commitPartitionId,
it,
onApplication,
- storageUpdateConfiguration.batchByteLength().value(),
+ replicationConfiguration.batchSizeBytes().value(),
indexIds
);
}
diff --git
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
index 97eef3011a2..3e3d49db0b1 100644
---
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
@@ -188,6 +188,7 @@ import org.apache.ignite.internal.replicator.ReplicaService;
import org.apache.ignite.internal.replicator.ReplicationGroupId;
import org.apache.ignite.internal.replicator.TablePartitionId;
import org.apache.ignite.internal.replicator.ZonePartitionId;
+import
org.apache.ignite.internal.replicator.configuration.ReplicationConfiguration;
import org.apache.ignite.internal.replicator.listener.ReplicaListener;
import org.apache.ignite.internal.replicator.message.ReplicaMessageUtils;
import org.apache.ignite.internal.replicator.message.ReplicaMessagesFactory;
@@ -196,7 +197,6 @@ import org.apache.ignite.internal.schema.SchemaManager;
import org.apache.ignite.internal.schema.SchemaRegistry;
import org.apache.ignite.internal.schema.SchemaSyncService;
import org.apache.ignite.internal.schema.configuration.GcConfiguration;
-import
org.apache.ignite.internal.schema.configuration.StorageUpdateConfiguration;
import org.apache.ignite.internal.storage.DataStorageManager;
import org.apache.ignite.internal.storage.MvPartitionStorage;
import org.apache.ignite.internal.storage.engine.MvTableStorage;
@@ -391,8 +391,7 @@ public class TableManager implements IgniteTablesInternal,
IgniteComponent {
/** Ends at the {@link IgniteComponent#stopAsync(ComponentContext)} with
an {@link NodeStoppingException}. */
private final CompletableFuture<Void> stopManagerFuture = new
CompletableFuture<>();
- /** Configuration for {@link StorageUpdateHandler}. */
- private final StorageUpdateConfiguration storageUpdateConfig;
+ private final ReplicationConfiguration replicationConfiguration;
/**
* Executes partition operations (that might cause I/O and/or be blocked
on locks).
@@ -460,7 +459,7 @@ public class TableManager implements IgniteTablesInternal,
IgniteComponent {
* @param registry Registry for versioned values.
* @param gcConfig Garbage collector configuration.
* @param txCfg Transaction configuration.
- * @param storageUpdateConfig Storage update handler configuration.
+ * @param replicationConfiguration Replication configuration.
* @param replicaMgr Replica manager.
* @param lockMgr Lock manager.
* @param replicaSvc Replica service.
@@ -489,7 +488,7 @@ public class TableManager implements IgniteTablesInternal,
IgniteComponent {
RevisionListenerRegistry registry,
GcConfiguration gcConfig,
TransactionConfiguration txCfg,
- StorageUpdateConfiguration storageUpdateConfig,
+ ReplicationConfiguration replicationConfiguration,
MessagingService messagingService,
TopologyService topologyService,
MessageSerializationRegistry messageSerializationRegistry,
@@ -539,7 +538,7 @@ public class TableManager implements IgniteTablesInternal,
IgniteComponent {
this.catalogService = catalogService;
this.observableTimestampTracker = observableTimestampTracker;
this.sql = sql;
- this.storageUpdateConfig = storageUpdateConfig;
+ this.replicationConfiguration = replicationConfiguration;
this.remotelyTriggeredResourceRegistry =
remotelyTriggeredResourceRegistry;
this.lowWatermark = lowWatermark;
this.transactionInflights = transactionInflights;
@@ -891,7 +890,7 @@ public class TableManager implements IgniteTablesInternal,
IgniteComponent {
partitionDataStorage,
table,
safeTimeTracker,
- storageUpdateConfig
+ replicationConfiguration
);
internalTbl.updatePartitionTrackers(partId, safeTimeTracker,
storageIndexTracker);
@@ -1321,7 +1320,7 @@ public class TableManager implements
IgniteTablesInternal, IgniteComponent {
partitionDataStorage,
table,
safeTimeTracker,
- storageUpdateConfig
+ replicationConfiguration
);
internalTbl.updatePartitionTrackers(partId,
safeTimeTracker, storageIndexTracker);
@@ -2945,7 +2944,7 @@ public class TableManager implements
IgniteTablesInternal, IgniteComponent {
PartitionDataStorage partitionDataStorage,
TableImpl table,
PendingComparableValuesTracker<HybridTimestamp, Void>
safeTimeTracker,
- StorageUpdateConfiguration storageUpdateConfig
+ ReplicationConfiguration replicationConfiguration
) {
TableIndexStoragesSupplier indexes =
table.indexStorageAdapters(partitionId);
@@ -2957,7 +2956,7 @@ public class TableManager implements
IgniteTablesInternal, IgniteComponent {
partitionId,
partitionDataStorage,
indexUpdateHandler,
- storageUpdateConfig
+ replicationConfiguration
);
return new PartitionUpdateHandlers(storageUpdateHandler,
indexUpdateHandler, gcUpdateHandler);
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/InteropOperationsTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/InteropOperationsTest.java
index f6c60076ff1..004e8956ef3 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/InteropOperationsTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/InteropOperationsTest.java
@@ -42,11 +42,11 @@ import
org.apache.ignite.internal.configuration.testframework.InjectConfiguratio
import org.apache.ignite.internal.network.ClusterService;
import org.apache.ignite.internal.network.MessagingService;
import org.apache.ignite.internal.replicator.ReplicaService;
+import
org.apache.ignite.internal.replicator.configuration.ReplicationConfiguration;
import org.apache.ignite.internal.schema.Column;
import org.apache.ignite.internal.schema.SchemaDescriptor;
import org.apache.ignite.internal.schema.SchemaRegistry;
import org.apache.ignite.internal.schema.SchemaTestUtils;
-import
org.apache.ignite.internal.schema.configuration.StorageUpdateConfiguration;
import
org.apache.ignite.internal.table.distributed.schema.ConstantSchemaVersions;
import org.apache.ignite.internal.table.distributed.schema.SchemaVersions;
import org.apache.ignite.internal.table.impl.DummyInternalTableImpl;
@@ -102,7 +102,7 @@ public class InteropOperationsTest extends
BaseIgniteAbstractTest {
private static TransactionConfiguration txConfiguration;
@InjectConfiguration
- private static StorageUpdateConfiguration storageUpdateConfiguration;
+ private static ReplicationConfiguration replicationConfiguration;
@BeforeAll
static void beforeAll() {
@@ -134,7 +134,7 @@ public class InteropOperationsTest extends
BaseIgniteAbstractTest {
when(clusterService.topologyService().localMember().address()).thenReturn(DummyInternalTableImpl.ADDR);
intTable = new DummyInternalTableImpl(mock(ReplicaService.class,
RETURNS_DEEP_STUBS), schema, txConfiguration,
- storageUpdateConfiguration);
+ replicationConfiguration);
SchemaRegistry schemaRegistry = new DummySchemaManagerImpl(schema);
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/TableKvOperationsMockedTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/TableKvOperationsMockedTest.java
index b442c5ac5a4..eb08e25b45b 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/TableKvOperationsMockedTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/TableKvOperationsMockedTest.java
@@ -52,10 +52,10 @@ import org.apache.ignite.internal.network.ClusterService;
import org.apache.ignite.internal.network.MessagingService;
import
org.apache.ignite.internal.partition.replicator.schemacompat.InternalSchemaVersionMismatchException;
import org.apache.ignite.internal.replicator.ReplicaService;
+import
org.apache.ignite.internal.replicator.configuration.ReplicationConfiguration;
import org.apache.ignite.internal.schema.BinaryRow;
import org.apache.ignite.internal.schema.Column;
import org.apache.ignite.internal.schema.SchemaDescriptor;
-import
org.apache.ignite.internal.schema.configuration.StorageUpdateConfiguration;
import org.apache.ignite.internal.schema.marshaller.TupleMarshallerImpl;
import
org.apache.ignite.internal.schema.marshaller.reflection.KvMarshallerImpl;
import
org.apache.ignite.internal.schema.marshaller.reflection.RecordMarshallerImpl;
@@ -92,7 +92,7 @@ public class TableKvOperationsMockedTest extends
BaseIgniteAbstractTest {
private TransactionConfiguration txConfiguration;
@InjectConfiguration
- private StorageUpdateConfiguration storageUpdateConfiguration;
+ private ReplicationConfiguration replicationConfiguration;
@Mock(answer = RETURNS_DEEP_STUBS)
private ReplicaService replicaService;
@@ -302,6 +302,6 @@ public class TableKvOperationsMockedTest extends
BaseIgniteAbstractTest {
}
private DummyInternalTableImpl createInternalTable(SchemaDescriptor
schema) {
- return new DummyInternalTableImpl(replicaService, schema,
txConfiguration, storageUpdateConfiguration);
+ return new DummyInternalTableImpl(replicaService, schema,
txConfiguration, replicationConfiguration);
}
}
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 96ab1b86ffb..63a58386df3 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
@@ -30,12 +30,12 @@ import
org.apache.ignite.internal.partition.replicator.network.PartitionReplicat
import org.apache.ignite.internal.partition.replicator.network.TimedBinaryRow;
import
org.apache.ignite.internal.partition.replicator.network.replication.BinaryRowMessage;
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.schema.configuration.StorageUpdateConfiguration;
import org.apache.ignite.internal.storage.BaseMvStoragesTest;
import org.apache.ignite.internal.storage.ReadResult;
import org.apache.ignite.internal.storage.RowId;
@@ -77,7 +77,7 @@ public abstract class IndexBaseTest extends
BaseMvStoragesTest {
};
@InjectConfiguration
- private StorageUpdateConfiguration storageUpdateConfiguration;
+ private ReplicationConfiguration replicationConfiguration;
private static final BinaryTupleSchema USER_INDEX_SCHEMA =
BinaryTupleSchema.createSchema(SCHEMA_DESCRIPTOR, USER_INDEX_COLS);
@@ -180,7 +180,7 @@ public abstract class IndexBaseTest extends
BaseMvStoragesTest {
PARTITION_ID,
partitionDataStorage,
indexUpdateHandler,
- storageUpdateConfiguration
+ replicationConfiguration
);
TestStorageUtils.completeBuiltIndexes(storage, hashInnerStorage,
sortedInnerStorage);
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/StorageCleanupTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/StorageCleanupTest.java
index 3f509ad3fc5..96010ec71eb 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/StorageCleanupTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/StorageCleanupTest.java
@@ -41,11 +41,11 @@ import org.apache.ignite.internal.hlc.HybridClockImpl;
import org.apache.ignite.internal.hlc.HybridTimestamp;
import org.apache.ignite.internal.partition.replicator.network.TimedBinaryRow;
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.BinaryTupleSchema;
import org.apache.ignite.internal.schema.ColumnsExtractor;
-import
org.apache.ignite.internal.schema.configuration.StorageUpdateConfiguration;
import org.apache.ignite.internal.storage.BaseMvStoragesTest;
import org.apache.ignite.internal.storage.PartitionTimestampCursor;
import org.apache.ignite.internal.storage.ReadResult;
@@ -92,7 +92,7 @@ public class StorageCleanupTest extends BaseMvStoragesTest {
private IndexUpdateHandler indexUpdateHandler;
@InjectConfiguration
- private StorageUpdateConfiguration storageUpdateConfiguration;
+ private ReplicationConfiguration replicationConfiguration;
@BeforeEach
void setUp() {
@@ -171,7 +171,7 @@ public class StorageCleanupTest extends BaseMvStoragesTest {
PARTITION_ID,
partitionDataStorage,
indexUpdateHandler,
- storageUpdateConfiguration
+ replicationConfiguration
);
}
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/StorageUpdateHandlerTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/StorageUpdateHandlerTest.java
index e14c1c93507..cd504d6cd7c 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/StorageUpdateHandlerTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/StorageUpdateHandlerTest.java
@@ -35,11 +35,11 @@ import org.apache.ignite.internal.hlc.HybridClockImpl;
import org.apache.ignite.internal.hlc.HybridTimestamp;
import org.apache.ignite.internal.partition.replicator.network.TimedBinaryRow;
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.BinaryTupleSchema;
import org.apache.ignite.internal.schema.ColumnsExtractor;
-import
org.apache.ignite.internal.schema.configuration.StorageUpdateConfiguration;
import org.apache.ignite.internal.storage.BaseMvStoragesTest;
import org.apache.ignite.internal.storage.ReadResult;
import org.apache.ignite.internal.storage.RowId;
@@ -83,7 +83,7 @@ public class StorageUpdateHandlerTest extends
BaseMvStoragesTest {
private LockByRowId lock;
@InjectConfiguration
- private StorageUpdateConfiguration storageUpdateConfiguration;
+ private ReplicationConfiguration replicationConfiguration;
@BeforeEach
void setUp() {
@@ -163,7 +163,7 @@ public class StorageUpdateHandlerTest extends
BaseMvStoragesTest {
PARTITION_ID,
partitionDataStorage,
indexUpdateHandler,
- storageUpdateConfiguration
+ replicationConfiguration
);
}
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerRecoveryTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerRecoveryTest.java
index b4bf6d1f82e..713d4b4aa52 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerRecoveryTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerRecoveryTest.java
@@ -111,12 +111,12 @@ import
org.apache.ignite.internal.raft.client.TopologyAwareRaftGroupService;
import org.apache.ignite.internal.raft.service.RaftGroupService;
import org.apache.ignite.internal.replicator.ReplicaManager;
import org.apache.ignite.internal.replicator.ReplicationGroupId;
+import
org.apache.ignite.internal.replicator.configuration.ReplicationConfiguration;
import org.apache.ignite.internal.schema.AlwaysSyncedSchemaSyncService;
import org.apache.ignite.internal.schema.SchemaDescriptor;
import org.apache.ignite.internal.schema.SchemaManager;
import org.apache.ignite.internal.schema.SchemaUtils;
import org.apache.ignite.internal.schema.configuration.GcConfiguration;
-import
org.apache.ignite.internal.schema.configuration.StorageUpdateConfiguration;
import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.storage.DataStorageManager;
import org.apache.ignite.internal.storage.DataStorageModule;
@@ -176,7 +176,7 @@ public class TableManagerRecoveryTest extends
IgniteAbstractTest {
@InjectConfiguration
private TransactionConfiguration txConfig;
@InjectConfiguration
- private StorageUpdateConfiguration storageUpdateConfiguration;
+ private ReplicationConfiguration replicationConfiguration;
@InjectConfiguration
private SystemDistributedConfiguration systemDistributedConfiguration;
@@ -391,7 +391,7 @@ public class TableManagerRecoveryTest extends
IgniteAbstractTest {
revisionUpdater,
gcConfig,
txConfig,
- storageUpdateConfiguration,
+ replicationConfiguration,
clusterService.messagingService(),
clusterService.topologyService(),
clusterService.serializationRegistry(),
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 90bc3d1e672..05258392587 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
@@ -116,12 +116,12 @@ import
org.apache.ignite.internal.placementdriver.TestPlacementDriver;
import org.apache.ignite.internal.raft.Loza;
import org.apache.ignite.internal.raft.client.TopologyAwareRaftGroupService;
import org.apache.ignite.internal.replicator.ReplicaManager;
+import
org.apache.ignite.internal.replicator.configuration.ReplicationConfiguration;
import org.apache.ignite.internal.schema.AlwaysSyncedSchemaSyncService;
import org.apache.ignite.internal.schema.SchemaDescriptor;
import org.apache.ignite.internal.schema.SchemaManager;
import org.apache.ignite.internal.schema.SchemaUtils;
import org.apache.ignite.internal.schema.configuration.GcConfiguration;
-import
org.apache.ignite.internal.schema.configuration.StorageUpdateConfiguration;
import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.storage.DataStorageManager;
import org.apache.ignite.internal.storage.DataStorageModules;
@@ -235,7 +235,7 @@ public class TableManagerTest extends IgniteAbstractTest {
/** Storage update configuration. */
@InjectConfiguration
- private StorageUpdateConfiguration storageUpdateConfiguration;
+ private ReplicationConfiguration replicationConfiguration;
@InjectConfiguration("mock = {profiles.default = {engine =
\"aipersist\"}}")
private StorageConfiguration storageConfiguration;
@@ -847,7 +847,7 @@ public class TableManagerTest extends IgniteAbstractTest {
revisionUpdater,
gcConfig,
txConfig,
- storageUpdateConfiguration,
+ replicationConfiguration,
clusterService.messagingService(),
clusterService.topologyService(),
clusterService.serializationRegistry(),
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 b1ddd456148..7651fdd4e9a 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
@@ -99,6 +99,7 @@ import org.apache.ignite.internal.replicator.TablePartitionId;
import
org.apache.ignite.internal.replicator.command.SafeTimePropagatingCommand;
import org.apache.ignite.internal.replicator.command.SafeTimeSyncCommand;
import
org.apache.ignite.internal.replicator.command.SafeTimeSyncCommandBuilder;
+import
org.apache.ignite.internal.replicator.configuration.ReplicationConfiguration;
import
org.apache.ignite.internal.replicator.message.PrimaryReplicaChangeCommand;
import org.apache.ignite.internal.replicator.message.ReplicaMessagesFactory;
import org.apache.ignite.internal.replicator.message.TablePartitionIdMessage;
@@ -108,7 +109,6 @@ 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;
-import
org.apache.ignite.internal.schema.configuration.StorageUpdateConfiguration;
import org.apache.ignite.internal.schema.row.Row;
import org.apache.ignite.internal.schema.row.RowAssembler;
import org.apache.ignite.internal.storage.MvPartitionStorage;
@@ -225,7 +225,7 @@ public class PartitionCommandListenerTest extends
BaseIgniteAbstractTest {
private StorageUpdateHandler storageUpdateHandler;
@InjectConfiguration
- private StorageUpdateConfiguration storageUpdateConfiguration;
+ private ReplicationConfiguration replicationConfiguration;
private CatalogService catalogService;
@@ -258,7 +258,7 @@ public class PartitionCommandListenerTest extends
BaseIgniteAbstractTest {
PARTITION_ID,
partitionDataStorage,
indexUpdateHandler,
- storageUpdateConfiguration
+ replicationConfiguration
));
catalogService = mock(CatalogService.class);
@@ -507,7 +507,7 @@ public class PartitionCommandListenerTest extends
BaseIgniteAbstractTest {
PARTITION_ID,
partitionDataStorage,
indexUpdateHandler,
- storageUpdateConfiguration
+ replicationConfiguration
);
PartitionListener testCommandListener = new PartitionListener(
diff --git
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
index ea990573935..cc79ca5402f 100644
---
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
@@ -79,6 +79,7 @@ import org.apache.ignite.internal.raft.service.LeaderWithTerm;
import org.apache.ignite.internal.raft.service.RaftGroupService;
import org.apache.ignite.internal.replicator.TablePartitionId;
import org.apache.ignite.internal.replicator.ZonePartitionId;
+import
org.apache.ignite.internal.replicator.configuration.ReplicationConfiguration;
import org.apache.ignite.internal.replicator.message.ReplicaRequest;
import org.apache.ignite.internal.schema.AlwaysSyncedSchemaSyncService;
import org.apache.ignite.internal.schema.BinaryRow;
@@ -87,7 +88,6 @@ import org.apache.ignite.internal.schema.BinaryTupleSchema;
import org.apache.ignite.internal.schema.Column;
import org.apache.ignite.internal.schema.ColumnsExtractor;
import org.apache.ignite.internal.schema.SchemaDescriptor;
-import
org.apache.ignite.internal.schema.configuration.StorageUpdateConfiguration;
import org.apache.ignite.internal.schema.marshaller.KvMarshaller;
import
org.apache.ignite.internal.schema.marshaller.reflection.ReflectionMarshallerFactory;
import org.apache.ignite.internal.storage.RowId;
@@ -163,7 +163,7 @@ public class PartitionReplicaListenerIndexLockingTest
extends IgniteAbstractTest
private static ColumnsExtractor row2SortKeyConverter;
@InjectConfiguration
- private static StorageUpdateConfiguration storageUpdateConfiguration;
+ private static ReplicationConfiguration replicationConfiguration;
@BeforeAll
public static void beforeAll() {
@@ -276,7 +276,7 @@ public class PartitionReplicaListenerIndexLockingTest
extends IgniteAbstractTest
PART_ID,
partitionDataStorage,
indexUpdateHandler,
- storageUpdateConfiguration
+ replicationConfiguration
),
new DummyValidationSchemasSource(schemaManager),
localNode,
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerSortedIndexLockingTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerSortedIndexLockingTest.java
index 7d42c42298d..bb977eec68d 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerSortedIndexLockingTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerSortedIndexLockingTest.java
@@ -79,6 +79,7 @@ import org.apache.ignite.internal.raft.service.LeaderWithTerm;
import org.apache.ignite.internal.raft.service.RaftGroupService;
import org.apache.ignite.internal.replicator.TablePartitionId;
import org.apache.ignite.internal.replicator.ZonePartitionId;
+import
org.apache.ignite.internal.replicator.configuration.ReplicationConfiguration;
import org.apache.ignite.internal.replicator.message.ReplicaRequest;
import org.apache.ignite.internal.schema.AlwaysSyncedSchemaSyncService;
import org.apache.ignite.internal.schema.BinaryRow;
@@ -86,7 +87,6 @@ import org.apache.ignite.internal.schema.BinaryRowConverter;
import org.apache.ignite.internal.schema.Column;
import org.apache.ignite.internal.schema.ColumnsExtractor;
import org.apache.ignite.internal.schema.SchemaDescriptor;
-import
org.apache.ignite.internal.schema.configuration.StorageUpdateConfiguration;
import org.apache.ignite.internal.schema.marshaller.KvMarshaller;
import
org.apache.ignite.internal.schema.marshaller.reflection.ReflectionMarshallerFactory;
import org.apache.ignite.internal.storage.RowId;
@@ -153,7 +153,7 @@ public class PartitionReplicaListenerSortedIndexLockingTest
extends IgniteAbstra
private static ColumnsExtractor row2HashKeyConverter;
@InjectConfiguration
- private static StorageUpdateConfiguration storageUpdateConfiguration;
+ private static ReplicationConfiguration replicationConfiguration;
@BeforeAll
public static void beforeAll() {
@@ -244,7 +244,7 @@ public class PartitionReplicaListenerSortedIndexLockingTest
extends IgniteAbstra
PART_ID,
partitionDataStorage,
indexUpdateHandler,
- storageUpdateConfiguration
+ replicationConfiguration
),
new DummyValidationSchemasSource(schemaManager),
localNode,
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 65682ae0f24..7be822b245f 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
@@ -175,6 +175,7 @@ import org.apache.ignite.internal.replicator.ReplicaResult;
import org.apache.ignite.internal.replicator.ReplicaService;
import org.apache.ignite.internal.replicator.TablePartitionId;
import org.apache.ignite.internal.replicator.ZonePartitionId;
+import
org.apache.ignite.internal.replicator.configuration.ReplicationConfiguration;
import
org.apache.ignite.internal.replicator.exception.PrimaryReplicaMissException;
import org.apache.ignite.internal.replicator.message.PrimaryReplicaRequest;
import
org.apache.ignite.internal.replicator.message.ReadOnlyDirectReplicaRequest;
@@ -191,7 +192,6 @@ import org.apache.ignite.internal.schema.Column;
import org.apache.ignite.internal.schema.ColumnsExtractor;
import org.apache.ignite.internal.schema.SchemaDescriptor;
import org.apache.ignite.internal.schema.SchemaSyncService;
-import
org.apache.ignite.internal.schema.configuration.StorageUpdateConfiguration;
import org.apache.ignite.internal.schema.marshaller.KvMarshaller;
import org.apache.ignite.internal.schema.marshaller.MarshallerFactory;
import
org.apache.ignite.internal.schema.marshaller.reflection.ReflectionMarshallerFactory;
@@ -426,7 +426,7 @@ public class PartitionReplicaListenerTest extends
IgniteAbstractTest {
private LowWatermark lowWatermark;
@InjectConfiguration
- private StorageUpdateConfiguration storageUpdateConfiguration;
+ private ReplicationConfiguration replicationConfiguration;
@InjectConfiguration
private TransactionConfiguration transactionConfiguration;
@@ -678,7 +678,7 @@ public class PartitionReplicaListenerTest extends
IgniteAbstractTest {
PART_ID,
partitionDataStorage,
indexUpdateHandler,
- storageUpdateConfiguration
+ replicationConfiguration
),
validationSchemasSource,
localNode,
diff --git
a/modules/table/src/testFixtures/java/org/apache/ignite/distributed/ItTxTestCluster.java
b/modules/table/src/testFixtures/java/org/apache/ignite/distributed/ItTxTestCluster.java
index b2763bb82c1..8cae91091f2 100644
---
a/modules/table/src/testFixtures/java/org/apache/ignite/distributed/ItTxTestCluster.java
+++
b/modules/table/src/testFixtures/java/org/apache/ignite/distributed/ItTxTestCluster.java
@@ -138,7 +138,6 @@ import org.apache.ignite.internal.schema.ColumnsExtractor;
import org.apache.ignite.internal.schema.SchemaDescriptor;
import org.apache.ignite.internal.schema.SchemaRegistry;
import org.apache.ignite.internal.schema.SchemaSyncService;
-import
org.apache.ignite.internal.schema.configuration.StorageUpdateConfiguration;
import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.storage.MvPartitionStorage;
import org.apache.ignite.internal.storage.engine.MvTableStorage;
@@ -212,8 +211,6 @@ public class ItTxTestCluster {
private final TransactionConfiguration txConfiguration;
- private final StorageUpdateConfiguration storageUpdateConfiguration;
-
private final Path workDir;
private final int nodes;
@@ -340,7 +337,6 @@ public class ItTxTestCluster {
TestInfo testInfo,
RaftConfiguration raftConfig,
TransactionConfiguration txConfiguration,
- StorageUpdateConfiguration storageUpdateConfiguration,
Path workDir,
int nodes,
int replicas,
@@ -350,7 +346,6 @@ public class ItTxTestCluster {
) {
this.raftConfig = raftConfig;
this.txConfiguration = txConfiguration;
- this.storageUpdateConfiguration = storageUpdateConfiguration;
this.workDir = workDir;
this.nodes = nodes;
this.replicas = replicas;
@@ -749,7 +744,7 @@ public class ItTxTestCluster {
partId,
partitionDataStorage,
indexUpdateHandler,
- storageUpdateConfiguration
+ replicationConfiguration
);
DummySchemaManagerImpl schemaManager = new
DummySchemaManagerImpl(schemaDescriptor);
diff --git
a/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/TxInfrastructureTest.java
b/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/TxInfrastructureTest.java
index facfa92acd9..aad2ee84d1f 100644
---
a/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/TxInfrastructureTest.java
+++
b/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/TxInfrastructureTest.java
@@ -52,7 +52,6 @@ import org.apache.ignite.internal.replicator.ZonePartitionId;
import
org.apache.ignite.internal.replicator.configuration.ReplicationConfiguration;
import org.apache.ignite.internal.schema.Column;
import org.apache.ignite.internal.schema.SchemaDescriptor;
-import
org.apache.ignite.internal.schema.configuration.StorageUpdateConfiguration;
import org.apache.ignite.internal.storage.MvPartitionStorage;
import org.apache.ignite.internal.table.distributed.raft.PartitionListener;
import org.apache.ignite.internal.testframework.ExecutorServiceExtension;
@@ -121,9 +120,6 @@ public abstract class TxInfrastructureTest extends
IgniteAbstractTest {
@InjectConfiguration
protected TransactionConfiguration txConfiguration;
- @InjectConfiguration
- protected StorageUpdateConfiguration storageUpdateConfiguration;
-
@InjectConfiguration
protected ReplicationConfiguration replicationConfiguration;
@@ -177,7 +173,6 @@ public abstract class TxInfrastructureTest extends
IgniteAbstractTest {
testInfo,
raftConfiguration,
txConfiguration,
- storageUpdateConfiguration,
workDir,
nodes(),
replicas(),
diff --git
a/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/impl/DummyInternalTableImpl.java
b/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/impl/DummyInternalTableImpl.java
index dc165a6527d..8844ff326ff 100644
---
a/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/impl/DummyInternalTableImpl.java
+++
b/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/impl/DummyInternalTableImpl.java
@@ -91,6 +91,7 @@ import
org.apache.ignite.internal.replicator.ReplicationGroupId;
import org.apache.ignite.internal.replicator.TablePartitionId;
import org.apache.ignite.internal.replicator.ZonePartitionId;
import
org.apache.ignite.internal.replicator.command.SafeTimePropagatingCommand;
+import
org.apache.ignite.internal.replicator.configuration.ReplicationConfiguration;
import org.apache.ignite.internal.replicator.listener.ReplicaListener;
import
org.apache.ignite.internal.replicator.message.PrimaryReplicaChangeCommand;
import org.apache.ignite.internal.replicator.message.ReplicaMessagesFactory;
@@ -101,7 +102,6 @@ import org.apache.ignite.internal.schema.BinaryRowConverter;
import org.apache.ignite.internal.schema.BinaryRowEx;
import org.apache.ignite.internal.schema.ColumnsExtractor;
import org.apache.ignite.internal.schema.SchemaDescriptor;
-import
org.apache.ignite.internal.schema.configuration.StorageUpdateConfiguration;
import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.storage.MvPartitionStorage;
import org.apache.ignite.internal.storage.engine.MvTableStorage;
@@ -197,13 +197,13 @@ public class DummyInternalTableImpl extends
InternalTableImpl {
* @param replicaSvc Replica service.
* @param schema Schema.
* @param txConfiguration Transaction configuration.
- * @param storageUpdateConfiguration Configuration for the storage update
handler.
+ * @param replicationConfiguration Replication configuration.
*/
public DummyInternalTableImpl(
ReplicaService replicaSvc,
SchemaDescriptor schema,
TransactionConfiguration txConfiguration,
- StorageUpdateConfiguration storageUpdateConfiguration
+ ReplicationConfiguration replicationConfiguration
) {
this(
replicaSvc,
@@ -211,7 +211,7 @@ public class DummyInternalTableImpl extends
InternalTableImpl {
new TestMvPartitionStorage(0),
schema,
txConfiguration,
- storageUpdateConfiguration
+ replicationConfiguration
);
}
@@ -223,7 +223,7 @@ public class DummyInternalTableImpl extends
InternalTableImpl {
* @param storage Storage.
* @param schema Schema.
* @param txConfiguration Transaction configuration.
- * @param storageUpdateConfiguration Configuration for the storage update
handler.
+ * @param replicationConfiguration Replication Configuration.
*/
public DummyInternalTableImpl(
ReplicaService replicaSvc,
@@ -231,7 +231,7 @@ public class DummyInternalTableImpl extends
InternalTableImpl {
MvPartitionStorage storage,
SchemaDescriptor schema,
TransactionConfiguration txConfiguration,
- StorageUpdateConfiguration storageUpdateConfiguration
+ ReplicationConfiguration replicationConfiguration
) {
this(
replicaSvc,
@@ -241,7 +241,7 @@ public class DummyInternalTableImpl extends
InternalTableImpl {
schema,
HybridTimestampTracker.atomicTracker(null),
placementDriver,
- storageUpdateConfiguration,
+ replicationConfiguration,
txConfiguration,
new RemotelyTriggeredResourceRegistry(),
new TransactionInflights(placementDriver, CLOCK_SERVICE)
@@ -259,7 +259,7 @@ public class DummyInternalTableImpl extends
InternalTableImpl {
* @param schema Schema descriptor.
* @param tracker Observable timestamp tracker.
* @param placementDriver Placement driver.
- * @param storageUpdateConfiguration Configuration for the storage config
handler.
+ * @param replicationConfiguration Replication configuration.
*/
public DummyInternalTableImpl(
ReplicaService replicaSvc,
@@ -269,7 +269,7 @@ public class DummyInternalTableImpl extends
InternalTableImpl {
SchemaDescriptor schema,
HybridTimestampTracker tracker,
PlacementDriver placementDriver,
- StorageUpdateConfiguration storageUpdateConfiguration,
+ ReplicationConfiguration replicationConfiguration,
TransactionConfiguration txConfiguration,
RemotelyTriggeredResourceRegistry resourcesRegistry,
TransactionInflights transactionInflights
@@ -429,7 +429,7 @@ public class DummyInternalTableImpl extends
InternalTableImpl {
PART_ID,
partitionDataStorage,
indexUpdateHandler,
- storageUpdateConfiguration
+ replicationConfiguration
);
DummySchemaManagerImpl schemaManager = new
DummySchemaManagerImpl(schema);
