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 348f68b10b IGNITE-22137 Rename "rocksDb" storage engine to "rocksdb"
(#3733)
348f68b10b is described below
commit 348f68b10b8dc4246e8b379edf683ef66f3f5472
Author: Alexander Polovtcev <[email protected]>
AuthorDate: Fri May 10 14:10:49 2024 +0300
IGNITE-22137 Rename "rocksDb" storage engine to "rocksdb" (#3733)
---
.../config/storage/rocksdb.adoc | 4 +-
examples/config/ignite-config.conf | 2 +-
.../example/storage/RocksDbStorageExample.java | 2 +-
.../management/topology/ItLogicalTopologyTest.java | 20 ++-----
.../ItDistributionZonesFiltersTest.java | 40 ++++++-------
.../rest/ItInitializedClusterRestTest.java | 6 +-
.../internal/ClusterPerClassIntegrationTest.java | 8 +--
.../internal/ClusterPerTestIntegrationTest.java | 8 +--
.../storage/rocksdb/RocksDbStorageEngine.java | 2 +-
.../schema/RocksDbProfileConfigurationSchema.java | 2 +-
.../RocksDbMvPartitionStorageConcurrencyTest.java | 4 +-
.../rocksdb/RocksDbMvPartitionStorageGcTest.java | 4 +-
.../rocksdb/RocksDbMvPartitionStorageTest.java | 4 +-
.../storage/rocksdb/RocksDbMvTableStorageTest.java | 4 +-
.../storage/rocksdb/RocksDbStorageEngineTest.java | 66 ----------------------
.../rocksdb/engine/RocksDbStorageEngineTest.java | 2 +-
.../rocksdb/index/RocksDbHashIndexStorageTest.java | 4 +-
.../index/RocksDbSortedIndexStorageTest.java | 4 +-
.../instance/SharedRocksDbInstanceTest.java | 2 +-
.../raftsnapshot/ItTableRaftSnapshotsTest.java | 8 +--
.../distributed/gc/RocksDbGcUpdateHandlerTest.java | 2 +-
21 files changed, 55 insertions(+), 143 deletions(-)
diff --git a/docs/_docs/administrators-guide/config/storage/rocksdb.adoc
b/docs/_docs/administrators-guide/config/storage/rocksdb.adoc
index 69630e6eb7..751edabb3a 100644
--- a/docs/_docs/administrators-guide/config/storage/rocksdb.adoc
+++ b/docs/_docs/administrators-guide/config/storage/rocksdb.adoc
@@ -45,10 +45,10 @@ The example below shows how to configure a data region with
RocksDB storage:
----
ignite config set --type cluster \
"{
- rocksDb.regions: [{
+ rocksdb.regions: [{
name: lsm_region,
size: 256000000,
cache: lru
}]
}"
-----
\ No newline at end of file
+----
diff --git a/examples/config/ignite-config.conf
b/examples/config/ignite-config.conf
index 007ab41aba..90440e9ed9 100644
--- a/examples/config/ignite-config.conf
+++ b/examples/config/ignite-config.conf
@@ -10,7 +10,7 @@ storage {
profiles {
"in-memory" {engine: "aimem"}
"persistent" {engine: "aipersist"}
- "rocksdb-example" : {engine: "rocksDb"}
+ "rocksdb-example" : {engine: "rocksdb"}
}
}
nodeAttributes.nodeAttributes {
diff --git
a/examples/src/main/java/org/apache/ignite/example/storage/RocksDbStorageExample.java
b/examples/src/main/java/org/apache/ignite/example/storage/RocksDbStorageExample.java
index 5230880f9a..6f1b9a0edd 100644
---
a/examples/src/main/java/org/apache/ignite/example/storage/RocksDbStorageExample.java
+++
b/examples/src/main/java/org/apache/ignite/example/storage/RocksDbStorageExample.java
@@ -37,7 +37,7 @@ package org.apache.ignite.example.storage;
* </li>
* <li>
* Add configuration for a data region of the RocksDB storage engine
using the CLI tool (if not done yet):<br>
- * {@code ignite cluster config update
"rocksDb.regions.rocksdb-example{}"}
+ * {@code ignite cluster config update
"rocksdb.regions.rocksdb-example{}"}
* </li>
* <li>Run the example in the IDE.</li>
* <li>
diff --git
a/modules/cluster-management/src/integrationTest/java/org/apache/ignite/internal/cluster/management/topology/ItLogicalTopologyTest.java
b/modules/cluster-management/src/integrationTest/java/org/apache/ignite/internal/cluster/management/topology/ItLogicalTopologyTest.java
index 37b9b0fd0b..8a4e73a500 100644
---
a/modules/cluster-management/src/integrationTest/java/org/apache/ignite/internal/cluster/management/topology/ItLogicalTopologyTest.java
+++
b/modules/cluster-management/src/integrationTest/java/org/apache/ignite/internal/cluster/management/topology/ItLogicalTopologyTest.java
@@ -57,29 +57,19 @@ import org.junit.jupiter.api.TestInfo;
class ItLogicalTopologyTest extends ClusterPerTestIntegrationTest {
private final BlockingQueue<Event> events = new LinkedBlockingQueue<>();
- private static final String NODE_ATTRIBUTES =
"{region:{attribute:\"US\"},storage:{attribute:\"SSD\"}}";
-
- private static final String STORAGE_PROFILES =
"{lru_rocks:{engine:\"rocksDb\"},segmented_aipersist:{engine:\"aipersist\"}}";
-
private static final Map<String, String> NODE_ATTRIBUTES_MAP =
Map.of("region", "US", "storage", "SSD");
private static final String[] STORAGE_PROFILES_LIST = {"lru_rocks",
"segmented_aipersist"};
- @Language("JSON")
+ @Language("HOCON")
private static final String
NODE_BOOTSTRAP_CFG_TEMPLATE_WITH_NODE_ATTRIBUTES_AND_STORAGE_PROFILES = "{\n"
+ " network: {\n"
+ " port: {},\n"
- + " nodeFinder: {\n"
- + " netClusterNodes: [ {} ]\n"
- + " }\n"
- + " },\n"
- + " nodeAttributes: {\n"
- + " nodeAttributes: " + NODE_ATTRIBUTES
- + " },\n"
- + " storage: {\n"
- + " profiles: " + STORAGE_PROFILES
+ + " nodeFinder.netClusterNodes: [ {} ]\n"
+ " },\n"
- + " clientConnector: { port:{} },\n"
+ + " nodeAttributes.nodeAttributes: {region.attribute = US,
storage.attribute = SSD},\n"
+ + " storage.profiles: {lru_rocks.engine = rocksdb,
segmented_aipersist.engine = aipersist},\n"
+ + " clientConnector.port: {},\n"
+ " rest.port: {}\n"
+ "}";
diff --git
a/modules/distribution-zones/src/integrationTest/java/org/apache/ignite/internal/distributionzones/ItDistributionZonesFiltersTest.java
b/modules/distribution-zones/src/integrationTest/java/org/apache/ignite/internal/distributionzones/ItDistributionZonesFiltersTest.java
index e676b39c85..ce9009e8c4 100644
---
a/modules/distribution-zones/src/integrationTest/java/org/apache/ignite/internal/distributionzones/ItDistributionZonesFiltersTest.java
+++
b/modules/distribution-zones/src/integrationTest/java/org/apache/ignite/internal/distributionzones/ItDistributionZonesFiltersTest.java
@@ -61,14 +61,14 @@ public class ItDistributionZonesFiltersTest extends
ClusterPerTestIntegrationTes
private static final String TABLE_NAME = "table1";
- @Language("JSON")
- private static final String NODE_ATTRIBUTES =
"{region:{attribute:\"US\"},storage:{attribute:\"SSD\"}}";
+ @Language("HOCON")
+ private static final String NODE_ATTRIBUTES = "{region.attribute = US,
storage.attribute = SSD}";
private static final String STORAGE_PROFILES = String.format("'%s, %s'",
DEFAULT_ROCKSDB_PROFILE_NAME, DEFAULT_AIPERSIST_PROFILE_NAME);
- @Language("JSON")
+ @Language("HOCON")
private static final String STORAGE_PROFILES_CONFIGS = String.format(
- "{%s:{engine:\"rocksDb\"}, %s:{engine:\"aipersist\"}}",
+ "{%s.engine = rocksdb, %s.engine = aipersist}",
DEFAULT_ROCKSDB_PROFILE_NAME,
DEFAULT_AIPERSIST_PROFILE_NAME
);
@@ -79,22 +79,16 @@ public class ItDistributionZonesFiltersTest extends
ClusterPerTestIntegrationTes
private static final int TIMEOUT_MILLIS = 10_000;
- @Language("JSON")
- private static String createStartConfig(@Language("JSON") String
nodeAttributes, @Language("JSON") String storageProfiles) {
+ @Language("HOCON")
+ private static String createStartConfig(@Language("HOCON") String
nodeAttributes, @Language("HOCON") String storageProfiles) {
return "{\n"
+ " network: {\n"
+ " port: {},\n"
- + " nodeFinder: {\n"
- + " netClusterNodes: [ {} ]\n"
- + " }\n"
+ + " nodeFinder.netClusterNodes: [ {} ]\n"
+ " },"
- + " nodeAttributes: {\n"
- + " nodeAttributes: " + nodeAttributes
- + " },\n"
- + " storage: {\n"
- + " profiles: " + storageProfiles
- + " },\n"
- + " clientConnector: { port:{} },\n"
+ + " nodeAttributes.nodeAttributes: " + nodeAttributes + ",\n"
+ + " storage.profiles: " + storageProfiles + ",\n"
+ + " clientConnector.port: {},\n"
+ " rest.port: {}\n"
+ "}";
}
@@ -119,7 +113,7 @@ public class ItDistributionZonesFiltersTest extends
ClusterPerTestIntegrationTes
String filter = "$[?(@.region == \"US\" && @.storage == \"SSD\")]";
// This node do not pass the filter
- @Language("JSON") String firstNodeAttributes =
"{region:{attribute:\"EU\"},storage:{attribute:\"SSD\"}}";
+ @Language("HOCON") String firstNodeAttributes =
"{region:{attribute:\"EU\"},storage:{attribute:\"SSD\"}}";
IgniteImpl node = startNode(1, createStartConfig(firstNodeAttributes,
STORAGE_PROFILES_CONFIGS));
@@ -144,12 +138,12 @@ public class ItDistributionZonesFiltersTest extends
ClusterPerTestIntegrationTes
TIMEOUT_MILLIS
);
- @Language("JSON") String secondNodeAttributes =
"{region:{attribute:\"US\"},storage:{attribute:\"SSD\"}}";
+ @Language("HOCON") String secondNodeAttributes =
"{region:{attribute:\"US\"},storage:{attribute:\"SSD\"}}";
// This node pass the filter but storage profiles of a node do not
match zone's storage profiles.
// TODO: https://issues.apache.org/jira/browse/IGNITE-21387 recovery
of this node is failing,
// TODO: because there are no appropriate storage profile on the node
- @Language("JSON") String notMatchingProfiles =
"{dummy:{engine:\"dummy\"},another_dummy:{engine:\"dummy\"}}";
+ @Language("HOCON") String notMatchingProfiles =
"{dummy:{engine:\"dummy\"},another_dummy:{engine:\"dummy\"}}";
startNode(2, createStartConfig(secondNodeAttributes,
notMatchingProfiles));
// This node pass the filter and storage profiles of a node match
zone's storage profiles.
@@ -214,7 +208,7 @@ public class ItDistributionZonesFiltersTest extends
ClusterPerTestIntegrationTes
TIMEOUT_MILLIS
);
- @Language("JSON") String firstNodeAttributes =
"{region:{attribute:\"US\"},storage:{attribute:\"SSD\"}}";
+ @Language("HOCON") String firstNodeAttributes =
"{region:{attribute:\"US\"},storage:{attribute:\"SSD\"}}";
// This node pass the filter
startNode(1, createStartConfig(firstNodeAttributes,
STORAGE_PROFILES_CONFIGS));
@@ -269,7 +263,7 @@ public class ItDistributionZonesFiltersTest extends
ClusterPerTestIntegrationTes
TIMEOUT_MILLIS
);
- @Language("JSON") String firstNodeAttributes =
"{region:{attribute:\"US\"},storage:{attribute:\"SSD\"}}";
+ @Language("HOCON") String firstNodeAttributes =
"{region:{attribute:\"US\"},storage:{attribute:\"SSD\"}}";
// This node pass the filter
startNode(1, createStartConfig(firstNodeAttributes,
STORAGE_PROFILES_CONFIGS));
@@ -310,7 +304,7 @@ public class ItDistributionZonesFiltersTest extends
ClusterPerTestIntegrationTes
IgniteImpl node0 = node(0);
// This node passes the filter
- @Language("JSON") String firstNodeAttributes =
"{region:{attribute:\"EU\"},storage:{attribute:\"HDD\"}}";
+ @Language("HOCON") String firstNodeAttributes =
"{region:{attribute:\"EU\"},storage:{attribute:\"HDD\"}}";
IgniteImpl node1 = startNode(1, createStartConfig(firstNodeAttributes,
STORAGE_PROFILES_CONFIGS));
@@ -354,7 +348,7 @@ public class ItDistributionZonesFiltersTest extends
ClusterPerTestIntegrationTes
IgniteImpl node0 = node(0);
// This node passes the filter
- @Language("JSON") String firstNodeAttributes =
"{region:{attribute:\"EU\"},storage:{attribute:\"HDD\"}}";
+ @Language("HOCON") String firstNodeAttributes =
"{region:{attribute:\"EU\"},storage:{attribute:\"HDD\"}}";
startNode(1, createStartConfig(firstNodeAttributes,
STORAGE_PROFILES_CONFIGS));
diff --git
a/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/ItInitializedClusterRestTest.java
b/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/ItInitializedClusterRestTest.java
index 298c5b20f5..0cce5e8cbc 100644
---
a/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/ItInitializedClusterRestTest.java
+++
b/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/ItInitializedClusterRestTest.java
@@ -119,7 +119,7 @@ public class ItInitializedClusterRestTest extends
AbstractRestTestBase {
assertThat(response.statusCode(), is(200));
// And configuration can be parsed to hocon format
Config config = ConfigFactory.parseString(response.body());
- // And rocksDb.defaultRegion.cache can be read
+ // And gc.batchSize can be read
assertThat(config.getInt("gc.batchSize"), is(equalTo(5)));
}
@@ -164,14 +164,14 @@ public class ItInitializedClusterRestTest extends
AbstractRestTestBase {
@Test
@DisplayName("Cluster configuration by path is available when the cluster
is initialized")
void clusterConfigurationByPath() throws IOException, InterruptedException
{
- // When GET /management/v1/configuration/cluster and path selector is
"rocksDb.defaultRegion"
+ // When GET /management/v1/configuration/cluster and path selector is
"gc"
HttpResponse<String> response =
send(get("/management/v1/configuration/cluster/gc"));
// Then cluster configuration is not available
assertThat(response.statusCode(), is(200));
// And configuration can be parsed to hocon format
Config config = ConfigFactory.parseString(response.body());
- // And rocksDb.defaultRegion.cache can be read
+ // And gc.batchSize can be read
assertThat(config.getInt("batchSize"), is(equalTo(5)));
}
diff --git
a/modules/runner/src/testFixtures/java/org/apache/ignite/internal/ClusterPerClassIntegrationTest.java
b/modules/runner/src/testFixtures/java/org/apache/ignite/internal/ClusterPerClassIntegrationTest.java
index 5a9b615750..a1dfffbe4c 100644
---
a/modules/runner/src/testFixtures/java/org/apache/ignite/internal/ClusterPerClassIntegrationTest.java
+++
b/modules/runner/src/testFixtures/java/org/apache/ignite/internal/ClusterPerClassIntegrationTest.java
@@ -71,17 +71,15 @@ public abstract class ClusterPerClassIntegrationTest
extends IgniteIntegrationTe
private static final String NODE_BOOTSTRAP_CFG_TEMPLATE = "{\n"
+ " network: {\n"
+ " port: {},\n"
- + " nodeFinder: {\n"
- + " netClusterNodes: [ {} ]\n"
- + " }\n"
+ + " nodeFinder.netClusterNodes: [ {} ]\n"
+ " },\n"
+ " storage.profiles: {"
+ " " + DEFAULT_TEST_PROFILE_NAME + ".engine: test, "
+ " " + DEFAULT_AIPERSIST_PROFILE_NAME + ".engine:
aipersist, "
+ " " + DEFAULT_AIMEM_PROFILE_NAME + ".engine: aimem, "
- + " " + DEFAULT_ROCKSDB_PROFILE_NAME + ".engine: rocksDb"
+ + " " + DEFAULT_ROCKSDB_PROFILE_NAME + ".engine: rocksdb"
+ " },\n"
- + " clientConnector: { port:{} },\n"
+ + " clientConnector.port: {},\n"
+ " rest.port: {},\n"
+ " compute.threadPoolSize: 1\n"
+ "}";
diff --git
a/modules/runner/src/testFixtures/java/org/apache/ignite/internal/ClusterPerTestIntegrationTest.java
b/modules/runner/src/testFixtures/java/org/apache/ignite/internal/ClusterPerTestIntegrationTest.java
index 83565cf402..1133fc6ce5 100644
---
a/modules/runner/src/testFixtures/java/org/apache/ignite/internal/ClusterPerTestIntegrationTest.java
+++
b/modules/runner/src/testFixtures/java/org/apache/ignite/internal/ClusterPerTestIntegrationTest.java
@@ -47,17 +47,15 @@ public abstract class ClusterPerTestIntegrationTest extends
IgniteIntegrationTes
private static final String NODE_BOOTSTRAP_CFG_TEMPLATE = "{\n"
+ " network: {\n"
+ " port: {},\n"
- + " nodeFinder: {\n"
- + " netClusterNodes: [ {} ]\n"
- + " }\n"
+ + " nodeFinder.netClusterNodes: [ {} ]\n"
+ " },\n"
+ " storage.profiles: {"
+ " " + DEFAULT_TEST_PROFILE_NAME + ".engine: test, "
+ " " + DEFAULT_AIPERSIST_PROFILE_NAME + ".engine:
aipersist, "
+ " " + DEFAULT_AIMEM_PROFILE_NAME + ".engine: aimem, "
- + " " + DEFAULT_ROCKSDB_PROFILE_NAME + ".engine: rocksDb"
+ + " " + DEFAULT_ROCKSDB_PROFILE_NAME + ".engine: rocksdb"
+ " },\n"
- + " clientConnector: { port:{} },\n"
+ + " clientConnector.port: {},\n"
+ " rest.port: {},\n"
+ " compute.threadPoolSize: 1\n"
+ "}";
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 ab8ae858eb..75003c9327 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
@@ -47,7 +47,7 @@ import org.rocksdb.RocksDB;
*/
public class RocksDbStorageEngine implements StorageEngine {
/** Engine name. */
- public static final String ENGINE_NAME = "rocksDb";
+ public static final String ENGINE_NAME = "rocksdb";
private static final IgniteLogger LOG =
Loggers.forClass(RocksDbStorageEngine.class);
diff --git
a/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/configuration/schema/RocksDbProfileConfigurationSchema.java
b/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/configuration/schema/RocksDbProfileConfigurationSchema.java
index 99b84544ea..0f7d33a336 100644
---
a/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/configuration/schema/RocksDbProfileConfigurationSchema.java
+++
b/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/configuration/schema/RocksDbProfileConfigurationSchema.java
@@ -26,7 +26,7 @@ import
org.apache.ignite.internal.storage.rocksdb.RocksDbStorageEngine;
/**
* Storage profile configuration for {@link RocksDbStorageEngine}.
*/
-@PolymorphicConfigInstance("rocksDb")
+@PolymorphicConfigInstance("rocksdb")
public class RocksDbProfileConfigurationSchema extends
StorageProfileConfigurationSchema {
/** Size of the rocksdb offheap cache. */
@Value(hasDefault = true)
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 1e2b6077a7..fd4bb95a14 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
@@ -47,9 +47,9 @@ public class RocksDbMvPartitionStorageConcurrencyTest extends
AbstractMvPartitio
@BeforeEach
void setUp(
@WorkDirectory Path workDir,
- @InjectConfiguration("mock {flushDelayMillis = 0}")
+ @InjectConfiguration("mock.flushDelayMillis = 0")
RocksDbStorageEngineConfiguration engineConfig,
- @InjectConfiguration("mock.profiles.default = {engine =
\"rocksDb\", size = 16777216, writeBufferSize = 16777216}")
+ @InjectConfiguration("mock.profiles.default = {engine = rocksdb,
size = 16777216, writeBufferSize = 16777216}")
StorageConfiguration storageConfiguration
) {
engine = new RocksDbStorageEngine("test", engineConfig,
storageConfiguration, workDir, mock(LogSyncer.class));
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 42096ed878..21b714beb6 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
@@ -47,9 +47,9 @@ public class RocksDbMvPartitionStorageGcTest extends
AbstractMvPartitionStorageG
@BeforeEach
void setUp(
@WorkDirectory Path workDir,
- @InjectConfiguration("mock {flushDelayMillis = 0}")
+ @InjectConfiguration("mock.flushDelayMillis = 0")
RocksDbStorageEngineConfiguration engineConfig,
- @InjectConfiguration("mock.profiles.default = {engine =
\"rocksDb\", size = 16777216, writeBufferSize = 16777216}")
+ @InjectConfiguration("mock.profiles.default = {engine = rocksdb,
size = 16777216, writeBufferSize = 16777216}")
StorageConfiguration storageConfiguration
) {
engine = new RocksDbStorageEngine("test", engineConfig,
storageConfiguration, workDir, mock(LogSyncer.class));
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 58246e21d3..1562fda94a 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
@@ -47,9 +47,9 @@ public class RocksDbMvPartitionStorageTest extends
AbstractMvPartitionStorageTes
@BeforeEach
void setUp(
@WorkDirectory Path workDir,
- @InjectConfiguration("mock {flushDelayMillis = 0}")
+ @InjectConfiguration("mock.flushDelayMillis = 0")
RocksDbStorageEngineConfiguration engineConfig,
- @InjectConfiguration("mock.profiles.default = {engine =
\"rocksDb\", size = 16777216, writeBufferSize = 16777216}")
+ @InjectConfiguration("mock.profiles.default = {engine = rocksdb,
size = 16777216, writeBufferSize = 16777216}")
StorageConfiguration storageConfiguration
) {
engine = new RocksDbStorageEngine("test", engineConfig,
storageConfiguration, workDir, mock(LogSyncer.class));
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 60f7f899f9..52f90af41d 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
@@ -56,9 +56,9 @@ public class RocksDbMvTableStorageTest extends
AbstractMvTableStorageTest {
@BeforeEach
void setUp(
@WorkDirectory Path workDir,
- @InjectConfiguration("mock {flushDelayMillis = 0}")
+ @InjectConfiguration("mock.flushDelayMillis = 0")
RocksDbStorageEngineConfiguration engineConfig,
- @InjectConfiguration("mock.profiles.default = {engine =
\"rocksDb\", size = 16777216, writeBufferSize = 16777216}")
+ @InjectConfiguration("mock.profiles.default {engine = rocksdb,
size = 16777216, writeBufferSize = 16777216}")
StorageConfiguration storageConfiguration
) {
engine = new RocksDbStorageEngine("test", engineConfig,
storageConfiguration, workDir, mock(LogSyncer.class));
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
deleted file mode 100644
index f3fd2f5b66..0000000000
---
a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbStorageEngineTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.storage.rocksdb;
-
-import static org.mockito.Mockito.mock;
-
-import java.nio.file.Path;
-import org.apache.ignite.internal.components.LogSyncer;
-import
org.apache.ignite.internal.configuration.testframework.ConfigurationExtension;
-import
org.apache.ignite.internal.configuration.testframework.InjectConfiguration;
-import org.apache.ignite.internal.storage.configurations.StorageConfiguration;
-import
org.apache.ignite.internal.storage.rocksdb.configuration.schema.RocksDbStorageEngineConfiguration;
-import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
-import org.apache.ignite.internal.testframework.WorkDirectory;
-import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
-import org.apache.ignite.internal.util.IgniteUtils;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.extension.ExtendWith;
-
-/**
- * Tests for {@link RocksDbStorageEngine}.
- */
-@ExtendWith(WorkDirectoryExtension.class)
-@ExtendWith(ConfigurationExtension.class)
-public class RocksDbStorageEngineTest extends BaseIgniteAbstractTest {
- @InjectConfiguration
- RocksDbStorageEngineConfiguration engineConfig;
-
- @InjectConfiguration("mock.profiles.default = {engine = \"rocksDb\"}")
- StorageConfiguration storageConfiguration;
-
- private RocksDbStorageEngine engine;
-
- private RocksDbTableStorage table;
-
- @BeforeEach
- void setUp(@WorkDirectory Path workDir) {
- engine = new RocksDbStorageEngine("test", engineConfig,
storageConfiguration, workDir, mock(LogSyncer.class));
-
- engine.start();
- }
-
- @AfterEach
- void tearDown() throws Exception {
- IgniteUtils.closeAllManually(
- table,
- engine == null ? null : engine::stop
- );
- }
-}
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 9eada80f0f..77904b0f15 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
@@ -36,7 +36,7 @@ public class RocksDbStorageEngineTest extends
AbstractStorageEngineTest {
@InjectConfiguration("mock.flushDelayMillis = 0")
private RocksDbStorageEngineConfiguration engineConfiguration;
- @InjectConfiguration("mock.profiles.default = {engine = \"rocksDb\"}")
+ @InjectConfiguration("mock.profiles.default.engine = rocksdb")
StorageConfiguration storageConfiguration;
@WorkDirectory
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 15e76376c2..024ac7572f 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
@@ -48,9 +48,9 @@ public class RocksDbHashIndexStorageTest extends
AbstractHashIndexStorageTest {
@BeforeEach
void setUp(
@WorkDirectory Path workDir,
- @InjectConfiguration("mock {flushDelayMillis = 0}")
+ @InjectConfiguration("mock.flushDelayMillis = 0")
RocksDbStorageEngineConfiguration engineConfig,
- @InjectConfiguration("mock.profiles.default = {engine =
\"rocksDb\", size = 16777216, writeBufferSize = 16777216}")
+ @InjectConfiguration("mock.profiles.default = {engine = rocksdb,
size = 16777216, writeBufferSize = 16777216}")
StorageConfiguration storageConfiguration
) {
engine = new RocksDbStorageEngine("test", engineConfig,
storageConfiguration, workDir, mock(LogSyncer.class));
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 64756133e8..043998e049 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
@@ -48,9 +48,9 @@ public class RocksDbSortedIndexStorageTest extends
AbstractSortedIndexStorageTes
@BeforeEach
void setUp(
@WorkDirectory Path workDir,
- @InjectConfiguration("mock {flushDelayMillis = 0}")
+ @InjectConfiguration("mock.flushDelayMillis = 0")
RocksDbStorageEngineConfiguration engineConfig,
- @InjectConfiguration("mock.profiles.default = {engine =
\"rocksDb\", size = 16777216, writeBufferSize = 16777216}")
+ @InjectConfiguration("mock.profiles.default = {engine = rocksdb,
size = 16777216, writeBufferSize = 16777216}")
StorageConfiguration storageConfiguration
) {
engine = new RocksDbStorageEngine("test", engineConfig,
storageConfiguration, workDir, mock(LogSyncer.class));
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 a60ebdee50..2c72278daf 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
@@ -76,7 +76,7 @@ class SharedRocksDbInstanceTest extends IgniteAbstractTest {
@BeforeEach
void setUp(
- @InjectConfiguration("mock.profiles.default = {engine =
\"rocksDb\", size = 16777216, writeBufferSize = 16777216}")
+ @InjectConfiguration("mock.profiles.default {engine = rocksdb,
size = 16777216, writeBufferSize = 16777216}")
StorageConfiguration storageConfiguration,
@InjectConfiguration RocksDbStorageEngineConfiguration engineConfig
) throws Exception {
diff --git
a/modules/table/src/integrationTest/java/org/apache/ignite/internal/raftsnapshot/ItTableRaftSnapshotsTest.java
b/modules/table/src/integrationTest/java/org/apache/ignite/internal/raftsnapshot/ItTableRaftSnapshotsTest.java
index f95ac9cc6b..70b68a98e6 100644
---
a/modules/table/src/integrationTest/java/org/apache/ignite/internal/raftsnapshot/ItTableRaftSnapshotsTest.java
+++
b/modules/table/src/integrationTest/java/org/apache/ignite/internal/raftsnapshot/ItTableRaftSnapshotsTest.java
@@ -120,16 +120,14 @@ class ItTableRaftSnapshotsTest extends
IgniteIntegrationTest {
*/
private static final String NODE_BOOTSTRAP_CFG = "{\n"
+ " network: {\n"
- + " port:{},\n"
- + " nodeFinder:{\n"
- + " netClusterNodes: [ {} ]\n"
- + " }\n"
+ + " port: {},\n"
+ + " nodeFinder.netClusterNodes: [ {} ]\n"
+ " },\n"
+ " raft.rpcInstallSnapshotTimeout: 10000,\n"
+ " storage.profiles: {"
+ " " + DEFAULT_AIPERSIST_PROFILE_NAME + ".engine:
aipersist, "
+ " " + DEFAULT_AIMEM_PROFILE_NAME + ".engine: aimem, "
- + " " + DEFAULT_ROCKSDB_PROFILE_NAME + ".engine: rocksDb"
+ + " " + DEFAULT_ROCKSDB_PROFILE_NAME + ".engine: rocksdb"
+ " },\n"
+ " clientConnector.port: {},\n"
+ " rest.port: {}\n"
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 f7a9f00bb3..fdabbf533c 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
@@ -52,7 +52,7 @@ class RocksDbGcUpdateHandlerTest extends
AbstractGcUpdateHandlerTest {
void setUp(
TestInfo testInfo,
@InjectConfiguration RocksDbStorageEngineConfiguration
engineConfig,
- @InjectConfiguration("mock.profiles.default = {engine =
\"rocksDb\"}")
+ @InjectConfiguration("mock.profiles.default.engine = rocksdb")
StorageConfiguration storageConfiguration
) {
engine = new RocksDbStorageEngine(testNodeName(testInfo, 0),
engineConfig, storageConfiguration, workDir, mock(LogSyncer.class));
