Skip to content

Commit 8de2b3c

Browse files
CaideyipiCaideyipi
committed
fix
1 parent 906cb45 commit 8de2b3c

File tree

7 files changed

+84
-84
lines changed

7 files changed

+84
-84
lines changed

‎integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBRestServiceIT.java‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -838,12 +838,12 @@ public void query(CloseableHttpClient httpClient) {
838838
{
839839
add("root.db25.s3");
840840
add("root.db25.s4");
841-
add("root.sg25.s5");
842-
add("root.sg25.s6");
843-
add("root.sg25.s7");
844-
add("root.sg25.s8");
845-
add("root.sg25.s4 + 1");
846-
add("root.sg25.s4 + 1");
841+
add("root.db25.s5");
842+
add("root.db25.s6");
843+
add("root.db25.s7");
844+
add("root.db25.s8");
845+
add("root.db25.s4 + 1");
846+
add("root.db25.s4 + 1");
847847
}
848848
};
849849
List<Object> timestamps =
@@ -925,7 +925,7 @@ public void queryGroupByLevel(CloseableHttpClient httpClient) {
925925
try {
926926
HttpPost httpPost = getHttpPost("http://127.0.0.1:" + port + "/rest/v1/query");
927927
String sql =
928-
"{\"sql\":\"select count(s4) from root.sg25 group by([1635232143960,1635232153960),1s),level=1\"}";
928+
"{\"sql\":\"select count(s4) from root.db25 group by([1635232143960,1635232153960),1s),level=1\"}";
929929
httpPost.setEntity(new StringEntity(sql, Charset.defaultCharset()));
930930
response = httpClient.execute(httpPost);
931931
HttpEntity responseEntity = response.getEntity();
@@ -938,7 +938,7 @@ public void queryGroupByLevel(CloseableHttpClient httpClient) {
938938
Assert.assertTrue(map.size() > 0);
939939
Assert.assertTrue(timestampsResult.size() == 10);
940940
Assert.assertTrue(valuesResult.size() == 1);
941-
Assert.assertTrue("count(root.sg25.s4)".equals(expressionsResult.get(0)));
941+
Assert.assertTrue("count(root.db25.s4)".equals(expressionsResult.get(0)));
942942
} catch (IOException e) {
943943
e.printStackTrace();
944944
fail(e.getMessage());
@@ -958,7 +958,7 @@ public void queryRowLimit(CloseableHttpClient httpClient) {
958958
CloseableHttpResponse response = null;
959959
try {
960960
HttpPost httpPost = getHttpPost("http://127.0.0.1:" + port + "/rest/v1/query");
961-
String sql = "{\"sql\":\"select *,s4+1,s4+1 from root.sg25\",\"rowLimit\":1}";
961+
String sql = "{\"sql\":\"select *,s4+1,s4+1 from root.db25\",\"rowLimit\":1}";
962962
httpPost.setEntity(new StringEntity(sql, Charset.defaultCharset()));
963963
response = httpClient.execute(httpPost);
964964
HttpEntity responseEntity = response.getEntity();
@@ -1008,7 +1008,7 @@ public Map queryMetaData(CloseableHttpClient httpClient, String sql) {
10081008
}
10091009

10101010
public void queryShowChildPaths(CloseableHttpClient httpClient) {
1011-
String sql = "{\"sql\":\"show child paths root.sg25\"}";
1011+
String sql = "{\"sql\":\"show child paths root.db25\"}";
10121012
Map map = queryMetaData(httpClient, sql);
10131013
List<String> columnNamesResult = (List<String>) map.get("columnNames");
10141014
List<List<Object>> valuesResult = (List<List<Object>>) map.get("values");
@@ -1023,12 +1023,12 @@ public void queryShowChildPaths(CloseableHttpClient httpClient) {
10231023
List<Object> values1 =
10241024
new ArrayList<Object>() {
10251025
{
1026-
add("root.sg25.s3");
1027-
add("root.sg25.s4");
1028-
add("root.sg25.s5");
1029-
add("root.sg25.s6");
1030-
add("root.sg25.s7");
1031-
add("root.sg25.s8");
1026+
add("root.db25.s3");
1027+
add("root.db25.s4");
1028+
add("root.db25.s5");
1029+
add("root.db25.s6");
1030+
add("root.db25.s7");
1031+
add("root.db25.s8");
10321032
}
10331033
};
10341034

@@ -1037,7 +1037,7 @@ public void queryShowChildPaths(CloseableHttpClient httpClient) {
10371037
}
10381038

10391039
public void queryShowNodes(CloseableHttpClient httpClient) {
1040-
String sql = "{\"sql\":\"show child nodes root.sg25\"}";
1040+
String sql = "{\"sql\":\"show child nodes root.db25\"}";
10411041
Map map = queryMetaData(httpClient, sql);
10421042
List<String> columnNamesResult = (List<String>) map.get("columnNames");
10431043
List<List<Object>> valuesResult = (List<List<Object>>) map.get("values");
@@ -1095,7 +1095,7 @@ public void showAllTTL(CloseableHttpClient httpClient) {
10951095
}
10961096

10971097
public void showDatabase(CloseableHttpClient httpClient) {
1098-
String sql = "{\"sql\":\"SHOW DATABASES root.sg25\"}";
1098+
String sql = "{\"sql\":\"SHOW DATABASES root.db25\"}";
10991099
Map map = queryMetaData(httpClient, sql);
11001100
List<String> columnNamesResult = (List<String>) map.get("columnNames");
11011101
List<List<Object>> valuesResult = (List<List<Object>>) map.get("values");
@@ -1113,7 +1113,7 @@ public void showDatabase(CloseableHttpClient httpClient) {
11131113
List<Object> values1 =
11141114
new ArrayList<Object>() {
11151115
{
1116-
add("root.sg25");
1116+
add("root.db25");
11171117
}
11181118
};
11191119
Assert.assertEquals(columnNames, columnNamesResult);
@@ -1130,7 +1130,7 @@ public void showFunctions(CloseableHttpClient httpClient) {
11301130
}
11311131

11321132
public void showTimeseries(CloseableHttpClient httpClient) {
1133-
String sql = "{\"sql\":\"show timeseries root.sg25.**\"}";
1133+
String sql = "{\"sql\":\"show timeseries root.db25.**\"}";
11341134
Map map = queryMetaData(httpClient, sql);
11351135
List<String> columnNamesResult = (List<String>) map.get("columnNames");
11361136
List<List<Object>> valuesResult = (List<List<Object>>) map.get("values");
@@ -1154,12 +1154,12 @@ public void showTimeseries(CloseableHttpClient httpClient) {
11541154
List<Object> values1 =
11551155
new ArrayList<Object>() {
11561156
{
1157-
add("root.sg25.s3");
1158-
add("root.sg25.s4");
1159-
add("root.sg25.s5");
1160-
add("root.sg25.s6");
1161-
add("root.sg25.s7");
1162-
add("root.sg25.s8");
1157+
add("root.db25.s3");
1158+
add("root.db25.s4");
1159+
add("root.db25.s5");
1160+
add("root.db25.s6");
1161+
add("root.db25.s7");
1162+
add("root.db25.s8");
11631163
}
11641164
};
11651165
List<Object> values2 =
@@ -1176,12 +1176,12 @@ public void showTimeseries(CloseableHttpClient httpClient) {
11761176
List<Object> values3 =
11771177
new ArrayList<Object>() {
11781178
{
1179-
add("root.sg25");
1180-
add("root.sg25");
1181-
add("root.sg25");
1182-
add("root.sg25");
1183-
add("root.sg25");
1184-
add("root.sg25");
1179+
add("root.db25");
1180+
add("root.db25");
1181+
add("root.db25");
1182+
add("root.db25");
1183+
add("root.db25");
1184+
add("root.db25");
11851185
}
11861186
};
11871187

@@ -1192,7 +1192,7 @@ public void showTimeseries(CloseableHttpClient httpClient) {
11921192
}
11931193

11941194
public void showLastTimeseries(CloseableHttpClient httpClient) {
1195-
String sql = "{\"sql\":\"SHOW LATEST TIMESERIES root.sg25.**\"}";
1195+
String sql = "{\"sql\":\"SHOW LATEST TIMESERIES root.db25.**\"}";
11961196
Map map = queryMetaData(httpClient, sql);
11971197
List<String> columnNamesResult = (List<String>) map.get("columnNames");
11981198
List<List<Object>> valuesResult = (List<List<Object>>) map.get("values");
@@ -1216,12 +1216,12 @@ public void showLastTimeseries(CloseableHttpClient httpClient) {
12161216
List<Object> values1 =
12171217
new ArrayList<Object>() {
12181218
{
1219-
add("root.sg25.s3");
1220-
add("root.sg25.s4");
1221-
add("root.sg25.s5");
1222-
add("root.sg25.s7");
1223-
add("root.sg25.s8");
1224-
add("root.sg25.s6");
1219+
add("root.db25.s3");
1220+
add("root.db25.s4");
1221+
add("root.db25.s5");
1222+
add("root.db25.s7");
1223+
add("root.db25.s8");
1224+
add("root.db25.s6");
12251225
}
12261226
};
12271227
List<Object> values2 =
@@ -1238,9 +1238,9 @@ public void showLastTimeseries(CloseableHttpClient httpClient) {
12381238
List<Object> values3 =
12391239
new ArrayList<Object>() {
12401240
{
1241-
add("root.sg25");
1242-
add("root.sg25");
1243-
add("root.sg25");
1241+
add("root.db25");
1242+
add("root.db25");
1243+
add("root.db25");
12441244
add("root.sg25");
12451245
add("root.sg25");
12461246
add("root.sg25");

‎integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSimpleQueryIT.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -655,8 +655,8 @@ public void testShowTimeseriesDataSet4() {
655655
statement.execute("CREATE TIMESERIES root.db1.d0.s6 WITH DATATYPE=INT32,ENCODING=PLAIN");
656656
statement.execute("CREATE TIMESERIES root.db1.d0.s7 WITH DATATYPE=INT32,ENCODING=PLAIN");
657657
statement.execute("CREATE TIMESERIES root.db1.d0.s8 WITH DATATYPE=INT32,ENCODING=PLAIN");
658-
statement.execute("CREATE TIMESERIES root.sg1.d0.s9 WITH DATATYPE=INT32,ENCODING=PLAIN");
659-
statement.execute("CREATE TIMESERIES root.sg1.d0.s10 WITH DATATYPE=INT32,ENCODING=PLAIN");
658+
statement.execute("CREATE TIMESERIES root.db1.d0.s9 WITH DATATYPE=INT32,ENCODING=PLAIN");
659+
statement.execute("CREATE TIMESERIES root.db1.d0.s10 WITH DATATYPE=INT32,ENCODING=PLAIN");
660660

661661
statement.execute("flush");
662662

@@ -680,12 +680,12 @@ public void testShowTimeseriesWithLimitOffset() throws SQLException {
680680
Statement statement = connection.createStatement()) {
681681

682682
List<String> exps =
683-
Arrays.asList("root.sg1.d0.s1", "root.sg1.d0.s2", "root.sg1.d0.s3", "root.sg1.d0.s4");
683+
Arrays.asList("root.db1.d0.s1", "root.db1.d0.s2", "root.db1.d0.s3", "root.db1.d0.s4");
684684

685-
statement.execute("INSERT INTO root.sg1.d0(timestamp, s1) VALUES (5, 5)");
686-
statement.execute("INSERT INTO root.sg1.d0(timestamp, s2) VALUES (5, 5)");
687-
statement.execute("INSERT INTO root.sg1.d0(timestamp, s3) VALUES (5, 5)");
688-
statement.execute("INSERT INTO root.sg1.d0(timestamp, s4) VALUES (5, 5)");
685+
statement.execute("INSERT INTO root.db1.d0(timestamp, s1) VALUES (5, 5)");
686+
statement.execute("INSERT INTO root.db1.d0(timestamp, s2) VALUES (5, 5)");
687+
statement.execute("INSERT INTO root.db1.d0(timestamp, s3) VALUES (5, 5)");
688+
statement.execute("INSERT INTO root.db1.d0(timestamp, s4) VALUES (5, 5)");
689689

690690
int count = 0;
691691
try (ResultSet resultSet = statement.executeQuery("show timeseries limit 2 offset 1")) {
@@ -703,7 +703,7 @@ public void testShowDevicesWithLimitOffset() throws SQLException {
703703
try (Connection connection = EnvFactory.getEnv().getConnection();
704704
Statement statement = connection.createStatement()) {
705705

706-
List<String> exps = Arrays.asList("root.sg1.d1,false", "root.sg1.d2,false");
706+
List<String> exps = Arrays.asList("root.db1.d1,false", "root.db1.d2,false");
707707

708708
statement.execute("INSERT INTO root.sg1.d0(timestamp, s1) VALUES (5, 5)");
709709
statement.execute("INSERT INTO root.sg1.d1(timestamp, s2) VALUES (5, 5)");

‎integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSyntaxConventionIdentifierIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1015,7 +1015,7 @@ public void testNodeNameWithWildcard() {
10151015
Statement statement = connection.createStatement()) {
10161016
statement.execute("CREATE TIMESERIES root.db.device_123.s1 INT32");
10171017

1018-
try (ResultSet resultSet = statement.executeQuery("SHOW DEVICES root.sg.device_123")) {
1018+
try (ResultSet resultSet = statement.executeQuery("SHOW DEVICES root.db.device_123")) {
10191019
Assert.assertTrue(resultSet.next());
10201020
Assert.assertFalse(resultSet.next());
10211021
}

‎integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBAuthIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ public void templateQueryTest() throws SQLException {
365365
adminStmt.execute(
366366
"insert into root.db.aligned_template(time,temperature,status) values(1,20,false),(2,22.1,true),(3,18,false);");
367367

368-
ResultSet set1 = adminStmt.executeQuery("SELECT * from root.sg.aligned_template");
368+
ResultSet set1 = adminStmt.executeQuery("SELECT * from root.db.aligned_template");
369369
assertEquals(3, set1.getMetaData().getColumnCount());
370370
assertEquals("root.sg.aligned_template.temperature", set1.getMetaData().getColumnName(2));
371371
assertEquals("root.sg.aligned_template.status", set1.getMetaData().getColumnName(3));

‎integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBSeriesPermissionIT.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -277,15 +277,15 @@ private void testWriteData() {
277277
"803: No permissions for this operation, please add privilege WRITE_SCHEMA on [root.db.d1.s1, root.db.d1.s2]",
278278
"test1",
279279
"test123123456");
280-
executeNonQuery("delete from root.sg.d1.s1, root.sg.d1.s2", "test1", "test123123456");
281-
grantUserSeriesPrivilege("test1", PrivilegeType.WRITE_SCHEMA, "root.sg.d1.**");
280+
executeNonQuery("delete from root.db.d1.s1, root.db.d1.s2", "test1", "test123123456");
281+
grantUserSeriesPrivilege("test1", PrivilegeType.WRITE_SCHEMA, "root.db.d1.**");
282282
assertNonQueryTestFail(
283-
"insert into root.sg.d1(time,s1,s2) values(1,1,1)",
283+
"insert into root.db.d1(time,s1,s2) values(1,1,1)",
284284
"803: No permissions for this operation, please add privilege SYSTEM",
285285
"test1",
286286
"test123123456");
287287
grantUserSystemPrivileges("test1", PrivilegeType.SYSTEM);
288-
executeNonQuery("insert into root.sg.d1(time,s1,s2) values(1,1,1)", "test1", "test123123456");
288+
executeNonQuery("insert into root.db.d1(time,s1,s2) values(1,1,1)", "test1", "test123123456");
289289
}
290290

291291
private void testReadData() {

‎integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFBuiltinFunctionIT.java‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ public void testConstantTimeSeriesGeneratingFunctions() {
441441

442442
try (Statement statement = connection.createStatement();
443443
ResultSet ignored =
444-
statement.executeQuery("select const(s8, 'type'='INT64') from root.sg.d1")) {
444+
statement.executeQuery("select const(s8, 'type'='INT64') from root.db.d1")) {
445445
fail();
446446
} catch (SQLException e) {
447447
assertTrue(e.getMessage().contains("attribute \"value\" is required but was not provided"));
@@ -450,7 +450,7 @@ public void testConstantTimeSeriesGeneratingFunctions() {
450450
try (Statement statement = connection.createStatement();
451451
ResultSet ignored =
452452
statement.executeQuery(
453-
"select const(s8, 'value'='1024', 'type'='long') from root.sg.d1")) {
453+
"select const(s8, 'value'='1024', 'type'='long') from root.db.d1")) {
454454
fail();
455455
} catch (SQLException e) {
456456
assertTrue(e.getMessage().contains("the given value type is not supported"));
@@ -459,7 +459,7 @@ public void testConstantTimeSeriesGeneratingFunctions() {
459459
try (Statement statement = connection.createStatement();
460460
ResultSet ignored =
461461
statement.executeQuery(
462-
"select const(s8, 'value'='1024e', 'type'='INT64') from root.sg.d1")) {
462+
"select const(s8, 'value'='1024e', 'type'='INT64') from root.db.d1")) {
463463
fail();
464464
} catch (SQLException e) {
465465
assertTrue(e.getMessage().contains("java.lang.NumberFormatException"));
@@ -483,7 +483,7 @@ public void testConversionFunction() {
483483
Statement statement = connection.createStatement()) {
484484
ResultSet resultSet =
485485
statement.executeQuery(
486-
"select cast(s1, 'type'='TEXT'), cast(s3, 'type'='FLOAT'), cast(s5, 'type'='INT32'), cast(s7, 'type'='DOUBLE') from root.sg.d1");
486+
"select cast(s1, 'type'='TEXT'), cast(s3, 'type'='FLOAT'), cast(s5, 'type'='INT32'), cast(s7, 'type'='DOUBLE') from root.db.d1");
487487

488488
int columnCount = resultSet.getMetaData().getColumnCount();
489489
assertEquals(5, columnCount);
@@ -500,7 +500,7 @@ public void testConversionFunction() {
500500

501501
resultSet =
502502
statement.executeQuery(
503-
"select cast(s1, 'type'='TEXT'), cast(s3, 'type'='FLOAT'), cast(s5, 'type'='INT32'), cast(s7, 'type'='DOUBLE') from root.sg.d1 align by device");
503+
"select cast(s1, 'type'='TEXT'), cast(s3, 'type'='FLOAT'), cast(s5, 'type'='INT32'), cast(s7, 'type'='DOUBLE') from root.db.d1 align by device");
504504

505505
columnCount = resultSet.getMetaData().getColumnCount();
506506
assertEquals(6, columnCount);
@@ -524,24 +524,24 @@ public void testConversionFunction() {
524524
public void testContinuouslySatisfies() {
525525
try (Connection connection = EnvFactory.getEnv().getConnection();
526526
Statement statement = connection.createStatement()) {
527-
statement.execute("CREATE TIMESERIES root.sg.d2.s1 with datatype=INT32,encoding=PLAIN");
528-
statement.execute("CREATE TIMESERIES root.sg.d2.s2 with datatype=INT64,encoding=PLAIN");
529-
statement.execute("CREATE TIMESERIES root.sg.d2.s3 with datatype=FLOAT,encoding=PLAIN");
530-
statement.execute("CREATE TIMESERIES root.sg.d2.s4 with datatype=DOUBLE,encoding=PLAIN");
531-
statement.execute("CREATE TIMESERIES root.sg.d2.s5 with datatype=BOOLEAN,encoding=PLAIN");
527+
statement.execute("CREATE TIMESERIES root.db.d2.s1 with datatype=INT32,encoding=PLAIN");
528+
statement.execute("CREATE TIMESERIES root.db.d2.s2 with datatype=INT64,encoding=PLAIN");
529+
statement.execute("CREATE TIMESERIES root.db.d2.s3 with datatype=FLOAT,encoding=PLAIN");
530+
statement.execute("CREATE TIMESERIES root.db.d2.s4 with datatype=DOUBLE,encoding=PLAIN");
531+
statement.execute("CREATE TIMESERIES root.db.d2.s5 with datatype=BOOLEAN,encoding=PLAIN");
532532
} catch (SQLException throwable) {
533533
fail(throwable.getMessage());
534534
}
535535

536536
// create timeseries with only 0,1 values
537537
String[] ZERO_ONE_SQL = {
538-
"insert into root.sg.d2(time, s1, s2, s3, s4, s5) values (0, 0, 0, 0, 0, false)",
539-
"insert into root.sg.d2(time, s1, s2, s3, s4, s5) values (1, 1, 1, 1, 1, true)",
540-
"insert into root.sg.d2(time, s1, s2, s3, s4, s5) values (2, 1, 1, 1, 1, true)",
541-
"insert into root.sg.d2(time, s1, s2, s3, s4, s5) values (3, 0, 0, 0, 0, false)",
542-
"insert into root.sg.d2(time, s1, s2, s3, s4, s5) values (4, 1, 1, 1, 1, true)",
543-
"insert into root.sg.d2(time, s1, s2, s3, s4, s5) values (5, 0, 0, 0, 0, false)",
544-
"insert into root.sg.d2(time, s1, s2, s3, s4, s5) values (6, 0, 0, 0, 0, false)",
538+
"insert into root.db.d2(time, s1, s2, s3, s4, s5) values (0, 0, 0, 0, 0, false)",
539+
"insert into root.db.d2(time, s1, s2, s3, s4, s5) values (1, 1, 1, 1, 1, true)",
540+
"insert into root.db.d2(time, s1, s2, s3, s4, s5) values (2, 1, 1, 1, 1, true)",
541+
"insert into root.db.d2(time, s1, s2, s3, s4, s5) values (3, 0, 0, 0, 0, false)",
542+
"insert into root.db.d2(time, s1, s2, s3, s4, s5) values (4, 1, 1, 1, 1, true)",
543+
"insert into root.db.d2(time, s1, s2, s3, s4, s5) values (5, 0, 0, 0, 0, false)",
544+
"insert into root.db.d2(time, s1, s2, s3, s4, s5) values (6, 0, 0, 0, 0, false)",
545545
"insert into root.sg.d2(time, s1, s2, s3, s4, s5) values (7, 1, 1, 1, 1, true)",
546546
"insert into root.sg.d2(time, s1, s2, s3, s4, s5) values (10000000000, 0, 0, 0, 0, false)",
547547
};

0 commit comments

Comments
 (0)