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 ac18ff2b5e6 IGNITE-27488 Remove TablePartitionKey (#7335)
ac18ff2b5e6 is described below
commit ac18ff2b5e60f4897459e24b8bb91ec6d08cab2a
Author: Roman Puchkovskiy <[email protected]>
AuthorDate: Tue Dec 30 21:27:31 2025 +0400
IGNITE-27488 Remove TablePartitionKey (#7335)
---
.../ItZonePartitionRaftListenerRecoveryTest.java | 6 +-
.../partition/replicator/ZoneResourcesManager.java | 4 +-
.../replicator/raft/ZonePartitionRaftListener.java | 3 +-
.../replicator/raft/snapshot/PartitionKey.java | 60 ++++++++++++++--
.../raft/snapshot/PartitionSnapshotStorage.java | 8 +--
.../replicator/raft/snapshot/ZonePartitionKey.java | 82 ---------------------
.../snapshot/incoming/IncomingSnapshotCopier.java | 4 +-
.../incoming/ReplicationLogStorageKey.java | 8 +--
.../raft/snapshot/outgoing/OutgoingSnapshot.java | 15 +---
.../raft/ZonePartitionRaftListenerTest.java | 4 +-
.../PartitionSnapshotStorageFactoryTest.java | 2 +-
.../snapshot/PartitionSnapshotStorageTest.java | 2 +-
.../incoming/IncomingSnapshotCopierTest.java | 6 +-
.../outgoing/OutgoingSnapshotCommonTest.java | 3 +-
.../OutgoingSnapshotMvDataStreamingTest.java | 3 +-
.../outgoing/OutgoingSnapshotReaderTest.java | 4 +-
.../outgoing/OutgoingSnapshotStatsTest.java | 4 +-
.../OutgoingSnapshotTxDataStreamingTest.java | 3 +-
.../outgoing/OutgoingSnapshotsManagerTest.java | 6 +-
.../SnapshotAwarePartitionDataStorageTest.java | 13 +---
.../internal/table/distributed/TableManager.java | 3 +-
.../SnapshotAwarePartitionDataStorage.java | 10 +--
.../raft/snapshot/TablePartitionKey.java | 84 ----------------------
23 files changed, 96 insertions(+), 241 deletions(-)
diff --git
a/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/raft/ItZonePartitionRaftListenerRecoveryTest.java
b/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/raft/ItZonePartitionRaftListenerRecoveryTest.java
index 1dc3a536168..b8843e0c833 100644
---
a/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/raft/ItZonePartitionRaftListenerRecoveryTest.java
+++
b/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/raft/ItZonePartitionRaftListenerRecoveryTest.java
@@ -78,11 +78,11 @@ import
org.apache.ignite.internal.partition.replicator.network.PartitionReplicat
import
org.apache.ignite.internal.partition.replicator.network.command.TimedBinaryRowMessage;
import
org.apache.ignite.internal.partition.replicator.network.command.UpdateCommand;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.LogStorageAccessImpl;
+import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionKey;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionMvStorageAccess;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionSnapshotStorage;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionSnapshotStorageFactory;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionTxStateAccessImpl;
-import
org.apache.ignite.internal.partition.replicator.raft.snapshot.ZonePartitionKey;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.metrics.RaftSnapshotsMetricsSource;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.outgoing.OutgoingSnapshotsManager;
import org.apache.ignite.internal.placementdriver.LeasePlacementDriver;
@@ -305,7 +305,7 @@ class ItZonePartitionRaftListenerRecoveryTest extends
IgniteAbstractTest {
txStateStorage = new TxStateRocksDbStorage(PARTITION_ID.zoneId(), 10,
sharedRockDbStorage);
partitionSnapshotStorage = new PartitionSnapshotStorage(
- new ZonePartitionKey(PARTITION_ID.zoneId(),
PARTITION_ID.partitionId()),
+ new PartitionKey(PARTITION_ID.zoneId(),
PARTITION_ID.partitionId()),
clusterService.topologyService(),
outgoingSnapshotsManager,
new
PartitionTxStateAccessImpl(txStateStorage.getOrCreatePartitionStorage(PARTITION_ID.partitionId())),
@@ -384,7 +384,7 @@ class ItZonePartitionRaftListenerRecoveryTest extends
IgniteAbstractTest {
tableId,
mockStorage(tableId).storage,
outgoingSnapshotsManager,
- new ZonePartitionKey(PARTITION_ID.zoneId(),
PARTITION_ID.partitionId())
+ new PartitionKey(PARTITION_ID.zoneId(),
PARTITION_ID.partitionId())
);
LeasePlacementDriver placementDriver =
mock(LeasePlacementDriver.class);
diff --git
a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/ZoneResourcesManager.java
b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/ZoneResourcesManager.java
index 552984b8784..f12603863c1 100644
---
a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/ZoneResourcesManager.java
+++
b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/ZoneResourcesManager.java
@@ -32,9 +32,9 @@ import org.apache.ignite.internal.hlc.HybridTimestamp;
import org.apache.ignite.internal.network.TopologyService;
import
org.apache.ignite.internal.partition.replicator.raft.ZonePartitionRaftListener;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.LogStorageAccessImpl;
+import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionKey;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionSnapshotStorage;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionTxStateAccessImpl;
-import
org.apache.ignite.internal.partition.replicator.raft.snapshot.ZonePartitionKey;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.metrics.RaftSnapshotsMetricsSource;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.outgoing.OutgoingSnapshotsManager;
import org.apache.ignite.internal.replicator.ReplicaManager;
@@ -125,7 +125,7 @@ public class ZoneResourcesManager implements
ManuallyCloseable {
);
var snapshotStorage = new PartitionSnapshotStorage(
- new ZonePartitionKey(zonePartitionId.zoneId(),
zonePartitionId.partitionId()),
+ new PartitionKey(zonePartitionId.zoneId(),
zonePartitionId.partitionId()),
topologyService,
outgoingSnapshotsManager,
new PartitionTxStateAccessImpl(txStatePartitionStorage),
diff --git
a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/ZonePartitionRaftListener.java
b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/ZonePartitionRaftListener.java
index 3a2114ae7ee..3abd9fb8662 100644
---
a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/ZonePartitionRaftListener.java
+++
b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/ZonePartitionRaftListener.java
@@ -41,7 +41,6 @@ import
org.apache.ignite.internal.partition.replicator.raft.handlers.FinishTxCom
import
org.apache.ignite.internal.partition.replicator.raft.handlers.VacuumTxStatesCommandHandler;
import
org.apache.ignite.internal.partition.replicator.raft.handlers.WriteIntentSwitchCommandHandler;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionKey;
-import
org.apache.ignite.internal.partition.replicator.raft.snapshot.ZonePartitionKey;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.outgoing.PartitionSnapshots;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.outgoing.PartitionsSnapshots;
import org.apache.ignite.internal.raft.Command;
@@ -126,7 +125,7 @@ public class ZonePartitionRaftListener implements
RaftGroupListener {
this.storageIndexTracker = storageIndexTracker;
this.partitionsSnapshots = partitionsSnapshots;
this.txStateStorage = txStatePartitionStorage;
- this.partitionKey = new ZonePartitionKey(zonePartitionId.zoneId(),
zonePartitionId.partitionId());
+ this.partitionKey = new PartitionKey(zonePartitionId.zoneId(),
zonePartitionId.partitionId());
onSnapshotSaveHandler = new
OnSnapshotSaveHandler(txStatePartitionStorage, partitionOperationsExecutor);
diff --git
a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionKey.java
b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionKey.java
index 37afbbed07a..16bad454660 100644
---
a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionKey.java
+++
b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionKey.java
@@ -17,13 +17,63 @@
package org.apache.ignite.internal.partition.replicator.raft.snapshot;
-import org.apache.ignite.internal.replicator.ReplicationGroupId;
+import java.util.Objects;
+import org.apache.ignite.internal.replicator.ZonePartitionId;
+import org.apache.ignite.internal.tostring.S;
/**
- * Uniquely identifies a partition.
+ * Uniquely identifies a partition. This is a pair of zone ID and partition
number (aka partition ID).
*/
-public interface PartitionKey {
- int partitionId();
+public class PartitionKey {
+ private final int zoneId;
- ReplicationGroupId toReplicationGroupId();
+ private final int partitionId;
+
+ /**
+ * Constructs a new partition key.
+ */
+ public PartitionKey(int zoneId, int partitionId) {
+ this.zoneId = zoneId;
+ this.partitionId = partitionId;
+ }
+
+ /**
+ * Returns ID of the zone.
+ */
+ public int zoneId() {
+ return zoneId;
+ }
+
+ /**
+ * Returns partition ID.
+ */
+ public int partitionId() {
+ return partitionId;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ PartitionKey that = (PartitionKey) o;
+ return partitionId == that.partitionId && zoneId == that.zoneId;
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(zoneId, partitionId);
+ }
+
+ @Override
+ public String toString() {
+ return S.toString(PartitionKey.class, this);
+ }
+
+ public ZonePartitionId toReplicationGroupId() {
+ return new ZonePartitionId(zoneId, partitionId);
+ }
}
diff --git
a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionSnapshotStorage.java
b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionSnapshotStorage.java
index c98b3315643..00b29839004 100644
---
a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionSnapshotStorage.java
+++
b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionSnapshotStorage.java
@@ -67,7 +67,7 @@ public class PartitionSnapshotStorage {
/** Default number of milliseconds that the follower is allowed to try to
catch up the required catalog version. */
private static final int DEFAULT_WAIT_FOR_METADATA_CATCHUP_MS = 3000;
- private final ZonePartitionKey partitionKey;
+ private final PartitionKey partitionKey;
private final TopologyService topologyService;
@@ -105,7 +105,7 @@ public class PartitionSnapshotStorage {
/** Constructor. */
public PartitionSnapshotStorage(
- ZonePartitionKey partitionKey,
+ PartitionKey partitionKey,
TopologyService topologyService,
OutgoingSnapshotsManager outgoingSnapshotsManager,
PartitionTxStateAccess txState,
@@ -131,7 +131,7 @@ public class PartitionSnapshotStorage {
/** Constructor. */
public PartitionSnapshotStorage(
- ZonePartitionKey partitionKey,
+ PartitionKey partitionKey,
TopologyService topologyService,
OutgoingSnapshotsManager outgoingSnapshotsManager,
PartitionTxStateAccess txState,
@@ -154,7 +154,7 @@ public class PartitionSnapshotStorage {
this.snapshotsMetricsSource = snapshotsMetricsSource;
}
- public ZonePartitionKey partitionKey() {
+ public PartitionKey partitionKey() {
return partitionKey;
}
diff --git
a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/ZonePartitionKey.java
b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/ZonePartitionKey.java
deleted file mode 100644
index b85947e65fb..00000000000
---
a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/ZonePartitionKey.java
+++ /dev/null
@@ -1,82 +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.partition.replicator.raft.snapshot;
-
-import java.util.Objects;
-import org.apache.ignite.internal.replicator.ReplicationGroupId;
-import org.apache.ignite.internal.replicator.ZonePartitionId;
-import org.apache.ignite.internal.tostring.S;
-
-/**
- * Uniquely identifies a partition. This is a pair of zone ID and partition
number (aka partition ID).
- */
-public class ZonePartitionKey implements PartitionKey {
- private final int zoneId;
-
- private final int partitionId;
-
- /**
- * Returns ID of the zone.
- */
- public int zoneId() {
- return zoneId;
- }
-
- /**
- * Returns partition ID.
- */
- @Override
- public int partitionId() {
- return partitionId;
- }
-
- /**
- * Constructs a new partition key.
- */
- public ZonePartitionKey(int zoneId, int partitionId) {
- this.zoneId = zoneId;
- this.partitionId = partitionId;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- ZonePartitionKey that = (ZonePartitionKey) o;
- return partitionId == that.partitionId && zoneId == that.zoneId;
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(zoneId, partitionId);
- }
-
- @Override
- public String toString() {
- return S.toString(ZonePartitionKey.class, this);
- }
-
- @Override
- public ReplicationGroupId toReplicationGroupId() {
- return new ZonePartitionId(zoneId, partitionId);
- }
-}
diff --git
a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/incoming/IncomingSnapshotCopier.java
b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/incoming/IncomingSnapshotCopier.java
index f9ffb208f04..8b7ab77b461 100644
---
a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/incoming/IncomingSnapshotCopier.java
+++
b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/incoming/IncomingSnapshotCopier.java
@@ -70,10 +70,10 @@ import
org.apache.ignite.internal.partition.replicator.network.replication.Binar
import
org.apache.ignite.internal.partition.replicator.raft.PartitionSnapshotInfo;
import
org.apache.ignite.internal.partition.replicator.raft.PartitionSnapshotInfoSerializer;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.LogStorageAccess;
+import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionKey;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionMvStorageAccess;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionSnapshotStorage;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.SnapshotUri;
-import
org.apache.ignite.internal.partition.replicator.raft.snapshot.ZonePartitionKey;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.metrics.RaftSnapshotsMetricsSource;
import org.apache.ignite.internal.raft.RaftGroupConfiguration;
import org.apache.ignite.internal.raft.RaftGroupConfigurationSerializer;
@@ -698,7 +698,7 @@ public class IncomingSnapshotCopier extends SnapshotCopier {
}
private String createPartitionInfo() {
- ZonePartitionKey partitionKey =
partitionSnapshotStorage.partitionKey();
+ PartitionKey partitionKey = partitionSnapshotStorage.partitionKey();
return "zoneId=" + partitionKey.zoneId() + ", partitionId=" +
partitionKey.partitionId();
}
diff --git
a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/incoming/ReplicationLogStorageKey.java
b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/incoming/ReplicationLogStorageKey.java
index 7c05c8bfd6f..01997ebacf0 100644
---
a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/incoming/ReplicationLogStorageKey.java
+++
b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/incoming/ReplicationLogStorageKey.java
@@ -19,18 +19,18 @@ package
org.apache.ignite.internal.partition.replicator.raft.snapshot.incoming;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionMvStorageAccess;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionSnapshotStorage;
-import org.apache.ignite.internal.replicator.ReplicationGroupId;
+import org.apache.ignite.internal.replicator.ZonePartitionId;
import org.apache.ignite.internal.tostring.IgniteToStringInclude;
import org.apache.ignite.internal.tostring.S;
/** Helper class for starting rebalancing for the replication log. */
class ReplicationLogStorageKey {
@IgniteToStringInclude
- private final ReplicationGroupId replicationGroupId;
+ private final ZonePartitionId replicationGroupId;
private final boolean isVolatile;
- private ReplicationLogStorageKey(ReplicationGroupId replicationGroupId,
boolean isVolatile) {
+ private ReplicationLogStorageKey(ZonePartitionId replicationGroupId,
boolean isVolatile) {
this.replicationGroupId = replicationGroupId;
this.isVolatile = isVolatile;
}
@@ -39,7 +39,7 @@ class ReplicationLogStorageKey {
return new
ReplicationLogStorageKey(snapshotStorage.partitionKey().toReplicationGroupId(),
mvStorage.isVolatile());
}
- ReplicationGroupId replicationGroupId() {
+ ZonePartitionId replicationGroupId() {
return replicationGroupId;
}
diff --git
a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/OutgoingSnapshot.java
b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/OutgoingSnapshot.java
index 2b82930b213..0c76b71cabe 100644
---
a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/OutgoingSnapshot.java
+++
b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/OutgoingSnapshot.java
@@ -54,7 +54,6 @@ import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionDa
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionKey;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionMvStorageAccess;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionTxStateAccess;
-import
org.apache.ignite.internal.partition.replicator.raft.snapshot.ZonePartitionKey;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.metrics.RaftSnapshotsMetricsSource;
import org.apache.ignite.internal.raft.RaftGroupConfiguration;
import org.apache.ignite.internal.replicator.message.ReplicaMessagesFactory;
@@ -262,17 +261,9 @@ public class OutgoingSnapshot {
}
private List<PartitionMvStorageAccess> freezePartitionStorages() {
- if (partitionKey instanceof ZonePartitionKey) {
- return partitionsByTableId.values().stream()
- .sorted(comparingInt(PartitionMvStorageAccess::tableId))
- .collect(toList());
- } else {
- // TODO: remove this clause, see
https://issues.apache.org/jira/browse/IGNITE-22522
- // For a non-colocation case we always have a single entry in this
map.
- assert partitionsByTableId.size() == 1;
-
- return List.copyOf(partitionsByTableId.values());
- }
+ return partitionsByTableId.values().stream()
+ .sorted(comparingInt(PartitionMvStorageAccess::tableId))
+ .collect(toList());
}
/**
diff --git
a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/ZonePartitionRaftListenerTest.java
b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/ZonePartitionRaftListenerTest.java
index 83eac87ffc8..daf786bb654 100644
---
a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/ZonePartitionRaftListenerTest.java
+++
b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/ZonePartitionRaftListenerTest.java
@@ -68,7 +68,7 @@ import
org.apache.ignite.internal.partition.replicator.network.command.UpdateCom
import
org.apache.ignite.internal.partition.replicator.network.command.UpdateMinimumActiveTxBeginTimeCommand;
import
org.apache.ignite.internal.partition.replicator.network.command.WriteIntentSwitchCommand;
import
org.apache.ignite.internal.partition.replicator.network.command.WriteIntentSwitchCommandV2;
-import
org.apache.ignite.internal.partition.replicator.raft.snapshot.ZonePartitionKey;
+import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionKey;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.outgoing.OutgoingSnapshotsManager;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.outgoing.PartitionSnapshots;
import org.apache.ignite.internal.placementdriver.LeasePlacementDriver;
@@ -131,7 +131,7 @@ class ZonePartitionRaftListenerTest extends
BaseIgniteAbstractTest {
private static final int TABLE_ID = 1;
- private static final ZonePartitionKey ZONE_PARTITION_KEY = new
ZonePartitionKey(ZONE_ID, PARTITION_ID);
+ private static final PartitionKey ZONE_PARTITION_KEY = new
PartitionKey(ZONE_ID, PARTITION_ID);
private static final PartitionReplicationMessagesFactory
PARTITION_REPLICATION_MESSAGES_FACTORY =
new PartitionReplicationMessagesFactory();
diff --git
a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionSnapshotStorageFactoryTest.java
b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionSnapshotStorageFactoryTest.java
index 4a95b5157b9..0d06c0dc83a 100644
---
a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionSnapshotStorageFactoryTest.java
+++
b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionSnapshotStorageFactoryTest.java
@@ -44,7 +44,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
class PartitionSnapshotStorageFactoryTest extends BaseIgniteAbstractTest {
private final PartitionSnapshotStorage snapshotStorage = new
PartitionSnapshotStorage(
- new ZonePartitionKey(1, 1),
+ new PartitionKey(1, 1),
mock(TopologyService.class),
mock(OutgoingSnapshotsManager.class),
mock(PartitionTxStateAccess.class),
diff --git
a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionSnapshotStorageTest.java
b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionSnapshotStorageTest.java
index 7f93c183908..168de545101 100644
---
a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionSnapshotStorageTest.java
+++
b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionSnapshotStorageTest.java
@@ -54,7 +54,7 @@ public class PartitionSnapshotStorageTest extends
BaseIgniteAbstractTest {
private static final int TABLE_ID_2 = 2;
private final PartitionSnapshotStorage snapshotStorage = new
PartitionSnapshotStorage(
- new ZonePartitionKey(1, 1),
+ new PartitionKey(1, 1),
mock(TopologyService.class),
mock(OutgoingSnapshotsManager.class),
mock(PartitionTxStateAccess.class),
diff --git
a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/incoming/IncomingSnapshotCopierTest.java
b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/incoming/IncomingSnapshotCopierTest.java
index 6834e60daa6..517e3ef7ab5 100644
---
a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/incoming/IncomingSnapshotCopierTest.java
+++
b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/incoming/IncomingSnapshotCopierTest.java
@@ -97,10 +97,10 @@ import
org.apache.ignite.internal.partition.replicator.network.replication.Binar
import
org.apache.ignite.internal.partition.replicator.raft.PartitionSnapshotInfo;
import
org.apache.ignite.internal.partition.replicator.raft.PartitionSnapshotInfoSerializer;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.LogStorageAccessImpl;
+import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionKey;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionSnapshotStorage;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionTxStateAccessImpl;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.SnapshotUri;
-import
org.apache.ignite.internal.partition.replicator.raft.snapshot.ZonePartitionKey;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.metrics.RaftSnapshotsMetricsSource;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.outgoing.OutgoingSnapshotsManager;
import org.apache.ignite.internal.raft.RaftGroupConfiguration;
@@ -415,7 +415,7 @@ public class IncomingSnapshotCopierTest extends
BaseIgniteAbstractTest {
when(outgoingSnapshotsManager.messagingService()).thenReturn(messagingService);
var storage = new PartitionSnapshotStorage(
- new ZonePartitionKey(ZONE_ID, PARTITION_ID),
+ new PartitionKey(ZONE_ID, PARTITION_ID),
topologyService,
outgoingSnapshotsManager,
new
PartitionTxStateAccessImpl(incomingTxStateStorage.getPartitionStorage(PARTITION_ID)),
@@ -754,7 +754,7 @@ public class IncomingSnapshotCopierTest extends
BaseIgniteAbstractTest {
void cancellationsFromMultipleThreadsDoNotBlockEachOther() throws
Exception {
PartitionSnapshotStorage partitionSnapshotStorage =
mock(PartitionSnapshotStorage.class);
- when(partitionSnapshotStorage.partitionKey()).thenReturn(new
ZonePartitionKey(1, 0));
+ when(partitionSnapshotStorage.partitionKey()).thenReturn(new
PartitionKey(1, 0));
IncomingSnapshotCopier copier = new IncomingSnapshotCopier(
partitionSnapshotStorage,
diff --git
a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/OutgoingSnapshotCommonTest.java
b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/OutgoingSnapshotCommonTest.java
index 8d39978dd80..05b1b1d7e2e 100644
---
a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/OutgoingSnapshotCommonTest.java
+++
b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/OutgoingSnapshotCommonTest.java
@@ -40,7 +40,6 @@ import
org.apache.ignite.internal.partition.replicator.network.raft.SnapshotMeta
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionKey;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionMvStorageAccess;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionTxStateAccess;
-import
org.apache.ignite.internal.partition.replicator.raft.snapshot.ZonePartitionKey;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.metrics.RaftSnapshotsMetricsSource;
import org.apache.ignite.internal.raft.RaftGroupConfiguration;
import org.apache.ignite.internal.storage.lease.LeaseInfo;
@@ -71,7 +70,7 @@ class OutgoingSnapshotCommonTest extends
BaseIgniteAbstractTest {
private final PartitionReplicationMessagesFactory messagesFactory = new
PartitionReplicationMessagesFactory();
- private final PartitionKey partitionKey = new ZonePartitionKey(ZONE_ID, 1);
+ private final PartitionKey partitionKey = new PartitionKey(ZONE_ID, 1);
private static final int REQUIRED_CATALOG_VERSION = 42;
diff --git
a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/OutgoingSnapshotMvDataStreamingTest.java
b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/OutgoingSnapshotMvDataStreamingTest.java
index f857fdabbe4..334ff019e3a 100644
---
a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/OutgoingSnapshotMvDataStreamingTest.java
+++
b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/OutgoingSnapshotMvDataStreamingTest.java
@@ -49,7 +49,6 @@ import
org.apache.ignite.internal.partition.replicator.network.raft.SnapshotMvDa
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionKey;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionMvStorageAccess;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionTxStateAccess;
-import
org.apache.ignite.internal.partition.replicator.raft.snapshot.ZonePartitionKey;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.metrics.RaftSnapshotsMetricsSource;
import org.apache.ignite.internal.raft.RaftGroupConfiguration;
import org.apache.ignite.internal.schema.BinaryRow;
@@ -103,7 +102,7 @@ class OutgoingSnapshotMvDataStreamingTest extends
BaseIgniteAbstractTest {
private final UUID transactionId = UUID.randomUUID();
private final int commitTableId = 999;
- private final PartitionKey partitionKey = new ZonePartitionKey(ZONE_ID,
PARTITION_ID);
+ private final PartitionKey partitionKey = new PartitionKey(ZONE_ID,
PARTITION_ID);
@BeforeEach
void createTestInstance(
diff --git
a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/OutgoingSnapshotReaderTest.java
b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/OutgoingSnapshotReaderTest.java
index f6bb26e7853..453c866bfd1 100644
---
a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/OutgoingSnapshotReaderTest.java
+++
b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/OutgoingSnapshotReaderTest.java
@@ -33,10 +33,10 @@ import org.apache.ignite.internal.catalog.CatalogService;
import org.apache.ignite.internal.failure.FailureProcessor;
import org.apache.ignite.internal.network.TopologyService;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.LogStorageAccess;
+import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionKey;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionMvStorageAccess;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionSnapshotStorage;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionTxStateAccess;
-import
org.apache.ignite.internal.partition.replicator.raft.snapshot.ZonePartitionKey;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.metrics.RaftSnapshotsMetricsSource;
import org.apache.ignite.internal.raft.RaftGroupConfiguration;
import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
@@ -79,7 +79,7 @@ public class OutgoingSnapshotReaderTest extends
BaseIgniteAbstractTest {
return null;
}).when(outgoingSnapshotsManager).startOutgoingSnapshot(any(), any());
- var partitionKey = new ZonePartitionKey(0, 0);
+ var partitionKey = new PartitionKey(0, 0);
var snapshotMetricsSource = new RaftSnapshotsMetricsSource();
diff --git
a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/OutgoingSnapshotStatsTest.java
b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/OutgoingSnapshotStatsTest.java
index a7cd1800c0c..b53a3864c78 100644
---
a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/OutgoingSnapshotStatsTest.java
+++
b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/OutgoingSnapshotStatsTest.java
@@ -25,7 +25,7 @@ import static org.hamcrest.Matchers.is;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
-import
org.apache.ignite.internal.partition.replicator.raft.snapshot.ZonePartitionKey;
+import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionKey;
import org.apache.ignite.internal.raft.RaftGroupConfiguration;
import org.junit.jupiter.api.Test;
@@ -58,7 +58,7 @@ class OutgoingSnapshotStatsTest {
private static final int CATALOG_VERSION = 10;
- private final OutgoingSnapshotStats stats = new
OutgoingSnapshotStats(UUID.randomUUID(), new ZonePartitionKey(0, 0));
+ private final OutgoingSnapshotStats stats = new
OutgoingSnapshotStats(UUID.randomUUID(), new PartitionKey(0, 0));
@Test
void totalSnapshotDuration() throws InterruptedException {
diff --git
a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/OutgoingSnapshotTxDataStreamingTest.java
b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/OutgoingSnapshotTxDataStreamingTest.java
index 212f31bbef8..e7da6deea07 100644
---
a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/OutgoingSnapshotTxDataStreamingTest.java
+++
b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/OutgoingSnapshotTxDataStreamingTest.java
@@ -54,7 +54,6 @@ import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionTx
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.metrics.RaftSnapshotsMetricsSource;
import org.apache.ignite.internal.raft.RaftGroupConfiguration;
import org.apache.ignite.internal.replicator.ZonePartitionId;
-import
org.apache.ignite.internal.table.distributed.raft.snapshot.TablePartitionKey;
import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.tx.TxMeta;
import org.apache.ignite.internal.tx.TxState;
@@ -93,7 +92,7 @@ class OutgoingSnapshotTxDataStreamingTest extends
BaseIgniteAbstractTest {
private final TxMeta meta1 = new TxMeta(TxState.ABORTED,
tableEnlistedPartitions(partition1Id), clock.now());
private final TxMeta meta2 = new TxMeta(TxState.COMMITTED,
tableEnlistedPartitions(partition1Id, partition2Id), clock.now());
- private final PartitionKey partitionKey = new TablePartitionKey(1, 1);
+ private final PartitionKey partitionKey = new PartitionKey(1, 1);
private static List<EnlistedPartitionGroup>
tableEnlistedPartitions(ZonePartitionId... zonePartitionIds) {
return Arrays.stream(zonePartitionIds)
diff --git
a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/OutgoingSnapshotsManagerTest.java
b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/OutgoingSnapshotsManagerTest.java
index a4dbc22532d..954c9a89830 100644
---
a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/OutgoingSnapshotsManagerTest.java
+++
b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/OutgoingSnapshotsManagerTest.java
@@ -36,7 +36,6 @@ import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionMv
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionTxStateAccess;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.metrics.RaftSnapshotsMetricsSource;
import org.apache.ignite.internal.raft.RaftGroupConfiguration;
-import
org.apache.ignite.internal.table.distributed.raft.snapshot.TablePartitionKey;
import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -46,7 +45,8 @@ import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
class OutgoingSnapshotsManagerTest extends BaseIgniteAbstractTest {
- private static final int TABLE_ID = 1;
+ private static final int ZONE_ID = 1;
+ private static final int TABLE_ID = 2;
@InjectMocks
private OutgoingSnapshotsManager manager;
@@ -57,7 +57,7 @@ class OutgoingSnapshotsManagerTest extends
BaseIgniteAbstractTest {
@Mock
private CatalogService catalogService;
- private final PartitionKey partitionKey = new TablePartitionKey(TABLE_ID,
1);
+ private final PartitionKey partitionKey = new PartitionKey(ZONE_ID, 1);
@SuppressWarnings("EmptyTryBlock")
@Test
diff --git
a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/SnapshotAwarePartitionDataStorageTest.java
b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/SnapshotAwarePartitionDataStorageTest.java
index ca8238df59c..f21812cb103 100644
---
a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/SnapshotAwarePartitionDataStorageTest.java
+++
b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/SnapshotAwarePartitionDataStorageTest.java
@@ -48,7 +48,6 @@ import org.apache.ignite.internal.storage.AddWriteResult;
import org.apache.ignite.internal.storage.MvPartitionStorage;
import org.apache.ignite.internal.storage.RowId;
import
org.apache.ignite.internal.table.distributed.raft.snapshot.SnapshotAwarePartitionDataStorage;
-import
org.apache.ignite.internal.table.distributed.raft.snapshot.TablePartitionKey;
import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -62,7 +61,8 @@ import org.mockito.junit.jupiter.MockitoExtension;
class SnapshotAwarePartitionDataStorageTest extends BaseIgniteAbstractTest {
private static final int PARTITION_ID = 1;
- private static final int TABLE_ID = 1;
+ private static final int ZONE_ID = 1;
+ private static final int TABLE_ID = 2;
@Mock
private MvPartitionStorage partitionStorage;
@@ -70,7 +70,7 @@ class SnapshotAwarePartitionDataStorageTest extends
BaseIgniteAbstractTest {
@Mock
private PartitionsSnapshots partitionsSnapshots;
- private final PartitionKey partitionKey = new TablePartitionKey(TABLE_ID,
PARTITION_ID);
+ private final PartitionKey partitionKey = new PartitionKey(ZONE_ID,
PARTITION_ID);
private SnapshotAwarePartitionDataStorage testedStorage;
@@ -296,13 +296,6 @@ class SnapshotAwarePartitionDataStorageTest extends
BaseIgniteAbstractTest {
verify(snapshot2).enqueueForSending(TABLE_ID, rowId);
}
- @Test
- void removesSnapshotsCollectionOnStop() {
- testedStorage.close();
-
- verify(partitionsSnapshots).cleanupOutgoingSnapshots(partitionKey);
- }
-
private enum MvWriteAction {
ADD_WRITE {
@Override
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 bb649037bfe..212d1304ba9 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
@@ -127,7 +127,6 @@ import
org.apache.ignite.internal.partition.replicator.PartitionReplicaLifecycle
import
org.apache.ignite.internal.partition.replicator.ZoneResourcesManager.ZonePartitionResources;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionDataStorage;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionKey;
-import
org.apache.ignite.internal.partition.replicator.raft.snapshot.ZonePartitionKey;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.outgoing.OutgoingSnapshotsManager;
import
org.apache.ignite.internal.partition.replicator.schema.CatalogValidationSchemasSource;
import
org.apache.ignite.internal.partition.replicator.schema.ExecutorInclinedSchemaSyncService;
@@ -890,7 +889,7 @@ public class TableManager implements IgniteTablesInternal,
IgniteComponent {
}
PartitionDataStorage partitionDataStorage = partitionDataStorage(
- new ZonePartitionKey(zonePartitionId.zoneId(), partId),
+ new PartitionKey(zonePartitionId.zoneId(), partId),
tableId,
mvPartitionStorage
);
diff --git
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/SnapshotAwarePartitionDataStorage.java
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/SnapshotAwarePartitionDataStorage.java
index 8b0f6da90e0..29480d86c00 100644
---
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/SnapshotAwarePartitionDataStorage.java
+++
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/SnapshotAwarePartitionDataStorage.java
@@ -24,7 +24,6 @@ import java.util.concurrent.CompletableFuture;
import org.apache.ignite.internal.hlc.HybridTimestamp;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionDataStorage;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionKey;
-import
org.apache.ignite.internal.partition.replicator.raft.snapshot.ZonePartitionKey;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.outgoing.OutgoingSnapshot;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.outgoing.PartitionSnapshots;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.outgoing.PartitionsSnapshots;
@@ -208,14 +207,7 @@ public class SnapshotAwarePartitionDataStorage implements
PartitionDataStorage {
@Override
public void close() {
- if (partitionKey instanceof ZonePartitionKey) {
- // FIXME: This is a hack for the colocation feature, for
zone-based partitions snapshots are cleaned up for a bunch of storages
- // at once and this is done in a separate place. Should be
removed as a part of
- // https://issues.apache.org/jira/browse/IGNITE-22522
- return;
- }
-
- partitionsSnapshots.cleanupOutgoingSnapshots(partitionKey);
+ // No-op.
}
@Override
diff --git
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/TablePartitionKey.java
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/TablePartitionKey.java
deleted file mode 100644
index 9561bdca516..00000000000
---
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/TablePartitionKey.java
+++ /dev/null
@@ -1,84 +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.table.distributed.raft.snapshot;
-
-import java.util.Objects;
-import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionKey;
-import org.apache.ignite.internal.replicator.ReplicationGroupId;
-import org.apache.ignite.internal.replicator.TablePartitionId;
-import org.apache.ignite.internal.tostring.S;
-
-/**
- * Uniquely identifies a partition. This is a pair of internal table ID and
partition number (aka partition ID).
- */
-// TODO IGNITE-22522 Remove
-public class TablePartitionKey implements PartitionKey {
- private final int tableId;
-
- private final int partitionId;
-
- /**
- * Returns ID of the table.
- */
- public int tableId() {
- return tableId;
- }
-
- /**
- * Returns partition ID.
- */
- @Override
- public int partitionId() {
- return partitionId;
- }
-
- /**
- * Constructs a new partition key.
- */
- public TablePartitionKey(int tableId, int partitionId) {
- this.tableId = tableId;
- this.partitionId = partitionId;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- TablePartitionKey that = (TablePartitionKey) o;
- return partitionId == that.partitionId && tableId == that.tableId;
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(tableId, partitionId);
- }
-
- @Override
- public String toString() {
- return S.toString(TablePartitionKey.class, this);
- }
-
- @Override
- public ReplicationGroupId toReplicationGroupId() {
- return new TablePartitionId(tableId, partitionId);
- }
-}
