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 0b65728d28e IGNITE-27148 Remove code related to non-colocated case
(storage modules) (#7053)
0b65728d28e is described below
commit 0b65728d28e317b009cdda0d30ac7b22d5983375
Author: Slava Koptilin <[email protected]>
AuthorDate: Mon Nov 24 19:48:38 2025 +0200
IGNITE-27148 Remove code related to non-colocated case (storage modules)
(#7053)
---
.../partition/replicator/ItZoneTxFinishTest.java | 2 +-
.../raft/snapshot/outgoing/OutgoingSnapshot.java | 3 +--
.../incoming/IncomingSnapshotCopierTest.java | 4 +--
.../internal/storage/MvPartitionStorage.java | 5 ++--
.../apache/ignite/internal/storage/ReadResult.java | 31 +++++++++++-----------
.../storage/ThreadAssertingMvPartitionStorage.java | 4 +--
.../storage/AbstractMvPartitionStorageTest.java | 14 +++++-----
.../storage/BaseMvPartitionStorageTest.java | 5 ++--
.../storage/impl/TestMvPartitionStorage.java | 29 ++++++++++----------
.../mv/AbstractPageMemoryMvPartitionStorage.java | 18 ++++++-------
.../pagememory/mv/AddWriteInvokeClosure.java | 12 ++++-----
.../storage/pagememory/mv/VersionChain.java | 4 +--
.../storage/rocksdb/RocksDbMvPartitionStorage.java | 26 +++++++++---------
.../replicator/PartitionReplicaListener.java | 8 +++---
14 files changed, 80 insertions(+), 85 deletions(-)
diff --git
a/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/ItZoneTxFinishTest.java
b/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/ItZoneTxFinishTest.java
index 67758ae29ed..9e49d3c3e85 100644
---
a/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/ItZoneTxFinishTest.java
+++
b/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/ItZoneTxFinishTest.java
@@ -242,7 +242,7 @@ class ItZoneTxFinishTest extends ItAbstractColocationTest {
waitOnAllNodes("A write intent should appear on every node with
expected commitZoneId", tableName, storage -> {
List<ReadResult> readResults = readAll(storage);
return readResults.size() == 1
- && readResults.stream().allMatch(version ->
Objects.equals(version.commitTableOrZoneId(), commitZoneId));
+ && readResults.stream().allMatch(version ->
Objects.equals(version.commitZoneId(), commitZoneId));
});
}
}
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 655b2908267..cc9cf2f52aa 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
@@ -449,8 +449,7 @@ public class OutgoingSnapshot {
assert i == 0 : rowVersionsN2O;
transactionId = version.transactionId();
- // TODO: https://issues.apache.org/jira/browse/IGNITE-22522 -
remove mentions of commit *table*.
- commitTableOrZoneId = version.commitTableOrZoneId();
+ commitTableOrZoneId = version.commitZoneId();
commitPartitionId = version.commitPartitionId();
} else {
commitTimestamps[j++] = version.commitTimestamp().longValue();
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 fdd3083b688..dfbdb45a3cf 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
@@ -493,7 +493,7 @@ public class IncomingSnapshotCopierTest extends
BaseIgniteAbstractTest {
if (readResult.isWriteIntent()) {
txId = readResult.transactionId();
- commitTableOrZoneId = readResult.commitTableOrZoneId();
+ commitTableOrZoneId = readResult.commitZoneId();
commitPartitionId = readResult.commitPartitionId();
} else {
timestamps[j++] = readResult.commitTimestamp().longValue();
@@ -544,7 +544,7 @@ public class IncomingSnapshotCopierTest extends
BaseIgniteAbstractTest {
assertEquals(expReadResult.commitTimestamp(),
actReadResult.commitTimestamp(), msg);
assertEquals(expReadResult.transactionId(),
actReadResult.transactionId(), msg);
- assertEquals(expReadResult.commitTableOrZoneId(),
actReadResult.commitTableOrZoneId(), msg);
+ assertEquals(expReadResult.commitZoneId(),
actReadResult.commitZoneId(), msg);
assertEquals(expReadResult.commitPartitionId(),
actReadResult.commitPartitionId(), msg);
assertEquals(expReadResult.isWriteIntent(),
actReadResult.isWriteIntent(), msg);
}
diff --git
a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/MvPartitionStorage.java
b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/MvPartitionStorage.java
index 42d13340b21..cdbc31fe921 100644
---
a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/MvPartitionStorage.java
+++
b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/MvPartitionStorage.java
@@ -187,7 +187,6 @@ public interface MvPartitionStorage extends
ManuallyCloseable {
*/
ReadResult read(RowId rowId, HybridTimestamp timestamp) throws
StorageException;
- // 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.
*
@@ -201,7 +200,7 @@ public interface MvPartitionStorage 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.
@@ -210,7 +209,7 @@ public interface MvPartitionStorage extends
ManuallyCloseable {
RowId rowId,
@Nullable BinaryRow row,
UUID txId,
- int commitTableOrZoneId,
+ int commitZoneId,
int commitPartitionId
) throws StorageException;
diff --git
a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/ReadResult.java
b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/ReadResult.java
index ad83c9dfc6d..50156555f26 100644
---
a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/ReadResult.java
+++
b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/ReadResult.java
@@ -25,7 +25,6 @@ import org.jetbrains.annotations.Nullable;
/**
* {@link MvPartitionStorage#read} result.
*/
-// TODO: https://issues.apache.org/jira/browse/IGNITE-22522 - remove mentions
of commit *table*.
public class ReadResult {
/** Unset commit partition id value. */
public static final int UNDEFINED_COMMIT_PARTITION_ID = -1;
@@ -39,10 +38,10 @@ public class ReadResult {
/** Transaction id. Not {@code null} iff this is a write-intent. */
private final @Nullable UUID transactionId;
- /** Commit table/zone id. Not {@code null} iff this is a write-intent. */
- private final @Nullable Integer commitTableOrZoneId;
+ /** Commit zone id. Not {@code null} iff this is a write-intent. */
+ private final @Nullable Integer commitZoneId;
- /** Commit table id. If this is not a write-intent it is equal to {@link
#UNDEFINED_COMMIT_PARTITION_ID}. */
+ /** Commit partition id. If this is not a write-intent it is equal to
{@link #UNDEFINED_COMMIT_PARTITION_ID}. */
private final int commitPartitionId;
/**
@@ -62,7 +61,7 @@ public class ReadResult {
RowId rowId,
@Nullable BinaryRow binaryRow,
@Nullable UUID transactionId,
- @Nullable Integer commitTableOrZoneId,
+ @Nullable Integer commitZoneId,
@Nullable HybridTimestamp commitTs,
@Nullable HybridTimestamp newestCommitTs,
int commitPartitionId
@@ -70,14 +69,14 @@ public class ReadResult {
this.rowId = rowId;
this.binaryRow = binaryRow;
- // If transaction is not null, then commitTableId and
commitPartitionId should be defined.
- assert (transactionId == null) || (commitTableOrZoneId != null &&
commitPartitionId != -1);
+ // If transaction id is not null, then commitZoneId and
commitPartitionId should be defined.
+ assert (transactionId == null) || (commitZoneId != null &&
commitPartitionId != -1);
- // If transaction id is null, then commitTableId and commitPartitionId
should not be defined.
- assert (transactionId != null) || (commitTableOrZoneId == null &&
commitPartitionId == -1);
+ // If transaction id is null, then commitZoneId and commitPartitionId
should not be defined.
+ assert (transactionId != null) || (commitZoneId == null &&
commitPartitionId == -1);
this.transactionId = transactionId;
- this.commitTableOrZoneId = commitTableOrZoneId;
+ this.commitZoneId = commitZoneId;
this.commitTs = commitTs;
this.newestCommitTs = newestCommitTs;
this.commitPartitionId = commitPartitionId;
@@ -93,9 +92,9 @@ public class ReadResult {
return new ReadResult(rowId, null, null, null, null, null,
UNDEFINED_COMMIT_PARTITION_ID);
}
- public static ReadResult createFromWriteIntent(RowId rowId, @Nullable
BinaryRow binaryRow, UUID transactionId, int commitTableId,
+ public static ReadResult createFromWriteIntent(RowId rowId, @Nullable
BinaryRow binaryRow, UUID transactionId, int commitZoneId,
int commitPartitionId, @Nullable HybridTimestamp
lastCommittedTimestamp) {
- return new ReadResult(rowId, binaryRow, transactionId, commitTableId,
null, lastCommittedTimestamp, commitPartitionId);
+ return new ReadResult(rowId, binaryRow, transactionId, commitZoneId,
null, lastCommittedTimestamp, commitPartitionId);
}
public static ReadResult createFromCommitted(RowId rowId, @Nullable
BinaryRow binaryRow, HybridTimestamp commitTs) {
@@ -132,14 +131,14 @@ public class ReadResult {
}
/**
- * Returns commit table/zone id part of the transaction state if this is a
write-intent,
+ * Returns commit zone id part of the transaction state if this is a
write-intent,
* {@code null} otherwise.
*
- * @return Commit table/zone id part of the transaction state if this is a
write-intent,
+ * @return Commit zone id part of the transaction state if this is a
write-intent,
* {@code null} otherwise.
*/
- public @Nullable Integer commitTableOrZoneId() {
- return commitTableOrZoneId;
+ public @Nullable Integer commitZoneId() {
+ return commitZoneId;
}
/**
diff --git
a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/ThreadAssertingMvPartitionStorage.java
b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/ThreadAssertingMvPartitionStorage.java
index 89f8fb0be44..93b58b9b577 100644
---
a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/ThreadAssertingMvPartitionStorage.java
+++
b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/ThreadAssertingMvPartitionStorage.java
@@ -97,12 +97,12 @@ public class ThreadAssertingMvPartitionStorage implements
MvPartitionStorage, Wr
RowId rowId,
@Nullable BinaryRow row,
UUID txId,
- int commitTableOrZoneId,
+ int commitZoneId,
int commitPartitionId
) throws StorageException {
assertThreadAllowsToWrite();
- return partitionStorage.addWrite(rowId, row, txId,
commitTableOrZoneId, commitPartitionId);
+ return partitionStorage.addWrite(rowId, row, txId, commitZoneId,
commitPartitionId);
}
@Override
diff --git
a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/AbstractMvPartitionStorageTest.java
b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/AbstractMvPartitionStorageTest.java
index 6773e022206..ec0eaf8a3dc 100644
---
a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/AbstractMvPartitionStorageTest.java
+++
b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/AbstractMvPartitionStorageTest.java
@@ -1162,7 +1162,7 @@ public abstract class AbstractMvPartitionStorageTest
extends BaseMvPartitionStor
assertNotNull(res);
assertNull(res.transactionId());
- assertNull(res.commitTableOrZoneId());
+ assertNull(res.commitZoneId());
assertEquals(ReadResult.UNDEFINED_COMMIT_PARTITION_ID,
res.commitPartitionId());
assertThat(res.binaryRow(), isRow(binaryRow));
@@ -1171,7 +1171,7 @@ public abstract class AbstractMvPartitionStorageTest
extends BaseMvPartitionStor
assertNotNull(res);
assertEquals(txId2, res.transactionId());
- assertEquals(COMMIT_TABLE_ID, res.commitTableOrZoneId());
+ assertEquals(COMMIT_ZONE_ID, res.commitZoneId());
assertEquals(PARTITION_ID, res.commitPartitionId());
assertThat(res.binaryRow(), isRow(binaryRow2));
}
@@ -1605,8 +1605,8 @@ public abstract class AbstractMvPartitionStorageTest
extends BaseMvPartitionStor
RowId rowId1 = new RowId(PARTITION_ID, 1, 0);
RowId rowId2 = new RowId(PARTITION_ID, 1, 1);
- RowMeta expectedRowMeta1 = new RowMeta(rowId1, txId, COMMIT_TABLE_ID,
PARTITION_ID);
- RowMeta expectedRowMeta2 = new RowMeta(rowId2, txId, COMMIT_TABLE_ID,
PARTITION_ID);
+ RowMeta expectedRowMeta1 = new RowMeta(rowId1, txId, COMMIT_ZONE_ID,
PARTITION_ID);
+ RowMeta expectedRowMeta2 = new RowMeta(rowId2, txId, COMMIT_ZONE_ID,
PARTITION_ID);
addWrite(rowId1, binaryRow, txId);
addWrite(rowId2, binaryRow2, txId);
@@ -1648,7 +1648,7 @@ public abstract class AbstractMvPartitionStorageTest
extends BaseMvPartitionStor
void testClosestRowReconstruction() {
RowId rowId = new RowId(PARTITION_ID, 0x1234567890ABCDEFL,
0xFEDCBA0987654321L);
- RowMeta expectedRowMeta = new RowMeta(rowId, txId, COMMIT_TABLE_ID,
PARTITION_ID);
+ RowMeta expectedRowMeta = new RowMeta(rowId, txId, COMMIT_ZONE_ID,
PARTITION_ID);
addWrite(rowId, binaryRow, txId);
@@ -1696,7 +1696,7 @@ public abstract class AbstractMvPartitionStorageTest
extends BaseMvPartitionStor
assertThat(result.rowId(), is(rowId));
assertTrue(result.isWriteIntent());
assertThat(result.commitPartitionId(),
is(not(ReadResult.UNDEFINED_COMMIT_PARTITION_ID)));
- assertThat(result.commitTableOrZoneId(), is(notNullValue()));
+ assertThat(result.commitZoneId(), is(notNullValue()));
assertThat(result.transactionId(), is(notNullValue()));
assertThat(result.commitTimestamp(), is(nullValue()));
assertThat(result.newestCommitTimestamp(), is(nullValue()));
@@ -1720,7 +1720,7 @@ public abstract class AbstractMvPartitionStorageTest
extends BaseMvPartitionStor
assertThat(result.rowId(), is(rowId));
assertFalse(result.isWriteIntent());
assertThat(result.commitPartitionId(),
is(ReadResult.UNDEFINED_COMMIT_PARTITION_ID));
- assertThat(result.commitTableOrZoneId(), is(nullValue()));
+ assertThat(result.commitZoneId(), is(nullValue()));
assertThat(result.transactionId(), is(nullValue()));
assertThat(result.commitTimestamp(), is(notNullValue()));
assertThat(result.newestCommitTimestamp(), is(nullValue()));
diff --git
a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/BaseMvPartitionStorageTest.java
b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/BaseMvPartitionStorageTest.java
index f42c82fdb36..c5d6ba98e63 100644
---
a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/BaseMvPartitionStorageTest.java
+++
b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/BaseMvPartitionStorageTest.java
@@ -30,11 +30,10 @@ import org.junit.jupiter.api.AfterEach;
/**
* Base test for MV partition storages.
*/
-// TODO: https://issues.apache.org/jira/browse/IGNITE-22522 - remove mentions
of commit *table*.
public abstract class BaseMvPartitionStorageTest extends BaseMvStoragesTest {
protected static final int PARTITION_ID = 1;
- protected static final int COMMIT_TABLE_ID = 999;
+ protected static final int COMMIT_ZONE_ID = 999;
protected static final RowId ROW_ID = new RowId(PARTITION_ID);
@@ -102,7 +101,7 @@ public abstract class BaseMvPartitionStorageTest extends
BaseMvStoragesTest {
return storage.runConsistently(locker -> {
locker.lock(rowId);
- return storage.addWrite(rowId, binaryRow, txId, COMMIT_TABLE_ID,
PARTITION_ID);
+ return storage.addWrite(rowId, binaryRow, txId, COMMIT_ZONE_ID,
PARTITION_ID);
});
}
diff --git
a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/impl/TestMvPartitionStorage.java
b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/impl/TestMvPartitionStorage.java
index de05824cbe0..4666c5e59e3 100644
---
a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/impl/TestMvPartitionStorage.java
+++
b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/impl/TestMvPartitionStorage.java
@@ -42,7 +42,6 @@ import
org.apache.ignite.internal.storage.AddWriteCommittedResult;
import org.apache.ignite.internal.storage.AddWriteResult;
import org.apache.ignite.internal.storage.CommitResult;
import org.apache.ignite.internal.storage.MvPartitionStorage;
-import org.apache.ignite.internal.storage.MvPartitionStorage.Locker;
import org.apache.ignite.internal.storage.PartitionTimestampCursor;
import org.apache.ignite.internal.storage.ReadResult;
import org.apache.ignite.internal.storage.RowId;
@@ -139,7 +138,7 @@ public class TestMvPartitionStorage implements
MvPartitionStorage {
private final @Nullable BinaryRow row;
private final @Nullable HybridTimestamp ts;
private final @Nullable UUID txId;
- private final @Nullable Integer commitTableId;
+ private final @Nullable Integer commitZoneId;
private final int commitPartitionId;
volatile @Nullable VersionChain next;
@@ -148,7 +147,7 @@ public class TestMvPartitionStorage implements
MvPartitionStorage {
@Nullable BinaryRow row,
@Nullable HybridTimestamp ts,
@Nullable UUID txId,
- @Nullable Integer commitTableId,
+ @Nullable Integer commitZoneId,
int commitPartitionId,
@Nullable VersionChain next
) {
@@ -156,14 +155,14 @@ public class TestMvPartitionStorage implements
MvPartitionStorage {
this.row = row;
this.ts = ts;
this.txId = txId;
- this.commitTableId = commitTableId;
+ this.commitZoneId = commitZoneId;
this.commitPartitionId = commitPartitionId;
this.next = next;
}
- static VersionChain forWriteIntent(RowId rowId, @Nullable BinaryRow
row, @Nullable UUID txId, @Nullable Integer commitTableId,
+ static VersionChain forWriteIntent(RowId rowId, @Nullable BinaryRow
row, @Nullable UUID txId, @Nullable Integer commitZoneId,
int commitPartitionId, @Nullable VersionChain next) {
- return new VersionChain(rowId, row, null, txId, commitTableId,
commitPartitionId, next);
+ return new VersionChain(rowId, row, null, txId, commitZoneId,
commitPartitionId, next);
}
static VersionChain forCommitted(RowId rowId, HybridTimestamp
timestamp, VersionChain uncommittedVersionChain) {
@@ -265,11 +264,11 @@ public class TestMvPartitionStorage implements
MvPartitionStorage {
RowId rowId,
@Nullable BinaryRow row,
UUID txId,
- int commitTableOrZoneId,
+ int commitZoneId,
int commitPartitionId
) throws StorageException {
assert rowId.partitionId() == partitionId : "rowId=" + rowId + ",
rowIsTombstone=" + (row == null) + ", txId=" + txId
- + ", commitTableOrZoneId=" + commitTableOrZoneId + ",
commitPartitionId=" + commitPartitionId;
+ + ", commitZoneId=" + commitZoneId + ", commitPartitionId=" +
commitPartitionId;
checkStorageClosed();
@@ -285,18 +284,18 @@ public class TestMvPartitionStorage implements
MvPartitionStorage {
addWriteResult[0] = AddWriteResult.success(versionChain.row);
- return VersionChain.forWriteIntent(rowId, row, txId,
commitTableOrZoneId, commitPartitionId, versionChain.next);
+ return VersionChain.forWriteIntent(rowId, row, txId,
commitZoneId, commitPartitionId, versionChain.next);
}
addWriteResult[0] = AddWriteResult.success(null);
- return VersionChain.forWriteIntent(rowId, row, txId,
commitTableOrZoneId, commitPartitionId, versionChain);
+ return VersionChain.forWriteIntent(rowId, row, txId, commitZoneId,
commitPartitionId, versionChain);
});
AddWriteResult res = addWriteResult[0];
assert res != null : "rowId=" + rowId + ", rowIsTombstone=" + (row ==
null) + ", txId=" + txId
- + ", commitTableOrZoneId=" + commitTableOrZoneId + ",
commitPartitionId=" + commitPartitionId;
+ + ", commitZoneId=" + commitZoneId + ", commitPartitionId=" +
commitPartitionId;
return res;
}
@@ -493,7 +492,7 @@ public class TestMvPartitionStorage implements
MvPartitionStorage {
// We *only* have a write-intent, return it.
BinaryRow binaryRow = cur.row;
- return ReadResult.createFromWriteIntent(cur.rowId, binaryRow,
cur.txId, cur.commitTableId, cur.commitPartitionId, null);
+ return ReadResult.createFromWriteIntent(cur.rowId, binaryRow,
cur.txId, cur.commitZoneId, cur.commitPartitionId, null);
}
// Move to first commit.
@@ -511,7 +510,7 @@ public class TestMvPartitionStorage implements
MvPartitionStorage {
versionChain.rowId,
versionChain.row,
versionChain.txId,
- versionChain.commitTableId,
+ versionChain.commitZoneId,
versionChain.commitPartitionId, fillLastCommittedTs &&
next != null ? next.ts : null
);
}
@@ -539,7 +538,7 @@ public class TestMvPartitionStorage implements
MvPartitionStorage {
chainHead.rowId,
binaryRow,
chainHead.txId,
- chainHead.commitTableId,
+ chainHead.commitZoneId,
chainHead.commitPartitionId,
firstCommit.ts);
}
@@ -695,7 +694,7 @@ public class TestMvPartitionStorage implements
MvPartitionStorage {
VersionChain versionChain = entry.getValue();
- return new RowMeta(versionChain.rowId, versionChain.txId,
versionChain.commitTableId, versionChain.commitPartitionId);
+ return new RowMeta(versionChain.rowId, versionChain.txId,
versionChain.commitZoneId, versionChain.commitPartitionId);
}
@Override
diff --git
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/AbstractPageMemoryMvPartitionStorage.java
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/AbstractPageMemoryMvPartitionStorage.java
index 6673afe03e5..c5b4c2a4e78 100644
---
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/AbstractPageMemoryMvPartitionStorage.java
+++
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/AbstractPageMemoryMvPartitionStorage.java
@@ -432,18 +432,18 @@ public abstract class
AbstractPageMemoryMvPartitionStorage implements MvPartitio
RowId rowId,
@Nullable BinaryRow row,
UUID txId,
- int commitTableOrZoneId,
+ int commitZoneId,
int commitPartitionId
) throws StorageException {
- assert rowId.partitionId() == partitionId : addWriteInfo(rowId, row,
txId, commitTableOrZoneId, commitPartitionId);
+ assert rowId.partitionId() == partitionId : addWriteInfo(rowId, row,
txId, commitZoneId, commitPartitionId);
return busy(() -> {
throwExceptionIfStorageNotInRunnableOrRebalanceState(state.get(),
this::createStorageInfo);
- assert rowIsLocked(rowId) : addWriteInfo(rowId, row, txId,
commitTableOrZoneId, commitPartitionId);
+ assert rowIsLocked(rowId) : addWriteInfo(rowId, row, txId,
commitZoneId, commitPartitionId);
try {
- var addWrite = new AddWriteInvokeClosure(rowId, row, txId,
commitTableOrZoneId, commitPartitionId, this);
+ var addWrite = new AddWriteInvokeClosure(rowId, row, txId,
commitZoneId, commitPartitionId, this);
renewableState.versionChainTree().invoke(new
VersionChainKey(rowId), null, addWrite);
@@ -451,7 +451,7 @@ public abstract class AbstractPageMemoryMvPartitionStorage
implements MvPartitio
AddWriteResult addWriteResult = addWrite.addWriteResult();
- assert addWriteResult != null : addWriteInfo(rowId, row, txId,
commitTableOrZoneId, commitPartitionId);
+ assert addWriteResult != null : addWriteInfo(rowId, row, txId,
commitZoneId, commitPartitionId);
return addWriteResult;
} catch (IgniteInternalCheckedException e) {
@@ -460,7 +460,7 @@ public abstract class AbstractPageMemoryMvPartitionStorage
implements MvPartitio
throw new StorageException(
"Error while executing addWrite: [{}]",
e,
- addWriteInfo(rowId, row, txId, commitTableOrZoneId,
commitPartitionId)
+ addWriteInfo(rowId, row, txId, commitZoneId,
commitPartitionId)
);
}
});
@@ -795,12 +795,12 @@ public abstract class
AbstractPageMemoryMvPartitionStorage implements MvPartitio
RowId rowId,
@Nullable BinaryRow row,
UUID txId,
- int commitTableOrZoneId,
+ int commitZoneId,
int commitPartitionId
) {
return IgniteStringFormatter.format(
- "rowId={}, rowIsTombstone={}, txId={}, commitTableOrZoneId={},
commitPartitionId={}, {}",
- rowId, row == null, txId, commitTableOrZoneId,
commitPartitionId, createStorageInfo()
+ "rowId={}, rowIsTombstone={}, txId={}, commitZoneId={},
commitPartitionId={}, {}",
+ rowId, row == null, txId, commitZoneId, commitPartitionId,
createStorageInfo()
);
}
diff --git
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/AddWriteInvokeClosure.java
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/AddWriteInvokeClosure.java
index c9633ff9020..3d284903416 100644
---
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/AddWriteInvokeClosure.java
+++
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/AddWriteInvokeClosure.java
@@ -48,7 +48,7 @@ class AddWriteInvokeClosure implements
InvokeClosure<VersionChain> {
private final UUID txId;
- private final int commitTableOrZoneId;
+ private final int commitZoneId;
private final int commitPartitionId;
@@ -66,14 +66,14 @@ class AddWriteInvokeClosure implements
InvokeClosure<VersionChain> {
RowId rowId,
@Nullable BinaryRow row,
UUID txId,
- int commitTableOrZoneId,
+ int commitZoneId,
int commitPartitionId,
AbstractPageMemoryMvPartitionStorage storage
) {
this.rowId = rowId;
this.row = row;
this.txId = txId;
- this.commitTableOrZoneId = commitTableOrZoneId;
+ this.commitZoneId = commitZoneId;
this.commitPartitionId = commitPartitionId;
this.storage = storage;
}
@@ -83,7 +83,7 @@ class AddWriteInvokeClosure implements
InvokeClosure<VersionChain> {
if (oldRow == null) {
RowVersion newVersion = insertRowVersion(row, NULL_LINK);
- newRow = VersionChain.createUncommitted(rowId, txId,
commitTableOrZoneId, commitPartitionId, newVersion.link(), NULL_LINK);
+ newRow = VersionChain.createUncommitted(rowId, txId, commitZoneId,
commitPartitionId, newVersion.link(), NULL_LINK);
operationType = OperationType.PUT;
@@ -119,7 +119,7 @@ class AddWriteInvokeClosure implements
InvokeClosure<VersionChain> {
newRow = VersionChain.createUncommitted(
rowId,
txId,
- commitTableOrZoneId,
+ commitZoneId,
commitPartitionId,
newVersion.link(),
newVersion.nextLink()
@@ -181,6 +181,6 @@ class AddWriteInvokeClosure implements
InvokeClosure<VersionChain> {
}
private String addWriteInfo() {
- return storage.addWriteInfo(rowId, row, txId, commitTableOrZoneId,
commitPartitionId);
+ return storage.addWriteInfo(rowId, row, txId, commitZoneId,
commitPartitionId);
}
}
diff --git
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/VersionChain.java
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/VersionChain.java
index aa2a74a3cbc..8346e67415a 100644
---
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/VersionChain.java
+++
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/VersionChain.java
@@ -66,9 +66,9 @@ public class VersionChain extends VersionChainKey {
return new VersionChain(rowId, null, null,
ReadResult.UNDEFINED_COMMIT_PARTITION_ID, headLink, nextLink);
}
- public static VersionChain createUncommitted(RowId rowId, UUID
transactionId, int commitTableId, int commitPartitionId, long headLink,
+ public static VersionChain createUncommitted(RowId rowId, UUID
transactionId, int commitZoneId, int commitPartitionId, long headLink,
long nextLink) {
- return new VersionChain(rowId, transactionId, commitTableId,
commitPartitionId, headLink, nextLink);
+ return new VersionChain(rowId, transactionId, commitZoneId,
commitPartitionId, headLink, nextLink);
}
/**
diff --git
a/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvPartitionStorage.java
b/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvPartitionStorage.java
index 2660cc8da8d..38676f31b88 100644
---
a/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvPartitionStorage.java
+++
b/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvPartitionStorage.java
@@ -111,17 +111,17 @@ import org.rocksdb.WriteBatchWithIndex;
* <p>Key:
* <pre>{@code
* For write-intents
- * | Table ID (4 bytes, BE) | Partition ID (2 bytes, BE) | Row ID (16 bytes,
BE) |
+ * | Zone ID (4 bytes, BE) | Partition ID (2 bytes, BE) | Row ID (16 bytes,
BE) |
*
* For committed rows
- * | Table ID (4 bytes, BE) | Partition ID (2 bytes, BE) | Row ID (16 bytes,
BE) | Commit Timestamp (8 bytes, DESC) |
+ * | Zone ID (4 bytes, BE) | Partition ID (2 bytes, BE) | Row ID (16 bytes,
BE) | Commit Timestamp (8 bytes, DESC) |
* }</pre>
*
* <p>Value:
*
* <pre>{@code
* For write-intents
- * | Data ID (24 bytes, BE) | Commit Table ID (16 bytes) | Commit Partition ID
(2 bytes) |
+ * | Data ID (24 bytes, BE) | Commit Zone ID (16 bytes) | Commit Partition ID
(2 bytes) |
*
* For committed rows
* | Data ID (24 bytes, BE) |
@@ -449,15 +449,15 @@ public class RocksDbMvPartitionStorage implements
MvPartitionStorage {
RowId rowId,
@Nullable BinaryRow row,
UUID txId,
- int commitTableOrZoneId,
+ int commitZoneId,
int commitPartitionId
) throws StorageException {
- assert rowId.partitionId() == partitionId : addWriteInfo(rowId, row,
txId, commitTableOrZoneId, commitPartitionId);
+ assert rowId.partitionId() == partitionId : addWriteInfo(rowId, row,
txId, commitZoneId, commitPartitionId);
return busy(() -> {
@SuppressWarnings("resource") WriteBatchWithIndex writeBatch =
requireWriteBatch();
- assert rowIsLocked(rowId) : addWriteInfo(rowId, row, txId,
commitTableOrZoneId, commitPartitionId);
+ assert rowIsLocked(rowId) : addWriteInfo(rowId, row, txId,
commitZoneId, commitPartitionId);
try {
// Check concurrent transaction data.
@@ -504,7 +504,7 @@ public class RocksDbMvPartitionStorage implements
MvPartitionStorage {
return AddWriteResult.success(previousRow);
} else {
- ByteBuffer txState = createTxState(rowId, txId,
commitTableOrZoneId, commitPartitionId, row == null);
+ ByteBuffer txState = createTxState(rowId, txId,
commitZoneId, commitPartitionId, row == null);
ByteBuffer dataId = readDataIdFromTxState(txState);
@@ -520,7 +520,7 @@ public class RocksDbMvPartitionStorage implements
MvPartitionStorage {
throw new IgniteRocksDbException(
"Failed to update a row in storage: [{}]",
e,
- addWriteInfo(rowId, row, txId, commitTableOrZoneId,
commitPartitionId)
+ addWriteInfo(rowId, row, txId, commitZoneId,
commitPartitionId)
);
}
});
@@ -534,7 +534,7 @@ public class RocksDbMvPartitionStorage implements
MvPartitionStorage {
return buffer.rewind();
}
- private static ByteBuffer createTxState(RowId rowId, UUID txId, int
commitTableId, int commitPartitionId, boolean isTombstone) {
+ private static ByteBuffer createTxState(RowId rowId, UUID txId, int
commitZoneId, int commitPartitionId, boolean isTombstone) {
ByteBuffer buffer = TX_STATE_BUFFER.get().clear();
putDataId(buffer, rowId, TransactionIds.beginTimestamp(txId),
isTombstone);
@@ -542,7 +542,7 @@ public class RocksDbMvPartitionStorage implements
MvPartitionStorage {
return buffer
.putLong(txId.getMostSignificantBits())
.putLong(txId.getLeastSignificantBits())
- .putInt(commitTableId)
+ .putInt(commitZoneId)
.putShort((short) commitPartitionId)
.rewind();
}
@@ -1741,12 +1741,12 @@ public class RocksDbMvPartitionStorage implements
MvPartitionStorage {
RowId rowId,
@Nullable BinaryRow row,
UUID txId,
- int commitTableOrZoneId,
+ int commitZoneId,
int commitPartitionId
) {
return format(
- "rowId={}, rowIsTombstone={}, txId={}, commitTableOrZoneId={},
commitPartitionId={}, {}",
- rowId, row == null, txId, commitTableOrZoneId,
commitPartitionId, createStorageInfo()
+ "rowId={}, rowIsTombstone={}, txId={}, commitZoneId={},
commitPartitionId={}, {}",
+ rowId, row == null, txId, commitZoneId, commitPartitionId,
createStorageInfo()
);
}
diff --git
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java
index 200a3c192a7..024f518d2c5 100644
---
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java
+++
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java
@@ -2026,9 +2026,9 @@ public class PartitionReplicaListener implements
ReplicaListener, ReplicaTablePr
assert Objects.equals(wi.transactionId(),
writeIntent.transactionId())
: "Unexpected write intent, tx1=" +
writeIntent.transactionId() + ", tx2=" + wi.transactionId();
- assert Objects.equals(wi.commitTableOrZoneId(),
writeIntent.commitTableOrZoneId())
- : "Unexpected write intent, commitTableOrZoneId1=" +
writeIntent.commitTableOrZoneId()
- + ", commitTableId2=" + wi.commitTableOrZoneId();
+ assert Objects.equals(wi.commitZoneId(),
writeIntent.commitZoneId())
+ : "Unexpected write intent, commitZoneId1=" +
writeIntent.commitZoneId()
+ + ", commitZoneId2=" + wi.commitZoneId();
assert wi.commitPartitionId() == writeIntent.commitPartitionId()
: "Unexpected write intent, commitPartitionId1=" +
writeIntent.commitPartitionId()
@@ -3550,7 +3550,7 @@ public class PartitionReplicaListener implements
ReplicaListener, ReplicaTablePr
return transactionStateResolver.resolveTxState(
txId,
- replicationGroupId(writeIntent.commitTableOrZoneId(),
writeIntent.commitPartitionId()),
+ replicationGroupId(writeIntent.commitZoneId(),
writeIntent.commitPartitionId()),
timestamp)
.thenApply(transactionMeta -> {
if (isFinalState(transactionMeta.txState())) {
