Set the parameter names from default_storage_group_level to default_database_level (#16626) (#16646)

Author: Caideyipi

integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppCommonConfig.java

@@ -551,7 +551,7 @@ public CommonConfig setSubscriptionEnabled(boolean subscriptionEnabled) {
 
   @Override
   public CommonConfig setDefaultStorageGroupLevel(int defaultStorageGroupLevel) {
-    setProperty("default_storage_group_level", String.valueOf(defaultStorageGroupLevel));
+    setProperty("default_database_level", String.valueOf(defaultStorageGroupLevel));
     return this;
   }
 

integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSetConfigurationIT.java

@@ -213,7 +213,7 @@ public void testSetDefaultSGLevel() throws SQLException {
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
       // legal value
-      statement.execute("set configuration \"default_storage_group_level\"=\"3\"");
+      statement.execute("set configuration \"default_database_level\"=\"3\"");
       statement.execute("INSERT INTO root.a.b.c.d1(timestamp, s1) VALUES (1, 1)");
       ResultSet databases = statement.executeQuery("show databases");
       databases.next();
@@ -231,18 +231,18 @@ public void testSetDefaultSGLevel() throws SQLException {
 
       // illegal value
       try {
-        statement.execute("set configuration \"default_storage_group_level\"=\"-1\"");
+        statement.execute("set configuration \"default_database_level\"=\"-1\"");
       } catch (SQLException e) {
-        assertTrue(e.getMessage().contains("Illegal defaultStorageGroupLevel: -1, should >= 1"));
+        assertTrue(e.getMessage().contains("Illegal defaultDatabaseLevel: -1, should >= 1"));
       }
 
       // Failed updates will not change the files.
       assertFalse(
           checkConfigFileContains(
-              EnvFactory.getEnv().getDataNodeWrapper(0), "default_storage_group_level=-1"));
+              EnvFactory.getEnv().getDataNodeWrapper(0), "default_database_level=-1"));
       assertTrue(
           checkConfigFileContains(
-              EnvFactory.getEnv().getDataNodeWrapper(0), "default_storage_group_level=3"));
+              EnvFactory.getEnv().getDataNodeWrapper(0), "default_database_level=3"));
     }
 
     // can start with an illegal value

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java

