Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -1054,7 +1054,9 @@ public void testLoadWithConvertOnTypeMismatchForTableModel() throws Exception {
statement.execute(String.format("create database if not exists %s", SchemaConfig.DATABASE_0));
statement.execute(String.format("use %s", SchemaConfig.DATABASE_0));
statement.execute(convert2TableSQL(SchemaConfig.TABLE_0, schemaList1, columnCategories));
statement.execute(String.format("load '%s'", file.getAbsolutePath()));
statement.execute(
String.format(
"load '%s' with ('database'='%s')", file.getAbsolutePath(), SchemaConfig.DATABASE_0));
try (final ResultSet resultSet =
statement.executeQuery(String.format("select count(*) from %s", SchemaConfig.TABLE_0))) {
if (resultSet.next()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2121,6 +2121,7 @@ public Statement visitLoadFile(IoTDBSqlParser.LoadFileContext ctx) {
LoadTsFileConfigurator.validateParameters(key, value);
loadTsFileAttributes.put(key, value);
}
LoadTsFileConfigurator.validateSynonymParameters(loadTsFileAttributes);

loadTsFileStatement.setLoadAttributes(loadTsFileAttributes);
return loadTsFileStatement;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -996,6 +996,7 @@ public Node visitLoadTsFileStatement(RelationalSqlParser.LoadTsFileStatementCont
: new HashMap<>();

withAttributes.forEach(LoadTsFileConfigurator::validateParameters);
LoadTsFileConfigurator.validateSynonymParameters(withAttributes);
return new LoadTsFile(
getLocation(ctx), ((StringLiteral) visit(ctx.fileName)).getValue(), withAttributes);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ public static void validateParameters(final String key, final String value) {
validateOnSuccessParam(value);
break;
case DATABASE_NAME_KEY:
case DATABASE_KEY:
case TABLET_CONVERSION_THRESHOLD_KEY:
break;
case CONVERT_ON_TYPE_MISMATCH_KEY:
Expand All @@ -61,6 +62,17 @@ public static void validateParameters(final String key, final String value) {
}
}

public static void validateSynonymParameters(final Map<String, String> parameters) {
if (parameters.containsKey(DATABASE_KEY) && parameters.containsKey(DATABASE_NAME_KEY)) {
throw new SemanticException(
"The parameter key '"
+ DATABASE_KEY
+ "' and '"
+ DATABASE_NAME_KEY
+ "' cannot co-exist.");
}
}

public static final String DATABASE_LEVEL_KEY = "database-level";
private static final int DATABASE_LEVEL_DEFAULT_VALUE =
IoTDBDescriptor.getInstance().getConfig().getDefaultStorageGroupLevel();
Expand Down Expand Up @@ -90,9 +102,13 @@ public static int parseOrGetDefaultDatabaseLevel(final Map<String, String> loadA
}

public static final String DATABASE_NAME_KEY = "database-name";
public static final String DATABASE_KEY = "database";

public static @Nullable String parseDatabaseName(final Map<String, String> loadAttributes) {
final String databaseName = loadAttributes.get(DATABASE_NAME_KEY);
String databaseName = loadAttributes.get(DATABASE_NAME_KEY);
if (Objects.isNull(databaseName)) {
databaseName = loadAttributes.get(DATABASE_KEY);
}
return Objects.nonNull(databaseName) ? databaseName.toLowerCase(Locale.ENGLISH) : null;
}

Expand Down
Loading