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 @@ -414,7 +414,9 @@ public void testManageTable() {
try {
statement.execute("alter table table2 add column speed DOUBLE FIELD");
} catch (final SQLException e) {
assertEquals("552: Column 'speed' already exist", e.getMessage());
assertEquals(
"552: Column 'speed' already exists or its source measurement is already mapped",
e.getMessage());
}

statement.execute("alter table table2 add column if not exists speed DOUBLE FIELD");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -655,8 +655,9 @@ public final class ManagerMessages {
public static final String
MESSAGE_ARG_SHOULD_BE_GREATER_THAN_OR_EQUAL_TO_DEFAULT_ARGREGIONGROUPNUM_ARG_4C00E92C =
"%s should be greater than or equal to default %sRegionGroupNum: %d.";
public static final String MESSAGE_COLUMN_ARG_ALREADY_EXIST_92F91B6A =
"Column '%s' already exist";
public static final String
MESSAGE_COLUMN_ARG_ALREADY_EXISTS_OR_ITS_SOURCE_MEASUREMENT_IS_ALREADY_MAPPED_8421FEAD =
"Column '%s' already exists or its source measurement is already mapped";
public static final String MESSAGE_COLUMN_ARG_DOES_NOT_EXIST_FF67AE82 =
"Column '%s' does not exist";
public static final String
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,9 @@ public final class ManagerMessages {
public static final String
MESSAGE_ARG_SHOULD_BE_GREATER_THAN_OR_EQUAL_TO_DEFAULT_ARGREGIONGROUPNUM_ARG_4C00E92C =
"%s 应大于或等于默认的 %sRegionGroupNum:%d。";
public static final String MESSAGE_COLUMN_ARG_ALREADY_EXIST_92F91B6A = "列 '%s' 已存在";
public static final String
MESSAGE_COLUMN_ARG_ALREADY_EXISTS_OR_ITS_SOURCE_MEASUREMENT_IS_ALREADY_MAPPED_8421FEAD =
"列 '%s' 已存在,或它引用的源测点已被映射";
public static final String MESSAGE_COLUMN_ARG_DOES_NOT_EXIST_FF67AE82 = "列 '%s' 不存在";
public static final String
MESSAGE_CONFIGNODE_LEADER_IS_WAITING_FOR_CLUSTER_HEARTBEAT_SAMPLING_EDB0331F =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1703,7 +1703,8 @@ public Pair<TSStatus, TsTable> tableColumnCheckForColumnExtension(
// the table read above is a copy, which this check expands and returns
final String errorMsg =
String.format(
ManagerMessages.MESSAGE_COLUMN_ARG_ALREADY_EXIST_92F91B6A,
ManagerMessages
.MESSAGE_COLUMN_ARG_ALREADY_EXISTS_OR_ITS_SOURCE_MEASUREMENT_IS_ALREADY_MAPPED_8421FEAD,
columnSchemaList.stream()
.map(TsTableColumnSchema::getColumnName)
.collect(Collectors.joining(", ")));
Expand Down
Loading