This is an automated email from the ASF dual-hosted git repository.
rpuch 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 e41ee1dd79 IGNITE-24114 Only create default storage profile if it
doesn't exist (#4970)
e41ee1dd79 is described below
commit e41ee1dd796c209115d818a26aded1dbf27bd9a1
Author: Roman Puchkovskiy <[email protected]>
AuthorDate: Wed Dec 25 16:09:39 2024 +0400
IGNITE-24114 Only create default storage profile if it doesn't exist (#4970)
---
.../ItDefaultStorageProfileTest.java | 59 ++++++++++++++++++++++
.../engine/ThreadAssertingMvTableStorage.java | 8 ++-
...emoryStorageEngineLocalConfigurationModule.java | 13 +++--
3 files changed, 76 insertions(+), 4 deletions(-)
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/storageprofile/ItDefaultStorageProfileTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/storageprofile/ItDefaultStorageProfileTest.java
new file mode 100644
index 0000000000..23f8fe3885
--- /dev/null
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/storageprofile/ItDefaultStorageProfileTest.java
@@ -0,0 +1,59 @@
+/*
+ * 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.storageprofile;
+
+import static org.apache.ignite.internal.TestWrappers.unwrapTableImpl;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.isA;
+
+import com.typesafe.config.parser.ConfigDocument;
+import com.typesafe.config.parser.ConfigDocumentFactory;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.internal.ClusterPerTestIntegrationTest;
+import org.apache.ignite.internal.catalog.CatalogService;
+import org.apache.ignite.internal.storage.engine.MvTableStorage;
+import org.apache.ignite.internal.storage.rocksdb.RocksDbTableStorage;
+import org.apache.ignite.internal.table.TableImpl;
+import org.apache.ignite.internal.wrapper.Wrappers;
+import org.junit.jupiter.api.Test;
+
+class ItDefaultStorageProfileTest extends ClusterPerTestIntegrationTest {
+ @Override
+ protected int initialNodes() {
+ return 1;
+ }
+
+ @Override
+ protected String getNodeBootstrapConfigTemplate() {
+ ConfigDocument document =
ConfigDocumentFactory.parseString(super.getNodeBootstrapConfigTemplate());
+ document = document.withValueText("ignite.storage.profiles." +
CatalogService.DEFAULT_STORAGE_PROFILE + ".engine", "rocksdb");
+ return document.render();
+ }
+
+ @Test
+ void engineInDefaultStorageProfileCanBeChanged() {
+ Ignite node = node(0);
+
+ node.sql().executeScript("CREATE TABLE TEST_TABLE (ID INT PRIMARY
KEY)");
+
+ TableImpl table = unwrapTableImpl(node.tables().table("TEST_TABLE"));
+ MvTableStorage tableStorage =
Wrappers.unwrap(table.internalTable().storage(), MvTableStorage.class);
+
+ assertThat(tableStorage, isA(RocksDbTableStorage.class));
+ }
+}
diff --git
a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/engine/ThreadAssertingMvTableStorage.java
b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/engine/ThreadAssertingMvTableStorage.java
index d48875ea88..836a804c79 100644
---
a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/engine/ThreadAssertingMvTableStorage.java
+++
b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/engine/ThreadAssertingMvTableStorage.java
@@ -31,6 +31,7 @@ import
org.apache.ignite.internal.storage.index.StorageSortedIndexDescriptor;
import
org.apache.ignite.internal.storage.index.ThreadAssertingHashIndexStorage;
import
org.apache.ignite.internal.storage.index.ThreadAssertingSortedIndexStorage;
import org.apache.ignite.internal.worker.ThreadAssertions;
+import org.apache.ignite.internal.wrapper.Wrapper;
import org.jetbrains.annotations.Nullable;
/**
@@ -39,7 +40,7 @@ import org.jetbrains.annotations.Nullable;
*
* @see ThreadAssertions
*/
-public class ThreadAssertingMvTableStorage implements MvTableStorage {
+public class ThreadAssertingMvTableStorage implements MvTableStorage, Wrapper {
private final MvTableStorage tableStorage;
/** Constructor. */
@@ -145,4 +146,9 @@ public class ThreadAssertingMvTableStorage implements
MvTableStorage {
public StorageTableDescriptor getTableDescriptor() {
return tableStorage.getTableDescriptor();
}
+
+ @Override
+ public <T> T unwrap(Class<T> classToUnwrap) {
+ return classToUnwrap.cast(tableStorage);
+ }
}
diff --git
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/configuration/PageMemoryStorageEngineLocalConfigurationModule.java
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/configuration/PageMemoryStorageEngineLocalConfigurationModule.java
index 475930c8c7..e7f9a1e08e 100644
---
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/configuration/PageMemoryStorageEngineLocalConfigurationModule.java
+++
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/configuration/PageMemoryStorageEngineLocalConfigurationModule.java
@@ -21,6 +21,7 @@ import com.google.auto.service.AutoService;
import java.util.Collection;
import java.util.List;
import org.apache.ignite.configuration.ConfigurationModule;
+import org.apache.ignite.configuration.NamedListChange;
import org.apache.ignite.configuration.SuperRootChange;
import org.apache.ignite.configuration.annotation.ConfigurationType;
import
org.apache.ignite.internal.pagememory.configuration.schema.PersistentPageMemoryProfileChange;
@@ -28,6 +29,8 @@ import
org.apache.ignite.internal.pagememory.configuration.schema.PersistentPage
import
org.apache.ignite.internal.pagememory.configuration.schema.VolatilePageMemoryProfileConfigurationSchema;
import
org.apache.ignite.internal.storage.configurations.StorageExtensionChange;
import
org.apache.ignite.internal.storage.configurations.StorageExtensionConfiguration;
+import org.apache.ignite.internal.storage.configurations.StorageProfileChange;
+import org.apache.ignite.internal.storage.configurations.StorageProfileView;
import
org.apache.ignite.internal.storage.pagememory.configuration.schema.PersistentPageMemoryStorageEngineExtensionConfigurationSchema;
import
org.apache.ignite.internal.storage.pagememory.configuration.schema.VolatilePageMemoryStorageEngineExtensionConfigurationSchema;
@@ -62,8 +65,12 @@ public class PageMemoryStorageEngineLocalConfigurationModule
implements Configur
@Override
public void patchConfigurationWithDynamicDefaults(SuperRootChange
rootChange) {
StorageExtensionChange storageExtensionChange =
(StorageExtensionChange)
rootChange.changeRoot(StorageExtensionConfiguration.KEY);
-
storageExtensionChange.changeStorage().changeProfiles().createOrUpdate(DEFAULT_PROFILE_NAME,
p -> {
- p.convert(PersistentPageMemoryProfileChange.class);
- });
+ NamedListChange<StorageProfileView, StorageProfileChange> profiles =
storageExtensionChange.changeStorage().changeProfiles();
+
+ if (profiles.get(DEFAULT_PROFILE_NAME) == null) {
+ profiles.create(DEFAULT_PROFILE_NAME, profileChange -> {
+ profileChange.convert(PersistentPageMemoryProfileChange.class);
+ });
+ }
}
}
