Skip to content

Commit 3660635

Browse files
CaideyipiCaideyipi
committed
f
1 parent 1d57a4e commit 3660635

File tree

10 files changed

+47
-47
lines changed

10 files changed

+47
-47
lines changed

‎integration-test/src/test/java/org/apache/iotdb/confignode/it/database/IoTDBDatabaseSetAndDeleteIT.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,16 +171,16 @@ public void testDeleteDatabase() throws Exception {
171171
status = client.setDatabase(databaseSchema0);
172172
Assert.assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
173173
// set Database1 by specific values
174-
TDatabaseSchema databaseSchema1 = new TDatabaseSchema(sg1);
174+
TDatabaseSchema databaseSchema1 = new TDatabaseSchema(db1);
175175
status = client.setDatabase(databaseSchema1);
176176
Assert.assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
177177
TDeleteDatabasesReq deleteDatabasesReq = new TDeleteDatabasesReq();
178-
List<String> sgs = Arrays.asList(sg0, sg1);
179-
deleteDatabasesReq.setPrefixPathList(sgs);
178+
List<String> dbs = Arrays.asList(db0, db1);
179+
deleteDatabasesReq.setPrefixPathList(dbs);
180180
TSStatus deleteSgStatus = client.deleteDatabases(deleteDatabasesReq);
181181
TDatabaseSchemaResp root =
182182
client.getMatchedDatabaseSchemas(
183-
new TGetDatabaseReq(Arrays.asList("root", "sg*"), ALL_MATCH_SCOPE_BINARY));
183+
new TGetDatabaseReq(Arrays.asList("root", "db*"), ALL_MATCH_SCOPE_BINARY));
184184
Assert.assertTrue(root.getDatabaseSchemaMap().isEmpty());
185185
Assert.assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), deleteSgStatus.getCode());
186186
}