@@ -692,7 +692,7 @@ public class IoTDBConfig {
   private TSDataType nanStringInferType = TSDataType.DOUBLE;
 
   /** Database level when creating schema automatically is enabled */
-  private int defaultStorageGroupLevel = 1;
+  private int defaultDatabaseLevel = 1;
 
   /** BOOLEAN encoding when creating schema automatically is enabled */
   private TSEncoding defaultBooleanEncoding = TSEncoding.RLE;
@@ -2490,24 +2490,23 @@ public void setNanStringInferType(TSDataType nanStringInferType) {
     this.nanStringInferType = nanStringInferType;
   }
 
-  public int getDefaultStorageGroupLevel() {
-    return defaultStorageGroupLevel;
+  public int getDefaultDatabaseLevel() {
+    return defaultDatabaseLevel;
   }
 
-  void setDefaultStorageGroupLevel(int defaultStorageGroupLevel, boolean startUp) {
-    if (defaultStorageGroupLevel < 1) {
+  void setDefaultDatabaseLevel(int defaultDatabaseLevel, boolean startUp) {
+    if (defaultDatabaseLevel < 1) {
       if (startUp) {
         logger.warn(
-            "Illegal defaultStorageGroupLevel: {}, should >= 1, use default value 1",
-            defaultStorageGroupLevel);
-        defaultStorageGroupLevel = 1;
+            "Illegal defaultDatabaseLevel: {}, should >= 1, use default value 1",
+            defaultDatabaseLevel);
+        defaultDatabaseLevel = 1;
       } else {
         throw new IllegalArgumentException(
-            String.format(
-                "Illegal defaultStorageGroupLevel: %d, should >= 1", defaultStorageGroupLevel));
+            String.format("Illegal defaultDatabaseLevel: %d, should >= 1", defaultDatabaseLevel));
       }
     }
-    this.defaultStorageGroupLevel = defaultStorageGroupLevel;
+    this.defaultDatabaseLevel = defaultDatabaseLevel;
   }
 
   public TSEncoding getDefaultBooleanEncoding() {

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java

@@ -1691,12 +1691,18 @@ private void loadAutoCreateSchemaProps(TrimProperties properties, boolean startU
             properties.getProperty(
                 "nan_string_infer_type",
                 ConfigurationFileUtils.getConfigurationDefaultValue("nan_string_infer_type"))));
-    conf.setDefaultStorageGroupLevel(
+    conf.setDefaultDatabaseLevel(
         Integer.parseInt(
-            properties.getProperty(
-                "default_storage_group_level",
-                ConfigurationFileUtils.getConfigurationDefaultValue(
-                    "default_storage_group_level"))),
+            Optional.ofNullable(properties.getProperty("default_database_level"))
+                .orElse(
+                    properties.getProperty(
+                        "default_storage_group_level",
+                        Optional.ofNullable(
+                                ConfigurationFileUtils.getConfigurationDefaultValue(
+                                    "default_database_level"))
+                            .orElse(
+                                ConfigurationFileUtils.getConfigurationDefaultValue(
+                                    "default_storage_group_level"))))),
         startUp);
     conf.setDefaultBooleanEncoding(
         properties.getProperty(

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/partition/PartitionCache.java

@@ -246,7 +246,7 @@ private void createStorageGroupAndUpdateCache(
           } else {
             PartialPath databaseNameNeedCreated =
                 MetaUtils.getStorageGroupPathByLevel(
-                    new PartialPath(devicePath), config.getDefaultStorageGroupLevel());
+                    new PartialPath(devicePath), config.getDefaultDatabaseLevel());
             databaseNamesNeedCreated.add(databaseNameNeedCreated.getFullPath());
           }
         }

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/LoadTsFileStatement.java

@@ -57,7 +57,7 @@ public class LoadTsFileStatement extends Statement {
 
   public LoadTsFileStatement(String filePath) throws FileNotFoundException {
     this.file = new File(filePath);
-    this.databaseLevel = IoTDBDescriptor.getInstance().getConfig().getDefaultStorageGroupLevel();
+    this.databaseLevel = IoTDBDescriptor.getInstance().getConfig().getDefaultDatabaseLevel();
     this.verifySchema = true;
     this.deleteAfterLoad = false;
     this.convertOnTypeMismatch = true;
@@ -90,7 +90,7 @@ public static List<File> processTsFile(final File file) throws FileNotFoundExcep
 
   protected LoadTsFileStatement() {
     this.file = null;
-    this.databaseLevel = IoTDBDescriptor.getInstance().getConfig().getDefaultStorageGroupLevel();
+    this.databaseLevel = IoTDBDescriptor.getInstance().getConfig().getDefaultDatabaseLevel();
     this.verifySchema = true;
     this.deleteAfterLoad = false;
     this.convertOnTypeMismatch = true;

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/config/LoadTsFileConfigurator.java

@@ -61,7 +61,7 @@ public static void validateParameters(final String key, final String value) {
 
   public static final String DATABASE_LEVEL_KEY = "database-level";
   private static final int DATABASE_LEVEL_DEFAULT_VALUE =
-      IoTDBDescriptor.getInstance().getConfig().getDefaultStorageGroupLevel();
+      IoTDBDescriptor.getInstance().getConfig().getDefaultDatabaseLevel();
   private static final int DATABASE_LEVEL_MIN_VALUE = 1;
 
   public static void validateDatabaseLevelParam(final String databaseLevel) {

iotdb-core/node-commons/src/assembly/resources/conf/iotdb-system.properties.template

@@ -910,7 +910,7 @@ enable_auto_create_schema=true
 # Default: 1
 # When illegal: report an error and change nothing during hot-reload; use the default value in
 # start-up
-default_storage_group_level=1
+default_database_level=1
 
 # ALL data types: BOOLEAN, INT32, INT64, FLOAT, DOUBLE, TEXT