This is an automated email from the ASF dual-hosted git repository.
sk0x50 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 8df4e8a495e IGNITE-27615 Cleanup code that uses tableOrZone id to
represent a replication group (#7457)
8df4e8a495e is described below
commit 8df4e8a495e0cfa3c287864541a310a2161d890d
Author: Slava Koptilin <[email protected]>
AuthorDate: Thu Jan 22 12:34:24 2026 +0200
IGNITE-27615 Cleanup code that uses tableOrZone id to represent a
replication group (#7457)
---
.../replicator/network/raft/SnapshotMvDataResponse.java | 5 +++--
.../replicator/raft/snapshot/PartitionDataStorage.java | 5 ++---
.../replicator/raft/snapshot/PartitionMvStorageAccess.java | 5 ++---
.../raft/snapshot/incoming/IncomingSnapshotCopier.java | 4 ++--
.../replicator/raft/snapshot/outgoing/OutgoingSnapshot.java | 6 +++---
.../raft/snapshot/incoming/IncomingSnapshotCopierTest.java | 7 +++----
.../outgoing/OutgoingSnapshotMvDataStreamingTest.java | 12 ++++++------
.../internal/placementdriver/PlacementDriverManagerTest.java | 10 +++++-----
.../placementdriver/leases/LeaseSerializationTest.java | 10 ++--------
.../apache/ignite/internal/replicator/ReplicaTestUtils.java | 7 +++----
.../raft/snapshot/PartitionMvStorageAccessImpl.java | 4 ++--
.../raft/snapshot/SnapshotAwarePartitionDataStorage.java | 4 ++--
.../apache/ignite/distributed/TestPartitionDataStorage.java | 4 ++--
.../tx/storage/state/rocksdb/RocksDbTxStateStorageTest.java | 2 +-
.../tx/storage/state/test/TestTxStateStorageTest.java | 2 +-
.../tx/storage/state/AbstractTxStateStorageTest.java | 4 ++--
16 files changed, 41 insertions(+), 50 deletions(-)
diff --git
a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/network/raft/SnapshotMvDataResponse.java
b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/network/raft/SnapshotMvDataResponse.java
index dd74afd8f0e..c585c05f4f1 100644
---
a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/network/raft/SnapshotMvDataResponse.java
+++
b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/network/raft/SnapshotMvDataResponse.java
@@ -20,6 +20,7 @@ package
org.apache.ignite.internal.partition.replicator.network.raft;
import java.util.List;
import java.util.UUID;
import org.apache.ignite.internal.network.NetworkMessage;
+import org.apache.ignite.internal.network.annotations.PropertyName;
import org.apache.ignite.internal.network.annotations.Transferable;
import
org.apache.ignite.internal.partition.replicator.network.PartitionReplicationMessageGroup;
import
org.apache.ignite.internal.partition.replicator.network.replication.BinaryRowMessage;
@@ -30,7 +31,6 @@ import org.jetbrains.annotations.Nullable;
* Snapshot partition data response message.
*/
@Transferable(PartitionReplicationMessageGroup.SNAPSHOT_MV_DATA_RESPONSE)
-// TODO: https://issues.apache.org/jira/browse/IGNITE-22522 - remove mentions
of commit *table*.
public interface SnapshotMvDataResponse extends NetworkMessage {
/** List of version chains. */
List<ResponseEntry> rows();
@@ -63,7 +63,8 @@ public interface SnapshotMvDataResponse extends
NetworkMessage {
@Nullable UUID txId();
/** Commit table/zone id for write-intent if it's present. */
- @Nullable Integer commitTableOrZoneId();
+ @PropertyName("commitTableOrZoneId")
+ @Nullable Integer commitZoneId();
/** Commit partition id for write-intent if it's present. {@link
ReadResult#UNDEFINED_COMMIT_PARTITION_ID} otherwise. */
int commitPartitionId();
diff --git
a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionDataStorage.java
b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionDataStorage.java
index 4deb45ad02e..8ba0190271b 100644
---
a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionDataStorage.java
+++
b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionDataStorage.java
@@ -126,7 +126,6 @@ public interface PartitionDataStorage extends
ManuallyCloseable {
*/
@Nullable RaftGroupConfiguration committedGroupConfiguration();
- // TODO: https://issues.apache.org/jira/browse/IGNITE-22522 - remove
mentions of commit *table*.
/**
* Creates (or replaces) an uncommitted (aka pending) version, assigned to
the given transaction ID.
*
@@ -140,7 +139,7 @@ public interface PartitionDataStorage extends
ManuallyCloseable {
* @param rowId Row ID.
* @param row Table row to update. {@code null} means value removal.
* @param txId Transaction ID.
- * @param commitTableOrZoneId Commit table/zone ID.
+ * @param commitZoneId Commit zone ID.
* @param commitPartitionId Commit partition ID.
* @return Result of add write intent.
* @throws StorageException If failed to write data to the storage.
@@ -150,7 +149,7 @@ public interface PartitionDataStorage extends
ManuallyCloseable {
RowId rowId,
@Nullable BinaryRow row,
UUID txId,
- int commitTableOrZoneId,
+ int commitZoneId,
int commitPartitionId
) throws StorageException;
diff --git
a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionMvStorageAccess.java
b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionMvStorageAccess.java
index cae0a756feb..637e409088b 100644
---
a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionMvStorageAccess.java
+++
b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionMvStorageAccess.java
@@ -70,7 +70,6 @@ public interface PartitionMvStorageAccess {
*/
@Nullable RaftGroupConfiguration committedGroupConfiguration();
- // TODO: https://issues.apache.org/jira/browse/IGNITE-22522 - remove
mentions of commit *table*.
/**
* Creates (or replaces) an uncommitted (aka pending) version, assigned to
the given transaction ID.
*
@@ -84,13 +83,13 @@ public interface PartitionMvStorageAccess {
* @param rowId Row ID.
* @param row Table row to update. Key only row means value removal.
* @param txId Transaction ID.
- * @param commitTableOrZoneId Commit table/zone ID.
+ * @param commitZoneId Commit table/zone ID.
* @param commitPartitionId Commit partition ID.
* @param catalogVersion Catalog version of the incoming partition
snapshot.
* @throws StorageException If failed to write data.
* @throws TxIdMismatchException If there's another pending update
associated with different transaction ID.
*/
- void addWrite(RowId rowId, @Nullable BinaryRow row, UUID txId, int
commitTableOrZoneId, int commitPartitionId, int catalogVersion);
+ void addWrite(RowId rowId, @Nullable BinaryRow row, UUID txId, int
commitZoneId, int commitPartitionId, int catalogVersion);
/**
* Creates a committed version.
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 3f22b434210..e0f182e534b 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
@@ -725,14 +725,14 @@ public class IncomingSnapshotCopier extends
SnapshotCopier {
if (entryIndex == entry.timestamps().length) {
// Writes an intent to write (uncommitted version).
assert entry.txId() != null;
- assert entry.commitTableOrZoneId() != null;
+ assert entry.commitZoneId() != null;
assert entry.commitPartitionId() !=
ReadResult.UNDEFINED_COMMIT_PARTITION_ID;
partition.addWrite(
rowId,
binaryRow,
entry.txId(),
- entry.commitTableOrZoneId(),
+ entry.commitZoneId(),
entry.commitPartitionId(),
snapshotCatalogVersion
);
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 0c76b71cabe..fc3d69c1247 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
@@ -453,7 +453,7 @@ public class OutgoingSnapshot {
long[] commitTimestamps = new long[commitTimestampsCount];
UUID transactionId = null;
- Integer commitTableOrZoneId = null;
+ Integer commitZoneId = null;
int commitPartitionId = ReadResult.UNDEFINED_COMMIT_PARTITION_ID;
for (int i = count - 1, j = 0; i >= 0; i--) {
@@ -473,7 +473,7 @@ public class OutgoingSnapshot {
assert i == 0 : rowVersionsN2O;
transactionId = version.transactionId();
- commitTableOrZoneId = version.commitZoneId();
+ commitZoneId = version.commitZoneId();
commitPartitionId = version.commitPartitionId();
} else {
commitTimestamps[j++] = version.commitTimestamp().longValue();
@@ -486,7 +486,7 @@ public class OutgoingSnapshot {
.rowVersions(rowVersions)
.timestamps(commitTimestamps)
.txId(transactionId)
- .commitTableOrZoneId(commitTableOrZoneId)
+ .commitZoneId(commitZoneId)
.commitPartitionId(commitPartitionId)
.build();
}
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 517e3ef7ab5..7de80b8902a 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
@@ -508,8 +508,7 @@ public class IncomingSnapshotCopierTest extends
BaseIgniteAbstractTest {
long[] timestamps = new long[readResults.size() +
(readResults.get(0).isWriteIntent() ? -1 : 0)];
UUID txId = null;
- // TODO: https://issues.apache.org/jira/browse/IGNITE-22522 -
remove mentions of commit *table*.
- Integer commitTableOrZoneId = null;
+ Integer commitZoneId = null;
int commitPartitionId = ReadResult.UNDEFINED_COMMIT_PARTITION_ID;
int j = 0;
@@ -523,7 +522,7 @@ public class IncomingSnapshotCopierTest extends
BaseIgniteAbstractTest {
if (readResult.isWriteIntent()) {
txId = readResult.transactionId();
- commitTableOrZoneId = readResult.commitZoneId();
+ commitZoneId = readResult.commitZoneId();
commitPartitionId = readResult.commitPartitionId();
} else {
timestamps[j++] = readResult.commitTimestamp().longValue();
@@ -536,7 +535,7 @@ public class IncomingSnapshotCopierTest extends
BaseIgniteAbstractTest {
.rowVersions(rowVersions)
.timestamps(timestamps)
.txId(txId)
- .commitTableOrZoneId(commitTableOrZoneId)
+ .commitZoneId(commitZoneId)
.commitPartitionId(commitPartitionId)
.tableId(TABLE_ID)
.build()
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 334ff019e3a..3bfa40304b4 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
@@ -100,7 +100,7 @@ class OutgoingSnapshotMvDataStreamingTest extends
BaseIgniteAbstractTest {
private final HybridClock clock = new HybridClockImpl();
private final UUID transactionId = UUID.randomUUID();
- private final int commitTableId = 999;
+ private static final int commitZoneId = 999;
private final PartitionKey partitionKey = new PartitionKey(ZONE_ID,
PARTITION_ID);
@@ -192,7 +192,7 @@ class OutgoingSnapshotMvDataStreamingTest extends
BaseIgniteAbstractTest {
rowId1,
ROW_2,
transactionId,
- commitTableId,
+ commitZoneId,
42,
clock.now()
);
@@ -206,7 +206,7 @@ class OutgoingSnapshotMvDataStreamingTest extends
BaseIgniteAbstractTest {
assertThat(responseRow.rowId(), is(rowId1.uuid()));
assertThat(responseRow.txId(), is(transactionId));
- assertThat(responseRow.commitTableOrZoneId(), is(commitTableId));
+ assertThat(responseRow.commitZoneId(), is(commitZoneId));
assertThat(responseRow.commitPartitionId(), is(42));
//noinspection ConstantConditions
assertThat(responseRow.timestamps(), is(equalTo(new long[]
{version1.commitTimestamp().longValue()})));
@@ -334,7 +334,7 @@ class OutgoingSnapshotMvDataStreamingTest extends
BaseIgniteAbstractTest {
rowIdOutOfOrder,
ROW_2,
transactionId,
- commitTableId,
+ commitZoneId,
42,
clock.now()
);
@@ -358,7 +358,7 @@ class OutgoingSnapshotMvDataStreamingTest extends
BaseIgniteAbstractTest {
assertThat(responseRow.rowId(), is(rowIdOutOfOrder.uuid()));
assertThat(responseRow.txId(), is(transactionId));
- assertThat(responseRow.commitTableOrZoneId(), is(commitTableId));
+ assertThat(responseRow.commitZoneId(), is(commitZoneId));
assertThat(responseRow.commitPartitionId(), is(42));
//noinspection ConstantConditions
assertThat(responseRow.timestamps(), is(equalTo(new long[]
{version1.commitTimestamp().longValue()})));
@@ -431,7 +431,7 @@ class OutgoingSnapshotMvDataStreamingTest extends
BaseIgniteAbstractTest {
rowId1,
ROW_1,
transactionId,
- commitTableId,
+ commitZoneId,
42,
clock.now()
);
diff --git
a/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/PlacementDriverManagerTest.java
b/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/PlacementDriverManagerTest.java
index a6e949dc104..f820b173630 100644
---
a/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/PlacementDriverManagerTest.java
+++
b/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/PlacementDriverManagerTest.java
@@ -165,7 +165,7 @@ public class PlacementDriverManagerTest extends
BasePlacementDriverTest {
/** This closure handles {@link LeaseGrantedMessage} to check the
placement driver manager behavior. */
private BiFunction<LeaseGrantedMessage, String,
LeaseGrantedMessageResponse> leaseGrantHandler;
- private final AtomicInteger nextTableOrZoneId = new AtomicInteger();
+ private final AtomicInteger nextZoneId = new AtomicInteger();
private final long assignmentsTimestamp = new HybridTimestamp(0,
1).longValue();
@@ -425,7 +425,7 @@ public class PlacementDriverManagerTest extends
BasePlacementDriverTest {
@Test
public void testPrimaryReplicaEvents() throws Exception {
PartitionGroupId grpPart0 =
- createAssignments(metaStorageManager,
nextTableOrZoneId.incrementAndGet(), List.of(nodeName), assignmentsTimestamp);
+ createAssignments(metaStorageManager,
nextZoneId.incrementAndGet(), List.of(nodeName), assignmentsTimestamp);
Lease lease1 = checkLeaseCreated(grpPart0, true);
@@ -553,8 +553,8 @@ public class PlacementDriverManagerTest extends
BasePlacementDriverTest {
@Test
public void testLeaseRemovedAfterExpirationAndAssignmetnsRemoval() throws
Exception {
List<PartitionGroupId> groupIds = List.of(
- createAssignments(metaStorageManager,
nextTableOrZoneId.incrementAndGet(), List.of(nodeName), assignmentsTimestamp),
- createAssignments(metaStorageManager,
nextTableOrZoneId.incrementAndGet(), List.of(nodeName), assignmentsTimestamp)
+ createAssignments(metaStorageManager,
nextZoneId.incrementAndGet(), List.of(nodeName), assignmentsTimestamp),
+ createAssignments(metaStorageManager,
nextZoneId.incrementAndGet(), List.of(nodeName), assignmentsTimestamp)
);
Map<PartitionGroupId, AtomicBoolean> leaseExpirationMap =
@@ -738,7 +738,7 @@ public class PlacementDriverManagerTest extends
BasePlacementDriverTest {
private PartitionGroupId createAssignments() {
return createAssignments(
metaStorageManager,
- nextTableOrZoneId.incrementAndGet(),
+ nextZoneId.incrementAndGet(),
List.of(nodeName, anotherNodeName),
assignmentsTimestamp
);
diff --git
a/modules/placement-driver/src/test/java/org/apache/ignite/internal/placementdriver/leases/LeaseSerializationTest.java
b/modules/placement-driver/src/test/java/org/apache/ignite/internal/placementdriver/leases/LeaseSerializationTest.java
index 33282cdb62b..97f4d2c0b05 100644
---
a/modules/placement-driver/src/test/java/org/apache/ignite/internal/placementdriver/leases/LeaseSerializationTest.java
+++
b/modules/placement-driver/src/test/java/org/apache/ignite/internal/placementdriver/leases/LeaseSerializationTest.java
@@ -17,15 +17,13 @@
package org.apache.ignite.internal.placementdriver.leases;
-import static java.nio.ByteOrder.LITTLE_ENDIAN;
import static java.util.UUID.randomUUID;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import java.nio.ByteBuffer;
import java.util.ArrayList;
import org.apache.ignite.internal.hlc.HybridTimestamp;
import org.apache.ignite.internal.replicator.ReplicationGroupId;
-import org.apache.ignite.internal.replicator.TablePartitionId;
+import org.apache.ignite.internal.replicator.ZonePartitionId;
import org.jetbrains.annotations.Nullable;
import org.junit.jupiter.api.Test;
@@ -43,7 +41,7 @@ public class LeaseSerializationTest {
i % 2 == 0,
i % 2 == 1,
i % 2 == 0 ? null : "node" + i,
- new TablePartitionId(1, i)
+ new ZonePartitionId(1, i)
));
}
@@ -76,8 +74,4 @@ public class LeaseSerializationTest {
private static HybridTimestamp timestamp(long physical, int logical) {
return new HybridTimestamp(physical, logical);
}
-
- private static ByteBuffer wrap(byte[] bytes) {
- return ByteBuffer.wrap(bytes).order(LITTLE_ENDIAN);
- }
}
diff --git
a/modules/replicator/src/testFixtures/java/org/apache/ignite/internal/replicator/ReplicaTestUtils.java
b/modules/replicator/src/testFixtures/java/org/apache/ignite/internal/replicator/ReplicaTestUtils.java
index 7d0fb2a10fe..487870593ca 100644
---
a/modules/replicator/src/testFixtures/java/org/apache/ignite/internal/replicator/ReplicaTestUtils.java
+++
b/modules/replicator/src/testFixtures/java/org/apache/ignite/internal/replicator/ReplicaTestUtils.java
@@ -100,15 +100,14 @@ public final class ReplicaTestUtils {
* Returns cluster node that is the leader of the corresponding partition
group or throws an exception if it cannot be found.
*
* @param node Ignite node with raft client.
- * @param tableOrZoneId Table or zone identifier.
+ * @param zoneId Table or zone identifier.
* @param partId Partition number.
*
* @return Leader node of the partition group corresponding to the
partition
*/
@TestOnly
- // TODO https://issues.apache.org/jira/browse/IGNITE-22522 tableOrZoneId
-> zoneId
- public static InternalClusterNode leaderAssignment(Ignite node, int
tableOrZoneId, int partId) {
- return leaderAssignment(getReplicaManager(node),
getTopologyService(node), tableOrZoneId, partId);
+ public static InternalClusterNode leaderAssignment(Ignite node, int
zoneId, int partId) {
+ return leaderAssignment(getReplicaManager(node),
getTopologyService(node), zoneId, partId);
}
/**
diff --git
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/PartitionMvStorageAccessImpl.java
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/PartitionMvStorageAccessImpl.java
index 77dd0133e81..2d6874d1e92 100644
---
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/PartitionMvStorageAccessImpl.java
+++
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/PartitionMvStorageAccessImpl.java
@@ -146,7 +146,7 @@ public class PartitionMvStorageAccessImpl implements
PartitionMvStorageAccess {
RowId rowId,
@Nullable BinaryRow row,
UUID txId,
- int commitTableOrZoneId,
+ int commitZoneId,
int commitPartitionId,
int catalogVersion
) {
@@ -163,7 +163,7 @@ public class PartitionMvStorageAccessImpl implements
PartitionMvStorageAccess {
mvPartitionStorage.runConsistently(locker -> {
locker.lock(rowId);
- AddWriteResult result = mvPartitionStorage.addWrite(rowId, row,
txId, commitTableOrZoneId, commitPartitionId);
+ AddWriteResult result = mvPartitionStorage.addWrite(rowId, row,
txId, commitZoneId, commitPartitionId);
if (result.status() == AddWriteResultStatus.TX_MISMATCH) {
throw new
TxIdMismatchException(result.currentWriteIntentTxId(), txId);
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 29480d86c00..306d18ad7d4 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
@@ -127,12 +127,12 @@ public class SnapshotAwarePartitionDataStorage implements
PartitionDataStorage {
RowId rowId,
@Nullable BinaryRow row,
UUID txId,
- int commitTableOrZoneId,
+ int commitZoneId,
int commitPartitionId
) throws StorageException {
handleSnapshotInterference(rowId);
- return partitionStorage.addWrite(rowId, row, txId,
commitTableOrZoneId, commitPartitionId);
+ return partitionStorage.addWrite(rowId, row, txId, commitZoneId,
commitPartitionId);
}
@Override
diff --git
a/modules/table/src/testFixtures/java/org/apache/ignite/distributed/TestPartitionDataStorage.java
b/modules/table/src/testFixtures/java/org/apache/ignite/distributed/TestPartitionDataStorage.java
index 76544ec73c8..397543940b2 100644
---
a/modules/table/src/testFixtures/java/org/apache/ignite/distributed/TestPartitionDataStorage.java
+++
b/modules/table/src/testFixtures/java/org/apache/ignite/distributed/TestPartitionDataStorage.java
@@ -113,10 +113,10 @@ public class TestPartitionDataStorage implements
PartitionDataStorage {
RowId rowId,
@Nullable BinaryRow row,
UUID txId,
- int commitTableOrZoneId,
+ int commitZoneId,
int commitPartitionId
) throws StorageException {
- return partitionStorage.addWrite(rowId, row, txId,
commitTableOrZoneId, commitPartitionId);
+ return partitionStorage.addWrite(rowId, row, txId, commitZoneId,
commitPartitionId);
}
@Override
diff --git
a/modules/transactions/src/test/java/org/apache/ignite/internal/tx/storage/state/rocksdb/RocksDbTxStateStorageTest.java
b/modules/transactions/src/test/java/org/apache/ignite/internal/tx/storage/state/rocksdb/RocksDbTxStateStorageTest.java
index ec802d0cdc2..0f21443e7be 100644
---
a/modules/transactions/src/test/java/org/apache/ignite/internal/tx/storage/state/rocksdb/RocksDbTxStateStorageTest.java
+++
b/modules/transactions/src/test/java/org/apache/ignite/internal/tx/storage/state/rocksdb/RocksDbTxStateStorageTest.java
@@ -54,7 +54,7 @@ public class RocksDbTxStateStorageTest extends
AbstractTxStateStorageTest {
private ExecutorService executor;
@Override
- protected TxStateRocksDbStorage createTableOrZoneStorage() {
+ protected TxStateRocksDbStorage createZoneStorage() {
return new TxStateRocksDbStorage(
ZONE_ID,
3,
diff --git
a/modules/transactions/src/test/java/org/apache/ignite/internal/tx/storage/state/test/TestTxStateStorageTest.java
b/modules/transactions/src/test/java/org/apache/ignite/internal/tx/storage/state/test/TestTxStateStorageTest.java
index 2dd9c26410a..dce7dbfa7b1 100644
---
a/modules/transactions/src/test/java/org/apache/ignite/internal/tx/storage/state/test/TestTxStateStorageTest.java
+++
b/modules/transactions/src/test/java/org/apache/ignite/internal/tx/storage/state/test/TestTxStateStorageTest.java
@@ -25,7 +25,7 @@ import
org.apache.ignite.internal.tx.storage.state.TxStateStorage;
* Tx storage test for test implementation based on {@link ConcurrentHashMap}.
*/
public class TestTxStateStorageTest extends AbstractTxStateStorageTest {
- @Override protected TxStateStorage createTableOrZoneStorage() {
+ @Override protected TxStateStorage createZoneStorage() {
return new TestTxStateStorage();
}
}
diff --git
a/modules/transactions/src/testFixtures/java/org/apache/ignite/internal/tx/storage/state/AbstractTxStateStorageTest.java
b/modules/transactions/src/testFixtures/java/org/apache/ignite/internal/tx/storage/state/AbstractTxStateStorageTest.java
index 94c2e63fd07..40d1ce94400 100644
---
a/modules/transactions/src/testFixtures/java/org/apache/ignite/internal/tx/storage/state/AbstractTxStateStorageTest.java
+++
b/modules/transactions/src/testFixtures/java/org/apache/ignite/internal/tx/storage/state/AbstractTxStateStorageTest.java
@@ -49,7 +49,7 @@ public abstract class AbstractTxStateStorageTest extends
BaseIgniteAbstractTest
/**
* Creates {@link TxStatePartitionStorage} to test.
*/
- protected abstract TxStateStorage createTableOrZoneStorage();
+ protected abstract TxStateStorage createZoneStorage();
@BeforeEach
protected void beforeTest() {
@@ -57,7 +57,7 @@ public abstract class AbstractTxStateStorageTest extends
BaseIgniteAbstractTest
}
private void createAndStartStorage() {
- txStateStorage = createTableOrZoneStorage();
+ txStateStorage = createZoneStorage();
txStateStorage.start();
}