‎integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBPartitionCreationIT.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ public void testPartitionAllocation() throws Exception {
279279
EnvFactory.getEnv().registerNewDataNode(true);
280280
partitionSlotsMap =
281281
ConfigNodeTestUtils.constructPartitionSlotsMap(
282-
sg,
282+
db,
283283
2,
284284
2 + testSeriesPartitionBatchSize,
285285
2,
@@ -308,7 +308,7 @@ public void testPartitionAllocation() throws Exception {
308308
dataPartitionTableResp.getStatus().getCode());
309309
Assert.assertNotNull(dataPartitionTableResp.getDataPartitionTable());
310310
ConfigNodeTestUtils.checkDataPartitionTable(
311-
sg,
311+
db,
312312
2,
313313
2 + testSeriesPartitionBatchSize,
314314
2,
@@ -352,7 +352,7 @@ public void testPartitionAllocation() throws Exception {
352352
TimeUnit.SECONDS.sleep(25);
353353
partitionSlotsMap =
354354
ConfigNodeTestUtils.constructPartitionSlotsMap(
355-
sg,
355+
db,
356356
3,
357357
3 + testSeriesPartitionBatchSize,
358358
3,
@@ -381,7 +381,7 @@ public void testPartitionAllocation() throws Exception {
381381
dataPartitionTableResp.getStatus().getCode());
382382
Assert.assertNotNull(dataPartitionTableResp.getDataPartitionTable());
383383
ConfigNodeTestUtils.checkDataPartitionTable(
384-
sg,
384+
db,
385385
3,
386386
3 + testSeriesPartitionBatchSize,
387387
3,

‎integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBPartitionDurableIT.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ public void testUnknownDataNode() throws Exception {
393393
// Test getOrCreateDataPartition, ConfigNode should create DataPartition and return
394394
partitionSlotsMap =
395395
ConfigNodeTestUtils.constructPartitionSlotsMap(
396-
sg,
396+
db,
397397
1,
398398
1 + testSeriesPartitionBatchSize,
399399
1,
@@ -420,7 +420,7 @@ public void testUnknownDataNode() throws Exception {
420420
dataPartitionTableResp.getStatus().getCode());
421421
Assert.assertNotNull(dataPartitionTableResp.getDataPartitionTable());
422422
ConfigNodeTestUtils.checkDataPartitionTable(
423-
sg,
423+
db,
424424
1,
425425
1 + testSeriesPartitionBatchSize,
426426
1,

‎integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBPartitionGetterIT.java‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -145,12 +145,12 @@ private static void prepareData() throws Exception {
145145
schemaPartitionTable = schemaPartitionTableResp.getSchemaPartitionTable();
146146
for (int i = 0; i < 2; i++) {
147147
Assert.assertTrue(schemaPartitionTable.containsKey(db + i));
148-
Assert.assertEquals(2, schemaPartitionTable.get(sg + i).size());
148+
Assert.assertEquals(2, schemaPartitionTable.get(db + i).size());
149149
}
150150

151151
/* Create DataPartitions */
152152
for (int i = 0; i < databaseNum; i++) {
153-
String database = sg + i;
153+
String database = db + i;
154154
for (int j = 0; j < testSeriesPartitionSlotNum; j += seriesPartitionBatchSize) {
155155
for (long k = 0; k < testTimePartitionSlotsNum; k += timePartitionBatchSize) {
156156
Map<String, Map<TSeriesPartitionSlot, TTimeSlotList>> partitionSlotsMap =
@@ -202,11 +202,11 @@ private static void prepareData() throws Exception {
202202

203203
@Test
204204
public void testGetSchemaPartition() throws Exception {
205-
final String sg = "root.db";
206-
final String sg0 = "root.db0";
207-
final String sg1 = "root.db1";
205+
final String db = "root.db";
206+
final String db0 = "root.db0";
207+
final String db1 = "root.db1";
208208

209-
final String d11 = sg1 + ".d1.s";
209+
final String d11 = db1 + ".d1.s";
210210

211211
final String allPaths = "root.db*";
212212
final String allSg0 = "root.db0.**";
@@ -240,8 +240,8 @@ public void testGetSchemaPartition() throws Exception {
240240
Assert.assertEquals(2, schemaPartitionTableResp.getSchemaPartitionTableSize());
241241
schemaPartitionTable = schemaPartitionTableResp.getSchemaPartitionTable();
242242
for (int i = 0; i < 2; i++) {
243-
Assert.assertTrue(schemaPartitionTable.containsKey(sg + i));
244-
Assert.assertEquals(2, schemaPartitionTable.get(sg + i).size());
243+
Assert.assertTrue(schemaPartitionTable.containsKey(db + i));
244+
Assert.assertEquals(2, schemaPartitionTable.get(db + i).size());
245245
}
246246

247247
// Test getSchemaPartition, when a device path matches with a Database and end with "*",
@@ -255,11 +255,11 @@ public void testGetSchemaPartition() throws Exception {
255255
Assert.assertEquals(2, schemaPartitionTableResp.getSchemaPartitionTableSize());
256256
schemaPartitionTable = schemaPartitionTableResp.getSchemaPartitionTable();
257257
// Check "root.db0"
258-
Assert.assertTrue(schemaPartitionTable.containsKey(sg0));
259-
Assert.assertEquals(2, schemaPartitionTable.get(sg0).size());
258+
Assert.assertTrue(schemaPartitionTable.containsKey(db0));
259+
Assert.assertEquals(2, schemaPartitionTable.get(db0).size());
260260
// Check "root.db1"
261-
Assert.assertTrue(schemaPartitionTable.containsKey(sg1));
262-
Assert.assertEquals(1, schemaPartitionTable.get(sg1).size());
261+
Assert.assertTrue(schemaPartitionTable.containsKey(db1));
262+
Assert.assertEquals(1, schemaPartitionTable.get(db1).size());
263263
}
264264
}
265265

@@ -276,7 +276,7 @@ public void testGetDataPartition() throws Exception {
276276
// Prepare partitionSlotsMap
277277
Map<String, Map<TSeriesPartitionSlot, TTimeSlotList>> partitionSlotsMap =
278278
ConfigNodeTestUtils.constructPartitionSlotsMap(
279-
sg + 10, 0, 10, 0, 10, testTimePartitionInterval);
279+
db + 10, 0, 10, 0, 10, testTimePartitionInterval);
280280

281281
// Test getDataPartitionTable, the result should be empty
282282
dataPartitionReq = new TDataPartitionReq(partitionSlotsMap);
@@ -299,7 +299,7 @@ public void testGetDataPartition() throws Exception {
299299
leastDataRegionGroupNum = Math.min(leastDataRegionGroupNum, testDataRegionGroupPerDatabase);
300300

301301
for (int i = 0; i < databaseNum; i++) {
302-
String database = sg + i;
302+
String database = db + i;
303303
for (int j = 0; j < testSeriesPartitionSlotNum; j += seriesPartitionBatchSize) {
304304
for (long k = 0; k < testTimePartitionSlotsNum; k += timePartitionBatchSize) {
305305
partitionSlotsMap =
@@ -344,13 +344,13 @@ public void testGetDataPartition() throws Exception {
344344

345345
@Test
346346
public void testGetSlots() throws Exception {
347-
final String sg0 = "root.db0";
348-
final String sg1 = "root.db1";
347+
final String db0 = "root.db0";
348+
final String db1 = "root.db1";
349349

350-
final IDeviceID d00 = Factory.DEFAULT_FACTORY.create(sg0 + ".d0.s");
351-
final IDeviceID d01 = Factory.DEFAULT_FACTORY.create(sg0 + ".d1.s");
352-
final IDeviceID d10 = Factory.DEFAULT_FACTORY.create(sg1 + ".d0.s");
353-
final IDeviceID d11 = Factory.DEFAULT_FACTORY.create(sg1 + ".d1.s");
350+
final IDeviceID d00 = Factory.DEFAULT_FACTORY.create(db0 + ".d0.s");
351+
final IDeviceID d01 = Factory.DEFAULT_FACTORY.create(db0 + ".d1.s");
352+
final IDeviceID d10 = Factory.DEFAULT_FACTORY.create(db1 + ".d0.s");
353+
final IDeviceID d11 = Factory.DEFAULT_FACTORY.create(db1 + ".d1.s");
354354

355355
IDeviceID[] devices = new IDeviceID[] {d00, d01, d10, d11};
356356

@@ -363,7 +363,7 @@ public void testGetSlots() throws Exception {
363363

364364
// Get RegionIds of specified database and timestamp
365365
getRegionIdReq = new TGetRegionIdReq(TConsensusGroupType.DataRegion);
366-
getRegionIdReq.setDatabase(sg0);
366+
getRegionIdReq.setDatabase(db0);
367367
getRegionIdReq.setStartTimeSlot(new TTimePartitionSlot(0));
368368
getRegionIdReq.setEndTimeSlot(new TTimePartitionSlot(0));
369369
getRegionIdResp = client.getRegionId(getRegionIdReq);
@@ -394,7 +394,7 @@ public void testGetSlots() throws Exception {
394394

395395
// Get all RegionIds within database
396396
for (int i = 0; i < databaseNum; i++) {
397-
String curSg = sg + i;
397+
String curSg = db + i;
398398
getRegionIdReq = new TGetRegionIdReq(TConsensusGroupType.DataRegion);
399399
getRegionIdReq.setDatabase(curSg);
400400
getRegionIdResp = client.getRegionId(getRegionIdReq);
@@ -443,7 +443,7 @@ public void testGetSlots() throws Exception {
443443
}
444444

445445
// Get RegionId of SchemaPartition
446-
getRegionIdReq.setDatabase(sg0);
446+
getRegionIdReq.setDatabase(db0);
447447
getRegionIdReq.setType(TConsensusGroupType.SchemaRegion);
448448
getRegionIdResp = client.getRegionId(getRegionIdReq);
449449
Assert.assertEquals(
@@ -453,7 +453,7 @@ public void testGetSlots() throws Exception {
453453
TGetTimeSlotListReq getTimeSlotListReq;
454454
TGetTimeSlotListResp getTimeSlotListResp;
455455
getTimeSlotListReq = new TGetTimeSlotListReq();
456-
getTimeSlotListReq.setDatabase(sg0);
456+
getTimeSlotListReq.setDatabase(db0);
457457
getTimeSlotListResp = client.getTimeSlotList(getTimeSlotListReq);
458458
Assert.assertEquals(
459459
TSStatusCode.SUCCESS_STATUS.getStatusCode(), getTimeSlotListResp.status.getCode());
@@ -480,7 +480,7 @@ public void testGetSlots() throws Exception {
480480
TCountTimeSlotListReq countTimeSlotListReq;
481481
TCountTimeSlotListResp countTimeSlotListResp;
482482
countTimeSlotListReq = new TCountTimeSlotListReq();
483-
countTimeSlotListReq.setDatabase(sg0);
483+
countTimeSlotListReq.setDatabase(db0);
484484
countTimeSlotListResp = client.countTimeSlotList(countTimeSlotListReq);
485485
Assert.assertEquals(
486486
TSStatusCode.SUCCESS_STATUS.getStatusCode(), countTimeSlotListResp.status.getCode());
@@ -504,7 +504,7 @@ public void testGetSlots() throws Exception {
504504
TGetSeriesSlotListReq getSeriesSlotListReq;
505505
TGetSeriesSlotListResp getSeriesSlotListResp;
506506

507-
getSeriesSlotListReq = new TGetSeriesSlotListReq(sg0, TConsensusGroupType.DataRegion);
507+
getSeriesSlotListReq = new TGetSeriesSlotListReq(db0, TConsensusGroupType.DataRegion);
508508
getSeriesSlotListResp = client.getSeriesSlotList(getSeriesSlotListReq);
509509
Assert.assertEquals(
510510
TSStatusCode.SUCCESS_STATUS.getStatusCode(), getSeriesSlotListResp.status.getCode());

‎iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlanSerDeTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ public void CreateDatabasePlanTest() throws IOException {
261261
new DatabaseSchemaPlan(
262262
ConfigPhysicalPlanType.CreateDatabase,
263263
new TDatabaseSchema()
264-
.setName("sg")
264+
.setName("db")
265265
.setSchemaReplicationFactor(3)
266266
.setDataReplicationFactor(3)
267267
.setTimePartitionInterval(604800));

‎iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/hash/DeviceGroupHashExecutorManualTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
public class DeviceGroupHashExecutorManualTest {
3939

4040
private static final int deviceGroupCount = 10_000;
41-
private static final String sg = "root.SGGroup.";
41+
private static final String db = "root.DBGroup.";
4242
private static final int batchCount = 10_000;
4343
private static final int batchSize = 10_000;
4444
private static final String chars =

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/tools/validate/TsFileOverlapValidationAndRepairTool.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,10 +155,10 @@ private static void validateSequenceDataDirs(List<String> sequenceDataDirPaths)
155155
continue;
156156
}
157157
for (File db : Objects.requireNonNull(sequenceDataDir.listFiles())) {
158-
if (!sg.isDirectory()) {
158+
if (!db.isDirectory()) {
159159
continue;
160160
}
161-
for (File dataRegionDir : Objects.requireNonNull(sg.listFiles())) {
161+
for (File dataRegionDir : Objects.requireNonNull(db.listFiles())) {
162162
if (!dataRegionDir.isDirectory()) {
163163
continue;
164164
}
@@ -168,7 +168,7 @@ private static void validateSequenceDataDirs(List<String> sequenceDataDirPaths)
168168
}
169169
String partitionKey =
170170
calculateTimePartitionKey(
171-
sg.getName(), dataRegionDir.getName(), timePartitionDir.getName());
171+
db.getName(), dataRegionDir.getName(), timePartitionDir.getName());
172172
List<File> partitionDirs =
173173
partitionMap.computeIfAbsent(partitionKey, v -> new ArrayList<>());
174174
partitionDirs.add(timePartitionDir);

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/ErrorHandlingUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public static Throwable getRootCause(Throwable e) {
9797
public static TSStatus onQueryException(Exception e, String operation, TSStatusCode statusCode) {
9898
TSStatus status = tryCatchQueryException(e);
9999
if (status != null) {
100-
// ignore logging sg not ready exception
100+
// ignore logging db not ready exception
101101
if (status.getCode() != TSStatusCode.STORAGE_ENGINE_NOT_READY.getStatusCode()) {
102102
String message =
103103
String.format(

‎iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/AbstractMetricManager.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ public Rate getOrCreateRate(String name, MetricLevel metricLevel, String... tags
240240
*
241241
* @param name the name of name
242242
* @param metricLevel the level of name
243-
* @param tags string pairs, like sg="ln" will be "sg", "ln"
243+
* @param tags string pairs, like db="ln" will be "db", "ln"
244244
* @throws IllegalArgumentException when there has different type metric with same name
245245
*/
246246
public Histogram getOrCreateHistogram(String name, MetricLevel metricLevel, String... tags) {
@@ -271,7 +271,7 @@ public Histogram getOrCreateHistogram(String name, MetricLevel metricLevel, Stri
271271
*
272272
* @param name the name of name
273273
* @param metricLevel the level of name
274-
* @param tags string pairs, like sg="ln" will be "sg", "ln"
274+
* @param tags string pairs, like db="ln" will be "db", "ln"
275275
* @throws IllegalArgumentException when there has different type metric with same name
276276
*/
277277
public Timer getOrCreateTimer(String name, MetricLevel metricLevel, String... tags) {
@@ -307,7 +307,7 @@ public Timer getOrCreateTimer(String name, MetricLevel metricLevel, String... ta
307307
* @param delta the value to update
308308
* @param name the name of name
309309
* @param metricLevel the level of name
310-
* @param tags string pairs, like sg="ln" will be "sg", "ln"
310+
* @param tags string pairs, like db="ln" will be "db", "ln"
311311
*/
312312
public Counter count(long delta, String name, MetricLevel metricLevel, String... tags) {
313313
Counter counter = getOrCreateCounter(name, metricLevel, tags);
@@ -321,7 +321,7 @@ public Counter count(long delta, String name, MetricLevel metricLevel, String...
321321
* @param value the value of gauge
322322
* @param name the name of name
323323
* @param metricLevel the level of name
324-
* @param tags string pairs, like sg="ln" will be "sg", "ln"
324+
* @param tags string pairs, like db="ln" will be "db", "ln"
325325
*/
326326
public Gauge gauge(long value, String name, MetricLevel metricLevel, String... tags) {
327327
Gauge gauge = getOrCreateGauge(name, metricLevel, tags);

‎iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/path/PartialPathTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void testLegalPath() throws IllegalPathException {
5656
// normal node
5757
PartialPath c = new PartialPath("root.db.a");
5858
Assert.assertEquals("root.db.a", c.getFullPath());
59-
nodes = new String[] {"root", "sg", "a"};
59+
nodes = new String[] {"root", "db", "a"};
6060
checkNodes(nodes, c.getNodes());
6161

6262
// quoted node

0 commit comments

Comments
 (0)