This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 1ded38ce5fd Optimized the error log for illegal database names in tree
model
1ded38ce5fd is described below
commit 1ded38ce5fd9ef06018de9ffab422095716a71bc
Author: Caideyipi <[email protected]>
AuthorDate: Wed Sep 25 09:54:15 2024 +0800
Optimized the error log for illegal database names in tree model
---
.../java/org/apache/iotdb/db/it/path/IoTDBQuotedPathIT.java | 11 ++++++-----
.../service/thrift/ConfigNodeRPCServiceProcessor.java | 9 +++++----
.../iotdb/db/queryengine/plan/parser/StatementGenerator.java | 11 ++++++-----
.../db/schemaengine/schemaregion/utils/MetaFormatUtils.java | 5 +++--
4 files changed, 20 insertions(+), 16 deletions(-)
diff --git
a/integration-test/src/test/java/org/apache/iotdb/db/it/path/IoTDBQuotedPathIT.java
b/integration-test/src/test/java/org/apache/iotdb/db/it/path/IoTDBQuotedPathIT.java
index 0c788782f2a..830c0a06d27 100644
---
a/integration-test/src/test/java/org/apache/iotdb/db/it/path/IoTDBQuotedPathIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/db/it/path/IoTDBQuotedPathIT.java
@@ -101,15 +101,16 @@ public class IoTDBQuotedPathIT {
@Test
public void testIllegalStorageGroup() {
- try (Connection connection = EnvFactory.getEnv().getConnection();
- Statement statement = connection.createStatement()) {
+ try (final Connection connection = EnvFactory.getEnv().getConnection();
+ final Statement statement = connection.createStatement()) {
statement.execute("CREATE DATABASE root.`\"ln`");
- } catch (SQLException e) {
+ } catch (final SQLException e) {
Assert.assertTrue(
e.getMessage().contains("Error StorageGroup name")
|| e.getMessage()
- .contains("The database name can only be characters, numbers
and underscores."));
- } catch (Exception e) {
+ .contains(
+ "The database name can only contain english or chinese
characters, numbers, backticks and underscores."));
+ } catch (final Exception e) {
e.printStackTrace();
Assert.fail();
}
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
index c6ca89969bc..d64e82026a4 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
@@ -383,9 +383,10 @@ public class ConfigNodeRPCServiceProcessor implements
IConfigNodeRPCService.Ifac
}
@Override
- public TSStatus setDatabase(TDatabaseSchema databaseSchema) {
+ public TSStatus setDatabase(final TDatabaseSchema databaseSchema) {
TSStatus errorResp = null;
- boolean isSystemDatabase =
databaseSchema.getName().equals(SchemaConstant.SYSTEM_DATABASE);
+ final boolean isSystemDatabase =
+ databaseSchema.getName().equals(SchemaConstant.SYSTEM_DATABASE);
if (databaseSchema.getTTL() < 0) {
errorResp =
@@ -465,9 +466,9 @@ public class ConfigNodeRPCServiceProcessor implements
IConfigNodeRPCService.Ifac
databaseSchema.setMaxSchemaRegionGroupNum(databaseSchema.getMinSchemaRegionGroupNum());
databaseSchema.setMaxDataRegionGroupNum(databaseSchema.getMinDataRegionGroupNum());
- DatabaseSchemaPlan setPlan =
+ final DatabaseSchemaPlan setPlan =
new DatabaseSchemaPlan(ConfigPhysicalPlanType.CreateDatabase,
databaseSchema);
- TSStatus resp = configManager.setDatabase(setPlan);
+ final TSStatus resp = configManager.setDatabase(setPlan);
// Print log to record the ConfigNode that performs the set
SetDatabaseRequest
LOGGER.info("Execute SetDatabase: {} with result: {}", databaseSchema,
resp);
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java
index 8e497ca056c..20461c5011c 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java
@@ -530,11 +530,11 @@ public class StatementGenerator {
return insertStatement;
}
- public static DatabaseSchemaStatement createStatement(String database)
+ public static DatabaseSchemaStatement createStatement(final String database)
throws IllegalPathException {
- long startTime = System.nanoTime();
+ final long startTime = System.nanoTime();
// construct create database statement
- DatabaseSchemaStatement statement =
+ final DatabaseSchemaStatement statement =
new
DatabaseSchemaStatement(DatabaseSchemaStatement.DatabaseSchemaStatementType.CREATE);
statement.setDatabasePath(parseDatabaseRawString(database));
PERFORMANCE_OVERVIEW_METRICS.recordParseCost(System.nanoTime() -
startTime);
@@ -889,8 +889,9 @@ public class StatementGenerator {
insertRowStatement.setMeasurements(newMeasurements.toArray(new String[0]));
}
- private static PartialPath parseDatabaseRawString(String database) throws
IllegalPathException {
- PartialPath databasePath = new PartialPath(database);
+ private static PartialPath parseDatabaseRawString(final String database)
+ throws IllegalPathException {
+ final PartialPath databasePath = new PartialPath(database);
if (databasePath.getNodeLength() < 2) {
throw new IllegalPathException(database);
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/utils/MetaFormatUtils.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/utils/MetaFormatUtils.java
index 1b7017e6940..579fb8f9cb6 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/utils/MetaFormatUtils.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/utils/MetaFormatUtils.java
@@ -102,11 +102,12 @@ public class MetaFormatUtils {
}
/** check whether the database name uses illegal characters */
- public static void checkDatabase(String database) throws
IllegalPathException {
+ public static void checkDatabase(final String database) throws
IllegalPathException {
if (!IoTDBConfig.STORAGE_GROUP_PATTERN.matcher(database).matches()) {
throw new IllegalPathException(
String.format(
- "The database name can only be characters, numbers and
underscores. %s", database));
+ "The database name can only contain english or chinese
characters, numbers, backticks and underscores. %s",
+ database));
}
}
