This is an automated email from the ASF dual-hosted git repository. apolovtsev 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 bad208168a IGNITE-21670 Remove MvTableStorage#start method (#3351) bad208168a is described below commit bad208168abc0a084b309fcb03c036d4889961b4 Author: Alexander Polovtcev <alex.polovt...@gmail.com> AuthorDate: Tue Mar 5 11:37:35 2024 +0200 IGNITE-21670 Remove MvTableStorage#start method (#3351) --- .idea/inspectionProfiles/Project_Default.xml | 13 ++++++++++--- .../ignite/internal/storage/engine/MvTableStorage.java | 7 ------- .../storage/engine/ThreadAssertingMvTableStorage.java | 5 ----- .../ignite/internal/storage/AbstractMvTableStorageTest.java | 7 ------- .../internal/storage/engine/AbstractStorageEngineTest.java | 2 -- .../ignite/internal/storage/impl/TestMvTableStorage.java | 4 ---- .../storage/pagememory/AbstractPageMemoryTableStorage.java | 12 ++---------- .../index/PersistentPageMemoryHashIndexStorageTest.java | 2 -- .../index/PersistentPageMemorySortedIndexStorageTest.java | 2 -- .../index/VolatilePageMemoryHashIndexStorageTest.java | 2 -- .../index/VolatilePageMemorySortedIndexStorageTest.java | 2 -- ...rsistentPageMemoryMvPartitionStorageConcurrencyTest.java | 2 -- .../mv/PersistentPageMemoryMvPartitionStorageGcTest.java | 2 -- .../mv/PersistentPageMemoryMvPartitionStorageTest.java | 2 -- ...VolatilePageMemoryMvPartitionStorageConcurrencyTest.java | 5 +---- .../mv/VolatilePageMemoryMvPartitionStorageGcTest.java | 2 -- .../mv/VolatilePageMemoryMvPartitionStorageTest.java | 2 -- .../internal/storage/rocksdb/RocksDbTableStorage.java | 4 ---- .../rocksdb/RocksDbMvPartitionStorageConcurrencyTest.java | 2 -- .../storage/rocksdb/RocksDbMvPartitionStorageGcTest.java | 2 -- .../storage/rocksdb/RocksDbMvPartitionStorageTest.java | 2 -- .../internal/storage/rocksdb/RocksDbMvTableStorageTest.java | 2 -- .../internal/storage/rocksdb/RocksDbStorageEngineTest.java | 4 ---- .../storage/rocksdb/index/RocksDbHashIndexStorageTest.java | 2 -- .../rocksdb/index/RocksDbSortedIndexStorageTest.java | 2 -- .../ignite/internal/table/distributed/TableManager.java | 6 +----- .../gc/PersistentPageMemoryGcUpdateHandlerTest.java | 2 -- .../table/distributed/gc/RocksDbGcUpdateHandlerTest.java | 2 -- .../gc/VolatilePageMemoryGcUpdateHandlerTest.java | 2 -- 29 files changed, 14 insertions(+), 91 deletions(-) diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml index 93292a3748..3ac91d24c4 100644 --- a/.idea/inspectionProfiles/Project_Default.xml +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -731,6 +731,15 @@ <inspection_tool class="JUnit5Converter" enabled="true" level="WARNING" enabled_by_default="true" /> <inspection_tool class="JUnit5Platform" enabled="false" level="WARNING" enabled_by_default="false" /> <inspection_tool class="JUnitDatapoint" enabled="true" level="WARNING" enabled_by_default="true" /> + <inspection_tool class="JUnitMalformedDeclaration" enabled="true" level="ERROR" enabled_by_default="true"> + <option name="ignorableAnnotations"> + <list> + <option value="mockit.Mocked" /> + <option value="org.junit.jupiter.api.io.TempDir" /> + <option value="org.apache.ignite.internal.configuration.testframework.InjectConfiguration" /> + </list> + </option> + </inspection_tool> <inspection_tool class="JUnitRule" enabled="true" level="ERROR" enabled_by_default="true" /> <inspection_tool class="Java8ArraySetAll" enabled="false" level="INFORMATION" enabled_by_default="false" /> <inspection_tool class="Java9CollectionFactory" enabled="true" level="WARNING" enabled_by_default="true" /> @@ -1047,9 +1056,7 @@ <inspection_tool class="SystemGetenv" enabled="true" level="WARNING" enabled_by_default="true" /> <inspection_tool class="TestCaseInProductCode" enabled="true" level="WARNING" enabled_by_default="true" /> <inspection_tool class="TestCaseWithConstructor" enabled="true" level="WARNING" enabled_by_default="true" /> - <inspection_tool class="TestCaseWithNoTestMethods" enabled="true" level="WARNING" enabled_by_default="true"> - <option name="ignoreSupers" value="true" /> - </inspection_tool> + <inspection_tool class="TestCaseWithNoTestMethods" enabled="true" level="WARNING" enabled_by_default="true" /> <inspection_tool class="TestMethodInProductCode" enabled="true" level="WARNING" enabled_by_default="true" /> <inspection_tool class="TestNGDataProvider" enabled="false" level="WARNING" enabled_by_default="false" /> <inspection_tool class="TestOnlyProblems" enabled="true" level="WARNING" enabled_by_default="true" /> diff --git a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/engine/MvTableStorage.java b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/engine/MvTableStorage.java index 65c5801676..3601a6fe3e 100644 --- a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/engine/MvTableStorage.java +++ b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/engine/MvTableStorage.java @@ -129,13 +129,6 @@ public interface MvTableStorage extends ManuallyCloseable { */ boolean isVolatile(); - /** - * Starts the storage. - * - * @throws StorageException If an error has occurred during the start of the storage. - */ - void start() throws StorageException; - /** * Stops and destroys the storage and cleans all allocated resources. * diff --git a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/engine/ThreadAssertingMvTableStorage.java b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/engine/ThreadAssertingMvTableStorage.java index dc36fcbbee..cc80c45bd1 100644 --- a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/engine/ThreadAssertingMvTableStorage.java +++ b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/engine/ThreadAssertingMvTableStorage.java @@ -101,11 +101,6 @@ public class ThreadAssertingMvTableStorage implements MvTableStorage { return tableStorage.isVolatile(); } - @Override - public void start() throws StorageException { - tableStorage.start(); - } - @Override public CompletableFuture<Void> destroy() { assertThreadAllowsToWrite(); diff --git a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/AbstractMvTableStorageTest.java b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/AbstractMvTableStorageTest.java index b16e3d2b89..bde33201b3 100644 --- a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/AbstractMvTableStorageTest.java +++ b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/AbstractMvTableStorageTest.java @@ -124,7 +124,6 @@ public abstract class AbstractMvTableStorageTest extends BaseMvStoragesTest { createTestTableAndIndexes(catalogService); this.tableStorage = createMvTableStorage(); - this.tableStorage.start(); CatalogTableDescriptor catalogTableDescriptor = catalogService.table(TABLE_NAME, clock.nowLong()); @@ -563,8 +562,6 @@ public abstract class AbstractMvTableStorageTest extends BaseMvStoragesTest { // Let's check that after restarting the table we will have an empty partition. tableStorage = createMvTableStorage(); - tableStorage.start(); - mvPartitionStorage = getOrCreateMvPartition(PARTITION_ID); hashIndexStorage = tableStorage.getOrCreateHashIndex(PARTITION_ID, hashIdx); sortedIndexStorage = tableStorage.getOrCreateSortedIndex(PARTITION_ID, sortedIdx); @@ -601,8 +598,6 @@ public abstract class AbstractMvTableStorageTest extends BaseMvStoragesTest { tableStorage = createMvTableStorage(); - tableStorage.start(); - mvPartitionStorage = getOrCreateMvPartition(PARTITION_ID); hashIndexStorage = tableStorage.getOrCreateHashIndex(PARTITION_ID, hashIdx); sortedIndexStorage = tableStorage.getOrCreateSortedIndex(PARTITION_ID, sortedIdx); @@ -745,8 +740,6 @@ public abstract class AbstractMvTableStorageTest extends BaseMvStoragesTest { tableStorage = createMvTableStorage(); - tableStorage.start(); - getOrCreateMvPartition(PARTITION_ID); IndexStorage hashIndexStorageRestarted = tableStorage.getOrCreateIndex(PARTITION_ID, hashIdx); diff --git a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/engine/AbstractStorageEngineTest.java b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/engine/AbstractStorageEngineTest.java index 42e02d5971..5909c6238a 100644 --- a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/engine/AbstractStorageEngineTest.java +++ b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/engine/AbstractStorageEngineTest.java @@ -73,7 +73,6 @@ public abstract class AbstractStorageEngineTest extends BaseMvStoragesTest { MvTableStorage mvTableStorage = storageEngine.createMvTable(tableDescriptor, indexSupplier); - mvTableStorage.start(); try (AutoCloseable ignored0 = mvTableStorage::close) { CompletableFuture<MvPartitionStorage> mvPartitionStorageFuture = mvTableStorage.createMvPartition(0); @@ -102,7 +101,6 @@ public abstract class AbstractStorageEngineTest extends BaseMvStoragesTest { mvTableStorage = storageEngine.createMvTable(tableDescriptor, indexSupplier); - mvTableStorage.start(); try (AutoCloseable ignored0 = mvTableStorage::close) { CompletableFuture<MvPartitionStorage> mvPartitionStorageFuture = mvTableStorage.createMvPartition(0); diff --git a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/impl/TestMvTableStorage.java b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/impl/TestMvTableStorage.java index 8798f40c3a..2fbcbeb80c 100644 --- a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/impl/TestMvTableStorage.java +++ b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/impl/TestMvTableStorage.java @@ -201,10 +201,6 @@ public class TestMvTableStorage implements MvTableStorage { return true; } - @Override - public void start() throws StorageException { - } - @Override public void close() throws StorageException { try { diff --git a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/AbstractPageMemoryTableStorage.java b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/AbstractPageMemoryTableStorage.java index fed6fb773b..de31b63d50 100644 --- a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/AbstractPageMemoryTableStorage.java +++ b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/AbstractPageMemoryTableStorage.java @@ -53,7 +53,7 @@ import org.jetbrains.annotations.Nullable; * Abstract table storage implementation based on {@link PageMemory}. */ public abstract class AbstractPageMemoryTableStorage implements MvTableStorage { - private volatile MvPartitionStorages<AbstractPageMemoryMvPartitionStorage> mvPartitionStorages; + private final MvPartitionStorages<AbstractPageMemoryMvPartitionStorage> mvPartitionStorages; private final IgniteSpinBusyLock busyLock = new IgniteSpinBusyLock(); @@ -78,6 +78,7 @@ public abstract class AbstractPageMemoryTableStorage implements MvTableStorage { ) { this.tableDescriptor = tableDescriptor; this.indexDescriptorSupplier = indexDescriptorSupplier; + this.mvPartitionStorages = new MvPartitionStorages<>(tableDescriptor.getId(), tableDescriptor.getPartitions()); } /** @@ -92,15 +93,6 @@ public abstract class AbstractPageMemoryTableStorage implements MvTableStorage { */ public abstract DataRegion<?> dataRegion(); - @Override - public void start() throws StorageException { - busy(() -> { - mvPartitionStorages = new MvPartitionStorages<>(getTableId(), tableDescriptor.getPartitions()); - - return null; - }); - } - @Override public CompletableFuture<Void> destroy() { if (!stopGuard.compareAndSet(false, true)) { diff --git a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/index/PersistentPageMemoryHashIndexStorageTest.java b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/index/PersistentPageMemoryHashIndexStorageTest.java index b3cd409b2e..d690684b0e 100644 --- a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/index/PersistentPageMemoryHashIndexStorageTest.java +++ b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/index/PersistentPageMemoryHashIndexStorageTest.java @@ -64,8 +64,6 @@ class PersistentPageMemoryHashIndexStorageTest extends AbstractPageMemoryHashInd new StorageIndexDescriptorSupplier(catalogService) ); - tableStorage.start(); - initialize(tableStorage, engineConfig); } diff --git a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/index/PersistentPageMemorySortedIndexStorageTest.java b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/index/PersistentPageMemorySortedIndexStorageTest.java index 6b11bd45de..c1ab65a0e8 100644 --- a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/index/PersistentPageMemorySortedIndexStorageTest.java +++ b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/index/PersistentPageMemorySortedIndexStorageTest.java @@ -69,8 +69,6 @@ class PersistentPageMemorySortedIndexStorageTest extends AbstractPageMemorySorte new StorageIndexDescriptorSupplier(catalogService) ); - tableStorage.start(); - initialize(tableStorage, engineConfig); } diff --git a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/index/VolatilePageMemoryHashIndexStorageTest.java b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/index/VolatilePageMemoryHashIndexStorageTest.java index 32714ab93e..9b6669415d 100644 --- a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/index/VolatilePageMemoryHashIndexStorageTest.java +++ b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/index/VolatilePageMemoryHashIndexStorageTest.java @@ -58,8 +58,6 @@ class VolatilePageMemoryHashIndexStorageTest extends AbstractPageMemoryHashIndex new StorageIndexDescriptorSupplier(catalogService) ); - tableStorage.start(); - initialize(tableStorage, engineConfig); } diff --git a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/index/VolatilePageMemorySortedIndexStorageTest.java b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/index/VolatilePageMemorySortedIndexStorageTest.java index 4078bacc5a..c8891363ae 100644 --- a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/index/VolatilePageMemorySortedIndexStorageTest.java +++ b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/index/VolatilePageMemorySortedIndexStorageTest.java @@ -58,8 +58,6 @@ class VolatilePageMemorySortedIndexStorageTest extends AbstractPageMemorySortedI new StorageIndexDescriptorSupplier(catalogService) ); - tableStorage.start(); - initialize(tableStorage, engineConfig); } diff --git a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvPartitionStorageConcurrencyTest.java b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvPartitionStorageConcurrencyTest.java index ec43fe6bc0..ed3b8bd475 100644 --- a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvPartitionStorageConcurrencyTest.java +++ b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvPartitionStorageConcurrencyTest.java @@ -64,8 +64,6 @@ class PersistentPageMemoryMvPartitionStorageConcurrencyTest extends AbstractMvPa new StorageIndexDescriptorSupplier(mock(CatalogService.class)) ); - table.start(); - initialize(table); } diff --git a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvPartitionStorageGcTest.java b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvPartitionStorageGcTest.java index a2876668e7..5025203771 100644 --- a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvPartitionStorageGcTest.java +++ b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvPartitionStorageGcTest.java @@ -64,8 +64,6 @@ class PersistentPageMemoryMvPartitionStorageGcTest extends AbstractMvPartitionSt new StorageIndexDescriptorSupplier(mock(CatalogService.class)) ); - table.start(); - initialize(table); } diff --git a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvPartitionStorageTest.java b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvPartitionStorageTest.java index 163d8da7e2..4832c4f8bf 100644 --- a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvPartitionStorageTest.java +++ b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvPartitionStorageTest.java @@ -75,8 +75,6 @@ class PersistentPageMemoryMvPartitionStorageTest extends AbstractPageMemoryMvPar new StorageIndexDescriptorSupplier(mock(CatalogService.class)) ); - table.start(); - initialize(table); } diff --git a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/VolatilePageMemoryMvPartitionStorageConcurrencyTest.java b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/VolatilePageMemoryMvPartitionStorageConcurrencyTest.java index 0e168c08e2..5e4a7826c2 100644 --- a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/VolatilePageMemoryMvPartitionStorageConcurrencyTest.java +++ b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/VolatilePageMemoryMvPartitionStorageConcurrencyTest.java @@ -42,8 +42,7 @@ class VolatilePageMemoryMvPartitionStorageConcurrencyTest extends AbstractMvPart @BeforeEach void setUp( - @InjectConfiguration - VolatilePageMemoryStorageEngineConfiguration engineConfig + @InjectConfiguration VolatilePageMemoryStorageEngineConfiguration engineConfig ) { var ioRegistry = new PageIoRegistry(); @@ -58,8 +57,6 @@ class VolatilePageMemoryMvPartitionStorageConcurrencyTest extends AbstractMvPart new StorageIndexDescriptorSupplier(mock(CatalogService.class)) ); - table.start(); - initialize(table); } diff --git a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/VolatilePageMemoryMvPartitionStorageGcTest.java b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/VolatilePageMemoryMvPartitionStorageGcTest.java index 058f530dce..75481fa552 100644 --- a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/VolatilePageMemoryMvPartitionStorageGcTest.java +++ b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/VolatilePageMemoryMvPartitionStorageGcTest.java @@ -57,8 +57,6 @@ class VolatilePageMemoryMvPartitionStorageGcTest extends AbstractMvPartitionStor new StorageIndexDescriptorSupplier(mock(CatalogService.class)) ); - table.start(); - initialize(table); } diff --git a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/VolatilePageMemoryMvPartitionStorageTest.java b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/VolatilePageMemoryMvPartitionStorageTest.java index af35e1843c..1a92b4c6c0 100644 --- a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/VolatilePageMemoryMvPartitionStorageTest.java +++ b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/VolatilePageMemoryMvPartitionStorageTest.java @@ -57,8 +57,6 @@ class VolatilePageMemoryMvPartitionStorageTest extends AbstractPageMemoryMvParti new StorageIndexDescriptorSupplier(mock(CatalogService.class)) ); - table.start(); - initialize(table); } diff --git a/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/RocksDbTableStorage.java b/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/RocksDbTableStorage.java index 69cad3ca2a..8bd6369c74 100644 --- a/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/RocksDbTableStorage.java +++ b/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/RocksDbTableStorage.java @@ -135,10 +135,6 @@ public class RocksDbTableStorage implements MvTableStorage { return rocksDb.gcQueueCf.handle(); } - @Override - public void start() { - } - /** * Returns a future to wait next flush operation from the current point in time. Uses {@link RocksDB#getLatestSequenceNumber()} to * achieve this. diff --git a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvPartitionStorageConcurrencyTest.java b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvPartitionStorageConcurrencyTest.java index 8161f3dea4..2db6b43e13 100644 --- a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvPartitionStorageConcurrencyTest.java +++ b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvPartitionStorageConcurrencyTest.java @@ -59,8 +59,6 @@ public class RocksDbMvPartitionStorageConcurrencyTest extends AbstractMvPartitio new StorageIndexDescriptorSupplier(mock(CatalogService.class)) ); - table.start(); - initialize(table); } diff --git a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvPartitionStorageGcTest.java b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvPartitionStorageGcTest.java index 05c3fa60f8..1d511a3eb3 100644 --- a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvPartitionStorageGcTest.java +++ b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvPartitionStorageGcTest.java @@ -59,8 +59,6 @@ public class RocksDbMvPartitionStorageGcTest extends AbstractMvPartitionStorageG new StorageIndexDescriptorSupplier(mock(CatalogService.class)) ); - table.start(); - initialize(table); } diff --git a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvPartitionStorageTest.java b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvPartitionStorageTest.java index 7df9af0e5e..0ca7d8e2bf 100644 --- a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvPartitionStorageTest.java +++ b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvPartitionStorageTest.java @@ -59,8 +59,6 @@ public class RocksDbMvPartitionStorageTest extends AbstractMvPartitionStorageTes new StorageIndexDescriptorSupplier(mock(CatalogService.class)) ); - table.start(); - initialize(table); } diff --git a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvTableStorageTest.java b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvTableStorageTest.java index 85dbd5bbd4..9c5515265a 100644 --- a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvTableStorageTest.java +++ b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvTableStorageTest.java @@ -145,8 +145,6 @@ public class RocksDbMvTableStorageTest extends AbstractMvTableStorageTest { tableStorage = createMvTableStorage(); - tableStorage.start(); - assertThat(tableStorage.getMvPartition(PARTITION_ID), is(nullValue())); assertThat(tableStorage.createMvPartition(PARTITION_ID), willCompleteSuccessfully()); diff --git a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbStorageEngineTest.java b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbStorageEngineTest.java index eaa497e969..99b87f3cc5 100644 --- a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbStorageEngineTest.java +++ b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbStorageEngineTest.java @@ -76,8 +76,6 @@ public class RocksDbStorageEngineTest extends BaseIgniteAbstractTest { new StorageIndexDescriptorSupplier(mock(CatalogService.class)) ); - table.start(); - getOrCreateMvPartition(table, 1); } @@ -95,8 +93,6 @@ public class RocksDbStorageEngineTest extends BaseIgniteAbstractTest { new StorageIndexDescriptorSupplier(mock(CatalogService.class)) ); - table.start(); - getOrCreateMvPartition(table, 1); } } diff --git a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/index/RocksDbHashIndexStorageTest.java b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/index/RocksDbHashIndexStorageTest.java index 89c082c3f4..b6cadb23cc 100644 --- a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/index/RocksDbHashIndexStorageTest.java +++ b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/index/RocksDbHashIndexStorageTest.java @@ -58,8 +58,6 @@ public class RocksDbHashIndexStorageTest extends AbstractHashIndexStorageTest { new StorageIndexDescriptorSupplier(catalogService) ); - tableStorage.start(); - initialize(tableStorage); } diff --git a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/index/RocksDbSortedIndexStorageTest.java b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/index/RocksDbSortedIndexStorageTest.java index a461ed39d0..aa8612d737 100644 --- a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/index/RocksDbSortedIndexStorageTest.java +++ b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/index/RocksDbSortedIndexStorageTest.java @@ -58,8 +58,6 @@ public class RocksDbSortedIndexStorageTest extends AbstractSortedIndexStorageTes new StorageIndexDescriptorSupplier(catalogService) ); - tableStorage.start(); - initialize(tableStorage); } 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 41ffe794cc..561ff10ddf 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 @@ -1345,14 +1345,10 @@ public class TableManager implements IgniteTablesInternal, IgniteComponent { assert engine != null : "tableId=" + tableDescriptor.id() + ", engine=" + dataStorage.engine(); - MvTableStorage tableStorage = engine.createMvTable( + return engine.createMvTable( new StorageTableDescriptor(tableDescriptor.id(), zoneDescriptor.partitions(), dataStorage.dataRegion()), new StorageIndexDescriptorSupplier(catalogService) ); - - tableStorage.start(); - - return tableStorage; } /** diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/gc/PersistentPageMemoryGcUpdateHandlerTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/gc/PersistentPageMemoryGcUpdateHandlerTest.java index 4d9a53a2d5..6c011b6cd4 100644 --- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/gc/PersistentPageMemoryGcUpdateHandlerTest.java +++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/gc/PersistentPageMemoryGcUpdateHandlerTest.java @@ -74,8 +74,6 @@ class PersistentPageMemoryGcUpdateHandlerTest extends AbstractGcUpdateHandlerTes new StorageIndexDescriptorSupplier(mock(CatalogService.class)) ); - table.start(); - initialize(table); } diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/gc/RocksDbGcUpdateHandlerTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/gc/RocksDbGcUpdateHandlerTest.java index 8541671597..01d251a0ac 100644 --- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/gc/RocksDbGcUpdateHandlerTest.java +++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/gc/RocksDbGcUpdateHandlerTest.java @@ -58,8 +58,6 @@ class RocksDbGcUpdateHandlerTest extends AbstractGcUpdateHandlerTest { new StorageIndexDescriptorSupplier(mock(CatalogService.class)) ); - table.start(); - initialize(table); } diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/gc/VolatilePageMemoryGcUpdateHandlerTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/gc/VolatilePageMemoryGcUpdateHandlerTest.java index 8b4347974d..4e240e1bd2 100644 --- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/gc/VolatilePageMemoryGcUpdateHandlerTest.java +++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/gc/VolatilePageMemoryGcUpdateHandlerTest.java @@ -56,8 +56,6 @@ class VolatilePageMemoryGcUpdateHandlerTest extends AbstractGcUpdateHandlerTest new StorageIndexDescriptorSupplier(mock(CatalogService.class)) ); - table.start(); - initialize(table); }