You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ib...@apache.org on 2025/03/12 10:12:29 UTC
(ignite-3) branch main updated: IGNITE-24766 Remove unnecessary configuration parameters from storage engines (#5397)
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 e64e210cd78 IGNITE-24766 Remove unnecessary configuration parameters from storage engines (#5397)
e64e210cd78 is described below
commit e64e210cd786566325cd45d98b94e809814d1aff
Author: Ivan Bessonov <be...@gmail.com>
AuthorDate: Wed Mar 12 13:12:24 2025 +0300
IGNITE-24766 Remove unnecessary configuration parameters from storage engines (#5397)
---
.../pagememory/PersistentPageMemoryDataStorageModule.java | 8 --------
.../pagememory/PersistentPageMemoryStorageEngine.java | 8 +++-----
.../pagememory/VolatilePageMemoryDataStorageModule.java | 8 --------
.../pagememory/VolatilePageMemoryStorageEngine.java | 13 +++++++++----
.../PersistentPageMemoryMvTableStorageTest.java | 3 ---
.../pagememory/VolatilePageMemoryMvTableStorageTest.java | 4 +---
.../engine/PersistentPageMemoryStorageEngineTest.java | 5 -----
.../index/PersistentPageMemoryHashIndexStorageTest.java | 6 +-----
.../index/PersistentPageMemorySortedIndexStorageTest.java | 6 +-----
.../index/VolatilePageMemoryHashIndexStorageTest.java | 7 ++-----
.../index/VolatilePageMemorySortedIndexStorageTest.java | 7 ++-----
...istentPageMemoryMvPartitionStorageConcurrencyTest.java | 4 ----
.../mv/PersistentPageMemoryMvPartitionStorageGcTest.java | 4 ----
.../mv/PersistentPageMemoryMvPartitionStorageTest.java | 7 +------
...PersistentPageMemoryMvTableStorageConcurrencyTest.java | 4 ----
...latilePageMemoryMvPartitionStorageConcurrencyTest.java | 4 +---
.../mv/VolatilePageMemoryMvPartitionStorageGcTest.java | 4 +---
.../mv/VolatilePageMemoryMvPartitionStorageTest.java | 8 ++------
.../VolatilePageMemoryMvTableStorageConcurrencyTest.java | 4 +---
.../storage/rocksdb/RocksDbDataStorageModule.java | 7 +------
.../internal/storage/rocksdb/RocksDbStorageEngine.java | 10 ++++------
.../rocksdb/RocksDbMvPartitionStorageConcurrencyTest.java | 5 +----
.../storage/rocksdb/RocksDbMvPartitionStorageGcTest.java | 5 +----
.../storage/rocksdb/RocksDbMvPartitionStorageTest.java | 5 +----
.../rocksdb/RocksDbMvTableStorageConcurrencyTest.java | 5 +----
.../storage/rocksdb/RocksDbMvTableStorageTest.java | 5 +----
.../rocksdb/benchmarks/CommitManyWritesBenchmark.java | 15 ---------------
.../storage/rocksdb/engine/RocksDbStorageEngineTest.java | 5 -----
.../rocksdb/index/RocksDbHashIndexStorageTest.java | 5 +----
.../rocksdb/index/RocksDbSortedIndexStorageTest.java | 5 +----
.../rocksdb/instance/SharedRocksDbInstanceTest.java | 4 +---
.../gc/PersistentPageMemoryGcUpdateHandlerTest.java | 3 ---
.../table/distributed/gc/RocksDbGcUpdateHandlerTest.java | 3 ---
.../gc/VolatilePageMemoryGcUpdateHandlerTest.java | 4 +---
34 files changed, 39 insertions(+), 161 deletions(-)
diff --git a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/PersistentPageMemoryDataStorageModule.java b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/PersistentPageMemoryDataStorageModule.java
index e43a4f99eb1..bba04e7329a 100644
--- a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/PersistentPageMemoryDataStorageModule.java
+++ b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/PersistentPageMemoryDataStorageModule.java
@@ -34,8 +34,6 @@ import org.apache.ignite.internal.storage.StorageException;
import org.apache.ignite.internal.storage.configurations.StorageConfiguration;
import org.apache.ignite.internal.storage.configurations.StorageExtensionConfiguration;
import org.apache.ignite.internal.storage.engine.StorageEngine;
-import org.apache.ignite.internal.storage.pagememory.configuration.schema.PersistentPageMemoryStorageEngineConfiguration;
-import org.apache.ignite.internal.storage.pagememory.configuration.schema.PersistentPageMemoryStorageEngineExtensionConfiguration;
import org.jetbrains.annotations.Nullable;
/**
@@ -62,11 +60,6 @@ public class PersistentPageMemoryDataStorageModule implements DataStorageModule
) throws StorageException {
StorageConfiguration storageConfig = configRegistry.getConfiguration(StorageExtensionConfiguration.KEY).storage();
- PersistentPageMemoryStorageEngineConfiguration engineConfig =
- ((PersistentPageMemoryStorageEngineExtensionConfiguration) storageConfig.engines()).aipersist();
-
- assert engineConfig != null;
-
PageIoRegistry ioRegistry = new PageIoRegistry();
ioRegistry.loadFromServiceLoader();
@@ -74,7 +67,6 @@ public class PersistentPageMemoryDataStorageModule implements DataStorageModule
return new PersistentPageMemoryStorageEngine(
igniteInstanceName,
metricManager,
- engineConfig,
storageConfig,
ioRegistry,
storagePath,
diff --git a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/PersistentPageMemoryStorageEngine.java b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/PersistentPageMemoryStorageEngine.java
index ca4fadff87c..e908f60adab 100644
--- a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/PersistentPageMemoryStorageEngine.java
+++ b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/PersistentPageMemoryStorageEngine.java
@@ -54,6 +54,7 @@ import org.apache.ignite.internal.storage.engine.MvTableStorage;
import org.apache.ignite.internal.storage.engine.StorageTableDescriptor;
import org.apache.ignite.internal.storage.index.StorageIndexDescriptorSupplier;
import org.apache.ignite.internal.storage.pagememory.configuration.schema.PersistentPageMemoryStorageEngineConfiguration;
+import org.apache.ignite.internal.storage.pagememory.configuration.schema.PersistentPageMemoryStorageEngineExtensionConfiguration;
import org.apache.ignite.internal.thread.NamedThreadFactory;
import org.jetbrains.annotations.Nullable;
@@ -107,20 +108,17 @@ public class PersistentPageMemoryStorageEngine extends AbstractPageMemoryStorage
* Constructor.
*
* @param igniteInstanceName Ignite instance name.
- * @param engineConfig PageMemory storage engine configuration.
* @param storageConfig Storage engine and storage profiles configurations.
* @param ioRegistry IO registry.
* @param storagePath Storage path.
- * @param failureManager Failure processor that is used to handle critical errors.
* @param longJvmPauseDetector Long JVM pause detector.
+ * @param failureManager Failure processor that is used to handle critical errors.
* @param logSyncer Write-ahead log synchronizer.
* @param clock Hybrid Logical Clock.
*/
public PersistentPageMemoryStorageEngine(
String igniteInstanceName,
MetricManager metricManager,
- // TODO IGNITE-24766 Remove this parameter.
- PersistentPageMemoryStorageEngineConfiguration engineConfig,
StorageConfiguration storageConfig,
PageIoRegistry ioRegistry,
Path storagePath,
@@ -133,8 +131,8 @@ public class PersistentPageMemoryStorageEngine extends AbstractPageMemoryStorage
this.igniteInstanceName = igniteInstanceName;
this.metricManager = metricManager;
- this.engineConfig = engineConfig;
this.storageConfig = storageConfig;
+ this.engineConfig = ((PersistentPageMemoryStorageEngineExtensionConfiguration) storageConfig.engines()).aipersist();
this.ioRegistry = ioRegistry;
this.storagePath = storagePath;
this.longJvmPauseDetector = longJvmPauseDetector;
diff --git a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/VolatilePageMemoryDataStorageModule.java b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/VolatilePageMemoryDataStorageModule.java
index f6f19d7275f..7f6a97bd106 100644
--- a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/VolatilePageMemoryDataStorageModule.java
+++ b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/VolatilePageMemoryDataStorageModule.java
@@ -34,8 +34,6 @@ import org.apache.ignite.internal.storage.StorageException;
import org.apache.ignite.internal.storage.configurations.StorageConfiguration;
import org.apache.ignite.internal.storage.configurations.StorageExtensionConfiguration;
import org.apache.ignite.internal.storage.engine.StorageEngine;
-import org.apache.ignite.internal.storage.pagememory.configuration.schema.VolatilePageMemoryStorageEngineConfiguration;
-import org.apache.ignite.internal.storage.pagememory.configuration.schema.VolatilePageMemoryStorageEngineExtensionConfiguration;
import org.jetbrains.annotations.Nullable;
/**
@@ -62,18 +60,12 @@ public class VolatilePageMemoryDataStorageModule implements DataStorageModule {
) throws StorageException {
StorageConfiguration storageConfig = configRegistry.getConfiguration(StorageExtensionConfiguration.KEY).storage();
- VolatilePageMemoryStorageEngineConfiguration engineConfig =
- ((VolatilePageMemoryStorageEngineExtensionConfiguration) storageConfig.engines()).aimem();
-
- assert engineConfig != null;
-
PageIoRegistry ioRegistry = new PageIoRegistry();
ioRegistry.loadFromServiceLoader();
return new VolatilePageMemoryStorageEngine(
igniteInstanceName,
- engineConfig,
storageConfig,
ioRegistry,
clock
diff --git a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/VolatilePageMemoryStorageEngine.java b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/VolatilePageMemoryStorageEngine.java
index e5b726f5ab9..c976a37a698 100644
--- a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/VolatilePageMemoryStorageEngine.java
+++ b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/VolatilePageMemoryStorageEngine.java
@@ -40,6 +40,7 @@ import org.apache.ignite.internal.storage.configurations.StorageConfiguration;
import org.apache.ignite.internal.storage.engine.StorageTableDescriptor;
import org.apache.ignite.internal.storage.index.StorageIndexDescriptorSupplier;
import org.apache.ignite.internal.storage.pagememory.configuration.schema.VolatilePageMemoryStorageEngineConfiguration;
+import org.apache.ignite.internal.storage.pagememory.configuration.schema.VolatilePageMemoryStorageEngineExtensionConfiguration;
import org.apache.ignite.internal.thread.NamedThreadFactory;
/** Storage engine implementation based on {@link VolatilePageMemory}. */
@@ -72,15 +73,12 @@ public class VolatilePageMemoryStorageEngine extends AbstractPageMemoryStorageEn
* Constructor.
*
* @param igniteInstanceName Ignite instance name.
- * @param engineConfig PageMemory storage engine configuration.
* @param storageConfig Storage engine and storage profiles configurations.
* @param ioRegistry IO registry.
* @param clock Hybrid Logical Clock.
*/
public VolatilePageMemoryStorageEngine(
String igniteInstanceName,
- // TODO IGNITE-24766 Remove this parameter.
- VolatilePageMemoryStorageEngineConfiguration engineConfig,
StorageConfiguration storageConfig,
PageIoRegistry ioRegistry,
HybridClock clock
@@ -88,11 +86,18 @@ public class VolatilePageMemoryStorageEngine extends AbstractPageMemoryStorageEn
super(clock);
this.igniteInstanceName = igniteInstanceName;
- this.engineConfig = engineConfig;
this.storageConfig = storageConfig;
+ this.engineConfig = ((VolatilePageMemoryStorageEngineExtensionConfiguration) storageConfig.engines()).aimem();
this.ioRegistry = ioRegistry;
}
+ /**
+ * Returns a storage engine configuration.
+ */
+ public VolatilePageMemoryStorageEngineConfiguration configuration() {
+ return engineConfig;
+ }
+
@Override
public String name() {
return ENGINE_NAME;
diff --git a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/PersistentPageMemoryMvTableStorageTest.java b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/PersistentPageMemoryMvTableStorageTest.java
index 3f1dbd76eea..2ec430baf6f 100644
--- a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/PersistentPageMemoryMvTableStorageTest.java
+++ b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/PersistentPageMemoryMvTableStorageTest.java
@@ -38,7 +38,6 @@ import org.apache.ignite.internal.storage.RowId;
import org.apache.ignite.internal.storage.configurations.StorageConfiguration;
import org.apache.ignite.internal.storage.engine.MvTableStorage;
import org.apache.ignite.internal.storage.engine.StorageTableDescriptor;
-import org.apache.ignite.internal.storage.pagememory.configuration.schema.PersistentPageMemoryStorageEngineConfiguration;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.apache.ignite.internal.util.IgniteUtils;
@@ -59,7 +58,6 @@ public class PersistentPageMemoryMvTableStorageTest extends AbstractMvTableStora
@BeforeEach
void setUp(
@WorkDirectory Path workDir,
- @InjectConfiguration PersistentPageMemoryStorageEngineConfiguration engineConfig,
@InjectConfiguration("mock.profiles.default.engine = aipersist")
StorageConfiguration storageConfig
) {
@@ -70,7 +68,6 @@ public class PersistentPageMemoryMvTableStorageTest extends AbstractMvTableStora
engine = new PersistentPageMemoryStorageEngine(
"test",
mock(MetricManager.class),
- engineConfig,
storageConfig,
ioRegistry,
workDir,
diff --git a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/VolatilePageMemoryMvTableStorageTest.java b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/VolatilePageMemoryMvTableStorageTest.java
index 50114ef2797..628a44a71a1 100644
--- a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/VolatilePageMemoryMvTableStorageTest.java
+++ b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/VolatilePageMemoryMvTableStorageTest.java
@@ -43,7 +43,6 @@ import org.apache.ignite.internal.storage.engine.StorageTableDescriptor;
import org.apache.ignite.internal.storage.index.HashIndexStorage;
import org.apache.ignite.internal.storage.index.IndexRowImpl;
import org.apache.ignite.internal.storage.index.SortedIndexStorage;
-import org.apache.ignite.internal.storage.pagememory.configuration.schema.VolatilePageMemoryStorageEngineConfiguration;
import org.apache.ignite.internal.type.NativeTypes;
import org.apache.ignite.internal.util.IgniteUtils;
import org.junit.jupiter.api.AfterEach;
@@ -58,7 +57,6 @@ public class VolatilePageMemoryMvTableStorageTest extends AbstractMvTableStorage
@BeforeEach
void setUp(
- @InjectConfiguration VolatilePageMemoryStorageEngineConfiguration engineConfig,
@InjectConfiguration("mock.profiles.default = {engine = aimem}")
StorageConfiguration storageConfig
) {
@@ -66,7 +64,7 @@ public class VolatilePageMemoryMvTableStorageTest extends AbstractMvTableStorage
ioRegistry.loadFromServiceLoader();
- engine = new VolatilePageMemoryStorageEngine("node", engineConfig, storageConfig, ioRegistry, clock);
+ engine = new VolatilePageMemoryStorageEngine("node", storageConfig, ioRegistry, clock);
engine.start();
diff --git a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/engine/PersistentPageMemoryStorageEngineTest.java b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/engine/PersistentPageMemoryStorageEngineTest.java
index 6c285081e64..e5b52f27808 100644
--- a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/engine/PersistentPageMemoryStorageEngineTest.java
+++ b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/engine/PersistentPageMemoryStorageEngineTest.java
@@ -28,7 +28,6 @@ import org.apache.ignite.internal.storage.configurations.StorageConfiguration;
import org.apache.ignite.internal.storage.engine.AbstractStorageEngineTest;
import org.apache.ignite.internal.storage.engine.StorageEngine;
import org.apache.ignite.internal.storage.pagememory.PersistentPageMemoryStorageEngine;
-import org.apache.ignite.internal.storage.pagememory.configuration.schema.PersistentPageMemoryStorageEngineConfiguration;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -38,9 +37,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
*/
@ExtendWith(WorkDirectoryExtension.class)
public class PersistentPageMemoryStorageEngineTest extends AbstractStorageEngineTest {
- @InjectConfiguration("mock {checkpoint.checkpointDelayMillis = 0}")
- private PersistentPageMemoryStorageEngineConfiguration engineConfig;
-
@InjectConfiguration("mock.profiles.default = {engine = \"aipersist\", size = 1048576}")
private StorageConfiguration storageConfig;
@@ -56,7 +52,6 @@ public class PersistentPageMemoryStorageEngineTest extends AbstractStorageEngine
return new PersistentPageMemoryStorageEngine(
"test",
mock(MetricManager.class),
- engineConfig,
storageConfig,
ioRegistry,
workDir,
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 f1fb91e8226..21a8fc7fcc3 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
@@ -33,7 +33,6 @@ import org.apache.ignite.internal.storage.configurations.StorageConfiguration;
import org.apache.ignite.internal.storage.engine.StorageTableDescriptor;
import org.apache.ignite.internal.storage.index.StorageIndexDescriptorSupplier;
import org.apache.ignite.internal.storage.pagememory.PersistentPageMemoryStorageEngine;
-import org.apache.ignite.internal.storage.pagememory.configuration.schema.PersistentPageMemoryStorageEngineConfiguration;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.junit.jupiter.api.AfterEach;
@@ -51,8 +50,6 @@ class PersistentPageMemoryHashIndexStorageTest extends AbstractPageMemoryHashInd
void setUp(
@WorkDirectory
Path workDir,
- @InjectConfiguration
- PersistentPageMemoryStorageEngineConfiguration engineConfig,
@InjectConfiguration("mock.profiles.default = {engine = aipersist}")
StorageConfiguration storageConfig
) {
@@ -63,7 +60,6 @@ class PersistentPageMemoryHashIndexStorageTest extends AbstractPageMemoryHashInd
engine = new PersistentPageMemoryStorageEngine(
"test",
mock(MetricManager.class),
- engineConfig,
storageConfig,
ioRegistry,
workDir,
@@ -80,7 +76,7 @@ class PersistentPageMemoryHashIndexStorageTest extends AbstractPageMemoryHashInd
mock(StorageIndexDescriptorSupplier.class)
);
- initialize(tableStorage, engineConfig.pageSize().value());
+ initialize(tableStorage, engine.configuration().pageSize().value());
}
@AfterEach
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 20ac9c2a6b0..fd604a06ee7 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
@@ -33,7 +33,6 @@ import org.apache.ignite.internal.storage.configurations.StorageConfiguration;
import org.apache.ignite.internal.storage.engine.StorageTableDescriptor;
import org.apache.ignite.internal.storage.index.StorageIndexDescriptorSupplier;
import org.apache.ignite.internal.storage.pagememory.PersistentPageMemoryStorageEngine;
-import org.apache.ignite.internal.storage.pagememory.configuration.schema.PersistentPageMemoryStorageEngineConfiguration;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.junit.jupiter.api.AfterEach;
@@ -50,8 +49,6 @@ class PersistentPageMemorySortedIndexStorageTest extends AbstractPageMemorySorte
@BeforeEach
void setUp(
@WorkDirectory Path workDir,
- @InjectConfiguration
- PersistentPageMemoryStorageEngineConfiguration engineConfig,
@InjectConfiguration("mock.profiles.default = {engine = aipersist}")
StorageConfiguration storageConfig
) {
@@ -62,7 +59,6 @@ class PersistentPageMemorySortedIndexStorageTest extends AbstractPageMemorySorte
engine = new PersistentPageMemoryStorageEngine(
"test",
mock(MetricManager.class),
- engineConfig,
storageConfig,
ioRegistry,
workDir,
@@ -79,7 +75,7 @@ class PersistentPageMemorySortedIndexStorageTest extends AbstractPageMemorySorte
mock(StorageIndexDescriptorSupplier.class)
);
- initialize(tableStorage, engineConfig.pageSize().value());
+ initialize(tableStorage, engine.configuration().pageSize().value());
}
@AfterEach
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 e6d6bcbdd1a..3f743f47c96 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
@@ -29,7 +29,6 @@ import org.apache.ignite.internal.storage.configurations.StorageConfiguration;
import org.apache.ignite.internal.storage.engine.StorageTableDescriptor;
import org.apache.ignite.internal.storage.index.StorageIndexDescriptorSupplier;
import org.apache.ignite.internal.storage.pagememory.VolatilePageMemoryStorageEngine;
-import org.apache.ignite.internal.storage.pagememory.configuration.schema.VolatilePageMemoryStorageEngineConfiguration;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -43,8 +42,6 @@ class VolatilePageMemoryHashIndexStorageTest extends AbstractPageMemoryHashIndex
@BeforeEach
void setUp(
- @InjectConfiguration
- VolatilePageMemoryStorageEngineConfiguration engineConfig,
@InjectConfiguration("mock.profiles.default = {engine = aimem}")
StorageConfiguration storageConfig
) {
@@ -52,7 +49,7 @@ class VolatilePageMemoryHashIndexStorageTest extends AbstractPageMemoryHashIndex
ioRegistry.loadFromServiceLoader();
- engine = new VolatilePageMemoryStorageEngine("node", engineConfig, storageConfig, ioRegistry, clock);
+ engine = new VolatilePageMemoryStorageEngine("node", storageConfig, ioRegistry, clock);
engine.start();
@@ -61,7 +58,7 @@ class VolatilePageMemoryHashIndexStorageTest extends AbstractPageMemoryHashIndex
mock(StorageIndexDescriptorSupplier.class)
);
- initialize(tableStorage, engineConfig.pageSize().value());
+ initialize(tableStorage, engine.configuration().pageSize().value());
}
@AfterEach
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 512ee0513b5..5d661bcc38f 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
@@ -29,7 +29,6 @@ import org.apache.ignite.internal.storage.configurations.StorageConfiguration;
import org.apache.ignite.internal.storage.engine.StorageTableDescriptor;
import org.apache.ignite.internal.storage.index.StorageIndexDescriptorSupplier;
import org.apache.ignite.internal.storage.pagememory.VolatilePageMemoryStorageEngine;
-import org.apache.ignite.internal.storage.pagememory.configuration.schema.VolatilePageMemoryStorageEngineConfiguration;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -43,8 +42,6 @@ class VolatilePageMemorySortedIndexStorageTest extends AbstractPageMemorySortedI
@BeforeEach
void setUp(
- @InjectConfiguration
- VolatilePageMemoryStorageEngineConfiguration engineConfig,
@InjectConfiguration("mock.profiles.default = {engine = aimem}")
StorageConfiguration storageConfig
) {
@@ -52,7 +49,7 @@ class VolatilePageMemorySortedIndexStorageTest extends AbstractPageMemorySortedI
ioRegistry.loadFromServiceLoader();
- engine = new VolatilePageMemoryStorageEngine("node", engineConfig, storageConfig, ioRegistry, clock);
+ engine = new VolatilePageMemoryStorageEngine("node", storageConfig, ioRegistry, clock);
engine.start();
@@ -61,7 +58,7 @@ class VolatilePageMemorySortedIndexStorageTest extends AbstractPageMemorySortedI
mock(StorageIndexDescriptorSupplier.class)
);
- initialize(tableStorage, engineConfig.pageSize().value());
+ initialize(tableStorage, engine.configuration().pageSize().value());
}
@AfterEach
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 126cd65a5f5..db0f9bad631 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
@@ -33,7 +33,6 @@ import org.apache.ignite.internal.storage.engine.MvTableStorage;
import org.apache.ignite.internal.storage.engine.StorageTableDescriptor;
import org.apache.ignite.internal.storage.index.StorageIndexDescriptorSupplier;
import org.apache.ignite.internal.storage.pagememory.PersistentPageMemoryStorageEngine;
-import org.apache.ignite.internal.storage.pagememory.configuration.schema.PersistentPageMemoryStorageEngineConfiguration;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.apache.ignite.internal.util.IgniteUtils;
@@ -50,8 +49,6 @@ class PersistentPageMemoryMvPartitionStorageConcurrencyTest extends AbstractMvPa
@BeforeEach
void setUp(
@WorkDirectory Path workDir,
- @InjectConfiguration("mock.checkpoint.checkpointDelayMillis = 0")
- PersistentPageMemoryStorageEngineConfiguration engineConfig,
@InjectConfiguration("mock.profiles.default = {engine = aipersist}")
StorageConfiguration storageConfig
) {
@@ -62,7 +59,6 @@ class PersistentPageMemoryMvPartitionStorageConcurrencyTest extends AbstractMvPa
engine = new PersistentPageMemoryStorageEngine(
"test",
mock(MetricManager.class),
- engineConfig,
storageConfig,
ioRegistry,
workDir,
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 e9014ac7eee..127bc5c0d1f 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
@@ -33,7 +33,6 @@ import org.apache.ignite.internal.storage.engine.MvTableStorage;
import org.apache.ignite.internal.storage.engine.StorageTableDescriptor;
import org.apache.ignite.internal.storage.index.StorageIndexDescriptorSupplier;
import org.apache.ignite.internal.storage.pagememory.PersistentPageMemoryStorageEngine;
-import org.apache.ignite.internal.storage.pagememory.configuration.schema.PersistentPageMemoryStorageEngineConfiguration;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.apache.ignite.internal.util.IgniteUtils;
@@ -50,8 +49,6 @@ class PersistentPageMemoryMvPartitionStorageGcTest extends AbstractMvPartitionSt
@BeforeEach
void setUp(
@WorkDirectory Path workDir,
- @InjectConfiguration("mock.checkpoint.checkpointDelayMillis = 0")
- PersistentPageMemoryStorageEngineConfiguration engineConfig,
@InjectConfiguration("mock.profiles.default = {engine = aipersist}")
StorageConfiguration storageConfig
) {
@@ -62,7 +59,6 @@ class PersistentPageMemoryMvPartitionStorageGcTest extends AbstractMvPartitionSt
engine = new PersistentPageMemoryStorageEngine(
"test",
mock(MetricManager.class),
- engineConfig,
storageConfig,
ioRegistry,
workDir,
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 d3a8b24e86a..feda3c9ee70 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
@@ -41,7 +41,6 @@ import org.apache.ignite.internal.storage.engine.MvTableStorage;
import org.apache.ignite.internal.storage.engine.StorageTableDescriptor;
import org.apache.ignite.internal.storage.index.StorageIndexDescriptorSupplier;
import org.apache.ignite.internal.storage.pagememory.PersistentPageMemoryStorageEngine;
-import org.apache.ignite.internal.storage.pagememory.configuration.schema.PersistentPageMemoryStorageEngineConfiguration;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.apache.ignite.internal.util.IgniteUtils;
@@ -52,9 +51,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
@ExtendWith(WorkDirectoryExtension.class)
class PersistentPageMemoryMvPartitionStorageTest extends AbstractPageMemoryMvPartitionStorageTest {
- @InjectConfiguration("mock.checkpoint.checkpointDelayMillis = 0")
- private PersistentPageMemoryStorageEngineConfiguration engineConfig;
-
@InjectConfiguration("mock.profiles.default = {engine = aipersist}")
private StorageConfiguration storageConfig;
@@ -74,7 +70,6 @@ class PersistentPageMemoryMvPartitionStorageTest extends AbstractPageMemoryMvPar
engine = new PersistentPageMemoryStorageEngine(
"test",
mock(MetricManager.class),
- engineConfig,
storageConfig,
ioRegistry,
workDir,
@@ -107,7 +102,7 @@ class PersistentPageMemoryMvPartitionStorageTest extends AbstractPageMemoryMvPar
@Override
int pageSize() {
- return engineConfig.pageSize().value();
+ return engine.configuration().pageSize().value();
}
@Test
diff --git a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvTableStorageConcurrencyTest.java b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvTableStorageConcurrencyTest.java
index 2ff28110450..66ff8fa6c29 100644
--- a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvTableStorageConcurrencyTest.java
+++ b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvTableStorageConcurrencyTest.java
@@ -32,7 +32,6 @@ import org.apache.ignite.internal.storage.configurations.StorageConfiguration;
import org.apache.ignite.internal.storage.engine.MvTableStorage;
import org.apache.ignite.internal.storage.engine.StorageTableDescriptor;
import org.apache.ignite.internal.storage.pagememory.PersistentPageMemoryStorageEngine;
-import org.apache.ignite.internal.storage.pagememory.configuration.schema.PersistentPageMemoryStorageEngineConfiguration;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.apache.ignite.internal.util.IgniteUtils;
@@ -47,8 +46,6 @@ class PersistentPageMemoryMvTableStorageConcurrencyTest extends AbstractMvTableS
@BeforeEach
void setUp(
@WorkDirectory Path workDir,
- @InjectConfiguration("mock.checkpoint.checkpointDelayMillis = 0")
- PersistentPageMemoryStorageEngineConfiguration engineConfig,
@InjectConfiguration("mock.profiles.default = {engine = aipersist}")
StorageConfiguration storageConfig
) {
@@ -59,7 +56,6 @@ class PersistentPageMemoryMvTableStorageConcurrencyTest extends AbstractMvTableS
engine = new PersistentPageMemoryStorageEngine(
"test",
mock(MetricManager.class),
- engineConfig,
storageConfig,
ioRegistry,
workDir,
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 53a04166104..603069e3e85 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
@@ -29,7 +29,6 @@ import org.apache.ignite.internal.storage.engine.StorageTableDescriptor;
import org.apache.ignite.internal.storage.index.StorageIndexDescriptorSupplier;
import org.apache.ignite.internal.storage.pagememory.VolatilePageMemoryStorageEngine;
import org.apache.ignite.internal.storage.pagememory.VolatilePageMemoryTableStorage;
-import org.apache.ignite.internal.storage.pagememory.configuration.schema.VolatilePageMemoryStorageEngineConfiguration;
import org.apache.ignite.internal.util.IgniteUtils;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -41,14 +40,13 @@ class VolatilePageMemoryMvPartitionStorageConcurrencyTest extends AbstractMvPart
@BeforeEach
void setUp(
- @InjectConfiguration VolatilePageMemoryStorageEngineConfiguration engineConfig,
@InjectConfiguration("mock.profiles.default = {engine = aimem}") StorageConfiguration storageConfig
) {
var ioRegistry = new PageIoRegistry();
ioRegistry.loadFromServiceLoader();
- engine = new VolatilePageMemoryStorageEngine("node", engineConfig, storageConfig, ioRegistry, clock);
+ engine = new VolatilePageMemoryStorageEngine("node", storageConfig, ioRegistry, clock);
engine.start();
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 bb76a19b750..e8c63b80240 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
@@ -29,7 +29,6 @@ import org.apache.ignite.internal.storage.engine.StorageTableDescriptor;
import org.apache.ignite.internal.storage.index.StorageIndexDescriptorSupplier;
import org.apache.ignite.internal.storage.pagememory.VolatilePageMemoryStorageEngine;
import org.apache.ignite.internal.storage.pagememory.VolatilePageMemoryTableStorage;
-import org.apache.ignite.internal.storage.pagememory.configuration.schema.VolatilePageMemoryStorageEngineConfiguration;
import org.apache.ignite.internal.util.IgniteUtils;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -41,7 +40,6 @@ class VolatilePageMemoryMvPartitionStorageGcTest extends AbstractMvPartitionStor
@BeforeEach
void setUp(
- @InjectConfiguration VolatilePageMemoryStorageEngineConfiguration engineConfig,
@InjectConfiguration("mock.profiles.default = {engine = aimem}")
StorageConfiguration storageConfig
) {
@@ -49,7 +47,7 @@ class VolatilePageMemoryMvPartitionStorageGcTest extends AbstractMvPartitionStor
ioRegistry.loadFromServiceLoader();
- engine = new VolatilePageMemoryStorageEngine("node", engineConfig, storageConfig, ioRegistry, clock);
+ engine = new VolatilePageMemoryStorageEngine("node", storageConfig, ioRegistry, clock);
engine.start();
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 7fae88ced83..d1b2d514454 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
@@ -28,15 +28,11 @@ import org.apache.ignite.internal.storage.engine.StorageTableDescriptor;
import org.apache.ignite.internal.storage.index.StorageIndexDescriptorSupplier;
import org.apache.ignite.internal.storage.pagememory.VolatilePageMemoryStorageEngine;
import org.apache.ignite.internal.storage.pagememory.VolatilePageMemoryTableStorage;
-import org.apache.ignite.internal.storage.pagememory.configuration.schema.VolatilePageMemoryStorageEngineConfiguration;
import org.apache.ignite.internal.util.IgniteUtils;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
class VolatilePageMemoryMvPartitionStorageTest extends AbstractPageMemoryMvPartitionStorageTest {
- @InjectConfiguration
- private VolatilePageMemoryStorageEngineConfiguration engineConfig;
-
@InjectConfiguration("mock.profiles.default = {engine = aimem}")
private StorageConfiguration storageConfig;
@@ -50,7 +46,7 @@ class VolatilePageMemoryMvPartitionStorageTest extends AbstractPageMemoryMvParti
ioRegistry.loadFromServiceLoader();
- engine = new VolatilePageMemoryStorageEngine("node", engineConfig, storageConfig, ioRegistry, clock);
+ engine = new VolatilePageMemoryStorageEngine("node", storageConfig, ioRegistry, clock);
engine.start();
@@ -75,6 +71,6 @@ class VolatilePageMemoryMvPartitionStorageTest extends AbstractPageMemoryMvParti
@Override
int pageSize() {
- return engineConfig.pageSize().value();
+ return engine.configuration().pageSize().value();
}
}
diff --git a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/VolatilePageMemoryMvTableStorageConcurrencyTest.java b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/VolatilePageMemoryMvTableStorageConcurrencyTest.java
index ad197afe9c5..7189fae8433 100644
--- a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/VolatilePageMemoryMvTableStorageConcurrencyTest.java
+++ b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/VolatilePageMemoryMvTableStorageConcurrencyTest.java
@@ -27,7 +27,6 @@ import org.apache.ignite.internal.storage.configurations.StorageConfiguration;
import org.apache.ignite.internal.storage.engine.MvTableStorage;
import org.apache.ignite.internal.storage.engine.StorageTableDescriptor;
import org.apache.ignite.internal.storage.pagememory.VolatilePageMemoryStorageEngine;
-import org.apache.ignite.internal.storage.pagememory.configuration.schema.VolatilePageMemoryStorageEngineConfiguration;
import org.apache.ignite.internal.util.IgniteUtils;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -37,14 +36,13 @@ class VolatilePageMemoryMvTableStorageConcurrencyTest extends AbstractMvTableSto
@BeforeEach
void setUp(
- @InjectConfiguration VolatilePageMemoryStorageEngineConfiguration engineConfig,
@InjectConfiguration("mock.profiles.default = {engine = aimem}") StorageConfiguration storageConfig
) {
var ioRegistry = new PageIoRegistry();
ioRegistry.loadFromServiceLoader();
- engine = new VolatilePageMemoryStorageEngine("node", engineConfig, storageConfig, ioRegistry, clock);
+ engine = new VolatilePageMemoryStorageEngine("node", storageConfig, ioRegistry, clock);
engine.start();
diff --git a/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/RocksDbDataStorageModule.java b/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/RocksDbDataStorageModule.java
index bb0065e29f3..4c7ef8c6799 100644
--- a/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/RocksDbDataStorageModule.java
+++ b/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/RocksDbDataStorageModule.java
@@ -33,8 +33,6 @@ import org.apache.ignite.internal.storage.StorageException;
import org.apache.ignite.internal.storage.configurations.StorageConfiguration;
import org.apache.ignite.internal.storage.configurations.StorageExtensionConfiguration;
import org.apache.ignite.internal.storage.engine.StorageEngine;
-import org.apache.ignite.internal.storage.rocksdb.configuration.schema.RocksDbStorageEngineConfiguration;
-import org.apache.ignite.internal.storage.rocksdb.configuration.schema.RocksDbStorageEngineExtensionConfiguration;
import org.jetbrains.annotations.Nullable;
/**
@@ -60,10 +58,7 @@ public class RocksDbDataStorageModule implements DataStorageModule {
ScheduledExecutorService commonScheduler
) throws StorageException {
StorageConfiguration storageConfig = configRegistry.getConfiguration(StorageExtensionConfiguration.KEY).storage();
- RocksDbStorageEngineConfiguration engineConfig = ((RocksDbStorageEngineExtensionConfiguration) storageConfig.engines()).rocksdb();
- assert engineConfig != null;
-
- return new RocksDbStorageEngine(igniteInstanceName, engineConfig, storageConfig, storagePath, logSyncer, commonScheduler);
+ return new RocksDbStorageEngine(igniteInstanceName, storageConfig, storagePath, logSyncer, commonScheduler);
}
}
diff --git a/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/RocksDbStorageEngine.java b/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/RocksDbStorageEngine.java
index d8477ea4448..9a71f5415ff 100644
--- a/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/RocksDbStorageEngine.java
+++ b/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/RocksDbStorageEngine.java
@@ -40,6 +40,7 @@ import org.apache.ignite.internal.storage.engine.StorageTableDescriptor;
import org.apache.ignite.internal.storage.index.StorageIndexDescriptorSupplier;
import org.apache.ignite.internal.storage.rocksdb.configuration.schema.RocksDbProfileView;
import org.apache.ignite.internal.storage.rocksdb.configuration.schema.RocksDbStorageEngineConfiguration;
+import org.apache.ignite.internal.storage.rocksdb.configuration.schema.RocksDbStorageEngineExtensionConfiguration;
import org.apache.ignite.internal.storage.rocksdb.instance.SharedRocksDbInstance;
import org.apache.ignite.internal.storage.rocksdb.instance.SharedRocksDbInstanceCreator;
import org.apache.ignite.internal.thread.NamedThreadFactory;
@@ -95,24 +96,21 @@ public class RocksDbStorageEngine implements StorageEngine {
* Constructor.
*
* @param nodeName Node name.
- * @param engineConfig RocksDB storage engine configuration.
* @param storageConfiguration Storage configuration.
* @param storagePath Storage path.
* @param logSyncer Write-ahead log synchronizer.
- * @param scheduledPool Common scheduled thread pool. Needed only for asynchronous start of scheduled operations without performing
- * blocking, long or IO operations.
+ * @param scheduledPool Common scheduled thread pool. Needed only for asynchronous start of scheduled operations without
+ * performing blocking, long or IO operations.
*/
public RocksDbStorageEngine(
String nodeName,
- // TODO IGNITE-24766 Remove this parameter.
- RocksDbStorageEngineConfiguration engineConfig,
StorageConfiguration storageConfiguration,
Path storagePath,
LogSyncer logSyncer,
ScheduledExecutorService scheduledPool
) {
- this.engineConfig = engineConfig;
this.storageConfiguration = storageConfiguration;
+ this.engineConfig = ((RocksDbStorageEngineExtensionConfiguration) storageConfiguration.engines()).rocksdb();
this.storagePath = storagePath;
this.logSyncer = logSyncer;
this.scheduledPool = scheduledPool;
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 666f689299b..c7d713fa2a5 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
@@ -28,7 +28,6 @@ import org.apache.ignite.internal.storage.AbstractMvPartitionStorageConcurrencyT
import org.apache.ignite.internal.storage.configurations.StorageConfiguration;
import org.apache.ignite.internal.storage.engine.StorageTableDescriptor;
import org.apache.ignite.internal.storage.index.StorageIndexDescriptorSupplier;
-import org.apache.ignite.internal.storage.rocksdb.configuration.schema.RocksDbStorageEngineConfiguration;
import org.apache.ignite.internal.testframework.ExecutorServiceExtension;
import org.apache.ignite.internal.testframework.InjectExecutorService;
import org.apache.ignite.internal.testframework.WorkDirectory;
@@ -51,15 +50,13 @@ public class RocksDbMvPartitionStorageConcurrencyTest extends AbstractMvPartitio
@BeforeEach
void setUp(
@WorkDirectory Path workDir,
- @InjectConfiguration("mock.flushDelayMillis = 0")
- RocksDbStorageEngineConfiguration engineConfig,
// Explicit size, small enough for fast allocation, and big enough to fit some data without flushing it to disk constantly.
@InjectConfiguration("mock.profiles.default = {engine = rocksdb, size = 16777216, writeBufferSize = 67108864}")
StorageConfiguration storageConfiguration,
@InjectExecutorService
ScheduledExecutorService scheduledExecutor
) {
- engine = new RocksDbStorageEngine("test", engineConfig, storageConfiguration, workDir, mock(LogSyncer.class), scheduledExecutor);
+ engine = new RocksDbStorageEngine("test", storageConfiguration, workDir, mock(LogSyncer.class), scheduledExecutor);
engine.start();
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 c700b436a08..31d4e62dc3e 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
@@ -28,7 +28,6 @@ import org.apache.ignite.internal.storage.AbstractMvPartitionStorageGcTest;
import org.apache.ignite.internal.storage.configurations.StorageConfiguration;
import org.apache.ignite.internal.storage.engine.StorageTableDescriptor;
import org.apache.ignite.internal.storage.index.StorageIndexDescriptorSupplier;
-import org.apache.ignite.internal.storage.rocksdb.configuration.schema.RocksDbStorageEngineConfiguration;
import org.apache.ignite.internal.testframework.ExecutorServiceExtension;
import org.apache.ignite.internal.testframework.InjectExecutorService;
import org.apache.ignite.internal.testframework.WorkDirectory;
@@ -51,15 +50,13 @@ public class RocksDbMvPartitionStorageGcTest extends AbstractMvPartitionStorageG
@BeforeEach
void setUp(
@WorkDirectory Path workDir,
- @InjectConfiguration("mock.flushDelayMillis = 0")
- RocksDbStorageEngineConfiguration engineConfig,
// Explicit size, small enough for fast allocation, and big enough to fit some data without flushing it to disk constantly.
@InjectConfiguration("mock.profiles.default = {engine = rocksdb, size = 16777216, writeBufferSize = 67108864}")
StorageConfiguration storageConfiguration,
@InjectExecutorService
ScheduledExecutorService scheduledExecutor
) {
- engine = new RocksDbStorageEngine("test", engineConfig, storageConfiguration, workDir, mock(LogSyncer.class), scheduledExecutor);
+ engine = new RocksDbStorageEngine("test", storageConfiguration, workDir, mock(LogSyncer.class), scheduledExecutor);
engine.start();
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 ba64eb59480..1c9cf5de776 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
@@ -28,7 +28,6 @@ import org.apache.ignite.internal.storage.AbstractMvPartitionStorageTest;
import org.apache.ignite.internal.storage.configurations.StorageConfiguration;
import org.apache.ignite.internal.storage.engine.StorageTableDescriptor;
import org.apache.ignite.internal.storage.index.StorageIndexDescriptorSupplier;
-import org.apache.ignite.internal.storage.rocksdb.configuration.schema.RocksDbStorageEngineConfiguration;
import org.apache.ignite.internal.testframework.ExecutorServiceExtension;
import org.apache.ignite.internal.testframework.InjectExecutorService;
import org.apache.ignite.internal.testframework.WorkDirectory;
@@ -51,15 +50,13 @@ public class RocksDbMvPartitionStorageTest extends AbstractMvPartitionStorageTes
@BeforeEach
void setUp(
@WorkDirectory Path workDir,
- @InjectConfiguration("mock.flushDelayMillis = 0")
- RocksDbStorageEngineConfiguration engineConfig,
// Explicit size, small enough for fast allocation, and big enough to fit some data without flushing it to disk constantly.
@InjectConfiguration("mock.profiles.default = {engine = rocksdb, size = 16777216, writeBufferSize = 67108864}")
StorageConfiguration storageConfiguration,
@InjectExecutorService
ScheduledExecutorService scheduledExecutor
) {
- engine = new RocksDbStorageEngine("test", engineConfig, storageConfiguration, workDir, mock(LogSyncer.class), scheduledExecutor);
+ engine = new RocksDbStorageEngine("test", storageConfiguration, workDir, mock(LogSyncer.class), scheduledExecutor);
engine.start();
diff --git a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvTableStorageConcurrencyTest.java b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvTableStorageConcurrencyTest.java
index 97e8267619b..04d10138123 100644
--- a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvTableStorageConcurrencyTest.java
+++ b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvTableStorageConcurrencyTest.java
@@ -28,7 +28,6 @@ import org.apache.ignite.internal.storage.AbstractMvTableStorageConcurrencyTest;
import org.apache.ignite.internal.storage.configurations.StorageConfiguration;
import org.apache.ignite.internal.storage.engine.MvTableStorage;
import org.apache.ignite.internal.storage.engine.StorageTableDescriptor;
-import org.apache.ignite.internal.storage.rocksdb.configuration.schema.RocksDbStorageEngineConfiguration;
import org.apache.ignite.internal.testframework.ExecutorServiceExtension;
import org.apache.ignite.internal.testframework.InjectExecutorService;
import org.apache.ignite.internal.testframework.WorkDirectory;
@@ -46,15 +45,13 @@ class RocksDbMvTableStorageConcurrencyTest extends AbstractMvTableStorageConcurr
@BeforeEach
void setUp(
@WorkDirectory Path workDir,
- @InjectConfiguration("mock.flushDelayMillis = 0")
- RocksDbStorageEngineConfiguration engineConfig,
// Explicit size, small enough for fast allocation, and big enough to fit some data without flushing it to disk constantly.
@InjectConfiguration("mock.profiles.default = {engine = rocksdb, size = 16777216, writeBufferSize = 67108864}")
StorageConfiguration storageConfiguration,
@InjectExecutorService
ScheduledExecutorService scheduledExecutor
) {
- engine = new RocksDbStorageEngine("test", engineConfig, storageConfiguration, workDir, mock(LogSyncer.class), scheduledExecutor);
+ engine = new RocksDbStorageEngine("test", storageConfiguration, workDir, mock(LogSyncer.class), scheduledExecutor);
engine.start();
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 d3df1273366..9bada3cb6d4 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
@@ -39,7 +39,6 @@ import org.apache.ignite.internal.storage.RowId;
import org.apache.ignite.internal.storage.configurations.StorageConfiguration;
import org.apache.ignite.internal.storage.engine.MvTableStorage;
import org.apache.ignite.internal.storage.engine.StorageTableDescriptor;
-import org.apache.ignite.internal.storage.rocksdb.configuration.schema.RocksDbStorageEngineConfiguration;
import org.apache.ignite.internal.testframework.ExecutorServiceExtension;
import org.apache.ignite.internal.testframework.InjectExecutorService;
import org.apache.ignite.internal.testframework.WorkDirectory;
@@ -61,15 +60,13 @@ public class RocksDbMvTableStorageTest extends AbstractMvTableStorageTest {
@BeforeEach
void setUp(
@WorkDirectory Path workDir,
- @InjectConfiguration("mock.flushDelayMillis = 0")
- RocksDbStorageEngineConfiguration engineConfig,
// Explicit size, small enough for fast allocation, and big enough to fit some data without flushing it to disk constantly.
@InjectConfiguration("mock.profiles.default {engine = rocksdb, size = 16777216, writeBufferSize = 67108864}")
StorageConfiguration storageConfiguration,
@InjectExecutorService
ScheduledExecutorService scheduledExecutor
) {
- engine = new RocksDbStorageEngine("test", engineConfig, storageConfiguration, workDir, mock(LogSyncer.class), scheduledExecutor);
+ engine = new RocksDbStorageEngine("test", storageConfiguration, workDir, mock(LogSyncer.class), scheduledExecutor);
engine.start();
diff --git a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/benchmarks/CommitManyWritesBenchmark.java b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/benchmarks/CommitManyWritesBenchmark.java
index 8ff81831611..30c3948fd32 100644
--- a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/benchmarks/CommitManyWritesBenchmark.java
+++ b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/benchmarks/CommitManyWritesBenchmark.java
@@ -37,7 +37,6 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.TimeUnit;
import java.util.stream.IntStream;
-import org.apache.ignite.configuration.ConfigurationValue;
import org.apache.ignite.configuration.NamedConfigurationTree;
import org.apache.ignite.configuration.NamedListView;
import org.apache.ignite.internal.hlc.HybridClock;
@@ -53,7 +52,6 @@ import org.apache.ignite.internal.storage.rocksdb.RocksDbMvPartitionStorage;
import org.apache.ignite.internal.storage.rocksdb.RocksDbStorageEngine;
import org.apache.ignite.internal.storage.rocksdb.RocksDbTableStorage;
import org.apache.ignite.internal.storage.rocksdb.configuration.schema.RocksDbProfileView;
-import org.apache.ignite.internal.storage.rocksdb.configuration.schema.RocksDbStorageEngineConfiguration;
import org.apache.ignite.internal.tx.TransactionIds;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
@@ -99,7 +97,6 @@ public class CommitManyWritesBenchmark {
storageEngine = new RocksDbStorageEngine(
"test",
- engineConfiguration(),
storageConfiguration(),
workDir,
() -> {},
@@ -187,18 +184,6 @@ public class CommitManyWritesBenchmark {
}
}
- private static RocksDbStorageEngineConfiguration engineConfiguration() {
- RocksDbStorageEngineConfiguration config = mock(RocksDbStorageEngineConfiguration.class);
-
- ConfigurationValue<Integer> flushDelayMillis = mock(ConfigurationValue.class);
-
- when(flushDelayMillis.value()).thenReturn(100);
-
- when(config.flushDelayMillis()).thenReturn(flushDelayMillis);
-
- return config;
- }
-
private static StorageConfiguration storageConfiguration() {
StorageConfiguration config = mock(StorageConfiguration.class);
diff --git a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/engine/RocksDbStorageEngineTest.java b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/engine/RocksDbStorageEngineTest.java
index 999d6b8cee7..56f581f517c 100644
--- a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/engine/RocksDbStorageEngineTest.java
+++ b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/engine/RocksDbStorageEngineTest.java
@@ -24,7 +24,6 @@ import org.apache.ignite.internal.storage.configurations.StorageConfiguration;
import org.apache.ignite.internal.storage.engine.AbstractStorageEngineTest;
import org.apache.ignite.internal.storage.engine.StorageEngine;
import org.apache.ignite.internal.storage.rocksdb.RocksDbStorageEngine;
-import org.apache.ignite.internal.storage.rocksdb.configuration.schema.RocksDbStorageEngineConfiguration;
import org.apache.ignite.internal.testframework.ExecutorServiceExtension;
import org.apache.ignite.internal.testframework.InjectExecutorService;
import org.apache.ignite.internal.testframework.WorkDirectory;
@@ -37,9 +36,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
@ExtendWith(ExecutorServiceExtension.class)
@ExtendWith(WorkDirectoryExtension.class)
public class RocksDbStorageEngineTest extends AbstractStorageEngineTest {
- @InjectConfiguration("mock.flushDelayMillis = 0")
- private RocksDbStorageEngineConfiguration engineConfiguration;
-
@InjectConfiguration("mock.profiles.default.engine = rocksdb")
StorageConfiguration storageConfiguration;
@@ -53,7 +49,6 @@ public class RocksDbStorageEngineTest extends AbstractStorageEngineTest {
protected StorageEngine createEngine() {
return new RocksDbStorageEngine(
"test",
- engineConfiguration,
storageConfiguration,
workDir,
logSyncer,
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 449ba5c1265..f4d16a57f16 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
@@ -31,7 +31,6 @@ import org.apache.ignite.internal.storage.engine.StorageTableDescriptor;
import org.apache.ignite.internal.storage.index.AbstractHashIndexStorageTest;
import org.apache.ignite.internal.storage.index.StorageIndexDescriptorSupplier;
import org.apache.ignite.internal.storage.rocksdb.RocksDbStorageEngine;
-import org.apache.ignite.internal.storage.rocksdb.configuration.schema.RocksDbStorageEngineConfiguration;
import org.apache.ignite.internal.testframework.ExecutorServiceExtension;
import org.apache.ignite.internal.testframework.InjectExecutorService;
import org.apache.ignite.internal.testframework.WorkDirectory;
@@ -52,15 +51,13 @@ public class RocksDbHashIndexStorageTest extends AbstractHashIndexStorageTest {
@BeforeEach
void setUp(
@WorkDirectory Path workDir,
- @InjectConfiguration("mock.flushDelayMillis = 0")
- RocksDbStorageEngineConfiguration engineConfig,
// Explicit size, small enough for fast allocation, and big enough to fit some data without flushing it to disk constantly.
@InjectConfiguration("mock.profiles.default = {engine = rocksdb, size = 16777216, writeBufferSize = 67108864}")
StorageConfiguration storageConfiguration,
@InjectExecutorService
ScheduledExecutorService scheduledExecutor
) {
- engine = new RocksDbStorageEngine("test", engineConfig, storageConfiguration, workDir, mock(LogSyncer.class), scheduledExecutor);
+ engine = new RocksDbStorageEngine("test", storageConfiguration, workDir, mock(LogSyncer.class), scheduledExecutor);
engine.start();
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 136d35baddf..172be340989 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
@@ -31,7 +31,6 @@ import org.apache.ignite.internal.storage.engine.StorageTableDescriptor;
import org.apache.ignite.internal.storage.index.AbstractSortedIndexStorageTest;
import org.apache.ignite.internal.storage.index.StorageIndexDescriptorSupplier;
import org.apache.ignite.internal.storage.rocksdb.RocksDbStorageEngine;
-import org.apache.ignite.internal.storage.rocksdb.configuration.schema.RocksDbStorageEngineConfiguration;
import org.apache.ignite.internal.testframework.ExecutorServiceExtension;
import org.apache.ignite.internal.testframework.InjectExecutorService;
import org.apache.ignite.internal.testframework.WorkDirectory;
@@ -52,15 +51,13 @@ public class RocksDbSortedIndexStorageTest extends AbstractSortedIndexStorageTes
@BeforeEach
void setUp(
@WorkDirectory Path workDir,
- @InjectConfiguration("mock.flushDelayMillis = 0")
- RocksDbStorageEngineConfiguration engineConfig,
// Explicit size, small enough for fast allocation, and big enough to fit some data without flushing it to disk constantly.
@InjectConfiguration("mock.profiles.default = {engine = rocksdb, size = 16777216, writeBufferSize = 67108864}")
StorageConfiguration storageConfiguration,
@InjectExecutorService
ScheduledExecutorService scheduledExecutor
) {
- engine = new RocksDbStorageEngine("test", engineConfig, storageConfiguration, workDir, mock(LogSyncer.class), scheduledExecutor);
+ engine = new RocksDbStorageEngine("test", storageConfiguration, workDir, mock(LogSyncer.class), scheduledExecutor);
engine.start();
diff --git a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/instance/SharedRocksDbInstanceTest.java b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/instance/SharedRocksDbInstanceTest.java
index 54b3f1740c0..c8fca8d3805 100644
--- a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/instance/SharedRocksDbInstanceTest.java
+++ b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/instance/SharedRocksDbInstanceTest.java
@@ -53,7 +53,6 @@ import org.apache.ignite.internal.storage.index.StorageSortedIndexDescriptor.Sto
import org.apache.ignite.internal.storage.rocksdb.RocksDbStorageEngine;
import org.apache.ignite.internal.storage.rocksdb.RocksDbStorageProfile;
import org.apache.ignite.internal.storage.rocksdb.configuration.schema.RocksDbProfileView;
-import org.apache.ignite.internal.storage.rocksdb.configuration.schema.RocksDbStorageEngineConfiguration;
import org.apache.ignite.internal.testframework.ExecutorServiceExtension;
import org.apache.ignite.internal.testframework.IgniteAbstractTest;
import org.apache.ignite.internal.testframework.InjectExecutorService;
@@ -83,11 +82,10 @@ class SharedRocksDbInstanceTest extends IgniteAbstractTest {
// Explicit size, small enough for fast allocation, and big enough to fit some data without flushing it to disk constantly.
@InjectConfiguration("mock.profiles.default {engine = rocksdb, size = 16777216, writeBufferSize = 67108864}")
StorageConfiguration storageConfiguration,
- @InjectConfiguration RocksDbStorageEngineConfiguration engineConfig,
@InjectExecutorService
ScheduledExecutorService scheduledExecutor
) throws Exception {
- engine = new RocksDbStorageEngine("test", engineConfig, storageConfiguration, workDir, mock(LogSyncer.class), scheduledExecutor);
+ engine = new RocksDbStorageEngine("test", storageConfiguration, workDir, mock(LogSyncer.class), scheduledExecutor);
engine.start();
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 27cafafabc1..8e0f16ac6f3 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
@@ -34,7 +34,6 @@ import org.apache.ignite.internal.storage.engine.MvTableStorage;
import org.apache.ignite.internal.storage.engine.StorageTableDescriptor;
import org.apache.ignite.internal.storage.index.StorageIndexDescriptorSupplier;
import org.apache.ignite.internal.storage.pagememory.PersistentPageMemoryStorageEngine;
-import org.apache.ignite.internal.storage.pagememory.configuration.schema.PersistentPageMemoryStorageEngineConfiguration;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.apache.ignite.internal.util.IgniteUtils;
@@ -55,7 +54,6 @@ class PersistentPageMemoryGcUpdateHandlerTest extends AbstractGcUpdateHandlerTes
@BeforeEach
void setUp(
TestInfo testInfo,
- @InjectConfiguration PersistentPageMemoryStorageEngineConfiguration engineConfig,
@InjectConfiguration("mock.profiles.default = {engine = aipersist}")
StorageConfiguration storageConfig
) {
@@ -68,7 +66,6 @@ class PersistentPageMemoryGcUpdateHandlerTest extends AbstractGcUpdateHandlerTes
engine = new PersistentPageMemoryStorageEngine(
nodeName,
mock(MetricManager.class),
- engineConfig,
storageConfig,
ioRegistry,
workDir,
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 a7389160a7a..d2a0762e07c 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
@@ -31,7 +31,6 @@ import org.apache.ignite.internal.storage.engine.StorageTableDescriptor;
import org.apache.ignite.internal.storage.index.StorageIndexDescriptorSupplier;
import org.apache.ignite.internal.storage.rocksdb.RocksDbStorageEngine;
import org.apache.ignite.internal.storage.rocksdb.RocksDbTableStorage;
-import org.apache.ignite.internal.storage.rocksdb.configuration.schema.RocksDbStorageEngineConfiguration;
import org.apache.ignite.internal.testframework.ExecutorServiceExtension;
import org.apache.ignite.internal.testframework.InjectExecutorService;
import org.apache.ignite.internal.testframework.WorkDirectory;
@@ -58,13 +57,11 @@ class RocksDbGcUpdateHandlerTest extends AbstractGcUpdateHandlerTest {
@BeforeEach
void setUp(
TestInfo testInfo,
- @InjectConfiguration RocksDbStorageEngineConfiguration engineConfig,
@InjectConfiguration("mock.profiles.default.engine = rocksdb")
StorageConfiguration storageConfiguration
) {
engine = new RocksDbStorageEngine(
testNodeName(testInfo, 0),
- engineConfig,
storageConfiguration,
workDir,
mock(LogSyncer.class),
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 71e7a7a4b37..0e82cd0c888 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
@@ -29,7 +29,6 @@ import org.apache.ignite.internal.storage.engine.StorageTableDescriptor;
import org.apache.ignite.internal.storage.index.StorageIndexDescriptorSupplier;
import org.apache.ignite.internal.storage.pagememory.VolatilePageMemoryStorageEngine;
import org.apache.ignite.internal.storage.pagememory.VolatilePageMemoryTableStorage;
-import org.apache.ignite.internal.storage.pagememory.configuration.schema.VolatilePageMemoryStorageEngineConfiguration;
import org.apache.ignite.internal.util.IgniteUtils;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -43,7 +42,6 @@ class VolatilePageMemoryGcUpdateHandlerTest extends AbstractGcUpdateHandlerTest
@BeforeEach
void setUp(
TestInfo testInfo,
- @InjectConfiguration VolatilePageMemoryStorageEngineConfiguration engineConfig,
@InjectConfiguration("mock.profiles.default = {engine = aimem}")
StorageConfiguration storageConfig
) {
@@ -51,7 +49,7 @@ class VolatilePageMemoryGcUpdateHandlerTest extends AbstractGcUpdateHandlerTest
ioRegistry.loadFromServiceLoader();
- engine = new VolatilePageMemoryStorageEngine(testNodeName(testInfo, 0), engineConfig, storageConfig, ioRegistry, clock);
+ engine = new VolatilePageMemoryStorageEngine(testNodeName(testInfo, 0), storageConfig, ioRegistry, clock);
engine.start();