This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch dev/1.3
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/dev/1.3 by this push:
new 78630df7186 Set the parameter names from default_storage_group_level
to default_database_level (#16626) (#16646)
78630df7186 is described below
commit 78630df7186cf68255bb5ffc04df89ea12497d8b
Author: Caideyipi <[email protected]>
AuthorDate: Mon Nov 17 23:07:51 2025 +0800
Set the parameter names from default_storage_group_level to
default_database_level (#16626) (#16646)
---
.../it/env/cluster/config/MppCommonConfig.java | 2 +-
.../apache/iotdb/db/it/IoTDBSetConfigurationIT.java | 10 +++++-----
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 21 ++++++++++-----------
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 16 +++++++++++-----
.../analyze/cache/partition/PartitionCache.java | 2 +-
.../plan/statement/crud/LoadTsFileStatement.java | 4 ++--
.../load/config/LoadTsFileConfigurator.java | 2 +-
.../resources/conf/iotdb-system.properties.template | 2 +-
8 files changed, 32 insertions(+), 27 deletions(-)
diff --git
a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppCommonConfig.java
b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppCommonConfig.java
index 2e715176eb8..052d2bdc146 100644
---
a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppCommonConfig.java
+++
b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppCommonConfig.java
@@ -551,7 +551,7 @@ public class MppCommonConfig extends MppBaseConfig
implements CommonConfig {
@Override
public CommonConfig setDefaultStorageGroupLevel(int
defaultStorageGroupLevel) {
- setProperty("default_storage_group_level",
String.valueOf(defaultStorageGroupLevel));
+ setProperty("default_database_level",
String.valueOf(defaultStorageGroupLevel));
return this;
}
diff --git
a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSetConfigurationIT.java
b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSetConfigurationIT.java
index 09a3a295112..4cb8454f05b 100644
---
a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSetConfigurationIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSetConfigurationIT.java
@@ -213,7 +213,7 @@ public class IoTDBSetConfigurationIT {
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 class IoTDBSetConfigurationIT {
// 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
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
index 1a65d588aa5..abd86cfef35 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
+++
b/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 class IoTDBConfig {
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() {
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
index e093d73a3c6..1ae3c4c7fef 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
@@ -1691,12 +1691,18 @@ public class IoTDBDescriptor {
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(
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/partition/PartitionCache.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/partition/PartitionCache.java
index cf876d92882..5bd88b79feb 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/partition/PartitionCache.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/partition/PartitionCache.java
@@ -246,7 +246,7 @@ public class PartitionCache {
} else {
PartialPath databaseNameNeedCreated =
MetaUtils.getStorageGroupPathByLevel(
- new PartialPath(devicePath),
config.getDefaultStorageGroupLevel());
+ new PartialPath(devicePath),
config.getDefaultDatabaseLevel());
databaseNamesNeedCreated.add(databaseNameNeedCreated.getFullPath());
}
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/LoadTsFileStatement.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/LoadTsFileStatement.java
index 88a00d39599..1ee2bd2cc60 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/LoadTsFileStatement.java
+++
b/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 class LoadTsFileStatement extends Statement {
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;
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/config/LoadTsFileConfigurator.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/config/LoadTsFileConfigurator.java
index 6ab188915f5..65d5b9d2941 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/config/LoadTsFileConfigurator.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/config/LoadTsFileConfigurator.java
@@ -61,7 +61,7 @@ public class LoadTsFileConfigurator {
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) {
diff --git
a/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-system.properties.template
b/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-system.properties.template
index bcfe4756b22..e95ce5a1bea 100644
---
a/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-system.properties.template
+++
b/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
