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 5851451b073 fix
5851451b073 is described below
commit 5851451b073cd727e1fca6ed1ad3a78765a3738a
Author: Caideyipi <[email protected]>
AuthorDate: Fri Jan 9 09:51:15 2026 +0800
fix
---
.../org/apache/iotdb/db/it/IoTDBLoadTsFileIT.java | 4 +--
.../org/apache/iotdb/db/it/IoTDBRestServiceIT.java | 2 +-
.../org/apache/iotdb/db/it/IoTDBSimpleQueryIT.java | 22 +++++++--------
.../db/it/IoTDBSyntaxConventionIdentifierIT.java | 32 +++++++++++-----------
.../org/apache/iotdb/db/it/auth/IoTDBAuthIT.java | 2 +-
.../iotdb/db/it/auth/IoTDBSeriesPermissionIT.java | 4 +--
.../org/apache/iotdb/db/it/cq/IoTDBCQExecIT.java | 14 +++++-----
.../apache/iotdb/db/it/cq/IoTDBCQExecInNsIT.java | 18 ++++++------
.../apache/iotdb/db/it/cq/IoTDBCQExecInUsIT.java | 12 ++++----
.../java/org/apache/iotdb/db/it/cq/IoTDBCQIT.java | 32 +++++++++++-----------
.../iotdb/db/it/udf/IoTDBUDFWindowQuery2IT.java | 20 +++++++-------
.../db/it/udf/IoTDBUDTFBuiltinFunctionIT.java | 24 ++++++++--------
.../org/apache/iotdb/commons/path/PartialPath.java | 6 ++--
.../iotdb/commons/path/fa/nfa/SimpleNFA.java | 4 +--
14 files changed, 98 insertions(+), 98 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 b13d5d530c4..5adb94f7c20 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
@@ -979,7 +979,7 @@ public class IoTDBLoadTsFileIT {
statement.execute(String.format("load \"%s\"",
tmpDir.getAbsolutePath()));
- try (final ResultSet resultSet = statement.executeQuery("show timeseries
root.sg")) {
+ try (final ResultSet resultSet = statement.executeQuery("show timeseries
root.db")) {
Assert.assertFalse(resultSet.next());
}
}
@@ -1047,7 +1047,7 @@ public class IoTDBLoadTsFileIT {
statement.execute(String.format("load \"%s\" sglevel=2",
tmpDir.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 sg1Count = resultSet.getLong("count(root.db.test_0.*.*)");
Assert.assertEquals(writtenPoint1, sg1Count);
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 f6260684a0e..4821b6ba239 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
@@ -822,7 +822,7 @@ public class IoTDBRestServiceIT {
CloseableHttpResponse response = null;
try {
HttpPost httpPost = getHttpPost("http://127.0.0.1:"; + port +
"/rest/v1/query");
- String sql = "{\"sql\":\"select *,s4+1,s4+1 from root.sg25\"}";
+ String sql = "{\"sql\":\"select *,s4+1,s4+1 from root.db25\"}";
httpPost.setEntity(new StringEntity(sql, Charset.defaultCharset()));
response = httpClient.execute(httpPost);
HttpEntity responseEntity = response.getEntity();
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 8806606c543..740085f3bc4 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
@@ -534,7 +534,7 @@ public class IoTDBSimpleQueryIT {
+ ","
+ resultSet.getString("root.db1.d0.s0")
+ ","
- + resultSet.getString("root.sg1.d0.s1");
+ + resultSet.getString("root.db1.d0.s1");
assertEquals(ret[cur], ans);
cur++;
}
@@ -547,16 +547,16 @@ public class IoTDBSimpleQueryIT {
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
statement.setFetchSize(5);
- 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 14952d693ae..76d52a8fdcb 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
@@ -287,10 +287,10 @@ public class IoTDBSyntaxConventionIdentifierIT {
for (int i = 0; i < selectNodeNames.length; i++) {
String selectSql =
- String.format("SELECT %s FROM root.sg1.d1 WHERE time = 1",
selectNodeNames[i]);
+ String.format("SELECT %s FROM root.db1.d1 WHERE time = 1",
selectNodeNames[i]);
try (ResultSet resultSet = statement.executeQuery(selectSql)) {
Assert.assertTrue(resultSet.next());
- Assert.assertEquals(1, resultSet.getInt("root.sg1.d1." +
suffixInResultColumns[i]));
+ Assert.assertEquals(1, resultSet.getInt("root.db1.d1." +
suffixInResultColumns[i]));
}
}
@@ -307,76 +307,76 @@ public class IoTDBSyntaxConventionIdentifierIT {
// nodeName with special characters should be quoted with '`'
try {
- statement.execute("create timeseries root.sg1.d1.`a INT32");
+ statement.execute("create timeseries root.db1.d1.`a INT32");
fail();
} catch (Exception ignored) {
}
try {
- statement.execute("create timeseries root.sg1.d1.[a INT32");
+ statement.execute("create timeseries root.db1.d1.[a INT32");
fail();
} catch (Exception ignored) {
}
try {
- statement.execute("create timeseries root.sg1.d1.a! INT32");
+ statement.execute("create timeseries root.db1.d1.a! INT32");
fail();
} catch (Exception ignored) {
}
try {
- statement.execute("create timeseries root.sg1.d1.a\" INT32");
+ statement.execute("create timeseries root.db1.d1.a\" INT32");
fail();
} catch (Exception ignored) {
}
try {
- statement.execute("create timeseries root.sg1.d1.a' INT32");
+ statement.execute("create timeseries root.db1.d1.a' INT32");
fail();
} catch (Exception ignored) {
}
// nodeName consists of numbers should be quoted with '`'
try {
- statement.execute("create timeseries root.sg1.d1.111 INT32");
+ statement.execute("create timeseries root.db1.d1.111 INT32");
fail();
} catch (Exception ignored) {
}
try {
- statement.execute("create timeseries root.sg1.d1.012 INT32");
+ statement.execute("create timeseries root.db1.d1.012 INT32");
fail();
} catch (Exception ignored) {
}
// shouled use double '`' in a quoted nodeName
try {
- statement.execute("create timeseries root.sg1.d1.`a`` INT32");
+ statement.execute("create timeseries root.db1.d1.`a`` INT32");
fail();
} catch (Exception ignored) {
}
try {
- statement.execute("create timeseries root.sg1.d1.``a` INT32");
+ statement.execute("create timeseries root.db1.d1.``a` INT32");
fail();
} catch (Exception ignored) {
}
// reserved words can not be identifier
try {
- statement.execute("create timeseries root.sg1.d1.root INT32");
+ statement.execute("create timeseries root.db1.d1.root INT32");
fail();
} catch (Exception ignored) {
}
try {
- statement.execute("create timeseries root.sg1.d1.time INT32");
+ statement.execute("create timeseries root.db1.d1.time INT32");
fail();
} catch (Exception ignored) {
}
try {
- statement.execute("create timeseries root.sg1.d1.timestamp INT32");
+ statement.execute("create timeseries root.db1.d1.timestamp INT32");
fail();
} catch (Exception ignored) {
}
@@ -393,7 +393,7 @@ public class IoTDBSyntaxConventionIdentifierIT {
Statement statement = connection.createStatement()) {
try {
- statement.execute("create database root.sg1.d1.");
+ statement.execute("create database root.db1.d1.");
fail();
} catch (Exception ignored) {
}
@@ -408,7 +408,7 @@ public class IoTDBSyntaxConventionIdentifierIT {
public void testExpression() {
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
- statement.execute("CREATE TIMESERIES root.sg1.d1.`1` INT32");
+ 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");
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 441dd1fdb5c..1b7deda9768 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
@@ -200,7 +200,7 @@ public class IoTDBAuthIT {
Statement userStmt = userCon.createStatement()) {
Assert.assertThrows(
- SQLException.class, () -> userStmt.execute("CREATE DATABASE
root.sgtest"));
+ SQLException.class, () -> userStmt.execute("CREATE DATABASE
root.dbtest"));
adminStmt.execute("GRANT SYSTEM ON root.** TO USER sgtest");
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 ad34c1cc0b9..39fc5e063b5 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
@@ -260,9 +260,9 @@ public class IoTDBSeriesPermissionIT {
}
private void testWriteData() {
- grantUserSeriesPrivilege("test1", PrivilegeType.WRITE_DATA,
"root.sg.d1.s1");
+ grantUserSeriesPrivilege("test1", PrivilegeType.WRITE_DATA,
"root.db.d1.s1");
assertNonQueryTestFail(
- "insert into root.sg.d1(time,s1,s2) values(1,1,1)",
+ "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]",
"test1",
"test123123456");
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 9a6a1577eb8..94cf4ef1856 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
@@ -305,14 +305,14 @@ public class IoTDBCQExecIT {
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)
+ " and "
+ (startTime + 4_000))) {
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);
@@ -329,19 +329,19 @@ public class IoTDBCQExecIT {
@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();
long firstExecutionTime = now + 10_000;
long startTime = firstExecutionTime - 3_000;
- 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(
@@ -374,7 +374,7 @@ public class IoTDBCQExecIT {
+ "RANGE 2s, 1s\n"
+ "BEGIN \n"
+ " SELECT max_value(s1) \n"
- + " INTO root.sg.d4(s1_max)\n"
+ + " INTO root.db.d4(s1_max)\n"
+ " FROM root.sg.d4\n"
+ " GROUP BY(1s) \n"
+ "END");
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 f29b527fa0d..5472277ffc9 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
@@ -155,11 +155,11 @@ public class IoTDBCQExecInNsIT {
long startTime = firstExecutionTime - 3_000_000_000L;
statement.execute("create timeseries root.db.d2.s1 WITH DATATYPE=INT64");
- statement.execute("create timeseries root.sg.d2.s1_max WITH
DATATYPE=INT64");
+ statement.execute("create timeseries root.db.d2.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.d2(time, s1) VALUES (0,0)");
+ statement.execute("INSERT INTO root.db.d2(time, s1) VALUES (0,0)");
statement.execute(
String.format(
@@ -192,8 +192,8 @@ public class IoTDBCQExecInNsIT {
+ "RANGE 4s \n"
+ "BEGIN \n"
+ " SELECT max_value(s1) \n"
- + " INTO root.sg.d2(s1_max)\n"
- + " FROM root.sg.d2\n"
+ + " INTO root.db.d2(s1_max)\n"
+ + " FROM root.db.d2\n"
+ " GROUP BY(1s) \n"
+ "END");
@@ -218,11 +218,11 @@ public class IoTDBCQExecInNsIT {
};
long[] expectedValue = {2, 4, 6, 8, 10};
- try (ResultSet resultSet = statement.executeQuery("select s1_max from
root.sg.d2")) {
+ try (ResultSet resultSet = statement.executeQuery("select s1_max from
root.db.d2")) {
int cnt = 0;
while (resultSet.next()) {
assertEquals(expectedTime[cnt], resultSet.getLong(TIMESTAMP_STR));
- assertEquals(expectedValue[cnt],
resultSet.getLong("root.sg.d2.s1_max"));
+ assertEquals(expectedValue[cnt],
resultSet.getLong("root.db.d2.s1_max"));
cnt++;
}
assertEquals(expectedTime.length, cnt);
@@ -239,15 +239,15 @@ public class IoTDBCQExecInNsIT {
@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_000_000L;
long firstExecutionTime = now + 10_000_000_000L;
long startTime = firstExecutionTime - 3_000_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.
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 ba3ad9a8593..7ef0bc5362c 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
@@ -155,11 +155,11 @@ public class IoTDBCQExecInUsIT {
long startTime = firstExecutionTime - 3_000_000L;
statement.execute("create timeseries root.db.d2.s1 WITH DATATYPE=INT64");
- statement.execute("create timeseries root.sg.d2.s1_max WITH
DATATYPE=INT64");
+ statement.execute("create timeseries root.db.d2.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.d2(time, s1) VALUES (0,0)");
+ statement.execute("INSERT INTO root.db.d2(time, s1) VALUES (0,0)");
statement.execute(
String.format(
@@ -192,8 +192,8 @@ public class IoTDBCQExecInUsIT {
+ "RANGE 4s \n"
+ "BEGIN \n"
+ " SELECT max_value(s1) \n"
- + " INTO root.sg.d2(s1_max)\n"
- + " FROM root.sg.d2\n"
+ + " INTO root.db.d2(s1_max)\n"
+ + " FROM root.db.d2\n"
+ " GROUP BY(1s) \n"
+ "END");
@@ -218,11 +218,11 @@ public class IoTDBCQExecInUsIT {
};
long[] expectedValue = {2, 4, 6, 8, 10};
- try (ResultSet resultSet = statement.executeQuery("select s1_max from
root.sg.d2")) {
+ try (ResultSet resultSet = statement.executeQuery("select s1_max from
root.db.d2")) {
int cnt = 0;
while (resultSet.next()) {
assertEquals(expectedTime[cnt], resultSet.getLong(TIMESTAMP_STR));
- assertEquals(expectedValue[cnt],
resultSet.getLong("root.sg.d2.s1_max"));
+ assertEquals(expectedValue[cnt],
resultSet.getLong("root.db.d2.s1_max"));
cnt++;
}
assertEquals(expectedTime.length, cnt);
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 a0a81380644..22c546e1258 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
@@ -182,7 +182,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);
@@ -201,8 +201,8 @@ public class IoTDBCQIT {
+ "RESAMPLE RANGE 30m, -1m\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";
statement.execute(sql);
@@ -221,8 +221,8 @@ public class IoTDBCQIT {
+ "RESAMPLE RANGE 30m, 30m\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";
statement.execute(sql);
@@ -241,8 +241,8 @@ public class IoTDBCQIT {
+ "RESAMPLE RANGE 30m, 31m\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";
statement.execute(sql);
@@ -261,8 +261,8 @@ public class IoTDBCQIT {
+ "RESAMPLE RANGE 30m\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(1h)\n"
+ "END";
statement.execute(sql);
@@ -282,8 +282,8 @@ public class IoTDBCQIT {
+ "TIMEOUT POLICY UNKNOWN\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(1h)\n"
+ "END";
statement.execute(sql);
@@ -301,8 +301,8 @@ public class IoTDBCQIT {
"CREATE CQ s1_count_cq \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";
statement.execute(sql);
@@ -339,8 +339,8 @@ 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";
statement.execute(sql);
@@ -354,7 +354,7 @@ public class IoTDBCQIT {
"CREATE CQ correct_cq_2\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/IoTDBUDFWindowQuery2IT.java
b/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDFWindowQuery2IT.java
index a6f5dce0d88..42ed5cecc56 100644
---
a/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDFWindowQuery2IT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDFWindowQuery2IT.java
@@ -82,11 +82,11 @@ public class IoTDBUDFWindowQuery2IT {
statement.execute("INSERT INTO root.db.d1(time, s1, s2) VALUES (3, 3,
3)");
statement.execute("INSERT INTO root.db.d1(time, s1, s2) VALUES (9, 9,
9)");
statement.execute("INSERT INTO root.db.d1(time, s1, s2) VALUES (5, 5,
5)");
- statement.execute("INSERT INTO root.sg.d1(time, s1, s2) VALUES (12, 12,
12)");
- statement.execute("INSERT INTO root.sg.d1(time, s1, s2) VALUES (14, 14,
14)");
- statement.execute("INSERT INTO root.sg.d1(time, s1, s2) VALUES (18, 18,
18)");
- statement.execute("INSERT INTO root.sg.d1(time, s1, s2) VALUES (21, 21,
21)");
- statement.execute("INSERT INTO root.sg.d1(time, s1, s2) VALUES (24, 24,
24)");
+ statement.execute("INSERT INTO root.db.d1(time, s1, s2) VALUES (12, 12,
12)");
+ statement.execute("INSERT INTO root.db.d1(time, s1, s2) VALUES (14, 14,
14)");
+ statement.execute("INSERT INTO root.db.d1(time, s1, s2) VALUES (18, 18,
18)");
+ statement.execute("INSERT INTO root.db.d1(time, s1, s2) VALUES (21, 21,
21)");
+ statement.execute("INSERT INTO root.db.d1(time, s1, s2) VALUES (24, 24,
24)");
} catch (SQLException throwable) {
fail(throwable.getMessage());
}
@@ -129,7 +129,7 @@ public class IoTDBUDFWindowQuery2IT {
if (displayBegin == null) {
sql =
String.format(
- "select window_start_end(s1, '%s'='%s', '%s'='%s') from
root.sg.d1",
+ "select window_start_end(s1, '%s'='%s', '%s'='%s') from
root.db.d1",
UDFTestConstant.ACCESS_STRATEGY_KEY,
UDFTestConstant.ACCESS_STRATEGY_SESSION,
UDFTestConstant.SESSION_GAP_KEY,
@@ -137,7 +137,7 @@ public class IoTDBUDFWindowQuery2IT {
} else {
sql =
String.format(
- "select window_start_end(s1, '%s'='%s', '%s'='%s', '%s'='%s',
'%s'='%s') from root.sg.d1",
+ "select window_start_end(s1, '%s'='%s', '%s'='%s', '%s'='%s',
'%s'='%s') from root.db.d1",
UDFTestConstant.ACCESS_STRATEGY_KEY,
UDFTestConstant.ACCESS_STRATEGY_SESSION,
UDFTestConstant.DISPLAY_WINDOW_BEGIN_KEY,
@@ -171,12 +171,12 @@ public class IoTDBUDFWindowQuery2IT {
if (delta == null) {
sql =
String.format(
- "select window_start_end(%s, '%s'='%s') from root.sg.d1",
+ "select window_start_end(%s, '%s'='%s') from root.db.d1",
"s2", UDFTestConstant.ACCESS_STRATEGY_KEY,
UDFTestConstant.ACCESS_STRATEGY_STATE);
} else {
sql =
String.format(
- "select window_start_end(%s, '%s'='%s', '%s'='%s') from
root.sg.d1",
+ "select window_start_end(%s, '%s'='%s', '%s'='%s') from
root.db.d1",
"s2",
UDFTestConstant.ACCESS_STRATEGY_KEY,
UDFTestConstant.ACCESS_STRATEGY_STATE,
@@ -186,7 +186,7 @@ public class IoTDBUDFWindowQuery2IT {
} else {
sql =
String.format(
- "select window_start_end(%s, '%s'='%s', '%s'='%s', '%s'='%s',
'%s'='%s') from root.sg.d1",
+ "select window_start_end(%s, '%s'='%s', '%s'='%s', '%s'='%s',
'%s'='%s') from root.db.d1",
"s2",
UDFTestConstant.ACCESS_STRATEGY_KEY,
UDFTestConstant.ACCESS_STRATEGY_STATE,
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 471aba1d927..554808ea032 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
@@ -56,11 +56,11 @@ public class IoTDBUDTFBuiltinFunctionIT {
private static final String[] INSERTION_SQLS = {
"insert into root.db.d1(time, s1, s2, s3, s4, s5, s6, s7, s8, s10, s11,
s12) values (0, 0, 0, 0, 0, true, '0', 0, 0, '2024-01-01', 0, '0')",
- "insert into root.sg.d1(time, s1, s2, s3, s4, s5, s6, s7, s10, s11, s12)
values (2, 1, 1, 1, 1, false, '1', 1, '2024-01-02', 1, '1')",
- "insert into root.sg.d1(time, s1, s2, s3, s4, s5, s6, s7, s10, s11, s12)
values (4, 2, 2, 2, 2, false, '2', 2, '2024-01-03', 2, '2')",
- "insert into root.sg.d1(time, s1, s2, s3, s4, s5, s6, s8, s10, s11, s12)
values (6, 3, 3, 3, 3, true, '3', 3, '2024-01-04', 3, '3')",
- "insert into root.sg.d1(time, s1, s2, s3, s4, s5, s6, s8, s10, s11, s12)
values (8, 4, 4, 4, 4, true, '4', 4, '2024-01-05', 4, '4')",
- "insert into root.sg.d1(time, s1, s2, s3, s4, s5, s6, s8, s10, s11, s12)
values (10000000000, 5, 5, 5, 5, false, '5', 5, '2024-01-06', 5, '5')"
+ "insert into root.db.d1(time, s1, s2, s3, s4, s5, s6, s7, s10, s11, s12)
values (2, 1, 1, 1, 1, false, '1', 1, '2024-01-02', 1, '1')",
+ "insert into root.db.d1(time, s1, s2, s3, s4, s5, s6, s7, s10, s11, s12)
values (4, 2, 2, 2, 2, false, '2', 2, '2024-01-03', 2, '2')",
+ "insert into root.db.d1(time, s1, s2, s3, s4, s5, s6, s8, s10, s11, s12)
values (6, 3, 3, 3, 3, true, '3', 3, '2024-01-04', 3, '3')",
+ "insert into root.db.d1(time, s1, s2, s3, s4, s5, s6, s8, s10, s11, s12)
values (8, 4, 4, 4, 4, true, '4', 4, '2024-01-05', 4, '4')",
+ "insert into root.db.d1(time, s1, s2, s3, s4, s5, s6, s8, s10, s11, s12)
values (10000000000, 5, 5, 5, 5, false, '5', 5, '2024-01-06', 5, '5')"
};
private static final double E = 0.0001;
@@ -80,13 +80,13 @@ public class IoTDBUDTFBuiltinFunctionIT {
private static void createTimeSeries() {
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
- statement.execute("CREATE DATABASE root.sg");
- statement.execute("CREATE TIMESERIES root.sg.d1.s1 with
datatype=INT32,encoding=PLAIN");
- statement.execute("CREATE TIMESERIES root.sg.d1.s2 with
datatype=INT64,encoding=PLAIN");
- statement.execute("CREATE TIMESERIES root.sg.d1.s3 with
datatype=FLOAT,encoding=PLAIN");
- statement.execute("CREATE TIMESERIES root.sg.d1.s4 with
datatype=DOUBLE,encoding=PLAIN");
- statement.execute("CREATE TIMESERIES root.sg.d1.s5 with
datatype=BOOLEAN,encoding=PLAIN");
- statement.execute("CREATE TIMESERIES root.sg.d1.s6 with
datatype=TEXT,encoding=PLAIN");
+ statement.execute("CREATE DATABASE root.db");
+ statement.execute("CREATE TIMESERIES root.db.d1.s1 with
datatype=INT32,encoding=PLAIN");
+ statement.execute("CREATE TIMESERIES root.db.d1.s2 with
datatype=INT64,encoding=PLAIN");
+ statement.execute("CREATE TIMESERIES root.db.d1.s3 with
datatype=FLOAT,encoding=PLAIN");
+ 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");
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 53aa0d9f067..1904c5460a8 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
@@ -439,8 +439,8 @@ public class PartialPath extends Path implements
Comparable<Path>, Cloneable {
/**
* Test if current PartialPath matches a full path. Current partialPath acts
as a full path
* pattern. rPath is supposed to be a full timeseries path without
wildcards. e.g.
- * "root.db.device.*" matches path "root.db.device.s1" whereas it does not
match "root.sg.device"
- * and "root.sg.vehicle.s1"
+ * "root.db.device.*" matches path "root.db.device.s1" whereas it does not
match "root.db.device"
+ * and "root.db.vehicle.s1"
*
* @param rPath a plain full path of a timeseries
* @return true if a successful match, otherwise return false
@@ -458,7 +458,7 @@ public class PartialPath extends Path implements
Comparable<Path>, Cloneable {
*
* <p>For example:
*
- * <p>1) Pattern "root.sg1.d1.*" can match prefix path "root.sg1.d1.s1",
"root.sg1.d1",
+ * <p>1) Pattern "root.db1.d1.*" can match prefix path "root.sg1.d1.s1",
"root.sg1.d1",
* "root.sg1", "root" etc.
*
* <p>1) Pattern "root.sg1.d1.*" does not match prefix path "root.sg2",
"root.sg1.d2".
diff --git
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/fa/nfa/SimpleNFA.java
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/fa/nfa/SimpleNFA.java
index 2a0304394ca..317933d840e 100644
---
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/fa/nfa/SimpleNFA.java
+++
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/fa/nfa/SimpleNFA.java
@@ -38,7 +38,7 @@ import static
org.apache.iotdb.commons.conf.IoTDBConstant.MULTI_LEVEL_PATH_WILDC
import static
org.apache.iotdb.commons.conf.IoTDBConstant.ONE_LEVEL_PATH_WILDCARD;
/**
- * Given path pattern root.sg.*.s, the SimpleNFA is:
+ * Given path pattern root.db.*.s, the SimpleNFA is:
*
* <p>initial -(root)-> state[0] -(sg)-> state[1] -(*)-> state[2] -(s)->
state[3] <br>
* state[3] is final state
@@ -49,7 +49,7 @@ import static
org.apache.iotdb.commons.conf.IoTDBConstant.ONE_LEVEL_PATH_WILDCAR
* with extra: state[1] -(*)-> state[1] and state[2] -(*)-> state[1] <br>
* state[3] is final state
*
- * <p>Given path pattern root.sg.d with prefix match, the SimpleNFA is:
+ * <p>Given path pattern root.db.d with prefix match, the SimpleNFA is:
*
* <p>initial -(root)-> state[0] -(sg)-> state[1] -(d)-> state[2] -(*)->
state[3] <br>
* with extra: state[3] -(*)-> state[3] <br>
