This is an automated email from the ASF dual-hosted git repository. sdanilov pushed a commit to branch ignite-19028 in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 49727b9a4943d9deb1ca28b0ed033d0f3c486a61 Author: Semyon Danilov <[email protected]> AuthorDate: Thu Mar 30 15:09:02 2023 +0400 Fix checkstyle --- ...istributionZoneManagerLogicalTopologyEventsTest.java | 1 - .../DistributionZoneManagerScaleUpTest.java | 4 ++-- .../DistributionZoneManagerWatchListenerTest.java | 4 ++-- .../impl/ItMetaStorageServicePersistenceTest.java | 9 +++++---- .../metastorage/impl/ItMetaStorageServiceTest.java | 3 +-- .../server/raft/ItMetaStorageRaftGroupTest.java | 7 ++++--- .../metastorage/command/HybridTimestampMessage.java | 7 +++++++ .../metastorage/command/MetaStorageWriteCommand.java | 11 +++++++++++ .../impl/MetaStorageRaftGroupEventsListener.java | 1 - .../metastorage/impl/MetaStorageServiceImpl.java | 10 ++++++++-- .../server/raft/MetaStorageLearnerListener.java | 1 - .../metastorage/server/raft/MetaStorageListener.java | 1 - .../server/raft/MetaStorageWriteHandler.java | 1 - .../internal/metastorage/server/time/ClusterTime.java | 3 +-- .../metastorage/server/time/ClusterTimeImpl.java | 17 +++++++++++++++++ .../metastorage/impl/MetaStorageRangeCursorTest.java | 3 ++- .../metastorage/impl/StandaloneMetaStorageManager.java | 1 - .../ignite/internal/raft/service/RaftGroupListener.java | 2 -- .../distributed/TableManagerDistributionZonesTest.java | 4 ++-- .../utils/RebalanceUtilUpdateAssignmentsTest.java | 4 ++-- 20 files changed, 64 insertions(+), 30 deletions(-) diff --git a/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/DistributionZoneManagerLogicalTopologyEventsTest.java b/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/DistributionZoneManagerLogicalTopologyEventsTest.java index d56068dbb7..7151e2257d 100644 --- a/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/DistributionZoneManagerLogicalTopologyEventsTest.java +++ b/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/DistributionZoneManagerLogicalTopologyEventsTest.java @@ -59,7 +59,6 @@ import org.apache.ignite.internal.metastorage.command.MultiInvokeCommand; import org.apache.ignite.internal.metastorage.dsl.Iif; import org.apache.ignite.internal.metastorage.server.SimpleInMemoryKeyValueStorage; import org.apache.ignite.internal.metastorage.server.raft.MetaStorageListener; -import org.apache.ignite.internal.metastorage.server.time.ClusterTime; import org.apache.ignite.internal.metastorage.server.time.ClusterTimeImpl; import org.apache.ignite.internal.raft.Command; import org.apache.ignite.internal.raft.ReadCommand; diff --git a/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/DistributionZoneManagerScaleUpTest.java b/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/DistributionZoneManagerScaleUpTest.java index aba45505f0..4b8369aa00 100644 --- a/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/DistributionZoneManagerScaleUpTest.java +++ b/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/DistributionZoneManagerScaleUpTest.java @@ -81,7 +81,7 @@ import org.apache.ignite.internal.metastorage.dsl.Iif; import org.apache.ignite.internal.metastorage.impl.EntryImpl; import org.apache.ignite.internal.metastorage.server.SimpleInMemoryKeyValueStorage; import org.apache.ignite.internal.metastorage.server.raft.MetaStorageListener; -import org.apache.ignite.internal.metastorage.server.time.ClusterTime; +import org.apache.ignite.internal.metastorage.server.time.ClusterTimeImpl; import org.apache.ignite.internal.raft.service.RaftGroupService; import org.apache.ignite.internal.schema.configuration.TableChange; import org.apache.ignite.internal.schema.configuration.TableConfiguration; @@ -191,7 +191,7 @@ public class DistributionZoneManagerScaleUpTest { keyValueStorage = spy(new SimpleInMemoryKeyValueStorage("test")); - MetaStorageListener metaStorageListener = new MetaStorageListener(keyValueStorage, mock(ClusterTime.class)); + MetaStorageListener metaStorageListener = new MetaStorageListener(keyValueStorage, mock(ClusterTimeImpl.class)); metaStorageService = mock(RaftGroupService.class); diff --git a/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/DistributionZoneManagerWatchListenerTest.java b/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/DistributionZoneManagerWatchListenerTest.java index 5ebc2f466e..a7f426025b 100644 --- a/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/DistributionZoneManagerWatchListenerTest.java +++ b/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/DistributionZoneManagerWatchListenerTest.java @@ -62,7 +62,7 @@ import org.apache.ignite.internal.metastorage.WatchListener; import org.apache.ignite.internal.metastorage.impl.EntryImpl; import org.apache.ignite.internal.metastorage.server.SimpleInMemoryKeyValueStorage; import org.apache.ignite.internal.metastorage.server.raft.MetaStorageListener; -import org.apache.ignite.internal.metastorage.server.time.ClusterTime; +import org.apache.ignite.internal.metastorage.server.time.ClusterTimeImpl; import org.apache.ignite.internal.raft.service.RaftGroupService; import org.apache.ignite.internal.schema.configuration.TableChange; import org.apache.ignite.internal.schema.configuration.TableConfiguration; @@ -165,7 +165,7 @@ public class DistributionZoneManagerWatchListenerTest extends IgniteAbstractTest keyValueStorage = spy(new SimpleInMemoryKeyValueStorage("test")); - MetaStorageListener metaStorageListener = new MetaStorageListener(keyValueStorage, mock(ClusterTime.class)); + MetaStorageListener metaStorageListener = new MetaStorageListener(keyValueStorage, mock(ClusterTimeImpl.class)); metaStorageService = mock(RaftGroupService.class); diff --git a/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageServicePersistenceTest.java b/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageServicePersistenceTest.java index a483f3979a..1e075abcbf 100644 --- a/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageServicePersistenceTest.java +++ b/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageServicePersistenceTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.metastorage.impl; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.mock; import java.nio.charset.StandardCharsets; import java.nio.file.Path; @@ -26,11 +25,12 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.ExecutionException; import java.util.function.BooleanSupplier; +import org.apache.ignite.internal.hlc.HybridClockImpl; import org.apache.ignite.internal.metastorage.Entry; import org.apache.ignite.internal.metastorage.server.KeyValueStorage; import org.apache.ignite.internal.metastorage.server.persistence.RocksDbKeyValueStorage; import org.apache.ignite.internal.metastorage.server.raft.MetaStorageListener; -import org.apache.ignite.internal.metastorage.server.time.ClusterTime; +import org.apache.ignite.internal.metastorage.server.time.ClusterTimeImpl; import org.apache.ignite.internal.raft.server.RaftServer; import org.apache.ignite.internal.raft.server.impl.JraftServerImpl; import org.apache.ignite.internal.raft.service.ItAbstractListenerSnapshotTest; @@ -71,7 +71,8 @@ public class ItMetaStorageServicePersistenceTest extends ItAbstractListenerSnaps public void beforeFollowerStop(RaftGroupService service, RaftServer server) throws Exception { ClusterNode followerNode = getNode(server); - metaStorage = new MetaStorageServiceImpl(service, new IgniteSpinBusyLock(), followerNode, mock(ClusterTime.class)); + metaStorage = new MetaStorageServiceImpl(service, new IgniteSpinBusyLock(), followerNode, + new ClusterTimeImpl(new IgniteSpinBusyLock(), new HybridClockImpl())); // Put some data in the metastorage metaStorage.put(FIRST_KEY, FIRST_VALUE).get(); @@ -147,7 +148,7 @@ public class ItMetaStorageServicePersistenceTest extends ItAbstractListenerSnaps return s; }); - return new MetaStorageListener(storage, mock(ClusterTime.class)); + return new MetaStorageListener(storage, new ClusterTimeImpl(new IgniteSpinBusyLock(), new HybridClockImpl())); } /** {@inheritDoc} */ diff --git a/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageServiceTest.java b/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageServiceTest.java index 8483aa744b..8cbec1ace5 100644 --- a/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageServiceTest.java +++ b/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageServiceTest.java @@ -90,7 +90,6 @@ import org.apache.ignite.internal.metastorage.server.ValueCondition.Type; import org.apache.ignite.internal.metastorage.server.raft.MetaStorageLearnerListener; import org.apache.ignite.internal.metastorage.server.raft.MetaStorageListener; import org.apache.ignite.internal.metastorage.server.raft.MetastorageGroupId; -import org.apache.ignite.internal.metastorage.server.time.ClusterTime; import org.apache.ignite.internal.metastorage.server.time.ClusterTimeImpl; import org.apache.ignite.internal.raft.Loza; import org.apache.ignite.internal.raft.Peer; @@ -179,7 +178,7 @@ public class ItMetaStorageServiceTest { private final KeyValueStorage mockStorage; - private final ClusterTime clusterTime; + private final ClusterTimeImpl clusterTime; private RaftGroupService metaStorageRaftService; diff --git a/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/server/raft/ItMetaStorageRaftGroupTest.java b/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/server/raft/ItMetaStorageRaftGroupTest.java index e791c93adf..143d754fb3 100644 --- a/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/server/raft/ItMetaStorageRaftGroupTest.java +++ b/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/server/raft/ItMetaStorageRaftGroupTest.java @@ -53,6 +53,7 @@ import org.apache.ignite.internal.metastorage.impl.MetaStorageService; import org.apache.ignite.internal.metastorage.impl.MetaStorageServiceImpl; import org.apache.ignite.internal.metastorage.server.KeyValueStorage; import org.apache.ignite.internal.metastorage.server.time.ClusterTime; +import org.apache.ignite.internal.metastorage.server.time.ClusterTimeImpl; import org.apache.ignite.internal.raft.PeersAndLearners; import org.apache.ignite.internal.raft.RaftGroupServiceImpl; import org.apache.ignite.internal.raft.RaftNodeId; @@ -371,17 +372,17 @@ public class ItMetaStorageRaftGroupTest extends IgniteAbstractTest { var raftNodeId1 = new RaftNodeId(MetastorageGroupId.INSTANCE, membersConfiguration.peer(localMemberName(cluster.get(0)))); metaStorageRaftSrv1.startRaftNode(raftNodeId1, membersConfiguration, - new MetaStorageListener(mockStorage, mock(ClusterTime.class)), defaults()); + new MetaStorageListener(mockStorage, mock(ClusterTimeImpl.class)), defaults()); var raftNodeId2 = new RaftNodeId(MetastorageGroupId.INSTANCE, membersConfiguration.peer(localMemberName(cluster.get(1)))); metaStorageRaftSrv2.startRaftNode(raftNodeId2, membersConfiguration, - new MetaStorageListener(mockStorage, mock(ClusterTime.class)), defaults()); + new MetaStorageListener(mockStorage, mock(ClusterTimeImpl.class)), defaults()); var raftNodeId3 = new RaftNodeId(MetastorageGroupId.INSTANCE, membersConfiguration.peer(localMemberName(cluster.get(2)))); metaStorageRaftSrv3.startRaftNode(raftNodeId3, membersConfiguration, - new MetaStorageListener(mockStorage, mock(ClusterTime.class)), defaults()); + new MetaStorageListener(mockStorage, mock(ClusterTimeImpl.class)), defaults()); metaStorageRaftGrpSvc1 = RaftGroupServiceImpl.start( MetastorageGroupId.INSTANCE, diff --git a/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/command/HybridTimestampMessage.java b/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/command/HybridTimestampMessage.java index 93e6d481b7..0733704c30 100644 --- a/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/command/HybridTimestampMessage.java +++ b/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/command/HybridTimestampMessage.java @@ -22,10 +22,17 @@ import org.apache.ignite.internal.hlc.HybridTimestamp; import org.apache.ignite.network.NetworkMessage; import org.apache.ignite.network.annotations.Transferable; +/** Message with a {@link HybridTimestamp}. */ @Transferable(MetastorageCommandsMessageGroup.HYBRID_TS) public interface HybridTimestampMessage extends NetworkMessage, Serializable { + /** + * Returns physical time. + */ long physical(); + /** + * Returns logical time. + */ int logical(); default HybridTimestamp asHybridTimestamp() { diff --git a/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/command/MetaStorageWriteCommand.java b/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/command/MetaStorageWriteCommand.java index 9015503f88..369cd32358 100644 --- a/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/command/MetaStorageWriteCommand.java +++ b/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/command/MetaStorageWriteCommand.java @@ -20,12 +20,23 @@ package org.apache.ignite.internal.metastorage.command; import org.apache.ignite.internal.raft.WriteCommand; import org.apache.ignite.network.annotations.WithSetter; +/** Base meta storage write command. */ public interface MetaStorageWriteCommand extends WriteCommand { + /** + * Returns time on the initiator node. + */ HybridTimestampMessage initiatorTime(); + /** + * This is a dirty hack. This time is set by the leader node to disseminate new safe time across + * followers and learners. + */ @WithSetter HybridTimestampMessage safeTime(); + /** + * Setter for the safeTime field. + */ default void safeTime(HybridTimestampMessage safeTime) { // No-op. } diff --git a/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/impl/MetaStorageRaftGroupEventsListener.java b/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/impl/MetaStorageRaftGroupEventsListener.java index 9b09c02805..ae73d277f6 100644 --- a/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/impl/MetaStorageRaftGroupEventsListener.java +++ b/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/impl/MetaStorageRaftGroupEventsListener.java @@ -31,7 +31,6 @@ import org.apache.ignite.internal.cluster.management.topology.api.LogicalTopolog import org.apache.ignite.internal.cluster.management.topology.api.LogicalTopologySnapshot; import org.apache.ignite.internal.logger.IgniteLogger; import org.apache.ignite.internal.logger.Loggers; -import org.apache.ignite.internal.metastorage.server.time.ClusterTime; import org.apache.ignite.internal.metastorage.server.time.ClusterTimeImpl; import org.apache.ignite.internal.raft.Peer; import org.apache.ignite.internal.raft.PeersAndLearners; diff --git a/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/impl/MetaStorageServiceImpl.java b/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/impl/MetaStorageServiceImpl.java index 824f1d31c6..2b27766436 100644 --- a/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/impl/MetaStorageServiceImpl.java +++ b/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/impl/MetaStorageServiceImpl.java @@ -275,9 +275,15 @@ public class MetaStorageServiceImpl implements MetaStorageService { return new CursorPublisher(context, createPrefixCommand); } - public CompletableFuture<Void> syncTime(HybridTimestamp hybridTimestamp) { + /** + * Sends safe time sync message. Should be called only on the leader node. + * + * @param safeTime New safe time. + * @return Future that will be completed when message is sent. + */ + public CompletableFuture<Void> syncTime(HybridTimestamp safeTime) { SyncTimeCommand syncTimeCommand = context.commandsFactory().syncTimeCommand() - .safeTime(hybridTimestamp(clusterTime.now())) + .safeTime(hybridTimestamp(safeTime)) .build(); return context.raftService().run(syncTimeCommand); diff --git a/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/server/raft/MetaStorageLearnerListener.java b/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/server/raft/MetaStorageLearnerListener.java index 7dd7e918f5..263e409412 100644 --- a/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/server/raft/MetaStorageLearnerListener.java +++ b/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/server/raft/MetaStorageLearnerListener.java @@ -21,7 +21,6 @@ import java.nio.file.Path; import java.util.Iterator; import java.util.function.Consumer; import org.apache.ignite.internal.metastorage.server.KeyValueStorage; -import org.apache.ignite.internal.metastorage.server.time.ClusterTime; import org.apache.ignite.internal.metastorage.server.time.ClusterTimeImpl; import org.apache.ignite.internal.raft.Command; import org.apache.ignite.internal.raft.ReadCommand; diff --git a/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/server/raft/MetaStorageListener.java b/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/server/raft/MetaStorageListener.java index 409380b88b..1823dbcbbd 100644 --- a/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/server/raft/MetaStorageListener.java +++ b/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/server/raft/MetaStorageListener.java @@ -39,7 +39,6 @@ import org.apache.ignite.internal.metastorage.command.cursor.NextBatchCommand; import org.apache.ignite.internal.metastorage.command.response.BatchResponse; import org.apache.ignite.internal.metastorage.exceptions.MetaStorageException; import org.apache.ignite.internal.metastorage.server.KeyValueStorage; -import org.apache.ignite.internal.metastorage.server.time.ClusterTime; import org.apache.ignite.internal.metastorage.server.time.ClusterTimeImpl; import org.apache.ignite.internal.raft.Command; import org.apache.ignite.internal.raft.ReadCommand; diff --git a/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/server/raft/MetaStorageWriteHandler.java b/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/server/raft/MetaStorageWriteHandler.java index 663856744a..0fdb2256d9 100644 --- a/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/server/raft/MetaStorageWriteHandler.java +++ b/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/server/raft/MetaStorageWriteHandler.java @@ -51,7 +51,6 @@ import org.apache.ignite.internal.metastorage.server.RevisionCondition; import org.apache.ignite.internal.metastorage.server.Statement; import org.apache.ignite.internal.metastorage.server.TombstoneCondition; import org.apache.ignite.internal.metastorage.server.ValueCondition; -import org.apache.ignite.internal.metastorage.server.time.ClusterTime; import org.apache.ignite.internal.metastorage.server.time.ClusterTimeImpl; import org.apache.ignite.internal.raft.Command; import org.apache.ignite.internal.raft.WriteCommand; diff --git a/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/server/time/ClusterTime.java b/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/server/time/ClusterTime.java index 7f631ef8dd..602209760c 100644 --- a/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/server/time/ClusterTime.java +++ b/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/server/time/ClusterTime.java @@ -19,10 +19,9 @@ package org.apache.ignite.internal.metastorage.server.time; import java.util.concurrent.CompletableFuture; import org.apache.ignite.internal.hlc.HybridTimestamp; -import org.apache.ignite.internal.metastorage.impl.MetaStorageServiceImpl; /** - * Cluster time. + * Cluster time with a hybrid clock instance and access to safe time. */ public interface ClusterTime { /** diff --git a/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/server/time/ClusterTimeImpl.java b/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/server/time/ClusterTimeImpl.java index 2f33436bd7..43da9ca70e 100644 --- a/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/server/time/ClusterTimeImpl.java +++ b/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/server/time/ClusterTimeImpl.java @@ -33,6 +33,9 @@ import org.apache.ignite.internal.util.IgniteUtils; import org.apache.ignite.internal.util.PendingComparableValuesTracker; import org.jetbrains.annotations.Nullable; +/** + * Cluster time implementation with additional methods to adjust time and update safe time. + */ public class ClusterTimeImpl implements ClusterTime { /** The logger. */ private static final IgniteLogger LOG = Loggers.forClass(ClusterTimeImpl.class); @@ -45,12 +48,23 @@ public class ClusterTimeImpl implements ClusterTime { private final PendingComparableValuesTracker<HybridTimestamp> safeTime; + /** + * Constructor. + * + * @param busyLock Busy lock. + * @param clock Node's hybrid clock. + */ public ClusterTimeImpl(IgniteSpinBusyLock busyLock, HybridClock clock) { this.busyLock = busyLock; this.clock = clock; this.safeTime = new PendingComparableValuesTracker<>(clock.now()); } + /** + * Starts sync time scheduler. + * + * @param service MetaStorage service that is used by scheduler to sync time. + */ public void startLeaderTimer(MetaStorageServiceImpl service) { if (!busyLock.enterBusy()) { return; @@ -69,6 +83,9 @@ public class ClusterTimeImpl implements ClusterTime { } } + /** + * Stops sync time scheduler. + */ public void stopLeaderTimer() { LeaderTimer timer = leaderTimer; diff --git a/modules/metastorage/src/test/java/org/apache/ignite/internal/metastorage/impl/MetaStorageRangeCursorTest.java b/modules/metastorage/src/test/java/org/apache/ignite/internal/metastorage/impl/MetaStorageRangeCursorTest.java index e07ed4e66b..c6b4f815cc 100644 --- a/modules/metastorage/src/test/java/org/apache/ignite/internal/metastorage/impl/MetaStorageRangeCursorTest.java +++ b/modules/metastorage/src/test/java/org/apache/ignite/internal/metastorage/impl/MetaStorageRangeCursorTest.java @@ -44,6 +44,7 @@ import org.apache.ignite.internal.metastorage.Entry; import org.apache.ignite.internal.metastorage.server.KeyValueStorage; import org.apache.ignite.internal.metastorage.server.raft.MetaStorageListener; import org.apache.ignite.internal.metastorage.server.time.ClusterTime; +import org.apache.ignite.internal.metastorage.server.time.ClusterTimeImpl; import org.apache.ignite.internal.raft.Command; import org.apache.ignite.internal.raft.ReadCommand; import org.apache.ignite.internal.raft.WriteCommand; @@ -85,7 +86,7 @@ public class MetaStorageRangeCursorTest { when(storage.range(any(), any(), anyBoolean())).thenReturn(Cursor.fromIterable(expectedEntries)); when(storage.range(any(), any(), anyLong(), anyBoolean())).thenReturn(Cursor.fromIterable(expectedEntries)); - listener = new MetaStorageListener(storage, mock(ClusterTime.class)); + listener = new MetaStorageListener(storage, mock(ClusterTimeImpl.class)); when(raftGroupService.run(any())).thenAnswer(invocation -> runCommand(invocation.getArgument(0))); diff --git a/modules/metastorage/src/testFixtures/java/org/apache/ignite/internal/metastorage/impl/StandaloneMetaStorageManager.java b/modules/metastorage/src/testFixtures/java/org/apache/ignite/internal/metastorage/impl/StandaloneMetaStorageManager.java index e3342069c0..12e9360231 100644 --- a/modules/metastorage/src/testFixtures/java/org/apache/ignite/internal/metastorage/impl/StandaloneMetaStorageManager.java +++ b/modules/metastorage/src/testFixtures/java/org/apache/ignite/internal/metastorage/impl/StandaloneMetaStorageManager.java @@ -32,7 +32,6 @@ import org.apache.ignite.internal.cluster.management.topology.api.LogicalTopolog import org.apache.ignite.internal.hlc.HybridClock; import org.apache.ignite.internal.metastorage.server.KeyValueStorage; import org.apache.ignite.internal.metastorage.server.SimpleInMemoryKeyValueStorage; -import org.apache.ignite.internal.metastorage.server.time.ClusterTime; import org.apache.ignite.internal.raft.Command; import org.apache.ignite.internal.raft.RaftManager; import org.apache.ignite.internal.raft.ReadCommand; diff --git a/modules/raft-api/src/main/java/org/apache/ignite/internal/raft/service/RaftGroupListener.java b/modules/raft-api/src/main/java/org/apache/ignite/internal/raft/service/RaftGroupListener.java index c5e0a0ba35..bbb6e134da 100644 --- a/modules/raft-api/src/main/java/org/apache/ignite/internal/raft/service/RaftGroupListener.java +++ b/modules/raft-api/src/main/java/org/apache/ignite/internal/raft/service/RaftGroupListener.java @@ -19,12 +19,10 @@ package org.apache.ignite.internal.raft.service; import java.nio.file.Path; import java.util.Iterator; -import java.util.concurrent.CompletableFuture; import java.util.function.Consumer; import org.apache.ignite.internal.raft.Command; import org.apache.ignite.internal.raft.ReadCommand; import org.apache.ignite.internal.raft.WriteCommand; -import org.jetbrains.annotations.Nullable; /** * A listener for replication group events. diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerDistributionZonesTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerDistributionZonesTest.java index 90b692a848..4178baaeaf 100644 --- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerDistributionZonesTest.java +++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerDistributionZonesTest.java @@ -67,7 +67,7 @@ import org.apache.ignite.internal.metastorage.dsl.Iif; import org.apache.ignite.internal.metastorage.impl.EntryImpl; import org.apache.ignite.internal.metastorage.server.SimpleInMemoryKeyValueStorage; import org.apache.ignite.internal.metastorage.server.raft.MetaStorageListener; -import org.apache.ignite.internal.metastorage.server.time.ClusterTime; +import org.apache.ignite.internal.metastorage.server.time.ClusterTimeImpl; import org.apache.ignite.internal.raft.Command; import org.apache.ignite.internal.raft.WriteCommand; import org.apache.ignite.internal.raft.client.TopologyAwareRaftGroupServiceFactory; @@ -148,7 +148,7 @@ public class TableManagerDistributionZonesTest extends IgniteAbstractTest { keyValueStorage = spy(new SimpleInMemoryKeyValueStorage("test")); - MetaStorageListener metaStorageListener = new MetaStorageListener(keyValueStorage, mock(ClusterTime.class)); + MetaStorageListener metaStorageListener = new MetaStorageListener(keyValueStorage, mock(ClusterTimeImpl.class)); RaftGroupService metaStorageService = mock(RaftGroupService.class); diff --git a/modules/table/src/test/java/org/apache/ignite/internal/utils/RebalanceUtilUpdateAssignmentsTest.java b/modules/table/src/test/java/org/apache/ignite/internal/utils/RebalanceUtilUpdateAssignmentsTest.java index d00f2cbf8e..54db5b1f1d 100644 --- a/modules/table/src/test/java/org/apache/ignite/internal/utils/RebalanceUtilUpdateAssignmentsTest.java +++ b/modules/table/src/test/java/org/apache/ignite/internal/utils/RebalanceUtilUpdateAssignmentsTest.java @@ -54,7 +54,7 @@ import org.apache.ignite.internal.metastorage.command.MultiInvokeCommand; import org.apache.ignite.internal.metastorage.dsl.Iif; import org.apache.ignite.internal.metastorage.server.SimpleInMemoryKeyValueStorage; import org.apache.ignite.internal.metastorage.server.raft.MetaStorageListener; -import org.apache.ignite.internal.metastorage.server.time.ClusterTime; +import org.apache.ignite.internal.metastorage.server.time.ClusterTimeImpl; import org.apache.ignite.internal.raft.Command; import org.apache.ignite.internal.raft.WriteCommand; import org.apache.ignite.internal.raft.service.CommandClosure; @@ -123,7 +123,7 @@ public class RebalanceUtilUpdateAssignmentsTest extends IgniteAbstractTest { keyValueStorage = spy(new SimpleInMemoryKeyValueStorage("test")); - MetaStorageListener metaStorageListener = new MetaStorageListener(keyValueStorage, mock(ClusterTime.class)); + MetaStorageListener metaStorageListener = new MetaStorageListener(keyValueStorage, mock(ClusterTimeImpl.class)); RaftGroupService metaStorageService = mock(RaftGroupService.class);
