Skip to content

Commit cee3a40

Browse files
committed
Fixed i18n
1 parent 72b8c04 commit cee3a40

3 files changed

Lines changed: 21 additions & 11 deletions

File tree

iotdb-core/node-commons/src/main/i18n/en/org/apache/iotdb/commons/i18n/CommonMessages.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,14 @@ public final class CommonMessages {
6969
// --- subscription ---
7070
public static final String CONFIG_PRINT = "{}: {}";
7171

72+
// --- partition ---
73+
public static final String DATABASE_NOT_EXISTS_AND_AUTO_CREATE_DISABLED =
74+
"Database %s not exists and failed to create automatically because enable_auto_create_schema is FALSE.";
75+
public static final String DATA_PARTITION_EMPTY =
76+
"Data partition is empty. device: %s, seriesSlot: %s, database: %s";
77+
public static final String TARGET_REGION_LIST_EMPTY =
78+
"targetRegionList is empty. device: %s, timeSlot: %s";
79+
7280
// --- concurrent ---
7381
public static final String EXCEPTION_IN_THREAD = "Exception in thread {}-{}";
7482
public static final String INTERRUPTED_WHILE_AWAITING = "Interrupted while awaiting condition";

iotdb-core/node-commons/src/main/i18n/zh/org/apache/iotdb/commons/i18n/CommonMessages.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,14 @@ public final class CommonMessages {
6868
// --- subscription ---
6969
public static final String CONFIG_PRINT = "{}:{}";
7070

71+
// --- partition ---
72+
public static final String DATABASE_NOT_EXISTS_AND_AUTO_CREATE_DISABLED =
73+
"Database %s 不存在,且由于 enable_auto_create_schema 为 FALSE,无法自动创建。";
74+
public static final String DATA_PARTITION_EMPTY =
75+
"数据分区为空。device: %s, seriesSlot: %s, database: %s";
76+
public static final String TARGET_REGION_LIST_EMPTY =
77+
"targetRegionList 为空。device: %s, timeSlot: %s";
78+
7179
// --- concurrent ---
7280
public static final String EXCEPTION_IN_THREAD = "线程 {}-{} 中发生异常";
7381
public static final String INTERRUPTED_WHILE_AWAITING = "等待条件时被中断";

iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/partition/DataPartition.java

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet;
2323
import org.apache.iotdb.common.rpc.thrift.TSeriesPartitionSlot;
2424
import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot;
25+
import org.apache.iotdb.commons.i18n.CommonMessages;
2526
import org.apache.iotdb.commons.utils.PathUtils;
2627
import org.apache.iotdb.commons.utils.TimePartitionUtils;
2728

@@ -223,25 +224,20 @@ public List<TRegionReplicaSet> getDataRegionReplicaSetForWriting(
223224
dataBasePartitionMap = dataPartitionMap.get(databaseName);
224225
if (dataBasePartitionMap == null) {
225226
throw new RuntimeException(
226-
"Database "
227-
+ databaseName
228-
+ " not exists and failed to create automatically because enable_auto_create_schema is FALSE.");
227+
String.format(CommonMessages.DATABASE_NOT_EXISTS_AND_AUTO_CREATE_DISABLED, databaseName));
229228
}
230229
final Map<TTimePartitionSlot, List<TRegionReplicaSet>> slotReplicaSetMap =
231230
dataBasePartitionMap.get(seriesPartitionSlot);
232231
if (slotReplicaSetMap == null) {
233232
throw new RuntimeException(
234233
String.format(
235-
"Data partition is empty. device: %s, seriesSlot: %s, database: %s",
236-
deviceID, seriesPartitionSlot, databaseName));
234+
CommonMessages.DATA_PARTITION_EMPTY, deviceID, seriesPartitionSlot, databaseName));
237235
}
238236
for (final TTimePartitionSlot timePartitionSlot : timePartitionSlotList) {
239237
final List<TRegionReplicaSet> targetRegionList = slotReplicaSetMap.get(timePartitionSlot);
240238
if (targetRegionList == null || targetRegionList.isEmpty()) {
241239
throw new RuntimeException(
242-
String.format(
243-
"targetRegionList is empty. device: %s, timeSlot: %s",
244-
deviceID, timePartitionSlot));
240+
String.format(CommonMessages.TARGET_REGION_LIST_EMPTY, deviceID, timePartitionSlot));
245241
} else {
246242
dataRegionReplicaSets.add(targetRegionList.get(targetRegionList.size() - 1));
247243
}
@@ -262,9 +258,7 @@ public TRegionReplicaSet getDataRegionReplicaSetForWriting(
262258
databasePartitionMap = dataPartitionMap.get(databaseName);
263259
if (databasePartitionMap == null) {
264260
throw new RuntimeException(
265-
"Database "
266-
+ databaseName
267-
+ " not exists and failed to create automatically because enable_auto_create_schema is FALSE.");
261+
String.format(CommonMessages.DATABASE_NOT_EXISTS_AND_AUTO_CREATE_DISABLED, databaseName));
268262
}
269263
final List<TRegionReplicaSet> regions =
270264
databasePartitionMap.get(seriesPartitionSlot).get(timePartitionSlot);

0 commit comments

Comments
 (0)