This is an automated email from the ASF dual-hosted git repository.
justinchen pushed a commit to branch clean
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/clean by this push:
new 85ead0ac3c5 ref
85ead0ac3c5 is described below
commit 85ead0ac3c56c5274c664f4f0d09a7a9164f3e54
Author: Caideyipi <[email protected]>
AuthorDate: Fri Jan 9 09:52:07 2026 +0800
ref
---
.../org/apache/iotdb/db/it/IoTDBLoadTsFileIT.java | 2 +-
.../org/apache/iotdb/db/it/IoTDBRestServiceIT.java | 2 +-
.../org/apache/iotdb/db/it/IoTDBSimpleQueryIT.java | 24 +++++++++----------
.../db/it/IoTDBSyntaxConventionIdentifierIT.java | 22 ++++++++---------
.../org/apache/iotdb/db/it/auth/IoTDBAuthIT.java | 4 ++--
.../iotdb/db/it/auth/IoTDBSeriesPermissionIT.java | 4 ++--
.../iotdb/db/it/auth/IoTDBSystemPermissionIT.java | 2 +-
.../db/it/auth/IoTDBTemplatePermissionIT.java | 6 ++---
.../org/apache/iotdb/db/it/cq/IoTDBCQExecIT.java | 22 ++++++++---------
.../apache/iotdb/db/it/cq/IoTDBCQExecInNsIT.java | 26 ++++++++++----------
.../apache/iotdb/db/it/cq/IoTDBCQExecInUsIT.java | 22 ++++++++---------
.../java/org/apache/iotdb/db/it/cq/IoTDBCQIT.java | 28 +++++++++++-----------
.../db/it/udf/IoTDBUDTFBuiltinFunctionIT.java | 16 ++++++-------
.../java/org/apache/iotdb/session/SessionTest.java | 2 +-
.../java/org/apache/iotdb/session/TabletTest.java | 2 +-
.../org/apache/iotdb/commons/path/PartialPath.java | 2 +-
16 files changed, 93 insertions(+), 93 deletions(-)
diff --git
a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBLoadTsFileIT.java
b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBLoadTsFileIT.java
index 5adb94f7c20..d4b03317c3d 100644
---
a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBLoadTsFileIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBLoadTsFileIT.java
@@ -1091,7 +1091,7 @@ public class IoTDBLoadTsFileIT {
statement.execute(String.format("load \"%s\" ", file.getAbsolutePath()));
try (final ResultSet resultSet =
- statement.executeQuery("select count(*) from root.sg.** group by
level=1,2")) {
+ statement.executeQuery("select count(*) from root.db.** group by
level=1,2")) {
if (resultSet.next()) {
final long sgCount = resultSet.getLong("count(root.db.test_0.*.*)");
Assert.assertEquals(writtenPoint, sgCount);
diff --git
a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBRestServiceIT.java
b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBRestServiceIT.java
index 4821b6ba239..7c7ab7fd0f2 100644
---
a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBRestServiceIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBRestServiceIT.java
@@ -836,7 +836,7 @@ public class IoTDBRestServiceIT {
List<Object> expressions =
new ArrayList<Object>() {
{
- add("root.sg25.s3");
+ add("root.db25.s3");
add("root.sg25.s4");
add("root.sg25.s5");
add("root.sg25.s6");
diff --git
a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSimpleQueryIT.java
b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSimpleQueryIT.java
index 740085f3bc4..80c3983ff63 100644
---
a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSimpleQueryIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSimpleQueryIT.java
@@ -557,12 +557,12 @@ public class IoTDBSimpleQueryIT {
statement.execute("CREATE TIMESERIES root.db1.d0.s7 WITH
DATATYPE=INT32,ENCODING=PLAIN");
statement.execute("CREATE TIMESERIES root.db1.d0.s8 WITH
DATATYPE=INT32,ENCODING=PLAIN");
statement.execute("CREATE TIMESERIES root.db1.d0.s9 WITH
DATATYPE=INT32,ENCODING=PLAIN");
- statement.execute("CREATE TIMESERIES root.sg1.d0.s10 WITH
DATATYPE=INT32,ENCODING=PLAIN");
+ statement.execute("CREATE TIMESERIES root.db1.d0.s10 WITH
DATATYPE=INT32,ENCODING=PLAIN");
statement.execute("flush");
int count = 0;
- try (ResultSet resultSet = statement.executeQuery("show timeseries
root.sg1.**")) {
+ try (ResultSet resultSet = statement.executeQuery("show timeseries
root.db1.**")) {
while (resultSet.next()) {
count++;
}
@@ -580,16 +580,16 @@ public class IoTDBSimpleQueryIT {
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
statement.setFetchSize(10);
- statement.execute("CREATE DATABASE root.sg1");
- statement.execute("CREATE TIMESERIES root.sg1.d0.s1 WITH
DATATYPE=INT32,ENCODING=PLAIN");
- statement.execute("CREATE TIMESERIES root.sg1.d0.s2 WITH
DATATYPE=INT32,ENCODING=PLAIN");
- statement.execute("CREATE TIMESERIES root.sg1.d0.s3 WITH
DATATYPE=INT32,ENCODING=PLAIN");
- statement.execute("CREATE TIMESERIES root.sg1.d0.s4 WITH
DATATYPE=INT32,ENCODING=PLAIN");
- statement.execute("CREATE TIMESERIES root.sg1.d0.s5 WITH
DATATYPE=INT32,ENCODING=PLAIN");
- statement.execute("CREATE TIMESERIES root.sg1.d0.s6 WITH
DATATYPE=INT32,ENCODING=PLAIN");
- statement.execute("CREATE TIMESERIES root.sg1.d0.s7 WITH
DATATYPE=INT32,ENCODING=PLAIN");
- statement.execute("CREATE TIMESERIES root.sg1.d0.s8 WITH
DATATYPE=INT32,ENCODING=PLAIN");
- statement.execute("CREATE TIMESERIES root.sg1.d0.s9 WITH
DATATYPE=INT32,ENCODING=PLAIN");
+ statement.execute("CREATE DATABASE root.db1");
+ statement.execute("CREATE TIMESERIES root.db1.d0.s1 WITH
DATATYPE=INT32,ENCODING=PLAIN");
+ statement.execute("CREATE TIMESERIES root.db1.d0.s2 WITH
DATATYPE=INT32,ENCODING=PLAIN");
+ statement.execute("CREATE TIMESERIES root.db1.d0.s3 WITH
DATATYPE=INT32,ENCODING=PLAIN");
+ statement.execute("CREATE TIMESERIES root.db1.d0.s4 WITH
DATATYPE=INT32,ENCODING=PLAIN");
+ statement.execute("CREATE TIMESERIES root.db1.d0.s5 WITH
DATATYPE=INT32,ENCODING=PLAIN");
+ statement.execute("CREATE TIMESERIES root.db1.d0.s6 WITH
DATATYPE=INT32,ENCODING=PLAIN");
+ statement.execute("CREATE TIMESERIES root.db1.d0.s7 WITH
DATATYPE=INT32,ENCODING=PLAIN");
+ statement.execute("CREATE TIMESERIES root.db1.d0.s8 WITH
DATATYPE=INT32,ENCODING=PLAIN");
+ statement.execute("CREATE TIMESERIES root.db1.d0.s9 WITH
DATATYPE=INT32,ENCODING=PLAIN");
statement.execute("CREATE TIMESERIES root.sg1.d0.s10 WITH
DATATYPE=INT32,ENCODING=PLAIN");
statement.execute("flush");
diff --git
a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSyntaxConventionIdentifierIT.java
b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSyntaxConventionIdentifierIT.java
index 76d52a8fdcb..1c9712f39a6 100644
---
a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSyntaxConventionIdentifierIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSyntaxConventionIdentifierIT.java
@@ -409,19 +409,19 @@ public class IoTDBSyntaxConventionIdentifierIT {
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
statement.execute("CREATE TIMESERIES root.db1.d1.`1` INT32");
- statement.execute("CREATE TIMESERIES root.sg1.d1.`a.b` INT32");
- statement.execute("CREATE TIMESERIES root.sg1.d1.`a.``b` INT32");
- statement.execute("CREATE TIMESERIES root.sg1.d1.text TEXT");
+ statement.execute("CREATE TIMESERIES root.db1.d1.`a.b` INT32");
+ statement.execute("CREATE TIMESERIES root.db1.d1.`a.``b` INT32");
+ statement.execute("CREATE TIMESERIES root.db1.d1.text TEXT");
int pointCnt = 3;
for (int i = 0; i < pointCnt; i++) {
statement.execute(
String.format(
- "insert into root.sg1.d1(time,%s,%s,%s) values(%d,%d,%d,%d)",
+ "insert into root.db1.d1(time,%s,%s,%s) values(%d,%d,%d,%d)",
"`1`", "`a.b`", "`a.``b`", i, i, i, i));
}
int cnt = 0;
- try (ResultSet resultSet = statement.executeQuery("SELECT `1` + 1 FROM
root.sg1.d1")) {
+ try (ResultSet resultSet = statement.executeQuery("SELECT `1` + 1 FROM
root.db1.d1")) {
while (resultSet.next()) {
cnt++;
}
@@ -430,7 +430,7 @@ public class IoTDBSyntaxConventionIdentifierIT {
cnt = 0;
try (ResultSet resultSet =
- statement.executeQuery("SELECT (`1`*`1`)+1-`a.b` FROM root.sg1.d1
where `1` > 1")) {
+ statement.executeQuery("SELECT (`1`*`1`)+1-`a.b` FROM root.db1.d1
where `1` > 1")) {
while (resultSet.next()) {
cnt++;
}
@@ -439,7 +439,7 @@ public class IoTDBSyntaxConventionIdentifierIT {
cnt = 0;
try (ResultSet resultSet =
- statement.executeQuery("SELECT (`1`*`1`)+1-`a.b` FROM root.sg1.d1"))
{
+ statement.executeQuery("SELECT (`1`*`1`)+1-`a.b` FROM root.db1.d1"))
{
while (resultSet.next()) {
cnt++;
}
@@ -448,7 +448,7 @@ public class IoTDBSyntaxConventionIdentifierIT {
cnt = 0;
try (ResultSet resultSet =
- statement.executeQuery("SELECT (`1`*`1`)+1-`a.b` FROM root.sg1.d1
where `1`>0")) {
+ statement.executeQuery("SELECT (`1`*`1`)+1-`a.b` FROM root.db1.d1
where `1`>0")) {
while (resultSet.next()) {
cnt++;
}
@@ -456,7 +456,7 @@ public class IoTDBSyntaxConventionIdentifierIT {
}
cnt = 0;
- try (ResultSet resultSet = statement.executeQuery("SELECT avg(`1`)+1
FROM root.sg1.d1")) {
+ try (ResultSet resultSet = statement.executeQuery("SELECT avg(`1`)+1
FROM root.db1.d1")) {
while (resultSet.next()) {
cnt++;
}
@@ -465,7 +465,7 @@ public class IoTDBSyntaxConventionIdentifierIT {
cnt = 0;
try (ResultSet resultSet =
- statement.executeQuery("SELECT count(`1`)+1 FROM root.sg1.d1 where
`1`>1")) {
+ statement.executeQuery("SELECT count(`1`)+1 FROM root.db1.d1 where
`1`>1")) {
while (resultSet.next()) {
Assert.assertEquals(2.0, resultSet.getDouble(1), 1e-7);
cnt++;
@@ -474,7 +474,7 @@ public class IoTDBSyntaxConventionIdentifierIT {
}
cnt = 0;
- try (ResultSet resultSet = statement.executeQuery("SELECT sin(`1`) + 1
FROM root.sg1.d1")) {
+ try (ResultSet resultSet = statement.executeQuery("SELECT sin(`1`) + 1
FROM root.db1.d1")) {
while (resultSet.next()) {
cnt++;
}
diff --git
a/integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBAuthIT.java
b/integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBAuthIT.java
index 1b7deda9768..ec142bb032e 100644
---
a/integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBAuthIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBAuthIT.java
@@ -205,8 +205,8 @@ public class IoTDBAuthIT {
adminStmt.execute("GRANT SYSTEM ON root.** TO USER sgtest");
try {
- userStmt.execute("CREATE DATABASE root.sgtest");
- userStmt.execute("DELETE DATABASE root.sgtest");
+ userStmt.execute("CREATE DATABASE root.dbtest");
+ userStmt.execute("DELETE DATABASE root.dbtest");
} catch (SQLException e) {
fail(e.getMessage());
}
diff --git
a/integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBSeriesPermissionIT.java
b/integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBSeriesPermissionIT.java
index 39fc5e063b5..b6fcc40e310 100644
---
a/integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBSeriesPermissionIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBSeriesPermissionIT.java
@@ -263,11 +263,11 @@ public class IoTDBSeriesPermissionIT {
grantUserSeriesPrivilege("test1", PrivilegeType.WRITE_DATA,
"root.db.d1.s1");
assertNonQueryTestFail(
"insert into root.db.d1(time,s1,s2) values(1,1,1)",
- "803: No permissions for this operation, please add privilege
WRITE_DATA on [root.sg.d1.s2]",
+ "803: No permissions for this operation, please add privilege
WRITE_DATA on [root.db.d1.s2]",
"test1",
"test123123456");
assertNonQueryTestFail(
- "delete from root.sg.d1.s1, root.sg.d1.s2",
+ "delete from root.db.d1.s1, root.db.d1.s2",
"803: No permissions for this operation, please add privilege
WRITE_DATA on [root.sg.d1.s2]",
"test1",
"test123123456");
diff --git
a/integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBSystemPermissionIT.java
b/integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBSystemPermissionIT.java
index 2ebdd37758f..cd09af10670 100644
---
a/integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBSystemPermissionIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBSystemPermissionIT.java
@@ -151,7 +151,7 @@ public class IoTDBSystemPermissionIT {
+ "TIMEOUT POLICY DISCARD\n"
+ "BEGIN \n"
+ " SELECT count(s1) \n"
- + " INTO root.sg_count.d(count_s1)\n"
+ + " INTO root.db_count.d(count_s1)\n"
+ " FROM root.sg.d\n"
+ " GROUP BY(10m)\n"
+ "END",
diff --git
a/integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBTemplatePermissionIT.java
b/integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBTemplatePermissionIT.java
index b2c02164c31..e4fbc126d05 100644
---
a/integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBTemplatePermissionIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBTemplatePermissionIT.java
@@ -85,12 +85,12 @@ public class IoTDBTemplatePermissionIT {
"test",
"test123123456");
assertNonQueryTestFail(
- "set device template t1 to root.sg1",
+ "set device template t1 to root.db1",
"803: No permissions for this operation, please add privilege SYSTEM",
"test",
"test123123456");
assertNonQueryTestFail(
- "unset device template t1 from root.sg1",
+ "unset device template t1 from root.db1",
"803: No permissions for this operation, please add privilege SYSTEM",
"test",
"test123123456");
@@ -105,7 +105,7 @@ public class IoTDBTemplatePermissionIT {
public void otherTest() {
executeNonQuery(
"create device template t1 (temperature FLOAT encoding=RLE, status
BOOLEAN encoding=PLAIN compression=SNAPPY)");
- executeNonQuery("create database root.sg1");
+ executeNonQuery("create database root.db1");
executeNonQuery("set device template t1 to root.sg1.d1");
// active
diff --git
a/integration-test/src/test/java/org/apache/iotdb/db/it/cq/IoTDBCQExecIT.java
b/integration-test/src/test/java/org/apache/iotdb/db/it/cq/IoTDBCQExecIT.java
index 94cf4ef1856..ddd06b3cb4c 100644
---
a/integration-test/src/test/java/org/apache/iotdb/db/it/cq/IoTDBCQExecIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/db/it/cq/IoTDBCQExecIT.java
@@ -375,7 +375,7 @@ public class IoTDBCQExecIT {
+ "BEGIN \n"
+ " SELECT max_value(s1) \n"
+ " INTO root.db.d4(s1_max)\n"
- + " FROM root.sg.d4\n"
+ + " FROM root.db.d4\n"
+ " GROUP BY(1s) \n"
+ "END");
@@ -394,11 +394,11 @@ public class IoTDBCQExecIT {
long[] expectedTime = {startTime + 1_000, startTime + 3_000};
long[] expectedValue = {4, 8};
- try (ResultSet resultSet = statement.executeQuery("select s1_max from
root.sg.d4")) {
+ try (ResultSet resultSet = statement.executeQuery("select s1_max from
root.db.d4")) {
int cnt = 0;
while (resultSet.next()) {
assertEquals(expectedTime[cnt], resultSet.getLong(TIMESTAMP_STR));
- assertEquals(expectedValue[cnt],
resultSet.getLong("root.sg.d4.s1_max"));
+ assertEquals(expectedValue[cnt],
resultSet.getLong("root.db.d4.s1_max"));
cnt++;
}
assertEquals(expectedTime.length, cnt);
@@ -415,19 +415,19 @@ public class IoTDBCQExecIT {
@Test
public void testCQExecution5() {
String insertTemplate =
- "INSERT INTO root.sg.d5(time, s1) VALUES (%d, %d), (%d, %d), (%d, %d),
(%d, %d), (%d, %d), (%d, %d), (%d, %d), (%d, %d), (%d, %d), (%d, %d)";
+ "INSERT INTO root.db.d5(time, s1) VALUES (%d, %d), (%d, %d), (%d, %d),
(%d, %d), (%d, %d), (%d, %d), (%d, %d), (%d, %d), (%d, %d), (%d, %d)";
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
long now = System.currentTimeMillis();
long firstExecutionTime = now + 10_000;
long startTime = firstExecutionTime - 3_000;
- statement.execute("create timeseries root.sg.d5.s1 WITH DATATYPE=INT64");
- statement.execute("create timeseries root.sg.d5.precalculated_s1 WITH
DATATYPE=DOUBLE");
+ statement.execute("create timeseries root.db.d5.s1 WITH DATATYPE=INT64");
+ statement.execute("create timeseries root.db.d5.precalculated_s1 WITH
DATATYPE=DOUBLE");
// firstly write one row to init data region, just for accelerating the
following insert
// statement.
- statement.execute("INSERT INTO root.sg.d5(time, s1) VALUES (0,0)");
+ statement.execute("INSERT INTO root.db.d5(time, s1) VALUES (0,0)");
statement.execute(
String.format(
@@ -460,8 +460,8 @@ public class IoTDBCQExecIT {
+ "RANGE 4s\n"
+ "BEGIN \n"
+ " SELECT s1 + 1 \n"
- + " INTO root.sg.d5(precalculated_s1)\n"
- + " FROM root.sg.d5\n"
+ + " INTO root.db.d5(precalculated_s1)\n"
+ + " FROM root.db.d5\n"
+ " align by device\n"
+ "END");
@@ -493,7 +493,7 @@ public class IoTDBCQExecIT {
try (ResultSet resultSet =
statement.executeQuery(
- "select precalculated_s1 from root.sg.d5 where time between "
+ "select precalculated_s1 from root.db.d5 where time between "
+ startTime
+ " and "
+ (startTime + 4_500))) {
@@ -501,7 +501,7 @@ public class IoTDBCQExecIT {
while (resultSet.next()) {
assertEquals(expectedTime[cnt], resultSet.getLong(TIMESTAMP_STR));
assertEquals(
- expectedValue[cnt],
resultSet.getDouble("root.sg.d5.precalculated_s1"), 0.00001);
+ expectedValue[cnt],
resultSet.getDouble("root.db.d5.precalculated_s1"), 0.00001);
cnt++;
}
assertEquals(expectedTime.length, cnt);
diff --git
a/integration-test/src/test/java/org/apache/iotdb/db/it/cq/IoTDBCQExecInNsIT.java
b/integration-test/src/test/java/org/apache/iotdb/db/it/cq/IoTDBCQExecInNsIT.java
index 5472277ffc9..78d8d2644b0 100644
---
a/integration-test/src/test/java/org/apache/iotdb/db/it/cq/IoTDBCQExecInNsIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/db/it/cq/IoTDBCQExecInNsIT.java
@@ -251,7 +251,7 @@ public class IoTDBCQExecInNsIT {
// firstly write one row to init data region, just for accelerating the
following insert
// statement.
- statement.execute("INSERT INTO root.sg.d3(time, s1) VALUES (0,0)");
+ statement.execute("INSERT INTO root.db.d3(time, s1) VALUES (0,0)");
statement.execute(
String.format(
@@ -284,8 +284,8 @@ public class IoTDBCQExecInNsIT {
+ "RANGE 4s\n"
+ "BEGIN \n"
+ " SELECT max_value(s1) \n"
- + " INTO root.sg.d3(s1_max)\n"
- + " FROM root.sg.d3\n"
+ + " INTO root.db.d3(s1_max)\n"
+ + " FROM root.db.d3\n"
+ " GROUP BY(1s) \n"
+ " FILL(100)\n"
+ "END");
@@ -314,14 +314,14 @@ public class IoTDBCQExecInNsIT {
try (ResultSet resultSet =
statement.executeQuery(
- "select s1_max from root.sg.d3 where time between "
+ "select s1_max from root.db.d3 where time between "
+ (startTime - 1_000_000_000L)
+ " and "
+ (startTime + 4_000_000_000L))) {
int cnt = 0;
while (resultSet.next()) {
assertEquals(expectedTime[cnt], resultSet.getLong(TIMESTAMP_STR));
- assertEquals(expectedValue[cnt],
resultSet.getLong("root.sg.d3.s1_max"));
+ assertEquals(expectedValue[cnt],
resultSet.getLong("root.db.d3.s1_max"));
cnt++;
}
assertEquals(expectedTime.length, cnt);
@@ -338,19 +338,19 @@ public class IoTDBCQExecInNsIT {
@Test
public void testCQExecution4() {
String insertTemplate =
- "INSERT INTO root.sg.d4(time, s1) VALUES (%d, %d), (%d, %d), (%d, %d),
(%d, %d), (%d, %d), (%d, %d), (%d, %d), (%d, %d), (%d, %d), (%d, %d)";
+ "INSERT INTO root.db.d4(time, s1) VALUES (%d, %d), (%d, %d), (%d, %d),
(%d, %d), (%d, %d), (%d, %d), (%d, %d), (%d, %d), (%d, %d), (%d, %d)";
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
long now = System.currentTimeMillis() * 1_000_000L;
long firstExecutionTime = now + 10_000_000_000L;
long startTime = firstExecutionTime - 3_000_000_000L;
- statement.execute("create timeseries root.sg.d4.s1 WITH DATATYPE=INT64");
- statement.execute("create timeseries root.sg.d4.s1_max WITH
DATATYPE=INT64");
+ statement.execute("create timeseries root.db.d4.s1 WITH DATATYPE=INT64");
+ statement.execute("create timeseries root.db.d4.s1_max WITH
DATATYPE=INT64");
// firstly write one row to init data region, just for accelerating the
following insert
// statement.
- statement.execute("INSERT INTO root.sg.d4(time, s1) VALUES (0,0)");
+ statement.execute("INSERT INTO root.db.d4(time, s1) VALUES (0,0)");
statement.execute(
String.format(
@@ -383,8 +383,8 @@ public class IoTDBCQExecInNsIT {
+ "RANGE 2s, 1s\n"
+ "BEGIN \n"
+ " SELECT max_value(s1) \n"
- + " INTO root.sg.d4(s1_max)\n"
- + " FROM root.sg.d4\n"
+ + " INTO root.db.d4(s1_max)\n"
+ + " FROM root.db.d4\n"
+ " GROUP BY(1s) \n"
+ "END");
@@ -403,11 +403,11 @@ public class IoTDBCQExecInNsIT {
long[] expectedTime = {startTime + 1_000_000_000L, startTime +
3_000_000_000L};
long[] expectedValue = {4, 8};
- try (ResultSet resultSet = statement.executeQuery("select s1_max from
root.sg.d4")) {
+ try (ResultSet resultSet = statement.executeQuery("select s1_max from
root.db.d4")) {
int cnt = 0;
while (resultSet.next()) {
assertEquals(expectedTime[cnt], resultSet.getLong(TIMESTAMP_STR));
- assertEquals(expectedValue[cnt],
resultSet.getLong("root.sg.d4.s1_max"));
+ assertEquals(expectedValue[cnt],
resultSet.getLong("root.db.d4.s1_max"));
cnt++;
}
assertEquals(expectedTime.length, cnt);
diff --git
a/integration-test/src/test/java/org/apache/iotdb/db/it/cq/IoTDBCQExecInUsIT.java
b/integration-test/src/test/java/org/apache/iotdb/db/it/cq/IoTDBCQExecInUsIT.java
index 7ef0bc5362c..2fbfba551b1 100644
---
a/integration-test/src/test/java/org/apache/iotdb/db/it/cq/IoTDBCQExecInUsIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/db/it/cq/IoTDBCQExecInUsIT.java
@@ -239,19 +239,19 @@ public class IoTDBCQExecInUsIT {
@Test
public void testCQExecution3() {
String insertTemplate =
- "INSERT INTO root.sg.d3(time, s1) VALUES (%d, %d), (%d, %d), (%d, %d),
(%d, %d), (%d, %d), (%d, %d), (%d, %d), (%d, %d), (%d, %d), (%d, %d)";
+ "INSERT INTO root.db.d3(time, s1) VALUES (%d, %d), (%d, %d), (%d, %d),
(%d, %d), (%d, %d), (%d, %d), (%d, %d), (%d, %d), (%d, %d), (%d, %d)";
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
long now = System.currentTimeMillis() * 1_000L;
long firstExecutionTime = now + 10_000_000L;
long startTime = firstExecutionTime - 3_000_000L;
- statement.execute("create timeseries root.sg.d3.s1 WITH DATATYPE=INT64");
- statement.execute("create timeseries root.sg.d3.s1_max WITH
DATATYPE=INT64");
+ statement.execute("create timeseries root.db.d3.s1 WITH DATATYPE=INT64");
+ statement.execute("create timeseries root.db.d3.s1_max WITH
DATATYPE=INT64");
// firstly write one row to init data region, just for accelerating the
following insert
// statement.
- statement.execute("INSERT INTO root.sg.d3(time, s1) VALUES (0,0)");
+ statement.execute("INSERT INTO root.db.d3(time, s1) VALUES (0,0)");
statement.execute(
String.format(
@@ -284,8 +284,8 @@ public class IoTDBCQExecInUsIT {
+ "RANGE 4s\n"
+ "BEGIN \n"
+ " SELECT max_value(s1) \n"
- + " INTO root.sg.d3(s1_max)\n"
- + " FROM root.sg.d3\n"
+ + " INTO root.db.d3(s1_max)\n"
+ + " FROM root.db.d3\n"
+ " GROUP BY(1s) \n"
+ " FILL(100)\n"
+ "END");
@@ -314,14 +314,14 @@ public class IoTDBCQExecInUsIT {
try (ResultSet resultSet =
statement.executeQuery(
- "select s1_max from root.sg.d3 where time between "
+ "select s1_max from root.db.d3 where time between "
+ (startTime - 1_000_000L)
+ " and "
+ (startTime + 4_000_000L))) {
int cnt = 0;
while (resultSet.next()) {
assertEquals(expectedTime[cnt], resultSet.getLong(TIMESTAMP_STR));
- assertEquals(expectedValue[cnt],
resultSet.getLong("root.sg.d3.s1_max"));
+ assertEquals(expectedValue[cnt],
resultSet.getLong("root.db.d3.s1_max"));
cnt++;
}
assertEquals(expectedTime.length, cnt);
@@ -338,15 +338,15 @@ public class IoTDBCQExecInUsIT {
@Test
public void testCQExecution4() {
String insertTemplate =
- "INSERT INTO root.sg.d4(time, s1) VALUES (%d, %d), (%d, %d), (%d, %d),
(%d, %d), (%d, %d), (%d, %d), (%d, %d), (%d, %d), (%d, %d), (%d, %d)";
+ "INSERT INTO root.db.d4(time, s1) VALUES (%d, %d), (%d, %d), (%d, %d),
(%d, %d), (%d, %d), (%d, %d), (%d, %d), (%d, %d), (%d, %d), (%d, %d)";
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
long now = System.currentTimeMillis() * 1_000L;
long firstExecutionTime = now + 10_000_000L;
long startTime = firstExecutionTime - 3_000_000L;
- statement.execute("create timeseries root.sg.d4.s1 WITH DATATYPE=INT64");
- statement.execute("create timeseries root.sg.d4.s1_max WITH
DATATYPE=INT64");
+ statement.execute("create timeseries root.db.d4.s1 WITH DATATYPE=INT64");
+ statement.execute("create timeseries root.db.d4.s1_max WITH
DATATYPE=INT64");
// firstly write one row to init data region, just for accelerating the
following insert
// statement.
diff --git
a/integration-test/src/test/java/org/apache/iotdb/db/it/cq/IoTDBCQIT.java
b/integration-test/src/test/java/org/apache/iotdb/db/it/cq/IoTDBCQIT.java
index 22c546e1258..f8f3f39480c 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/cq/IoTDBCQIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/cq/IoTDBCQIT.java
@@ -355,7 +355,7 @@ public class IoTDBCQIT {
+ "BEGIN \n"
+ " SELECT count(s1) \n"
+ " INTO root.db_count.d(count_s1)\n"
- + " FROM root.sg.d\n"
+ + " FROM root.db.d\n"
+ " GROUP BY(30m)\n"
+ "END";
statement.execute(sql);
@@ -371,8 +371,8 @@ public class IoTDBCQIT {
+ "TIMEOUT POLICY DISCARD\n"
+ "BEGIN \n"
+ " SELECT count(s1) \n"
- + " INTO root.sg_count.d(count_s1)\n"
- + " FROM root.sg.d\n"
+ + " INTO root.db_count.d(count_s1)\n"
+ + " FROM root.db.d\n"
+ " GROUP BY(10m)\n"
+ "END";
statement.execute(sql);
@@ -388,8 +388,8 @@ public class IoTDBCQIT {
+ "TIMEOUT POLICY DISCARD\n"
+ "BEGIN \n"
+ " SELECT count(s1) \n"
- + " INTO root.sg_count.d(count_s1)\n"
- + " FROM root.sg.d\n"
+ + " INTO root.db_count.d(count_s1)\n"
+ + " FROM root.db.d\n"
+ " GROUP BY(10m)\n"
+ "END";
statement.execute(sql);
@@ -423,15 +423,15 @@ public class IoTDBCQIT {
+ "TIMEOUT POLICY BLOCKED\n"
+ "BEGIN \n"
+ " SELECT count(s1) \n"
- + " INTO root.sg_count.d(count_s1)\n"
- + " FROM root.sg.d\n"
+ + " INTO root.db_count.d(count_s1)\n"
+ + " FROM root.db.d\n"
+ " GROUP BY(30m)\n"
+ "END",
"CREATE CQ show_cq_2\n"
+ "BEGIN \n"
+ " SELECT count(s1) \n"
- + " INTO root.sg_count.d(count_s1)\n"
- + " FROM root.sg.d\n"
+ + " INTO root.db_count.d(count_s1)\n"
+ + " FROM root.db.d\n"
+ " GROUP BY(30m)\n"
+ "END",
"CREATE CQ show_cq_3\n"
@@ -439,8 +439,8 @@ public class IoTDBCQIT {
+ "TIMEOUT POLICY DISCARD\n"
+ "BEGIN \n"
+ " SELECT count(s1) \n"
- + " INTO root.sg_count.d(count_s1)\n"
- + " FROM root.sg.d\n"
+ + " INTO root.db_count.d(count_s1)\n"
+ + " FROM root.db.d\n"
+ " GROUP BY(10m)\n"
+ "END",
"CREATE CQ show_cq_4\n"
@@ -448,8 +448,8 @@ public class IoTDBCQIT {
+ "TIMEOUT POLICY DISCARD\n"
+ "BEGIN \n"
+ " SELECT count(s1) \n"
- + " INTO root.sg_count.d(count_s1)\n"
- + " FROM root.sg.d\n"
+ + " INTO root.db_count.d(count_s1)\n"
+ + " FROM root.db.d\n"
+ " GROUP BY(10m)\n"
+ "END"
};
@@ -497,7 +497,7 @@ public class IoTDBCQIT {
+ "TIMEOUT POLICY BLOCKED\n"
+ "BEGIN \n"
+ " SELECT count(s1) \n"
- + " INTO root.sg_count.d(count_s1)\n"
+ + " INTO root.db_count.d(count_s1)\n"
+ " FROM root.sg.d\n"
+ " GROUP BY(30m)\n"
+ "END",
diff --git
a/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFBuiltinFunctionIT.java
b/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFBuiltinFunctionIT.java
index 554808ea032..8eb52b364f4 100644
---
a/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFBuiltinFunctionIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFBuiltinFunctionIT.java
@@ -87,9 +87,9 @@ public class IoTDBUDTFBuiltinFunctionIT {
statement.execute("CREATE TIMESERIES root.db.d1.s4 with
datatype=DOUBLE,encoding=PLAIN");
statement.execute("CREATE TIMESERIES root.db.d1.s5 with
datatype=BOOLEAN,encoding=PLAIN");
statement.execute("CREATE TIMESERIES root.db.d1.s6 with
datatype=TEXT,encoding=PLAIN");
- statement.execute("CREATE TIMESERIES root.sg.d1.s10 with
datatype=DATE,encoding=PLAIN");
- statement.execute("CREATE TIMESERIES root.sg.d1.s11 with
datatype=TIMESTAMP,encoding=PLAIN");
- statement.execute("CREATE TIMESERIES root.sg.d1.s12 with
datatype=STRING,encoding=PLAIN");
+ statement.execute("CREATE TIMESERIES root.db.d1.s10 with
datatype=DATE,encoding=PLAIN");
+ statement.execute("CREATE TIMESERIES root.db.d1.s11 with
datatype=TIMESTAMP,encoding=PLAIN");
+ statement.execute("CREATE TIMESERIES root.db.d1.s12 with
datatype=STRING,encoding=PLAIN");
} catch (SQLException throwable) {
fail(throwable.getMessage());
}
@@ -141,7 +141,7 @@ public class IoTDBUDTFBuiltinFunctionIT {
ResultSet resultSet =
statement.executeQuery(
String.format(
- "select %s(s1), %s(s2), %s(s3), %s(s4) from root.sg.d1",
+ "select %s(s1), %s(s2), %s(s3), %s(s4) from root.db.d1",
functionName, functionName, functionName, functionName));
int columnCount = resultSet.getMetaData().getColumnCount();
@@ -160,7 +160,7 @@ public class IoTDBUDTFBuiltinFunctionIT {
resultSet =
statement.executeQuery(
String.format(
- "select %s(s1), %s(s2), %s(s3), %s(s4) from root.sg.d1 align
by device",
+ "select %s(s1), %s(s2), %s(s3), %s(s4) from root.db.d1 align
by device",
functionName, functionName, functionName, functionName));
columnCount = resultSet.getMetaData().getColumnCount();
@@ -191,7 +191,7 @@ public class IoTDBUDTFBuiltinFunctionIT {
ResultSet resultSet =
statement.executeQuery(
String.format(
- "select %s(s1, %s), %s(s2, %s), %s(s3, %s), %s(s4, %s),
%s(s6, %s), %s(s10, %s), %s(s11, %s), %s(s12, %s) from root.sg.d1",
+ "select %s(s1, %s), %s(s2, %s), %s(s3, %s), %s(s4, %s),
%s(s6, %s), %s(s10, %s), %s(s11, %s), %s(s12, %s) from root.db.d1",
TOP_K, K, TOP_K, K, TOP_K, K, TOP_K, K, TOP_K, K, TOP_K, K,
TOP_K, K, TOP_K, K));
int columnCount = resultSet.getMetaData().getColumnCount();
@@ -214,7 +214,7 @@ public class IoTDBUDTFBuiltinFunctionIT {
resultSet =
statement.executeQuery(
String.format(
- "select %s(s1, %s), %s(s2, %s), %s(s3, %s), %s(s4, %s),
%s(s6, %s) from root.sg.d1 align by device",
+ "select %s(s1, %s), %s(s2, %s), %s(s3, %s), %s(s4, %s),
%s(s6, %s) from root.db.d1 align by device",
TOP_K, K, TOP_K, K, TOP_K, K, TOP_K, K, TOP_K, K));
columnCount = resultSet.getMetaData().getColumnCount();
@@ -236,7 +236,7 @@ public class IoTDBUDTFBuiltinFunctionIT {
ResultSet resultSet =
statement.executeQuery(
String.format(
- "select %s(s1, %s), %s(s2, %s), %s(s3, %s), %s(s4, %s),
%s(s6, %s), %s(s10, %s), %s(s11, %s), %s(s12, %s) from root.sg.d1",
+ "select %s(s1, %s), %s(s2, %s), %s(s3, %s), %s(s4, %s),
%s(s6, %s), %s(s10, %s), %s(s11, %s), %s(s12, %s) from root.db.d1",
BOTTOM_K, K, BOTTOM_K, K, BOTTOM_K, K, BOTTOM_K, K,
BOTTOM_K, K, BOTTOM_K, K,
BOTTOM_K, K, BOTTOM_K, K));
diff --git
a/iotdb-client/session/src/test/java/org/apache/iotdb/session/SessionTest.java
b/iotdb-client/session/src/test/java/org/apache/iotdb/session/SessionTest.java
index e4d2dbbb41d..5471c221908 100644
---
a/iotdb-client/session/src/test/java/org/apache/iotdb/session/SessionTest.java
+++
b/iotdb-client/session/src/test/java/org/apache/iotdb/session/SessionTest.java
@@ -78,7 +78,7 @@ public class SessionTest {
.build();
Whitebox.setInternalState(session, "defaultSessionConnection",
sessionConnection);
TSQueryTemplateResp resp = new TSQueryTemplateResp();
- resp.setMeasurements(Arrays.asList("root.sg1.d1.s1"));
+ resp.setMeasurements(Arrays.asList("root.db1.d1.s1"));
Mockito.when(sessionConnection.querySchemaTemplate(any())).thenReturn(resp);
HashMap<String, TEndPoint> deviceIdToEndpoint = new HashMap<>();
deviceIdToEndpoint.put("device1", new TEndPoint());
diff --git
a/iotdb-client/session/src/test/java/org/apache/iotdb/session/TabletTest.java
b/iotdb-client/session/src/test/java/org/apache/iotdb/session/TabletTest.java
index bc9469e57a4..13b12586b0e 100644
---
a/iotdb-client/session/src/test/java/org/apache/iotdb/session/TabletTest.java
+++
b/iotdb-client/session/src/test/java/org/apache/iotdb/session/TabletTest.java
@@ -50,7 +50,7 @@ public class TabletTest {
schemaList.add(new MeasurementSchema("s9", TSDataType.STRING));
;
// insert three rows data
- Tablet tablet = new Tablet("root.sg1.d1", schemaList, 3);
+ Tablet tablet = new Tablet("root.db1.d1", schemaList, 3);
Object[] values = tablet.getValues();
/*
diff --git
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/PartialPath.java
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/PartialPath.java
index 1904c5460a8..383cdfb32d8 100644
---
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/PartialPath.java
+++
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/PartialPath.java
@@ -458,7 +458,7 @@ public class PartialPath extends Path implements
Comparable<Path>, Cloneable {
*
* <p>For example:
*
- * <p>1) Pattern "root.db1.d1.*" can match prefix path "root.sg1.d1.s1",
"root.sg1.d1",
+ * <p>1) Pattern "root.db1.d1.*" can match prefix path "root.db1.d1.s1",
"root.db1.d1",
* "root.sg1", "root" etc.
*
* <p>1) Pattern "root.sg1.d1.*" does not match prefix path "root.sg2",
"root.sg1.d2".
