(ignite-3) branch main updated: IGNITE-21048 Support for changing type of default Storage Engine (#2939)

[sergeychugunov]

This is an automated email from the ASF dual-hosted git repository.

sergeychugunov 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 67601b5ba7 IGNITE-21048 Support for changing type of default Storage 
Engine (#2939)
67601b5ba7 is described below

commit 67601b5ba7f73d8e3f9bda96dc9cddc4942f49ac
Author: Sergey Chugunov <sergey.chugu...@gmail.com>
AuthorDate: Mon Dec 18 12:29:50 2023 +0400

    IGNITE-21048 Support for changing type of default Storage Engine (#2939)
    
    Signed-off-by: Kirill Tkalenko <tkalkir...@yandex.ru>
---
 .../org/apache/ignite/internal/catalog/commands/CatalogUtils.java | 3 ++-
 .../ignite/internal/sql/engine/prepare/PrepareServiceImpl.java    | 3 ++-
 .../org/apache/ignite/internal/storage/DataStorageManager.java    | 8 --------
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git 
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CatalogUtils.java
 
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CatalogUtils.java
index 52178827b6..4470edfa87 100644
--- 
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CatalogUtils.java
+++ 
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CatalogUtils.java
@@ -40,6 +40,7 @@ import 
org.apache.ignite.internal.catalog.descriptors.CatalogSchemaDescriptor;
 import 
org.apache.ignite.internal.catalog.descriptors.CatalogTableColumnDescriptor;
 import org.apache.ignite.internal.catalog.descriptors.CatalogTableDescriptor;
 import org.apache.ignite.internal.catalog.descriptors.CatalogZoneDescriptor;
+import org.apache.ignite.internal.lang.IgniteSystemProperties;
 import org.apache.ignite.internal.type.NativeTypes;
 import org.apache.ignite.sql.ColumnType;
 import org.jetbrains.annotations.Nullable;
@@ -62,7 +63,7 @@ public class CatalogUtils {
 
     /** Default distribution zone storage engine. */
     // TODO: IGNITE-19719 Should be defined differently
-    public static final String DEFAULT_STORAGE_ENGINE = "aipersist";
+    public static final String DEFAULT_STORAGE_ENGINE = 
IgniteSystemProperties.getString("IGNITE_DEFAULT_STORAGE_ENGINE", "aipersist");
 
     /** Default distribution zone storage engine data region. */
     // TODO: IGNITE-19719 Must be storage engine specific
diff --git 
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/PrepareServiceImpl.java
 
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/PrepareServiceImpl.java
index d828777231..5b287f80c0 100644
--- 
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/PrepareServiceImpl.java
+++ 
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/PrepareServiceImpl.java
@@ -41,6 +41,7 @@ import org.apache.calcite.sql.SqlDdl;
 import org.apache.calcite.sql.SqlExplain;
 import org.apache.calcite.sql.SqlNode;
 import org.apache.calcite.sql.SqlNodeList;
+import org.apache.ignite.internal.catalog.commands.CatalogUtils;
 import org.apache.ignite.internal.lang.SqlExceptionMapperUtil;
 import org.apache.ignite.internal.logger.IgniteLogger;
 import org.apache.ignite.internal.logger.Loggers;
@@ -130,7 +131,7 @@ public class PrepareServiceImpl implements PrepareService {
                 nodeName,
                 cacheSize,
                 cacheFactory,
-                new DdlSqlToCommandConverter(dataStorageFields, 
DataStorageManager::defaultDataStorage),
+                new DdlSqlToCommandConverter(dataStorageFields, () -> 
CatalogUtils.DEFAULT_STORAGE_ENGINE),
                 DEFAULT_PLANNER_TIMEOUT,
                 metricManager
         );
diff --git 
a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/DataStorageManager.java
 
b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/DataStorageManager.java
index 8b2509005a..d10f5df177 100644
--- 
a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/DataStorageManager.java
+++ 
b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/DataStorageManager.java
@@ -33,9 +33,6 @@ import org.jetbrains.annotations.Nullable;
 
 /** Data storage manager. */
 public class DataStorageManager implements IgniteComponent {
-    // TODO: IGNITE-20237 Make it configurable
-    private static final String DEFAULT_DATA_STORAGE = "aipersist";
-
     /** Mapping: {@link DataStorageModule#name} -> {@link StorageEngine}. */
     private final Map<String, StorageEngine> engines;
 
@@ -69,11 +66,6 @@ public class DataStorageManager implements IgniteComponent {
         return engines.get(name);
     }
 
-    /** Returns the default data storage. */
-    public static String defaultDataStorage() {
-        return DEFAULT_DATA_STORAGE;
-    }
-
     /**
      * Creates a consumer that will change the {@link 
DataStorageConfigurationSchema data storage}.
      *