This is an automated email from the ASF dual-hosted git repository.
ibessonov 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 4ff66be7b33 IGNITE-27041 Remove "createPartitionStorage" from
TxStateStorage (#6962)
4ff66be7b33 is described below
commit 4ff66be7b33a7997085f32cf1d53effef66c2177
Author: Ivan Bessonov <[email protected]>
AuthorDate: Thu Nov 13 13:27:31 2025 +0300
IGNITE-27041 Remove "createPartitionStorage" from TxStateStorage (#6962)
---
.../replicator/PartitionReplicaLifecycleManagerTest.java | 2 +-
.../table/distributed/storage/BrokenTxStateStorage.java | 5 -----
.../tx/storage/state/ThreadAssertingTxStateStorage.java | 7 -------
.../ignite/internal/tx/storage/state/TxStateStorage.java | 8 --------
.../tx/storage/state/rocksdb/TxStateRocksDbStorage.java | 11 ++++++++---
.../state/rocksdb/TxStateRocksDbSharedStorageTest.java | 2 +-
.../internal/tx/storage/state/AbstractTxStateStorageTest.java | 9 +++++++--
.../internal/tx/storage/state/test/TestTxStateStorage.java | 7 +------
8 files changed, 18 insertions(+), 33 deletions(-)
diff --git
a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/PartitionReplicaLifecycleManagerTest.java
b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/PartitionReplicaLifecycleManagerTest.java
index e6134840ee2..9a6493d7e1c 100644
---
a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/PartitionReplicaLifecycleManagerTest.java
+++
b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/PartitionReplicaLifecycleManagerTest.java
@@ -216,7 +216,7 @@ class PartitionReplicaLifecycleManagerTest extends
BaseIgniteAbstractTest {
protected TxStateStorage createTxStateStorage(int zoneId, int
partitionCount) {
TxStateStorage txStateStorage = new
TxStateRocksDbStorage(zoneId, partitionCount, sharedTxStateStorage) {
@Override
- public TxStateRocksDbPartitionStorage
createPartitionStorage(int partitionId) {
+ protected TxStateRocksDbPartitionStorage
createPartitionStorage(int partitionId) {
return txStatePartitionStorage;
}
};
diff --git
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/storage/BrokenTxStateStorage.java
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/storage/BrokenTxStateStorage.java
index 731059c7851..ae7cbcd8b78 100644
---
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/storage/BrokenTxStateStorage.java
+++
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/storage/BrokenTxStateStorage.java
@@ -32,11 +32,6 @@ public class BrokenTxStateStorage implements TxStateStorage {
return new BrokenTxStatePartitionStorage();
}
- @Override
- public TxStatePartitionStorage createPartitionStorage(int partitionId) {
- return null;
- }
-
@Override
public @Nullable TxStatePartitionStorage getPartitionStorage(int
partitionId) {
return new BrokenTxStatePartitionStorage();
diff --git
a/modules/transactions/src/main/java/org/apache/ignite/internal/tx/storage/state/ThreadAssertingTxStateStorage.java
b/modules/transactions/src/main/java/org/apache/ignite/internal/tx/storage/state/ThreadAssertingTxStateStorage.java
index 103510931c5..d4c02e75de6 100644
---
a/modules/transactions/src/main/java/org/apache/ignite/internal/tx/storage/state/ThreadAssertingTxStateStorage.java
+++
b/modules/transactions/src/main/java/org/apache/ignite/internal/tx/storage/state/ThreadAssertingTxStateStorage.java
@@ -42,13 +42,6 @@ public class ThreadAssertingTxStateStorage implements
TxStateStorage {
return
wrapTxStatePartitionStorage(wrappedStorage.getOrCreatePartitionStorage(partitionId));
}
- @Override
- public TxStatePartitionStorage createPartitionStorage(int partitionId) {
- assertThreadAllowsToWrite();
-
- return
wrapTxStatePartitionStorage(wrappedStorage.createPartitionStorage(partitionId));
- }
-
private static ThreadAssertingTxStatePartitionStorage
wrapTxStatePartitionStorage(TxStatePartitionStorage storage) {
return storage instanceof ThreadAssertingTxStatePartitionStorage
? (ThreadAssertingTxStatePartitionStorage) storage
diff --git
a/modules/transactions/src/main/java/org/apache/ignite/internal/tx/storage/state/TxStateStorage.java
b/modules/transactions/src/main/java/org/apache/ignite/internal/tx/storage/state/TxStateStorage.java
index c513b8f7441..6a46b76a376 100644
---
a/modules/transactions/src/main/java/org/apache/ignite/internal/tx/storage/state/TxStateStorage.java
+++
b/modules/transactions/src/main/java/org/apache/ignite/internal/tx/storage/state/TxStateStorage.java
@@ -33,14 +33,6 @@ public interface TxStateStorage extends ManuallyCloseable {
*/
TxStatePartitionStorage getOrCreatePartitionStorage(int partitionId);
- /*
- * Creates transaction state storage for partition.
- *
- * @param partitionId Partition id.
- * @throws IgniteInternalException In case when the operation has failed.
- */
- TxStatePartitionStorage createPartitionStorage(int partitionId);
-
/**
* Gets transaction state storage.
*
diff --git
a/modules/transactions/src/main/java/org/apache/ignite/internal/tx/storage/state/rocksdb/TxStateRocksDbStorage.java
b/modules/transactions/src/main/java/org/apache/ignite/internal/tx/storage/state/rocksdb/TxStateRocksDbStorage.java
index 9d2f58adefe..a6da379dcd5 100644
---
a/modules/transactions/src/main/java/org/apache/ignite/internal/tx/storage/state/rocksdb/TxStateRocksDbStorage.java
+++
b/modules/transactions/src/main/java/org/apache/ignite/internal/tx/storage/state/rocksdb/TxStateRocksDbStorage.java
@@ -88,7 +88,7 @@ public class TxStateRocksDbStorage implements TxStateStorage {
}
@Override
- public TxStatePartitionStorage getOrCreatePartitionStorage(int
partitionId) {
+ public TxStateRocksDbPartitionStorage getOrCreatePartitionStorage(int
partitionId) {
checkPartitionId(partitionId);
TxStateRocksDbPartitionStorage storage = storages.get(partitionId);
@@ -104,8 +104,13 @@ public class TxStateRocksDbStorage implements
TxStateStorage {
return storage;
}
- @Override
- public TxStateRocksDbPartitionStorage createPartitionStorage(int
partitionId) {
+ /*
+ * Creates transaction state storage for partition.
+ *
+ * @param partitionId Partition id.
+ * @throws IgniteInternalException In case when the operation has failed.
+ */
+ protected TxStateRocksDbPartitionStorage createPartitionStorage(int
partitionId) {
return new TxStateRocksDbPartitionStorage(partitionId, this);
}
diff --git
a/modules/transactions/src/test/java/org/apache/ignite/internal/tx/storage/state/rocksdb/TxStateRocksDbSharedStorageTest.java
b/modules/transactions/src/test/java/org/apache/ignite/internal/tx/storage/state/rocksdb/TxStateRocksDbSharedStorageTest.java
index 35b8e7b7f8e..31677831a61 100644
---
a/modules/transactions/src/test/java/org/apache/ignite/internal/tx/storage/state/rocksdb/TxStateRocksDbSharedStorageTest.java
+++
b/modules/transactions/src/test/java/org/apache/ignite/internal/tx/storage/state/rocksdb/TxStateRocksDbSharedStorageTest.java
@@ -94,7 +94,7 @@ class TxStateRocksDbSharedStorageTest {
TxStateRocksDbStorage zoneStorage = new TxStateRocksDbStorage(zoneId,
2, sharedStorage);
zoneStorage.start();
- TxStateRocksDbPartitionStorage partitionStorage =
zoneStorage.createPartitionStorage(0);
+ TxStateRocksDbPartitionStorage partitionStorage =
zoneStorage.getOrCreatePartitionStorage(0);
partitionStorage.start();
partitionStorage.committedGroupConfiguration(new byte[]{1, 2, 3}, 1,
1);
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 4c3a6419d84..94c2e63fd07 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
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.tx.storage.state;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.nullValue;
+import static org.junit.jupiter.api.Assertions.assertNull;
import java.util.List;
import java.util.UUID;
@@ -81,7 +82,9 @@ public abstract class AbstractTxStateStorageTest extends
BaseIgniteAbstractTest
txStateStorage.destroyPartitionStorage(partitionIndex);
- TxStatePartitionStorage newPartitionStorage =
txStateStorage.createPartitionStorage(partitionIndex);
+ assertNull(txStateStorage.getPartitionStorage(partitionIndex));
+
+ TxStatePartitionStorage newPartitionStorage =
txStateStorage.getOrCreatePartitionStorage(partitionIndex);
assertThat(newPartitionStorage.lastAppliedIndex(), is(0L));
assertThat(newPartitionStorage.lastAppliedTerm(), is(0L));
@@ -106,7 +109,9 @@ public abstract class AbstractTxStateStorageTest extends
BaseIgniteAbstractTest
txStateStorage.destroy();
createAndStartStorage();
- TxStatePartitionStorage newPartitionStorage =
txStateStorage.createPartitionStorage(partitionIndex);
+ assertNull(txStateStorage.getPartitionStorage(partitionIndex));
+
+ TxStatePartitionStorage newPartitionStorage =
txStateStorage.getOrCreatePartitionStorage(partitionIndex);
assertThat(newPartitionStorage.lastAppliedIndex(), is(0L));
assertThat(newPartitionStorage.lastAppliedTerm(), is(0L));
diff --git
a/modules/transactions/src/testFixtures/java/org/apache/ignite/internal/tx/storage/state/test/TestTxStateStorage.java
b/modules/transactions/src/testFixtures/java/org/apache/ignite/internal/tx/storage/state/test/TestTxStateStorage.java
index c012c333b93..3d7eaf231e5 100644
---
a/modules/transactions/src/testFixtures/java/org/apache/ignite/internal/tx/storage/state/test/TestTxStateStorage.java
+++
b/modules/transactions/src/testFixtures/java/org/apache/ignite/internal/tx/storage/state/test/TestTxStateStorage.java
@@ -32,12 +32,7 @@ public class TestTxStateStorage implements TxStateStorage {
private final Map<Integer, TxStatePartitionStorage> storages = new
ConcurrentHashMap<>();
@Override public TxStatePartitionStorage getOrCreatePartitionStorage(int
partitionId) {
- return storages.computeIfAbsent(partitionId, k ->
spy(createPartitionStorage(partitionId)));
- }
-
- @Override
- public TxStatePartitionStorage createPartitionStorage(int partitionId) {
- return new TestTxStatePartitionStorage();
+ return storages.computeIfAbsent(partitionId, k -> spy(new
TestTxStatePartitionStorage()));
}
@Override
