This is an automated email from the ASF dual-hosted git repository. zstan pushed a commit to branch ignite-26069 in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 8b3d70a1fc8a1b3f1ba9116c0978c1e65de834b7 Author: zstan <[email protected]> AuthorDate: Tue Oct 7 09:32:49 2025 +0300 interm --- .../distributed/PartitionModificationCounter.java | 18 ++---------- .../PartitionModificationCounterFactory.java | 22 +++++++++----- ...va => PartitionModificationCounterHandler.java} | 34 ++++++++++++++++------ .../table/distributed/StorageUpdateHandler.java | 11 ++----- .../internal/table/distributed/TableManager.java | 15 ++++------ .../replicator/PartitionReplicaListener.java | 5 ---- .../internal/table/distributed/IndexBaseTest.java | 2 +- .../PartitionModificationCounterTest.java | 25 ++++++---------- .../table/distributed/StorageCleanupTest.java | 2 +- .../distributed/StorageUpdateHandlerTest.java | 2 +- .../raft/PartitionCommandListenerTest.java | 4 +-- .../PartitionReplicaListenerIndexLockingTest.java | 2 +- ...itionReplicaListenerSortedIndexLockingTest.java | 2 +- .../replication/PartitionReplicaListenerTest.java | 2 +- .../ZonePartitionReplicaListenerTest.java | 2 +- .../apache/ignite/distributed/ItTxTestCluster.java | 2 +- .../ignite/internal/table/TableTestUtils.java | 12 +++++--- .../table/impl/DummyInternalTableImpl.java | 2 +- 18 files changed, 79 insertions(+), 85 deletions(-) diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/PartitionModificationCounter.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/PartitionModificationCounter.java index 672d8db4b30..e8f0f1e6966 100644 --- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/PartitionModificationCounter.java +++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/PartitionModificationCounter.java @@ -35,7 +35,6 @@ public class PartitionModificationCounter { private final LongSupplier partitionSizeSupplier; private final double staleRowsFraction; private final long minStaleRowsCount; - private final PartitionModificationRequestHandler partitionModificationRequestHandler; private final AtomicLong counter = new AtomicLong(0); private volatile long nextMilestone; @@ -43,21 +42,11 @@ public class PartitionModificationCounter { /** Constructor. */ public PartitionModificationCounter( - int tableId, - int partitionId, - MessagingService messagingService, HybridTimestamp initTimestamp, LongSupplier partitionSizeSupplier, double staleRowsFraction, long minStaleRowsCount ) { - lastMilestoneReachedTimestamp = Objects.requireNonNull(initTimestamp, "initTimestamp"); - this.partitionSizeSupplier = Objects.requireNonNull(partitionSizeSupplier, "partitionSizeSupplier"); - - this.partitionModificationRequestHandler = - new PartitionModificationRequestHandler(tableId, partitionId, messagingService, partitionSizeSupplier, - this::lastMilestoneTimestamp); - if (staleRowsFraction < 0 || staleRowsFraction > 1) { throw new IllegalArgumentException("staleRowsFraction must be in [0, 1] range"); } @@ -66,6 +55,9 @@ public class PartitionModificationCounter { throw new IllegalArgumentException("minStaleRowsCount must be non-negative"); } + lastMilestoneReachedTimestamp = Objects.requireNonNull(initTimestamp, "initTimestamp"); + this.partitionSizeSupplier = Objects.requireNonNull(partitionSizeSupplier, "partitionSizeSupplier"); + this.staleRowsFraction = staleRowsFraction; this.minStaleRowsCount = minStaleRowsCount; @@ -124,8 +116,4 @@ public class PartitionModificationCounter { ) { return Math.max((long) (currentSize * staleRowsFraction), minStaleRowsCount); } - - private static class PartitionModificationRequestsHandler { - - } } diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/PartitionModificationCounterFactory.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/PartitionModificationCounterFactory.java index cc67f2be0f0..582febc60bb 100644 --- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/PartitionModificationCounterFactory.java +++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/PartitionModificationCounterFactory.java @@ -17,14 +17,13 @@ package org.apache.ignite.internal.table.distributed; -import java.util.function.Consumer; import java.util.function.LongSupplier; import java.util.function.Supplier; import org.apache.ignite.internal.hlc.HybridTimestamp; import org.apache.ignite.internal.network.MessagingService; /** - * Factory for producing {@link PartitionModificationCounter}. + * Factory for producing {@link PartitionModificationCounterHandler}. */ public class PartitionModificationCounterFactory { public static final long DEFAULT_MIN_STALE_ROWS_COUNT = 500L; @@ -40,20 +39,27 @@ public class PartitionModificationCounterFactory { } /** - * Creates a new partition modification counter. + * Creates a new partition modification counter handler. * * @param partitionSizeSupplier Partition size supplier. + * @param tableId Table ID. + * @param partitionId partition ID. * @return New partition modification counter. */ - public PartitionModificationCounter create(LongSupplier partitionSizeSupplier, int tableId, int partitionId) { - return new PartitionModificationCounter( - tableId, - partitionId, - messagingService, + public PartitionModificationCounterHandler create(LongSupplier partitionSizeSupplier, int tableId, int partitionId) { + PartitionModificationCounter modificationCounter = new PartitionModificationCounter( currentTimestampSupplier.get(), partitionSizeSupplier, DEFAULT_STALE_ROWS_FRACTION, DEFAULT_MIN_STALE_ROWS_COUNT ); + + return new PartitionModificationCounterHandler( + tableId, + partitionId, + messagingService, + partitionSizeSupplier, + modificationCounter + ); } } diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/PartitionModificationRequestHandler.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/PartitionModificationCounterHandler.java similarity index 79% rename from modules/table/src/main/java/org/apache/ignite/internal/table/distributed/PartitionModificationRequestHandler.java rename to modules/table/src/main/java/org/apache/ignite/internal/table/distributed/PartitionModificationCounterHandler.java index c5cf359bef1..e3470ea84cc 100644 --- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/PartitionModificationRequestHandler.java +++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/PartitionModificationCounterHandler.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.table.distributed; import java.util.function.LongSupplier; -import java.util.function.Supplier; import org.apache.ignite.internal.hlc.HybridTimestamp; import org.apache.ignite.internal.network.InternalClusterNode; import org.apache.ignite.internal.network.MessagingService; @@ -28,28 +27,27 @@ import org.apache.ignite.internal.partition.replicator.network.PartitionReplicat import org.apache.ignite.internal.partition.replicator.network.message.GetEstimatedSizeWithLastModifiedTsRequest; import org.jetbrains.annotations.Nullable; -/** Process partition modification requests. */ -class PartitionModificationRequestHandler { +public class PartitionModificationCounterHandler { + private final PartitionModificationCounter modificationCounter; private final int tableId; private final int partitionId; - private final MessagingService messagingService; private final LongSupplier partitionSizeSupplier; - private final Supplier<HybridTimestamp> lastMilestoneTsConsumer; + private final MessagingService messagingService; private static final PartitionReplicationMessagesFactory PARTITION_REPLICATION_MESSAGES_FACTORY = new PartitionReplicationMessagesFactory(); - PartitionModificationRequestHandler( + public PartitionModificationCounterHandler( int tableId, int partitionId, MessagingService messagingService, LongSupplier partitionSizeSupplier, - Supplier<HybridTimestamp> lastMilestoneTsConsumer + PartitionModificationCounter modificationCounter ) { + this.modificationCounter = modificationCounter; this.tableId = tableId; this.partitionId = partitionId; this.messagingService = messagingService; this.partitionSizeSupplier = partitionSizeSupplier; - this.lastMilestoneTsConsumer = lastMilestoneTsConsumer; messagingService.addMessageHandler(PartitionReplicationMessageGroup.class, this::handleMessage); } @@ -66,13 +64,31 @@ class PartitionModificationRequestHandler { @Nullable Long correlationId ) { if (tableId == message.tableId() && partitionId == message.partitionId()) { + assert correlationId != null; + messagingService.respond( sender, PARTITION_REPLICATION_MESSAGES_FACTORY .getEstimatedSizeWithLastModifiedTsResponse().estimatedSize(partitionSizeSupplier.getAsLong()) - .ts(lastMilestoneTsConsumer.get()).build(), + .ts(lastMilestoneTimestamp()).build(), correlationId ); } } + + public long value() { + return modificationCounter.value(); + } + + public HybridTimestamp lastMilestoneTimestamp() { + return modificationCounter.lastMilestoneTimestamp(); + } + + public long nextMilestone() { + return modificationCounter.nextMilestone(); + } + + public void updateValue(int delta, HybridTimestamp commitTimestamp) { + modificationCounter.updateValue(delta, commitTimestamp); + } } 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 43bcbf4fac1..7cf3abcfc8b 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 @@ -66,8 +66,8 @@ public class StorageUpdateHandler { /** Replication configuration. */ private final ReplicationConfiguration replicationConfiguration; - /** Partition modification counter. */ - private final PartitionModificationCounter modificationCounter; + /** Partition modification counter handler. */ + private final PartitionModificationCounterHandler modificationCounter; /** * The constructor. @@ -83,7 +83,7 @@ public class StorageUpdateHandler { PartitionDataStorage storage, IndexUpdateHandler indexUpdateHandler, ReplicationConfiguration replicationConfiguration, - PartitionModificationCounter modificationCounter + PartitionModificationCounterHandler modificationCounter ) { this.partitionId = partitionId; this.storage = storage; @@ -97,11 +97,6 @@ public class StorageUpdateHandler { return partitionId; } - /** Returns last milestone of modification observer. */ - public HybridTimestamp lastModificationCounterMilestone() { - return modificationCounter.lastMilestoneTimestamp(); - } - /** * Handles single update. * 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 23702916ead..7b792c820ef 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 @@ -472,8 +472,6 @@ public class TableManager implements IgniteTablesInternal, IgniteComponent { private final PartitionModificationCounterFactory partitionModificationCounterFactory; private final Map<TablePartitionId, PartitionModificationCounterMetricSource> partModCounterMetricSources = new ConcurrentHashMap<>(); - MessagingService messagingService0; // TODO - /** * Creates a new table manager. * @@ -583,8 +581,6 @@ public class TableManager implements IgniteTablesInternal, IgniteComponent { this.executorInclinedPlacementDriver = new ExecutorInclinedPlacementDriver(placementDriver, partitionOperationsExecutor); this.reliableCatalogVersions = new ReliableCatalogVersions(schemaSyncService, catalogService); - messagingService0 = messagingService; - TxMessageSender txMessageSender = new TxMessageSender( messagingService, replicaSvc, @@ -3164,8 +3160,9 @@ public class TableManager implements IgniteTablesInternal, IgniteComponent { LongSupplier partSizeSupplier = () -> partitionDataStorage.getStorage().estimatedSize(); - PartitionModificationCounter modificationCounter = + PartitionModificationCounterHandler modificationCounter = partitionModificationCounterFactory.create(partSizeSupplier, table.tableId(), partitionId); + registerPartitionModificationCounterMetrics(table.tableId(), partitionId, modificationCounter); StorageUpdateHandler storageUpdateHandler = new StorageUpdateHandler( @@ -3180,7 +3177,7 @@ public class TableManager implements IgniteTablesInternal, IgniteComponent { } private void registerPartitionModificationCounterMetrics( - int tableId, int partitionId, PartitionModificationCounter counter) { + int tableId, int partitionId, PartitionModificationCounterHandler counterHandler) { PartitionModificationCounterMetricSource metricSource = new PartitionModificationCounterMetricSource(tableId, partitionId); @@ -3189,21 +3186,21 @@ public class TableManager implements IgniteTablesInternal, IgniteComponent { PartitionModificationCounterMetricSource.METRIC_COUNTER, "The value of the volatile counter of partition modifications. " + "This value is used to determine staleness of the related SQL statistics.", - counter::value + counterHandler::value )); metricSource.addMetric(new LongGauge( PartitionModificationCounterMetricSource.METRIC_NEXT_MILESTONE, "The value of the next milestone for the number of partition modifications. " + "This value is used to determine staleness of the related SQL statistics.", - counter::nextMilestone + counterHandler::nextMilestone )); metricSource.addMetric(new LongGauge( PartitionModificationCounterMetricSource.METRIC_LAST_MILESTONE_TIMESTAMP, "The timestamp value representing the commit time of the last modification operation that " + "reached the milestone. This value is used to determine staleness of the related SQL statistics.", - () -> counter.lastMilestoneTimestamp().longValue() + () -> counterHandler.lastMilestoneTimestamp().longValue() )); metricManager.registerSource(metricSource); diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java index a7a12560198..3ca00a2c7da 100644 --- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java +++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java @@ -616,11 +616,6 @@ public class PartitionReplicaListener implements ReplicaListener, ReplicaTablePr return completedFuture(mvDataStorage.estimatedSize()); } - private CompletableFuture<LongObjectImmutablePair<HybridTimestamp>> processGetEstimatedSizeWithTsRequest() { - return completedFuture(LongObjectImmutablePair.of(mvDataStorage.estimatedSize(), - storageUpdateHandler.lastModificationCounterMilestone())); - } - private CompletableFuture<Void> processChangePeersAndLearnersReplicaRequest(ChangePeersAndLearnersAsyncReplicaRequest request) { TablePartitionId replicaGrpId = (TablePartitionId) request.groupId().asReplicationGroupId(); 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 438bb3fe804..caf1fbf5a76 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 @@ -182,7 +182,7 @@ public abstract class IndexBaseTest extends BaseMvStoragesTest { partitionDataStorage, indexUpdateHandler, replicationConfiguration, - TableTestUtils.NOOP_PARTITION_MODIFICATION_COUNTER + TableTestUtils.NOOP_PARTITION_MODIFICATION_COUNTER_HANDLER ); TestStorageUtils.completeBuiltIndexes(storage, hashInnerStorage, sortedInnerStorage); diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/PartitionModificationCounterTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/PartitionModificationCounterTest.java index 0f9b0e8772a..bb87f3ba7e0 100644 --- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/PartitionModificationCounterTest.java +++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/PartitionModificationCounterTest.java @@ -26,18 +26,11 @@ import org.apache.ignite.internal.network.MessagingService; import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest; import org.apache.ignite.internal.testframework.IgniteTestUtils; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.Mock; -import org.mockito.junit.jupiter.MockitoExtension; /** * Tests for class {@link PartitionModificationCounter}. */ -@ExtendWith(MockitoExtension.class) public class PartitionModificationCounterTest extends BaseIgniteAbstractTest { - @Mock - private MessagingService messaging; - private final PartitionModificationCounterFactory factory = new PartitionModificationCounterFactory(() -> HybridTimestamp.hybridTimestamp(1L), mock(MessagingService.class)); @@ -45,7 +38,7 @@ public class PartitionModificationCounterTest extends BaseIgniteAbstractTest { void initialValues() { // Empty table. { - PartitionModificationCounter counter = factory.create(() -> 0L, 0, 0); + PartitionModificationCounterHandler counter = factory.create(() -> 0L, 0, 0); assertThat(counter.value(), is(0L)); assertThat(counter.nextMilestone(), is(PartitionModificationCounterFactory.DEFAULT_MIN_STALE_ROWS_COUNT)); @@ -54,7 +47,7 @@ public class PartitionModificationCounterTest extends BaseIgniteAbstractTest { // Table with 10k rows. { - PartitionModificationCounter counter = factory.create(() -> 10_000L, 0, 0); + PartitionModificationCounterHandler counter = factory.create(() -> 10_000L, 0, 0); assertThat(counter.value(), is(0L)); assertThat(counter.nextMilestone(), is(2000L)); @@ -73,7 +66,7 @@ public class PartitionModificationCounterTest extends BaseIgniteAbstractTest { void lastMilestoneTimestampUpdate() { int rowsCount = 10_000; int threshold = (int) (rowsCount * PartitionModificationCounterFactory.DEFAULT_STALE_ROWS_FRACTION); - PartitionModificationCounter counter = factory.create(() -> rowsCount, 0, 0); + PartitionModificationCounterHandler counter = factory.create(() -> rowsCount, 0, 0); assertThat(counter.lastMilestoneTimestamp().longValue(), is(1L)); @@ -100,7 +93,7 @@ public class PartitionModificationCounterTest extends BaseIgniteAbstractTest { @Test @SuppressWarnings({"ThrowableNotThrown", "ResultOfObjectAllocationIgnored", "DataFlowIssue"}) void invalidUpdateValues() { - PartitionModificationCounter counter = factory.create(() -> 0L, 0, 0); + PartitionModificationCounterHandler counter = factory.create(() -> 0L, 0, 0); IgniteTestUtils.assertThrows(NullPointerException.class, () -> counter.updateValue(1, null), "commitTimestamp"); @@ -113,31 +106,31 @@ public class PartitionModificationCounterTest extends BaseIgniteAbstractTest { IgniteTestUtils.assertThrows( NullPointerException.class, - () -> new PartitionModificationCounter(0, 0, messaging, null, () -> 0L, 0.0d, 0), + () -> new PartitionModificationCounter(null, () -> 0L, 0.0d, 0), "initTimestamp" ); IgniteTestUtils.assertThrows( NullPointerException.class, - () -> new PartitionModificationCounter(0, 0, messaging, HybridTimestamp.MIN_VALUE, null, 0.0d, 0), + () -> new PartitionModificationCounter(HybridTimestamp.MIN_VALUE, null, 0.0d, 0), "partitionSizeSupplier" ); IgniteTestUtils.assertThrows( IllegalArgumentException.class, - () -> new PartitionModificationCounter(0, 0, messaging, HybridTimestamp.MIN_VALUE, () -> 0L, 1.1d, 0), + () -> new PartitionModificationCounter(HybridTimestamp.MIN_VALUE, () -> 0L, 1.1d, 0), "staleRowsFraction must be in [0, 1] range" ); IgniteTestUtils.assertThrows( IllegalArgumentException.class, - () -> new PartitionModificationCounter(0, 0, messaging, HybridTimestamp.MIN_VALUE, () -> 0L, -0.1d, 0), + () -> new PartitionModificationCounter(HybridTimestamp.MIN_VALUE, () -> 0L, -0.1d, 0), "staleRowsFraction must be in [0, 1] range" ); IgniteTestUtils.assertThrows( IllegalArgumentException.class, - () -> new PartitionModificationCounter(0, 0, messaging, HybridTimestamp.MIN_VALUE, () -> 0L, -0.1d, -1), + () -> new PartitionModificationCounter(HybridTimestamp.MIN_VALUE, () -> 0L, -0.1d, -1), "staleRowsFraction must be in [0, 1] range" ); } 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 502f85ad9e4..0f79b5783f4 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 @@ -174,7 +174,7 @@ public class StorageCleanupTest extends BaseMvStoragesTest { partitionDataStorage, indexUpdateHandler, replicationConfiguration, - TableTestUtils.NOOP_PARTITION_MODIFICATION_COUNTER + TableTestUtils.NOOP_PARTITION_MODIFICATION_COUNTER_HANDLER ); } 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 ec24635ff6b..08cbbe8490b 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 @@ -166,7 +166,7 @@ public class StorageUpdateHandlerTest extends BaseMvStoragesTest { partitionDataStorage, indexUpdateHandler, replicationConfiguration, - TableTestUtils.NOOP_PARTITION_MODIFICATION_COUNTER + TableTestUtils.NOOP_PARTITION_MODIFICATION_COUNTER_HANDLER ); } 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 272b15a936e..ebade0720fe 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 @@ -264,7 +264,7 @@ public class PartitionCommandListenerTest extends BaseIgniteAbstractTest { partitionDataStorage, indexUpdateHandler, replicationConfiguration, - TableTestUtils.NOOP_PARTITION_MODIFICATION_COUNTER + TableTestUtils.NOOP_PARTITION_MODIFICATION_COUNTER_HANDLER )); catalogService = mock(CatalogService.class); @@ -524,7 +524,7 @@ public class PartitionCommandListenerTest extends BaseIgniteAbstractTest { partitionDataStorage, indexUpdateHandler, replicationConfiguration, - TableTestUtils.NOOP_PARTITION_MODIFICATION_COUNTER + TableTestUtils.NOOP_PARTITION_MODIFICATION_COUNTER_HANDLER ); LeasePlacementDriver placementDriver = mock(LeasePlacementDriver.class); 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 ad5e88d2261..08176dfb1aa 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 @@ -282,7 +282,7 @@ public class PartitionReplicaListenerIndexLockingTest extends IgniteAbstractTest partitionDataStorage, indexUpdateHandler, replicationConfiguration, - TableTestUtils.NOOP_PARTITION_MODIFICATION_COUNTER + TableTestUtils.NOOP_PARTITION_MODIFICATION_COUNTER_HANDLER ), 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 6464c29d946..75336b112e0 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 @@ -251,7 +251,7 @@ public class PartitionReplicaListenerSortedIndexLockingTest extends IgniteAbstra partitionDataStorage, indexUpdateHandler, replicationConfiguration, - TableTestUtils.NOOP_PARTITION_MODIFICATION_COUNTER + TableTestUtils.NOOP_PARTITION_MODIFICATION_COUNTER_HANDLER ), 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 442b02a220c..6be953e16a9 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 @@ -690,7 +690,7 @@ public class PartitionReplicaListenerTest extends IgniteAbstractTest { partitionDataStorage, indexUpdateHandler, replicationConfiguration, - TableTestUtils.NOOP_PARTITION_MODIFICATION_COUNTER + TableTestUtils.NOOP_PARTITION_MODIFICATION_COUNTER_HANDLER ), validationSchemasSource, localNode, diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/ZonePartitionReplicaListenerTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/ZonePartitionReplicaListenerTest.java index bacda373b05..a0f6a7768c4 100644 --- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/ZonePartitionReplicaListenerTest.java +++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/ZonePartitionReplicaListenerTest.java @@ -659,7 +659,7 @@ public class ZonePartitionReplicaListenerTest extends IgniteAbstractTest { partitionDataStorage, indexUpdateHandler, replicationConfiguration, - TableTestUtils.NOOP_PARTITION_MODIFICATION_COUNTER + TableTestUtils.NOOP_PARTITION_MODIFICATION_COUNTER_HANDLER ), 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 f53682bb5f6..599c2c1f527 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 @@ -761,7 +761,7 @@ public class ItTxTestCluster { partitionDataStorage, indexUpdateHandler, replicationConfiguration, - TableTestUtils.NOOP_PARTITION_MODIFICATION_COUNTER + TableTestUtils.NOOP_PARTITION_MODIFICATION_COUNTER_HANDLER ); DummySchemaManagerImpl schemaManager = new DummySchemaManagerImpl(schemaDescriptor); diff --git a/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/TableTestUtils.java b/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/TableTestUtils.java index 1550e16cb73..addb324f8d4 100644 --- a/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/TableTestUtils.java +++ b/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/TableTestUtils.java @@ -49,6 +49,7 @@ import org.apache.ignite.internal.network.MessagingService; import org.apache.ignite.internal.sql.SqlCommon; import org.apache.ignite.internal.table.distributed.PartitionModificationCounter; import org.apache.ignite.internal.table.distributed.PartitionModificationCounterFactory; +import org.apache.ignite.internal.table.distributed.PartitionModificationCounterHandler; import org.apache.ignite.sql.ColumnType; import org.jetbrains.annotations.Nullable; @@ -66,16 +67,19 @@ public class TableTestUtils { /** Column name. */ public static final String COLUMN_NAME = "TEST_COLUMN"; + private static final PartitionModificationCounter NOOP_PARTITION_MODIFICATION_COUNTER = + new PartitionModificationCounter(HybridTimestamp.MIN_VALUE, () -> 0, 0, 0); + /** No-op partition modification counter. */ - public static final PartitionModificationCounter NOOP_PARTITION_MODIFICATION_COUNTER = - new PartitionModificationCounter(0, 0, mock(MessagingService.class), HybridTimestamp.MIN_VALUE, () -> 0, 0, 0); + public static final PartitionModificationCounterHandler NOOP_PARTITION_MODIFICATION_COUNTER_HANDLER = + new PartitionModificationCounterHandler(0, 0, mock(MessagingService.class), () -> 0, NOOP_PARTITION_MODIFICATION_COUNTER); /** No-op partition modification counter factory. */ public static PartitionModificationCounterFactory NOOP_PARTITION_MODIFICATION_COUNTER_FACTORY = new PartitionModificationCounterFactory(() -> HybridTimestamp.MIN_VALUE, mock(MessagingService.class)) { @Override - public PartitionModificationCounter create(LongSupplier partitionSizeSupplier, int tableId, int partitionId) { - return NOOP_PARTITION_MODIFICATION_COUNTER; + public PartitionModificationCounterHandler create(LongSupplier partitionSizeSupplier, int tableId, int partitionId) { + return NOOP_PARTITION_MODIFICATION_COUNTER_HANDLER; } }; 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 3dd865fea1d..7b8cce8974b 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 @@ -450,7 +450,7 @@ public class DummyInternalTableImpl extends InternalTableImpl { partitionDataStorage, indexUpdateHandler, replicationConfiguration, - TableTestUtils.NOOP_PARTITION_MODIFICATION_COUNTER + TableTestUtils.NOOP_PARTITION_MODIFICATION_COUNTER_HANDLER ); DummySchemaManagerImpl schemaManager = new DummySchemaManagerImpl(schema);
