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 bd5e6786819 ref
bd5e6786819 is described below
commit bd5e67868197b73a12966fdb5a40fbed4f220d0d
Author: Caideyipi <[email protected]>
AuthorDate: Fri Jan 9 09:49:47 2026 +0800
ref
---
.../apache/iotdb/db/it/GrafanaApiServiceIT.java | 18 ++--
.../java/org/apache/iotdb/db/it/IoTDBFilterIT.java | 12 +--
.../apache/iotdb/db/it/IoTDBFloatPrecisionIT.java | 16 +--
.../iotdb/db/it/IoTDBInsertMultiPartitionIT.java | 6 +-
.../apache/iotdb/db/it/IoTDBInsertMultiRowIT.java | 6 +-
.../org/apache/iotdb/db/it/IoTDBInsertNullIT.java | 30 +++---
.../iotdb/db/it/IoTDBInsertWithoutTimeIT.java | 34 +++---
.../apache/iotdb/db/it/IoTDBJDBCMetadataIT.java | 28 ++---
.../org/apache/iotdb/db/it/IoTDBLoadTsFileIT.java | 18 ++--
.../iotdb/db/it/IoTDBPartialInsertionIT.java | 16 +--
.../db/it/IoTDBQueryWithRecreatedTimeseriesIT.java | 16 +--
.../org/apache/iotdb/db/it/IoTDBRestServiceIT.java | 24 ++---
.../org/apache/iotdb/db/it/IoTDBRestartIT.java | 14 +--
.../org/apache/iotdb/db/it/IoTDBSimpleQueryIT.java | 120 ++++++++++-----------
.../db/it/IoTDBSyntaxConventionIdentifierIT.java | 88 +++++++--------
.../it/IoTDBSyntaxConventionStringLiteralIT.java | 44 ++++----
.../java/org/apache/iotdb/db/it/IoTDBTtlIT.java | 34 +++---
.../org/apache/iotdb/db/it/cq/IoTDBCQExecIT.java | 44 ++++----
.../apache/iotdb/db/it/cq/IoTDBCQExecInNsIT.java | 20 ++--
.../apache/iotdb/db/it/cq/IoTDBCQExecInUsIT.java | 20 ++--
.../java/org/apache/iotdb/db/it/cq/IoTDBCQIT.java | 24 ++---
.../iotdb/db/it/udf/IoTDBUDFWindowQuery2IT.java | 16 +--
.../db/it/udf/IoTDBUDTFAlignByTimeQueryIT.java | 6 +-
.../db/it/udf/IoTDBUDTFBuiltinFunctionIT.java | 2 +-
.../iotdb/db/it/udf/IoTDBUDTFHybridQueryIT.java | 2 +-
.../iotdb/confignode/manager/ConfigManager.java | 6 +-
.../confignode/persistence/schema/ConfigMTree.java | 13 +--
.../schemaregion/impl/SchemaRegionMemoryImpl.java | 8 +-
...MemoryImpl.java => MTreeBelowDBMemoryImpl.java} | 12 +--
.../org/apache/iotdb/commons/path/PartialPath.java | 12 +--
.../apache/iotdb/commons/path/PathPatternTree.java | 2 +-
31 files changed, 356 insertions(+), 355 deletions(-)
diff --git
a/integration-test/src/test/java/org/apache/iotdb/db/it/GrafanaApiServiceIT.java
b/integration-test/src/test/java/org/apache/iotdb/db/it/GrafanaApiServiceIT.java
index 7fcb0d325e4..53679a9aefe 100644
---
a/integration-test/src/test/java/org/apache/iotdb/db/it/GrafanaApiServiceIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/db/it/GrafanaApiServiceIT.java
@@ -181,7 +181,7 @@ public class GrafanaApiServiceIT {
try {
HttpPost httpPost = getHttpPost("http://127.0.0.1:"; + port +
"/grafana/v1/query/expression");
String sql =
-
"{\"expression\":[\"count(s4)\"],\"prefixPath\":[\"root.sg25\"],\"startTime\":1635232143960,\"endTime\":1635232153960,\"control\":\"group
by([1635232143960,1635232153960),1s),level=1\"}";
+
"{\"expression\":[\"count(s4)\"],\"prefixPath\":[\"root.db25\"],\"startTime\":1635232143960,\"endTime\":1635232153960,\"control\":\"group
by([1635232143960,1635232153960),1s),level=1\"}";
httpPost.setEntity(new StringEntity(sql, Charset.defaultCharset()));
response = httpClient.execute(httpPost);
HttpEntity responseEntity = response.getEntity();
@@ -194,7 +194,7 @@ public class GrafanaApiServiceIT {
Assert.assertTrue(map.size() > 0);
Assert.assertTrue(timestampsResult.size() == 10);
Assert.assertTrue(valuesResult.size() == 1);
-
Assert.assertTrue("count(root.sg25.s4)".equals(expressionsResult.get(0)));
+
Assert.assertTrue("count(root.db25.s4)".equals(expressionsResult.get(0)));
} catch (IOException e) {
e.printStackTrace();
fail(e.getMessage());
@@ -215,7 +215,7 @@ public class GrafanaApiServiceIT {
try {
HttpPost httpPost = getHttpPost("http://127.0.0.1:"; + port +
"/grafana/v1/query/expression");
String sql =
-
"{\"expression\":[\"s4\",\"s5\"],\"prefixPath\":[\"root.sg25\"],\"startTime\":1635232133960,\"endTime\":1635232163960}";
+
"{\"expression\":[\"s4\",\"s5\"],\"prefixPath\":[\"root.db25\"],\"startTime\":1635232133960,\"endTime\":1635232163960}";
httpPost.setEntity(new StringEntity(sql, Charset.defaultCharset()));
for (int i = 0; i < 30; i++) {
try {
@@ -237,7 +237,7 @@ public class GrafanaApiServiceIT {
String message = EntityUtils.toString(responseEntity, "utf-8");
ObjectMapper mapper = new ObjectMapper();
Map<String, List> map = mapper.readValue(message, Map.class);
- String[] expressionsResult = {"root.sg25.s4", "root.sg25.s5"};
+ String[] expressionsResult = {"root.db25.s4", "root.db25.s5"};
Long[] timestamps = {1635232143960L, 1635232153960L};
Object[] values1 = {11, 2};
Object[] values2 = {15, 13};
@@ -268,7 +268,7 @@ public class GrafanaApiServiceIT {
try {
HttpPost httpPost = getHttpPost("http://127.0.0.1:"; + port +
"/grafana/v1/query/expression");
String sql =
-
"{\"expression\":[\"sum(s4)\",\"avg(s5)\"],\"prefixPath\":[\"root.sg25\"],\"startTime\":1635232133960,\"endTime\":1635232163960,\"control\":\"group
by([1635232133960,1635232163960),20s)\"}";
+
"{\"expression\":[\"sum(s4)\",\"avg(s5)\"],\"prefixPath\":[\"root.db25\"],\"startTime\":1635232133960,\"endTime\":1635232163960,\"control\":\"group
by([1635232133960,1635232163960),20s)\"}";
httpPost.setEntity(new StringEntity(sql, Charset.defaultCharset()));
for (int i = 0; i < 30; i++) {
@@ -291,7 +291,7 @@ public class GrafanaApiServiceIT {
String message = EntityUtils.toString(responseEntity, "utf-8");
ObjectMapper mapper = new ObjectMapper();
Map<String, List> map = mapper.readValue(message, Map.class);
- String[] expressionsResult = {"sum(root.sg25.s4)", "avg(root.sg25.s5)"};
+ String[] expressionsResult = {"sum(root.db25.s4)", "avg(root.db25.s5)"};
Long[] timestamps = {1635232133960L, 1635232153960L};
Object[] values1 = {11.0, 2.0};
Object[] values2 = {15.0, 13.0};
@@ -322,7 +322,7 @@ public class GrafanaApiServiceIT {
try {
HttpPost httpPost = getHttpPost("http://127.0.0.1:"; + port +
"/grafana/v1/query/expression");
String sql =
-
"{\"expression\":[\"sum(s4)\",\"avg(s5)\"],\"prefixPath\":[\"root.sg25\"],\"condition\":\"timestamp=1635232143960\",\"startTime\":1635232133960,\"endTime\":1635232163960,\"control\":\"group
by([1635232133960,1635232163960),20s)\"}";
+
"{\"expression\":[\"sum(s4)\",\"avg(s5)\"],\"prefixPath\":[\"root.db25\"],\"condition\":\"timestamp=1635232143960\",\"startTime\":1635232133960,\"endTime\":1635232163960,\"control\":\"group
by([1635232133960,1635232163960),20s)\"}";
httpPost.setEntity(new StringEntity(sql, Charset.defaultCharset()));
for (int i = 0; i < 30; i++) {
try {
@@ -343,7 +343,7 @@ public class GrafanaApiServiceIT {
String message = EntityUtils.toString(responseEntity, "utf-8");
ObjectMapper mapper = new ObjectMapper();
Map<String, List> map = mapper.readValue(message, Map.class);
- String[] expressionsResult = {"sum(root.sg25.s4)", "avg(root.sg25.s5)"};
+ String[] expressionsResult = {"sum(root.db25.s4)", "avg(root.db25.s5)"};
Long[] timestamps = {1635232133960L, 1635232153960L};
Object[] values1 = {11.0, null};
Object[] values2 = {15.0, null};
@@ -372,7 +372,7 @@ public class GrafanaApiServiceIT {
CloseableHttpResponse response = null;
try {
HttpPost httpPost = getHttpPost("http://127.0.0.1:"; + port +
"/grafana/v1/variable");
- String sql = "{\"sql\":\"show child paths root.sg25\"}";
+ String sql = "{\"sql\":\"show child paths 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/IoTDBFilterIT.java
b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBFilterIT.java
index b8dd88ea9d7..c5ae6b3f815 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBFilterIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBFilterIT.java
@@ -116,7 +116,7 @@ public class IoTDBFilterIT {
}
}
statement.execute(
- " insert into root.sg1.d1(time, s1, s2) aligned values (1,1, \"1\"),
(2,2,\"2\")");
+ " insert into root.db1.d1(time, s1, s2) aligned values (1,1, \"1\"),
(2,2,\"2\")");
statement.execute(
" insert into root.vehicle.testUDTF(time, s1, s2) values
(1,\"ss\",0), (2,\"d\",3)");
} catch (SQLException throwable) {
@@ -185,7 +185,7 @@ public class IoTDBFilterIT {
Statement statement = connection.createStatement();
ResultSet resultSet =
statement.executeQuery(
- "select s2 from root.sg1.d1 where s1 = 1 and s2 >= \"1\" and
s2 <= \"2\";")) {
+ "select s2 from root.db1.d1 where s1 = 1 and s2 >= \"1\" and
s2 <= \"2\";")) {
int count = 0;
while (resultSet.next()) {
++count;
@@ -199,16 +199,16 @@ public class IoTDBFilterIT {
@Test
public void testMismatchedDataTypes() {
assertTestFail(
- "select s1 from root.sg1.d1 where s1;",
+ "select s1 from root.db1.d1 where s1;",
"The output type of the expression in WHERE clause should be BOOLEAN,
actual data type: DOUBLE.");
assertTestFail(
- "select count(s1) from root.sg1.d1 group by ([0, 40), 5ms) having
count(s1) + 1;",
+ "select count(s1) from root.db1.d1 group by ([0, 40), 5ms) having
count(s1) + 1;",
"The output type of the expression in HAVING clause should be BOOLEAN,
actual data type: DOUBLE.");
assertTestFail(
- "select s1 from root.sg1.d1 where s1 align by device;",
+ "select s1 from root.db1.d1 where s1 align by device;",
"The output type of the expression in WHERE clause should be BOOLEAN,
actual data type: DOUBLE.");
assertTestFail(
- "select count(s1) from root.sg1.d1 group by ([0, 40), 5ms) having
count(s1) + 1 align by device;",
+ "select count(s1) from root.db1.d1 group by ([0, 40), 5ms) having
count(s1) + 1 align by device;",
"The output type of the expression in HAVING clause should be BOOLEAN,
actual data type: DOUBLE.");
}
diff --git
a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBFloatPrecisionIT.java
b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBFloatPrecisionIT.java
index 1230edd8c9b..5f14368a003 100644
---
a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBFloatPrecisionIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBFloatPrecisionIT.java
@@ -182,16 +182,16 @@ public class IoTDBFloatPrecisionIT {
statement.execute(
"insert into root.db.d1(time, s1, s2) values (1, 6.5536403E8,
9.223372036854E18)");
statement.execute(
- "insert into root.sg.d1(time, s1, s2) values (2, 3.123456768E20,
9.223372036854E100)");
- statement.execute("insert into root.sg.d1(time, s1, s2) values (3, NaN,
NaN)");
+ "insert into root.db.d1(time, s1, s2) values (2, 3.123456768E20,
9.223372036854E100)");
+ statement.execute("insert into root.db.d1(time, s1, s2) values (3, NaN,
NaN)");
int cnt;
- try (ResultSet resultSet = statement.executeQuery("select s1, s2 from
root.sg.d1")) {
+ try (ResultSet resultSet = statement.executeQuery("select s1, s2 from
root.db.d1")) {
assertNotNull(resultSet);
cnt = 0;
while (resultSet.next()) {
- assertEquals(floats[cnt], resultSet.getFloat("root.sg.d1.s1"),
DELTA_FLOAT);
- assertEquals(doubles[cnt], resultSet.getDouble("root.sg.d1.s2"),
DELTA_DOUBLE);
+ assertEquals(floats[cnt], resultSet.getFloat("root.db.d1.s1"),
DELTA_FLOAT);
+ assertEquals(doubles[cnt], resultSet.getDouble("root.db.d1.s2"),
DELTA_DOUBLE);
cnt++;
}
assertEquals(3, cnt);
@@ -199,12 +199,12 @@ public class IoTDBFloatPrecisionIT {
statement.execute("flush");
- try (ResultSet resultSet = statement.executeQuery("select s1, s2 from
root.sg.d1")) {
+ try (ResultSet resultSet = statement.executeQuery("select s1, s2 from
root.db.d1")) {
assertNotNull(resultSet);
cnt = 0;
while (resultSet.next()) {
- assertEquals(floats[cnt], resultSet.getFloat("root.sg.d1.s1"),
DELTA_FLOAT);
- assertEquals(doubles[cnt], resultSet.getDouble("root.sg.d1.s2"),
DELTA_DOUBLE);
+ assertEquals(floats[cnt], resultSet.getFloat("root.db.d1.s1"),
DELTA_FLOAT);
+ assertEquals(doubles[cnt], resultSet.getDouble("root.db.d1.s2"),
DELTA_DOUBLE);
cnt++;
}
assertEquals(3, cnt);
diff --git
a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBInsertMultiPartitionIT.java
b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBInsertMultiPartitionIT.java
index fac1175f74e..e6baf334a62 100644
---
a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBInsertMultiPartitionIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBInsertMultiPartitionIT.java
@@ -59,10 +59,10 @@ public class IoTDBInsertMultiPartitionIT {
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
- statement.execute("insert into root.sg.d1(time,s1) values(1,2)");
+ statement.execute("insert into root.db.d1(time,s1) values(1,2)");
statement.execute("flush");
- statement.execute("insert into root.sg.d1(time,s1) values(2,2)");
- statement.execute("insert into root.sg.d1(time,s1) values(604800001,2)");
+ statement.execute("insert into root.db.d1(time,s1) values(2,2)");
+ statement.execute("insert into root.db.d1(time,s1) values(604800001,2)");
statement.execute("flush");
} catch (Exception e) {
fail(e.getMessage());
diff --git
a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBInsertMultiRowIT.java
b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBInsertMultiRowIT.java
index 18c00b125dd..1e03bbc308e 100644
---
a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBInsertMultiRowIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBInsertMultiRowIT.java
@@ -176,11 +176,11 @@ public class IoTDBInsertMultiRowIT {
@Test
public void testInsertMultiRowWithMultiTimePartition() throws Exception {
try (Statement st1 = connection.createStatement()) {
- st1.execute("insert into root.sg1.d1(time,s1) values(604800010,1)");
+ st1.execute("insert into root.db1.d1(time,s1) values(604800010,1)");
st1.execute("flush");
- st1.execute("insert into root.sg1.d1(time,s1) values(604799990,1),
(604800001,1)");
+ st1.execute("insert into root.db1.d1(time,s1) values(604799990,1),
(604800001,1)");
st1.execute("flush");
- ResultSet rs1 = st1.executeQuery("select s1 from root.sg1.d1");
+ ResultSet rs1 = st1.executeQuery("select s1 from root.db1.d1");
assertTrue(rs1.next());
assertEquals(604799990, rs1.getLong("Time"));
assertTrue(rs1.next());
diff --git
a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBInsertNullIT.java
b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBInsertNullIT.java
index 47f1e8f67df..bcd842769dc 100644
---
a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBInsertNullIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBInsertNullIT.java
@@ -76,11 +76,11 @@ public class IoTDBInsertNullIT {
}
private static void initCreateSQLStatement() {
- sqls.add("CREATE DATABASE root.sg");
- sqls.add("CREATE TIMESERIES root.sg.d1.s1 WITH DATATYPE=BOOLEAN");
- sqls.add("CREATE TIMESERIES root.sg.d1.s2 WITH DATATYPE=FLOAT");
- sqls.add("CREATE TIMESERIES root.sg.d1.s3 WITH DATATYPE=INT32");
- sqls.add("CREATE ALIGNED TIMESERIES root.sg.d2(s1 BOOLEAN,s2 FLOAT,s3
INT32)");
+ sqls.add("CREATE DATABASE root.db");
+ sqls.add("CREATE TIMESERIES root.db.d1.s1 WITH DATATYPE=BOOLEAN");
+ sqls.add("CREATE TIMESERIES root.db.d1.s2 WITH DATATYPE=FLOAT");
+ sqls.add("CREATE TIMESERIES root.db.d1.s3 WITH DATATYPE=INT32");
+ sqls.add("CREATE ALIGNED TIMESERIES root.db.d2(s1 BOOLEAN,s2 FLOAT,s3
INT32)");
}
private static void insertData() throws SQLException {
@@ -103,17 +103,17 @@ public class IoTDBInsertNullIT {
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
- statement.execute("insert into root.sg.d1(time,s1,s2,s3)
values(1,null,1.0,1)");
- statement.execute("insert into root.sg.d1(time,s1,s2,s3)
values(2,true,null,2)");
- statement.execute("insert into root.sg.d1(time,s1,s2,s3)
values(3,true,3.0,null)");
+ statement.execute("insert into root.db.d1(time,s1,s2,s3)
values(1,null,1.0,1)");
+ statement.execute("insert into root.db.d1(time,s1,s2,s3)
values(2,true,null,2)");
+ statement.execute("insert into root.db.d1(time,s1,s2,s3)
values(3,true,3.0,null)");
- try (ResultSet resultSet = statement.executeQuery("select * from
root.sg.d1")) {
+ try (ResultSet resultSet = statement.executeQuery("select * from
root.db.d1")) {
assertNotNull(resultSet);
ResultSetMetaData resultSetMetaData = resultSet.getMetaData();
List<Integer> actualIndexToExpectedIndexList =
checkHeader(
resultSetMetaData,
- "Time,root.sg.d1.s1,root.sg.d1.s2,root.sg.d1.s3",
+ "Time,root.db.d1.s1,root.db.d1.s2,root.db.d1.s3",
new int[] {
Types.TIMESTAMP, Types.BOOLEAN, Types.FLOAT, Types.INTEGER,
});
@@ -149,17 +149,17 @@ public class IoTDBInsertNullIT {
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
- statement.execute("insert into root.sg.d2(time,s1,s2,s3) aligned
values(1,null,1.0,1)");
- statement.execute("insert into root.sg.d2(time,s1,s2,s3) aligned
values(2,true,null,2)");
- statement.execute("insert into root.sg.d2(time,s1,s2,s3) aligned
values(3,true,3.0,null)");
+ statement.execute("insert into root.db.d2(time,s1,s2,s3) aligned
values(1,null,1.0,1)");
+ statement.execute("insert into root.db.d2(time,s1,s2,s3) aligned
values(2,true,null,2)");
+ statement.execute("insert into root.db.d2(time,s1,s2,s3) aligned
values(3,true,3.0,null)");
- try (ResultSet resultSet = statement.executeQuery("select * from
root.sg.d2")) {
+ try (ResultSet resultSet = statement.executeQuery("select * from
root.db.d2")) {
assertNotNull(resultSet);
ResultSetMetaData resultSetMetaData = resultSet.getMetaData();
List<Integer> actualIndexToExpectedIndexList =
checkHeader(
resultSetMetaData,
- "Time,root.sg.d2.s1,root.sg.d2.s2,root.sg.d2.s3",
+ "Time,root.db.d2.s1,root.db.d2.s2,root.db.d2.s3",
new int[] {
Types.TIMESTAMP, Types.BOOLEAN, Types.FLOAT, Types.INTEGER,
});
diff --git
a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBInsertWithoutTimeIT.java
b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBInsertWithoutTimeIT.java
index 62d04de083a..16b36b9e478 100644
---
a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBInsertWithoutTimeIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBInsertWithoutTimeIT.java
@@ -46,10 +46,10 @@ public class IoTDBInsertWithoutTimeIT {
private static final List<String> sqls =
Arrays.asList(
- "CREATE DATABASE root.sg1",
- "CREATE TIMESERIES root.sg1.d1.s1 INT64",
- "CREATE TIMESERIES root.sg1.d1.s2 FLOAT",
- "CREATE TIMESERIES root.sg1.d1.s3 TEXT");
+ "CREATE DATABASE root.db1",
+ "CREATE TIMESERIES root.db1.d1.s1 INT64",
+ "CREATE TIMESERIES root.db1.d1.s2 FLOAT",
+ "CREATE TIMESERIES root.db1.d1.s3 TEXT");
@Before
public void setUp() throws Exception {
@@ -78,50 +78,50 @@ public class IoTDBInsertWithoutTimeIT {
public void testInsertWithoutTime() {
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
- statement.execute("insert into root.sg1.d1(s1, s2, s3) values (1, 1,
'1')");
+ statement.execute("insert into root.db1.d1(s1, s2, s3) values (1, 1,
'1')");
Thread.sleep(1);
- statement.execute("insert into root.sg1.d1(s2, s1, s3) values (2, 2,
'2')");
+ statement.execute("insert into root.db1.d1(s2, s1, s3) values (2, 2,
'2')");
Thread.sleep(1);
- statement.execute("insert into root.sg1.d1(s3, s2, s1) values ('3', 3,
3)");
+ statement.execute("insert into root.db1.d1(s3, s2, s1) values ('3', 3,
3)");
Thread.sleep(1);
- statement.execute("insert into root.sg1.d1(s1) values (1)");
- statement.execute("insert into root.sg1.d1(s2) values (2)");
- statement.execute("insert into root.sg1.d1(s3) values ('3')");
+ statement.execute("insert into root.db1.d1(s1) values (1)");
+ statement.execute("insert into root.db1.d1(s2) values (2)");
+ statement.execute("insert into root.db1.d1(s3) values ('3')");
} catch (SQLException | InterruptedException e) {
e.printStackTrace();
fail(e.getMessage());
}
- String expectedHeader =
"count(root.sg1.d1.s1),count(root.sg1.d1.s2),count(root.sg1.d1.s3),";
+ String expectedHeader =
"count(root.db1.d1.s1),count(root.db1.d1.s2),count(root.db1.d1.s3),";
String[] retArray = new String[] {"4,4,4,"};
resultSetEqualTest(
- "select count(s1), count(s2), count(s3) from root.sg1.d1",
expectedHeader, retArray);
+ "select count(s1), count(s2), count(s3) from root.db1.d1",
expectedHeader, retArray);
}
@Test
public void testInsertWithoutValueColumns() {
assertNonQueryTestFail(
- "insert into root.sg1.d1(time) values (1)",
+ "insert into root.db1.d1(time) values (1)",
"InsertStatement should contain at least one measurement");
}
@Test
public void testInsertMultiRow() {
assertNonQueryTestFail(
- "insert into root.sg1.d1(s3) values ('1'), ('2')",
+ "insert into root.db1.d1(s3) values ('1'), ('2')",
"need timestamps when insert multi rows");
assertNonQueryTestFail(
- "insert into root.sg1.d1(s1, s2) values (1, 1), (2, 2)",
+ "insert into root.db1.d1(s1, s2) values (1, 1), (2, 2)",
"need timestamps when insert multi rows");
}
@Test
public void testInsertWithMultiTimesColumns() {
assertNonQueryTestFail(
- "insert into root.sg1.d1(time, time) values (1, 1)",
+ "insert into root.db1.d1(time, time) values (1, 1)",
"One row should only have one time value");
assertNonQueryTestFail(
- "insert into root.sg1.d1(time, s1, time) values (1, 1, 1)",
+ "insert into root.db1.d1(time, s1, time) values (1, 1, 1)",
"One row should only have one time value");
}
}
diff --git
a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBJDBCMetadataIT.java
b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBJDBCMetadataIT.java
index 8e82865f8c2..01c01be0ff6 100644
---
a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBJDBCMetadataIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBJDBCMetadataIT.java
@@ -47,18 +47,18 @@ public class IoTDBJDBCMetadataIT {
protected static final String[] SQLs =
new String[] {
- "CREATE DATABASE root.sg_type;",
- "CREATE TIMESERIES root.sg_type.d_0.s_boolean BOOLEAN;",
- "CREATE TIMESERIES root.sg_type.d_0.s_int32 INT32;",
- "CREATE TIMESERIES root.sg_type.d_0.s_int64 INT64;",
- "CREATE TIMESERIES root.sg_type.d_0.s_float FLOAT;",
- "CREATE TIMESERIES root.sg_type.d_0.s_double DOUBLE;",
- "CREATE TIMESERIES root.sg_type.d_0.s_text TEXT;",
- "CREATE TIMESERIES root.sg_type.d_0.s_timestamp TIMESTAMP;",
- "CREATE TIMESERIES root.sg_type.d_0.s_date DATE;",
- "CREATE TIMESERIES root.sg_type.d_0.s_blob BLOB;",
- "CREATE TIMESERIES root.sg_type.d_0.s_string STRING;",
- "INSERT INTO root.sg_type.d_0(time, s_int32, s_int64, s_float,
s_double, s_text) VALUES (0, 0, 0, 0.000000, 0.000000, 'text0');"
+ "CREATE DATABASE root.db_type;",
+ "CREATE TIMESERIES root.db_type.d_0.s_boolean BOOLEAN;",
+ "CREATE TIMESERIES root.db_type.d_0.s_int32 INT32;",
+ "CREATE TIMESERIES root.db_type.d_0.s_int64 INT64;",
+ "CREATE TIMESERIES root.db_type.d_0.s_float FLOAT;",
+ "CREATE TIMESERIES root.db_type.d_0.s_double DOUBLE;",
+ "CREATE TIMESERIES root.db_type.d_0.s_text TEXT;",
+ "CREATE TIMESERIES root.db_type.d_0.s_timestamp TIMESTAMP;",
+ "CREATE TIMESERIES root.db_type.d_0.s_date DATE;",
+ "CREATE TIMESERIES root.db_type.d_0.s_blob BLOB;",
+ "CREATE TIMESERIES root.db_type.d_0.s_string STRING;",
+ "INSERT INTO root.db_type.d_0(time, s_int32, s_int64, s_float,
s_double, s_text) VALUES (0, 0, 0, 0.000000, 0.000000, 'text0');"
};
@BeforeClass
@@ -113,14 +113,14 @@ public class IoTDBJDBCMetadataIT {
};
String[] values =
new String[] {
- "0", "root.sg_type.d_0", null, "0", "0", "0.0", "0.0", "text0",
null, null, null, null
+ "0", "root.db_type.d_0", null, "0", "0", "0.0", "0.0", "text0",
null, null, null, null
};
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
try (ResultSet resultSet =
statement.executeQuery(
- "select s_boolean, s_int32, s_int64, s_float, s_double, s_text,
s_timestamp, s_date, s_blob, s_string from root.sg_type.d_0 align by device")) {
+ "select s_boolean, s_int32, s_int64, s_float, s_double, s_text,
s_timestamp, s_date, s_blob, s_string from root.db_type.d_0 align by device")) {
ResultSetMetaData metaData = resultSet.getMetaData();
assertEquals(columnNames.length, metaData.getColumnCount());
assertTrue(resultSet.next());
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 6bc018bf7a8..b13d5d530c4 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
@@ -241,7 +241,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()) {
long sg1Count = resultSet.getLong("count(root.db.test_0.*.*)");
Assert.assertEquals(writtenPoint1, sg1Count);
@@ -488,7 +488,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);
@@ -578,7 +578,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);
@@ -595,7 +595,7 @@ public class IoTDBLoadTsFileIT {
isAligned.put(SchemaConfig.DEVICE_2, "false");
isAligned.put(SchemaConfig.DEVICE_3, "false");
isAligned.put(SchemaConfig.DEVICE_4, "true");
- try (final ResultSet resultSet = statement.executeQuery("show devices
root.sg.**")) {
+ try (final ResultSet resultSet = statement.executeQuery("show devices
root.db.**")) {
int size = 0;
while (resultSet.next()) {
size += 1;
@@ -744,7 +744,7 @@ public class IoTDBLoadTsFileIT {
file1.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);
@@ -764,7 +764,7 @@ public class IoTDBLoadTsFileIT {
file2.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()) {
long sg1Count = resultSet.getLong("count(root.db.test_0.*.*)");
Assert.assertEquals(writtenPoint1, sg1Count);
@@ -833,7 +833,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);
@@ -953,7 +953,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);
@@ -965,7 +965,7 @@ public class IoTDBLoadTsFileIT {
}
TestUtils.assertSingleResultSetEqual(
- TestUtils.executeQueryWithRetry(statement, "count timeSeries
root.sg.**"),
+ TestUtils.executeQueryWithRetry(statement, "count timeSeries
root.db.**"),
Collections.singletonMap("count(timeseries)", "18"));
}
}
diff --git
a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBPartialInsertionIT.java
b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBPartialInsertionIT.java
index 6565f321603..c608e08b8e7 100644
---
a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBPartialInsertionIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBPartialInsertionIT.java
@@ -129,11 +129,11 @@ public class IoTDBPartialInsertionIT {
int cnt = 0;
while (resultSet.next()) {
cnt++;
- assertEquals("test", resultSet.getString("root.sg.d1.s1"));
+ assertEquals("test", resultSet.getString("root.db.d1.s1"));
}
assertEquals(1, cnt);
}
- try (ResultSet resultSet = statement.executeQuery("SELECT s2 FROM
root.sg.d1")) {
+ try (ResultSet resultSet = statement.executeQuery("SELECT s2 FROM
root.db.d1")) {
assertNotNull(resultSet);
assertFalse(resultSet.next());
}
@@ -144,14 +144,14 @@ public class IoTDBPartialInsertionIT {
public void testPartialInsertTablet() {
try (ISession session = EnvFactory.getEnv().getSessionConnection()) {
session.createTimeseries(
- "root.sg1.d1.s1", TSDataType.INT64, TSEncoding.PLAIN,
CompressionType.SNAPPY);
+ "root.db1.d1.s1", TSDataType.INT64, TSEncoding.PLAIN,
CompressionType.SNAPPY);
session.createTimeseries(
- "root.sg1.d1.s2", TSDataType.INT64, TSEncoding.PLAIN,
CompressionType.SNAPPY);
+ "root.db1.d1.s2", TSDataType.INT64, TSEncoding.PLAIN,
CompressionType.SNAPPY);
List<IMeasurementSchema> schemaList = new ArrayList<>();
schemaList.add(new MeasurementSchema("s1", TSDataType.INT64));
schemaList.add(new MeasurementSchema("s2", TSDataType.INT64));
schemaList.add(new MeasurementSchema("s3", TSDataType.INT64));
- Tablet tablet = new Tablet("root.sg1.d1", schemaList, 300);
+ Tablet tablet = new Tablet("root.db1.d1", schemaList, 300);
long timestamp = 0;
for (long row = 0; row < 100; row++) {
int rowIndex = tablet.getRowSize();
@@ -179,11 +179,11 @@ public class IoTDBPartialInsertionIT {
fail(e.getMessage());
}
}
- try (SessionDataSet dataSet = session.executeQueryStatement("SELECT *
FROM root.sg1.d1")) {
+ try (SessionDataSet dataSet = session.executeQueryStatement("SELECT *
FROM root.db1.d1")) {
assertEquals(dataSet.getColumnNames().size(), 3);
assertEquals(dataSet.getColumnNames().get(0), "Time");
- assertEquals(dataSet.getColumnNames().get(1), "root.sg1.d1.s1");
- assertEquals(dataSet.getColumnNames().get(2), "root.sg1.d1.s2");
+ assertEquals(dataSet.getColumnNames().get(1), "root.db1.d1.s1");
+ assertEquals(dataSet.getColumnNames().get(2), "root.db1.d1.s2");
int cnt = 0;
while (dataSet.hasNext()) {
RowRecord rowRecord = dataSet.next();
diff --git
a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBQueryWithRecreatedTimeseriesIT.java
b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBQueryWithRecreatedTimeseriesIT.java
index 5472fabec5e..d6126135dcb 100644
---
a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBQueryWithRecreatedTimeseriesIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBQueryWithRecreatedTimeseriesIT.java
@@ -53,23 +53,23 @@ public class IoTDBQueryWithRecreatedTimeseriesIT {
public void testQueryDiffTypeTimeseries() {
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
- statement.execute("CREATE DATABASE root.sg");
+ statement.execute("CREATE DATABASE root.db");
Thread.sleep(100);
- statement.execute("CREATE TIMESERIES root.sg.d1.s1 with
datatype=FLOAT,encoding=PLAIN");
- statement.execute("CREATE TIMESERIES root.sg.d1.s2 with
datatype=INT64,encoding=PLAIN");
- statement.execute("INSERT INTO root.sg.d1(time, s1, s2) VALUES(11000,
10, 20)");
+ statement.execute("CREATE TIMESERIES root.db.d1.s1 with
datatype=FLOAT,encoding=PLAIN");
+ statement.execute("CREATE TIMESERIES root.db.d1.s2 with
datatype=INT64,encoding=PLAIN");
+ statement.execute("INSERT INTO root.db.d1(time, s1, s2) VALUES(11000,
10, 20)");
Thread.sleep(100);
statement.execute("FLUSH");
Thread.sleep(100);
- statement.execute("DELETE TIMESERIES root.sg.d1.s1");
- statement.execute("CREATE TIMESERIES root.sg.d1.s1 with
datatype=INT32,encoding=PLAIN");
+ statement.execute("DELETE TIMESERIES root.db.d1.s1");
+ statement.execute("CREATE TIMESERIES root.db.d1.s1 with
datatype=INT32,encoding=PLAIN");
try (ResultSet resultSet =
- statement.executeQuery("SELECT s1 FROM root.sg.d1 WHERE s1 > 10")) {
+ statement.executeQuery("SELECT s1 FROM root.db.d1 WHERE s1 > 10")) {
Assert.assertFalse(resultSet.next());
}
try (ResultSet resultSet =
- statement.executeQuery("SELECT s1 FROM root.sg.d1 WHERE s1 <= 10")) {
+ statement.executeQuery("SELECT s1 FROM root.db.d1 WHERE s1 <= 10")) {
Assert.assertFalse(resultSet.next());
}
} catch (Exception e) {
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 d84a2493cc2..f6260684a0e 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
@@ -272,7 +272,7 @@ public class IoTDBRestServiceIT {
try {
HttpPost httpPost = getHttpPost("http://127.0.0.1:"; + port +
"/rest/v1/insertTablet");
String json =
-
"{\"timestamps\":[1635232143960,1635232153960],\"measurements\":[\"s3\",\"s4\",\"s5\",\"s6\",\"s7\",\"s8\"],\"dataTypes\":[\"TEXT\",\"INT32\",\"INT64\",\"FLOAT\",\"BOOLEAN\",\"DOUBLE\"],\"values\":[[\"2aa\",\"\"],[11,2],[1635000012345555,1635000012345556],[1.41,null],[null,false],[null,3.5555]],\"isAligned\":false,\"deviceId\":\"root.sg25\"}";
+
"{\"timestamps\":[1635232143960,1635232153960],\"measurements\":[\"s3\",\"s4\",\"s5\",\"s6\",\"s7\",\"s8\"],\"dataTypes\":[\"TEXT\",\"INT32\",\"INT64\",\"FLOAT\",\"BOOLEAN\",\"DOUBLE\"],\"values\":[[\"2aa\",\"\"],[11,2],[1635000012345555,1635000012345556],[1.41,null],[null,false],[null,3.5555]],\"isAligned\":false,\"deviceId\":\"root.db25\"}";
httpPost.setEntity(new StringEntity(json, Charset.defaultCharset()));
for (int i = 0; i < 30; i++) {
try {
@@ -338,7 +338,7 @@ public class IoTDBRestServiceIT {
try {
HttpPost httpPost = getHttpPost("http://127.0.0.1:"; + port +
"/rest/v1/insertTablet");
String json =
-
"{\"timestamps\":[1635232143960,1635232153960],\"measurements\":[\"s3\",\"s4\",\"s5\",\"s6\",\"s7\",\"s8\"],\"dataTypes\":[\"TEXT\",\"INT32\",\"INT64\",\"FLOAT\",\"BOOLEAN\",\"DOUBLE\"],\"values\":[[\"2aa\",\"\"],[111111112312312442352545452323123,2],[16,15],[1.41,null],[null,false],[null,3.55555555555555555555555555555555555555555555312234235345123127318927461482308478123645555555555555555555555555555555555555555555531223423534512312731892746148230847812364]],\"isAligned\":fal
[...]
+
"{\"timestamps\":[1635232143960,1635232153960],\"measurements\":[\"s3\",\"s4\",\"s5\",\"s6\",\"s7\",\"s8\"],\"dataTypes\":[\"TEXT\",\"INT32\",\"INT64\",\"FLOAT\",\"BOOLEAN\",\"DOUBLE\"],\"values\":[[\"2aa\",\"\"],[111111112312312442352545452323123,2],[16,15],[1.41,null],[null,false],[null,3.55555555555555555555555555555555555555555555312234235345123127318927461482308478123645555555555555555555555555555555555555555555531223423534512312731892746148230847812364]],\"isAligned\":fal
[...]
httpPost.setEntity(new StringEntity(json, Charset.defaultCharset()));
for (int i = 0; i < 30; i++) {
try {
@@ -452,13 +452,13 @@ public class IoTDBRestServiceIT {
insertTablet_right_json_list.add(
"{\"timestamps\":[1635232143960,1635232153960],\"measurements\":[\"s3\",\"s4\",\"s5\",\"s6\",\"s7\",\"s8\"],\"dataTypes\":[\"TEXT\",\"INT32\",\"INT64\",\"FLOAT\",\"BOOLEAN\",\"DOUBLE\"],\"values\":[[\"2aa\",\"\"],[11,2],[1635000012345555,1635000012345556],[1.41,null],[null,false],[null,3.5555]],\"isAligned\":\""
+ isAligned
- + "\",\"deviceId\":\"root.sg21"
+ + "\",\"deviceId\":\"root.db21"
+ i
+ "\"}");
insertTablet_right_json_list.add(
"{\"timestamps\":[1635232143960,1635232153960],\"measurements\":[\"`s3`\",\"s4\",\"s5\",\"s6\",\"s7\",\"s8\"],\"dataTypes\":[\"TEXT\",\"INT32\",\"INT64\",\"FLOAT\",\"BOOLEAN\",\"DOUBLE\"],\"values\":[[\"2aa\",\"\"],[11,2],[1635000012345555,1635000012345556],[1.41,null],[null,false],[null,3.5555]],\"isAligned\":\""
+ isAligned
- + "\",\"deviceId\":\"root.sg22"
+ + "\",\"deviceId\":\"root.db22"
+ i
+ "\"}");
insertTablet_right_json_list.add(
@@ -476,13 +476,13 @@ public class IoTDBRestServiceIT {
insertTablet_error_json_list.add(
"{\"timestamps\":[1635232143960,1635232153960],\"measurements\":[\"s3\",\"s4\",\"s5\",\"s6\",\"s7\",\"s8\"],\"dataTypes\":[\"TEXT\",\"INT32\",\"INT64\",\"FLOAT\",\"BOOLEAN\",\"DOUBLE\"],\"values\":[[\"2aa\",\"\"],[111111112312312442352545452323123,2],[16,15],[1.41,null],[null,false],[null,3.55555555555555555555555555555555555555555555312234235345123127318927461482308478123645555555555555555555555555555555555555555555531223423534512312731892746148230847812364]],\"isAligned\":"
+ isAligned
- + ",\"deviceId\":\"root.sg25"
+ + ",\"deviceId\":\"root.db25"
+ i
+ "\"}");
insertTablet_error_json_list.add(
"{\"timestamps\":[1635232143960,1635232153960],\"measurements\":[\"`s3`\",\"s4\",\"s5\",\"s6\",\"s7\",\"s8\"],\"dataTypes\":[\"TEXT\",\"INT32\",\"INT64\",\"FLOAT\",\"BOOLEAN\",\"DOUBLE\"],\"values\":[[\"2aa\",\"\"],[111111112312312442352545452323123,2],[16,15],[1.41,null],[null,false],[null,3.55555555555555555555555555555555555555555555312234235345123127318927461482308478123645555555555555555555555555555555555555555555531223423534512312731892746148230847812364]],\"isAligned\":"
+ isAligned
- + ",\"deviceId\":\"root.sg36"
+ + ",\"deviceId\":\"root.db36"
+ i
+ "\"}");
insertTablet_error_json_list.add(
@@ -546,13 +546,13 @@ public class IoTDBRestServiceIT {
insertTablet_right_json_list_v2.add(
"{\"timestamps\":[1635232143960,1635232153960],\"measurements\":[\"s3\",\"s4\",\"s5\",\"s6\",\"s7\",\"s8\"],\"data_types\":[\"TEXT\",\"INT32\",\"INT64\",\"FLOAT\",\"BOOLEAN\",\"DOUBLE\"],\"values\":[[\"2aa\",\"\"],[11,2],[1635000012345555,1635000012345556],[1.41,null],[null,false],[null,3.5555]],\"is_aligned\":\""
+ isAligned
- + "\",\"device\":\"root.sg21"
+ + "\",\"device\":\"root.db21"
+ i
+ "\"}");
insertTablet_right_json_list_v2.add(
"{\"timestamps\":[1635232143960,1635232153960],\"measurements\":[\"`s3`\",\"s4\",\"s5\",\"s6\",\"s7\",\"s8\"],\"data_types\":[\"TEXT\",\"INT32\",\"INT64\",\"FLOAT\",\"BOOLEAN\",\"DOUBLE\"],\"values\":[[\"2aa\",\"\"],[11,2],[1635000012345555,1635000012345556],[1.41,null],[null,false],[null,3.5555]],\"is_aligned\":"
+ isAligned
- + ",\"device\":\"root.sg22"
+ + ",\"device\":\"root.db22"
+ i
+ "\"}");
insertTablet_right_json_list_v2.add(
@@ -570,13 +570,13 @@ public class IoTDBRestServiceIT {
insertTablet_error_json_list_v2.add(
"{\"timestamps\":[1635232143960,1635232153960],\"measurements\":[\"s3\",\"s4\",\"s5\",\"s6\",\"s7\",\"s8\"],\"data_types\":[\"TEXT\",\"INT32\",\"INT64\",\"FLOAT\",\"BOOLEAN\",\"DOUBLE\"],\"values\":[[\"2aa\",\"\"],[111111112312312442352545452323123,2],[16,15],[1.41,null],[null,false],[null,3.55555555555555555555555555555555555555555555312234235345123127318927461482308478123645555555555555555555555555555555555555555555531223423534512312731892746148230847812364]],\"is_aligned\":"
+ isAligned
- + ",\"device\":\"root.sg25"
+ + ",\"device\":\"root.db25"
+ i
+ "\"}");
insertTablet_error_json_list_v2.add(
"{\"timestamps\":[1635232143960,1635232153960],\"measurements\":[\"`s3`\",\"s4\",\"s5\",\"s6\",\"s7\",\"s8\"],\"data_types\":[\"TEXT\",\"INT32\",\"INT64\",\"FLOAT\",\"BOOLEAN\",\"DOUBLE\"],\"values\":[[\"2aa\",\"\"],[111111112312312442352545452323123,2],[16,15],[1.41,null],[null,false],[null,3.55555555555555555555555555555555555555555555312234235345123127318927461482308478123645555555555555555555555555555555555555555555531223423534512312731892746148230847812364]],\"is_aligned\":"
+ isAligned
- + ",\"device\":\"root.sg26"
+ + ",\"device\":\"root.db26"
+ i
+ "\"}");
insertTablet_error_json_list_v2.add(
@@ -734,7 +734,7 @@ public class IoTDBRestServiceIT {
HttpPost httpPost = new HttpPost("http://127.0.0.1:"; + port +
"/rest/v1/query");
httpPost.addHeader("Content-type", "application/json; charset=utf-8");
httpPost.setHeader("Accept", "application/json");
- 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()));
for (int i = 0; i < 30; i++) {
try {
@@ -781,7 +781,7 @@ public class IoTDBRestServiceIT {
httpPost.setHeader("Accept", "application/json");
String authorization = getAuthorization("abc", "def");
httpPost.setHeader("Authorization", authorization);
- 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()));
for (int i = 0; i < 30; i++) {
try {
diff --git
a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBRestartIT.java
b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBRestartIT.java
index 571826307c6..e5d5d3cdea9 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBRestartIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBRestartIT.java
@@ -383,8 +383,8 @@ public class IoTDBRestartIT {
public void testInsertLoadAndRecover() throws Exception {
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
- statement.execute("create timeseries root.sg.d1.s1 with datatype=int32");
- statement.execute("insert into root.sg.d1(time,s1) values(2,2)");
+ statement.execute("create timeseries root.db.d1.s1 with datatype=int32");
+ statement.execute("insert into root.db.d1(time,s1) values(2,2)");
statement.execute("flush");
}
File tmpDir = new File(Files.createTempDirectory("load").toUri());
@@ -392,14 +392,14 @@ public class IoTDBRestartIT {
try {
try (final TsFileGenerator generator = new TsFileGenerator(tsfile)) {
generator.registerTimeseries(
- "root.sg.d1", Collections.singletonList(new
MeasurementSchema("s1", TSDataType.INT32)));
- generator.generateData("root.sg.d1", 1, 2, false);
+ "root.db.d1", Collections.singletonList(new
MeasurementSchema("s1", TSDataType.INT32)));
+ generator.generateData("root.db.d1", 1, 2, false);
}
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
- statement.execute("insert into root.sg.d1(time,s1) values(1,1)");
+ statement.execute("insert into root.db.d1(time,s1) values(1,1)");
statement.execute(String.format("load \"%s\" ",
tsfile.getAbsolutePath()));
- try (ResultSet resultSet = statement.executeQuery("select s1 from
root.sg.d1")) {
+ try (ResultSet resultSet = statement.executeQuery("select s1 from
root.db.d1")) {
assertNotNull(resultSet);
int cnt = 0;
while (resultSet.next()) {
@@ -415,7 +415,7 @@ public class IoTDBRestartIT {
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
- try (ResultSet resultSet = statement.executeQuery("select s1 from
root.sg.d1")) {
+ try (ResultSet resultSet = statement.executeQuery("select s1 from
root.db.d1")) {
assertNotNull(resultSet);
int cnt = 0;
while (resultSet.next()) {
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 109c308ed82..8806606c543 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
@@ -99,12 +99,12 @@ public class IoTDBSimpleQueryIT {
} catch (Exception e) {
assertEquals(
TSStatusCode.ILLEGAL_PARAMETER.getStatusCode()
- + ": SDT compression deviation cannot be negative. Failed to
create timeseries for path root.sg1.d0.s1",
+ + ": SDT compression deviation cannot be negative. Failed to
create timeseries for path root.db1.d0.s1",
e.getMessage());
}
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++;
}
@@ -159,21 +159,21 @@ 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 DATABASE root.db1");
// test set sdt property
statement.execute(
- "CREATE TIMESERIES root.sg1.d0.s0 WITH
DATATYPE=DOUBLE,ENCODING=PLAIN,LOSS=SDT,COMPDEV=0.01");
+ "CREATE TIMESERIES root.db1.d0.s0 WITH
DATATYPE=DOUBLE,ENCODING=PLAIN,LOSS=SDT,COMPDEV=0.01");
int degree = 0;
for (int time = 0; time < 100; time++) {
// generate data in sine wave pattern
double value = 10 * Math.sin(degree++ * 3.141592653589793D / 180.0D);
- String sql = "insert into root.sg1.d0(timestamp,s0) values(" + time +
"," + value + ")";
+ String sql = "insert into root.db1.d0(timestamp,s0) values(" + time +
"," + value + ")";
statement.execute(sql);
}
// before SDT encoding
- ResultSet resultSet = statement.executeQuery("select s0 from
root.sg1.d0");
+ ResultSet resultSet = statement.executeQuery("select s0 from
root.db1.d0");
int count = 0;
while (resultSet.next()) {
count++;
@@ -182,7 +182,7 @@ public class IoTDBSimpleQueryIT {
// after flush and SDT encoding
statement.execute("flush");
- resultSet = statement.executeQuery("select s0 from root.sg1.d0");
+ resultSet = statement.executeQuery("select s0 from root.db1.d0");
count = 0;
while (resultSet.next()) {
count++;
@@ -200,28 +200,28 @@ 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 DATABASE root.db1");
// test set sdt property
statement.execute(
- "CREATE TIMESERIES root.sg1.d0.s0 WITH
DATATYPE=INT32,ENCODING=PLAIN,LOSS=SDT,COMPDEV=2");
+ "CREATE TIMESERIES root.db1.d0.s0 WITH
DATATYPE=INT32,ENCODING=PLAIN,LOSS=SDT,COMPDEV=2");
for (int time = 1; time < 8; time++) {
- String sql = "insert into root.sg1.d0(timestamp,s0) values(" + time +
",1)";
+ String sql = "insert into root.db1.d0(timestamp,s0) values(" + time +
",1)";
statement.execute(sql);
}
statement.execute("flush");
- String sql = "insert into root.sg1.d0(timestamp,s0) values(15,10)";
+ String sql = "insert into root.db1.d0(timestamp,s0) values(15,10)";
statement.execute(sql);
- sql = "insert into root.sg1.d0(timestamp,s0) values(16,20)";
+ sql = "insert into root.db1.d0(timestamp,s0) values(16,20)";
statement.execute(sql);
- sql = "insert into root.sg1.d0(timestamp,s0) values(17,1)";
+ sql = "insert into root.db1.d0(timestamp,s0) values(17,1)";
statement.execute(sql);
- sql = "insert into root.sg1.d0(timestamp,s0) values(18,30)";
+ sql = "insert into root.db1.d0(timestamp,s0) values(18,30)";
statement.execute(sql);
statement.execute("flush");
- ResultSet resultSet = statement.executeQuery("select * from
root.sg1.**");
+ ResultSet resultSet = statement.executeQuery("select * from
root.db1.**");
int count = 0;
String[] timestamps = {"1", "7", "15", "16", "17", "18"};
@@ -229,7 +229,7 @@ public class IoTDBSimpleQueryIT {
while (resultSet.next()) {
assertEquals(timestamps[count], resultSet.getString("Time"));
- assertEquals(values[count], resultSet.getString("root.sg1.d0.s0"));
+ assertEquals(values[count], resultSet.getString("root.db1.d0.s0"));
count++;
}
} catch (SQLException e) {
@@ -243,28 +243,28 @@ 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 DATABASE root.db1");
// test set sdt property
statement.execute(
- "CREATE TIMESERIES root.sg1.d0.s0 WITH
DATATYPE=INT32,ENCODING=PLAIN,LOSS=SDT,COMPDEV=2, COMPMINTIME=1");
+ "CREATE TIMESERIES root.db1.d0.s0 WITH
DATATYPE=INT32,ENCODING=PLAIN,LOSS=SDT,COMPDEV=2, COMPMINTIME=1");
for (int time = 1; time < 8; time++) {
- String sql = "insert into root.sg1.d0(timestamp,s0) values(" + time +
",1)";
+ String sql = "insert into root.db1.d0(timestamp,s0) values(" + time +
",1)";
statement.execute(sql);
}
statement.execute("flush");
- String sql = "insert into root.sg1.d0(timestamp,s0) values(15,10)";
+ String sql = "insert into root.db1.d0(timestamp,s0) values(15,10)";
statement.execute(sql);
- sql = "insert into root.sg1.d0(timestamp,s0) values(16,20)";
+ sql = "insert into root.db1.d0(timestamp,s0) values(16,20)";
statement.execute(sql);
- sql = "insert into root.sg1.d0(timestamp,s0) values(17,1)";
+ sql = "insert into root.db1.d0(timestamp,s0) values(17,1)";
statement.execute(sql);
- sql = "insert into root.sg1.d0(timestamp,s0) values(18,30)";
+ sql = "insert into root.db1.d0(timestamp,s0) values(18,30)";
statement.execute(sql);
statement.execute("flush");
- ResultSet resultSet = statement.executeQuery("select * from
root.sg1.**");
+ ResultSet resultSet = statement.executeQuery("select * from
root.db1.**");
int count = 0;
// will not store time = 16 since time distance to last stored time 15
is within compMinTime
@@ -273,7 +273,7 @@ public class IoTDBSimpleQueryIT {
while (resultSet.next()) {
assertEquals(timestamps[count], resultSet.getString("Time"));
- assertEquals(values[count], resultSet.getString("root.sg1.d0.s0"));
+ assertEquals(values[count], resultSet.getString("root.db1.d0.s0"));
count++;
}
} catch (SQLException e) {
@@ -287,18 +287,18 @@ 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 DATABASE root.db1");
// test set sdt property
statement.execute(
- "CREATE TIMESERIES root.sg1.d0.s0 WITH
DATATYPE=INT32,ENCODING=PLAIN,LOSS=SDT,COMPDEV=2, COMPMAXTIME=20");
+ "CREATE TIMESERIES root.db1.d0.s0 WITH
DATATYPE=INT32,ENCODING=PLAIN,LOSS=SDT,COMPDEV=2, COMPMAXTIME=20");
for (int time = 1; time < 50; time++) {
- String sql = "insert into root.sg1.d0(timestamp,s0) values(" + time +
",1)";
+ String sql = "insert into root.db1.d0(timestamp,s0) values(" + time +
",1)";
statement.execute(sql);
}
statement.execute("flush");
- ResultSet resultSet = statement.executeQuery("select * from
root.sg1.**");
+ ResultSet resultSet = statement.executeQuery("select * from
root.db1.**");
int count = 0;
String[] timestamps = {"1", "21", "41", "49"};
@@ -306,7 +306,7 @@ public class IoTDBSimpleQueryIT {
while (resultSet.next()) {
assertEquals(timestamps[count], resultSet.getString("Time"));
- assertEquals(values[count], resultSet.getString("root.sg1.d0.s0"));
+ assertEquals(values[count], resultSet.getString("root.db1.d0.s0"));
count++;
}
} catch (SQLException e) {
@@ -320,25 +320,25 @@ 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 DATABASE root.db1");
// test set sdt property
statement.execute(
- "CREATE TIMESERIES root.sg1.d0.s0 WITH
DATATYPE=DOUBLE,ENCODING=PLAIN,LOSS=SDT,COMPDEV=0.01");
+ "CREATE TIMESERIES root.db1.d0.s0 WITH
DATATYPE=DOUBLE,ENCODING=PLAIN,LOSS=SDT,COMPDEV=0.01");
int degree = 0;
for (int time = 0; time < 100; time++) {
// generate data in sine wave pattern
double value = 10 * Math.sin(degree++ * 3.141592653589793D / 180.0D);
- String sql = "insert into root.sg1.d0(timestamp,s0) values(" + time +
"," + value + ")";
+ String sql = "insert into root.db1.d0(timestamp,s0) values(" + time +
"," + value + ")";
statement.execute(sql);
}
// insert unseq
- String sql = "insert into root.sg1.d0(timestamp,s0) values(2,19)";
+ String sql = "insert into root.db1.d0(timestamp,s0) values(2,19)";
statement.execute(sql);
// before SDT encoding
- ResultSet resultSet = statement.executeQuery("select s0 from
root.sg1.d0");
+ ResultSet resultSet = statement.executeQuery("select s0 from
root.db1.d0");
int count = 0;
while (resultSet.next()) {
count++;
@@ -347,7 +347,7 @@ public class IoTDBSimpleQueryIT {
// after flush and SDT encoding
statement.execute("flush");
- resultSet = statement.executeQuery("select s0 from root.sg1.d0");
+ resultSet = statement.executeQuery("select s0 from root.db1.d0");
count = 0;
while (resultSet.next()) {
count++;
@@ -365,21 +365,21 @@ 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 DATABASE root.db1");
// test set sdt property
statement.execute(
- "CREATE TIMESERIES root.sg1.d0.s0 WITH
DATATYPE=DOUBLE,ENCODING=PLAIN,LOSS=SDT,COMPDEV=0.01");
+ "CREATE TIMESERIES root.db1.d0.s0 WITH
DATATYPE=DOUBLE,ENCODING=PLAIN,LOSS=SDT,COMPDEV=0.01");
int degree = 0;
for (int time = 0; time < 100; time++) {
// generate data in sine wave pattern
double value = 10 * Math.sin(degree++ * 3.141592653589793D / 180.0D);
- String sql = "insert into root.sg1.d0(timestamp,s0) values(" + time +
"," + value + ")";
+ String sql = "insert into root.db1.d0(timestamp,s0) values(" + time +
"," + value + ")";
statement.execute(sql);
}
// before SDT encoding
- ResultSet resultSet = statement.executeQuery("select s0 from
root.sg1.d0");
+ ResultSet resultSet = statement.executeQuery("select s0 from
root.db1.d0");
int count = 0;
while (resultSet.next()) {
count++;
@@ -388,7 +388,7 @@ public class IoTDBSimpleQueryIT {
// after flush and SDT encoding
statement.execute("flush");
- resultSet = statement.executeQuery("select s0 from root.sg1.d0");
+ resultSet = statement.executeQuery("select s0 from root.db1.d0");
count = 0;
while (resultSet.next()) {
count++;
@@ -405,25 +405,25 @@ 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 DATABASE root.db1");
// test set sdt property
statement.execute(
- "CREATE TIMESERIES root.sg1.d0.s0 WITH
DATATYPE=DOUBLE,ENCODING=PLAIN,LOSS=SDT,COMPDEV=0.01");
+ "CREATE TIMESERIES root.db1.d0.s0 WITH
DATATYPE=DOUBLE,ENCODING=PLAIN,LOSS=SDT,COMPDEV=0.01");
int degree = 0;
for (int time = 0; time < 100; time++) {
// generate data in sine wave pattern
double value = 10 * Math.sin(degree++ * 3.141592653589793D / 180.0D);
- String sql = "insert into root.sg1.d0(timestamp,s0) values(" + time +
"," + value + ")";
+ String sql = "insert into root.db1.d0(timestamp,s0) values(" + time +
"," + value + ")";
statement.execute(sql);
}
// insert unseq
- String sql = "insert into root.sg1.d0(timestamp,s0) values(2,19)";
+ String sql = "insert into root.db1.d0(timestamp,s0) values(2,19)";
statement.execute(sql);
// before SDT encoding
- ResultSet resultSet = statement.executeQuery("select s0 from
root.sg1.d0");
+ ResultSet resultSet = statement.executeQuery("select s0 from
root.db1.d0");
int count = 0;
while (resultSet.next()) {
count++;
@@ -432,7 +432,7 @@ public class IoTDBSimpleQueryIT {
// after flush and SDT encoding
statement.execute("flush");
- resultSet = statement.executeQuery("select s0 from root.sg1.d0");
+ resultSet = statement.executeQuery("select s0 from root.db1.d0");
count = 0;
while (resultSet.next()) {
count++;
@@ -449,7 +449,7 @@ public class IoTDBSimpleQueryIT {
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
- ResultSet resultSet = statement.executeQuery("select * from
root.sg1.**");
+ ResultSet resultSet = statement.executeQuery("select * from
root.db1.**");
// has an empty time column
Assert.assertEquals(1, resultSet.getMetaData().getColumnCount());
try {
@@ -473,7 +473,7 @@ public class IoTDBSimpleQueryIT {
fail();
}
- resultSet = statement.executeQuery("select * from root.sg1.** align by
device");
+ resultSet = statement.executeQuery("select * from root.db1.** align by
device");
// has time and device columns
Assert.assertEquals(1, resultSet.getMetaData().getColumnCount());
while (resultSet.next()) {
@@ -509,15 +509,15 @@ 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.s0 WITH
DATATYPE=INT32,ENCODING=PLAIN");
- statement.execute("CREATE TIMESERIES root.sg1.d0.s1 WITH
DATATYPE=INT32,ENCODING=PLAIN");
- statement.execute("INSERT INTO root.sg1.d0(timestamp, s0) VALUES (1,
1)");
- statement.execute("INSERT INTO root.sg1.d0(timestamp, s0) VALUES (2,
2)");
- statement.execute("INSERT INTO root.sg1.d0(timestamp, s0) VALUES (3,
3)");
- statement.execute("INSERT INTO root.sg1.d0(timestamp, s0) VALUES (4,
4)");
- statement.execute("INSERT INTO root.sg1.d0(timestamp, s1) VALUES (3,
3)");
- statement.execute("INSERT INTO root.sg1.d0(timestamp, s1) VALUES (1,
1)");
+ statement.execute("CREATE DATABASE root.db1");
+ statement.execute("CREATE TIMESERIES root.db1.d0.s0 WITH
DATATYPE=INT32,ENCODING=PLAIN");
+ statement.execute("CREATE TIMESERIES root.db1.d0.s1 WITH
DATATYPE=INT32,ENCODING=PLAIN");
+ statement.execute("INSERT INTO root.db1.d0(timestamp, s0) VALUES (1,
1)");
+ statement.execute("INSERT INTO root.db1.d0(timestamp, s0) VALUES (2,
2)");
+ statement.execute("INSERT INTO root.db1.d0(timestamp, s0) VALUES (3,
3)");
+ statement.execute("INSERT INTO root.db1.d0(timestamp, s0) VALUES (4,
4)");
+ statement.execute("INSERT INTO root.db1.d0(timestamp, s1) VALUES (3,
3)");
+ statement.execute("INSERT INTO root.db1.d0(timestamp, s1) VALUES (1,
1)");
statement.execute("flush");
String[] ret =
@@ -527,12 +527,12 @@ public class IoTDBSimpleQueryIT {
int cur = 0;
try (ResultSet resultSet =
- statement.executeQuery("select * from root.sg1.** order by time
desc")) {
+ statement.executeQuery("select * from root.db1.** order by time
desc")) {
while (resultSet.next()) {
String ans =
resultSet.getString(ColumnHeaderConstant.TIME)
+ ","
- + resultSet.getString("root.sg1.d0.s0")
+ + resultSet.getString("root.db1.d0.s0")
+ ","
+ resultSet.getString("root.sg1.d0.s1");
assertEquals(ret[cur], ans);
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 c21e4e347c4..14952d693ae 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
@@ -71,15 +71,15 @@ public class IoTDBSyntaxConventionIdentifierIT {
};
String[] resultTimeseries = {
- "root.sg1.d1.add",
- "root.sg1.d1.as",
- "root.sg1.d1.select",
- "root.sg1.d1.drop_trigger",
- "root.sg1.d1.REVOKE_USER_ROLE",
- "root.sg1.d1.pipesink",
- "root.sg1.d1.boolean",
- "root.sg1.d1.datatype",
- "root.sg1.d1.device",
+ "root.db1.d1.add",
+ "root.db1.d1.as",
+ "root.db1.d1.select",
+ "root.db1.d1.drop_trigger",
+ "root.db1.d1.REVOKE_USER_ROLE",
+ "root.db1.d1.pipesink",
+ "root.db1.d1.boolean",
+ "root.db1.d1.datatype",
+ "root.db1.d1.device",
};
String[] selectNodeNames = {
@@ -109,14 +109,14 @@ public class IoTDBSyntaxConventionIdentifierIT {
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
for (String createNodeName : createNodeNames) {
- String createSql = String.format("CREATE TIMESERIES root.sg1.d1.%s
INT32", createNodeName);
+ String createSql = String.format("CREATE TIMESERIES root.db1.d1.%s
INT32", createNodeName);
String insertSql =
- String.format("INSERT INTO root.sg1.d1(time, %s) VALUES(1, 1)",
createNodeName);
+ String.format("INSERT INTO root.db1.d1(time, %s) VALUES(1, 1)",
createNodeName);
statement.execute(createSql);
statement.execute(insertSql);
}
- try (ResultSet resultSet = statement.executeQuery("SHOW TIMESERIES
root.sg1.**")) {
+ try (ResultSet resultSet = statement.executeQuery("SHOW TIMESERIES
root.db1.**")) {
Set<String> expectedResult = new
HashSet<>(Arrays.asList(resultTimeseries));
while (resultSet.next()) {
@@ -129,10 +129,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]));
}
}
@@ -175,33 +175,33 @@ public class IoTDBSyntaxConventionIdentifierIT {
};
String[] resultTimeseries = {
- "root.sg1.d1.a_1",
- "root.sg1.d1.aaa",
- "root.sg1.d1.in",
- "root.sg1.d1.between",
- "root.sg1.d1.is",
- "root.sg1.d1.select",
- "root.sg1.d1.`a.b`",
- "root.sg1.d1.`111`",
- "root.sg1.d1.`a``b`",
- "root.sg1.d1.`a.\"b`",
- "root.sg1.d1.`a.'b`",
- "root.sg1.d1.````",
- "root.sg1.d1.`c.d.```",
- "root.sg1.d1.abc",
- "root.sg1.d1.`+12`",
- "root.sg1.d1.`1e3`",
- "root.sg1.d1.`001`",
- "root.sg1.d1.`-1.0`",
- "root.sg1.d1.`01e-3`",
- "root.sg1.d1.`+0001`",
- "root.sg1.d1.`-0001`",
- "root.sg1.d1.`++1`",
- "root.sg1.d1.`+-1`",
- "root.sg1.d1.`--1`",
- "root.sg1.d1.123w",
- "root.sg1.d1.123d",
- "root.sg1.d1.123h"
+ "root.db1.d1.a_1",
+ "root.db1.d1.aaa",
+ "root.db1.d1.in",
+ "root.db1.d1.between",
+ "root.db1.d1.is",
+ "root.db1.d1.select",
+ "root.db1.d1.`a.b`",
+ "root.db1.d1.`111`",
+ "root.db1.d1.`a``b`",
+ "root.db1.d1.`a.\"b`",
+ "root.db1.d1.`a.'b`",
+ "root.db1.d1.````",
+ "root.db1.d1.`c.d.```",
+ "root.db1.d1.abc",
+ "root.db1.d1.`+12`",
+ "root.db1.d1.`1e3`",
+ "root.db1.d1.`001`",
+ "root.db1.d1.`-1.0`",
+ "root.db1.d1.`01e-3`",
+ "root.db1.d1.`+0001`",
+ "root.db1.d1.`-0001`",
+ "root.db1.d1.`++1`",
+ "root.db1.d1.`+-1`",
+ "root.db1.d1.`--1`",
+ "root.db1.d1.123w",
+ "root.db1.d1.123d",
+ "root.db1.d1.123h"
};
String[] selectNodeNames = {
@@ -267,14 +267,14 @@ public class IoTDBSyntaxConventionIdentifierIT {
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
for (String createNodeName : createNodeNames) {
- String createSql = String.format("CREATE TIMESERIES root.sg1.d1.%s
INT32", createNodeName);
+ String createSql = String.format("CREATE TIMESERIES root.db1.d1.%s
INT32", createNodeName);
String insertSql =
- String.format("INSERT INTO root.sg1.d1(time, %s) VALUES(1, 1)",
createNodeName);
+ String.format("INSERT INTO root.db1.d1(time, %s) VALUES(1, 1)",
createNodeName);
statement.execute(createSql);
statement.execute(insertSql);
}
- try (ResultSet resultSet = statement.executeQuery("SHOW TIMESERIES
root.sg1.**")) {
+ try (ResultSet resultSet = statement.executeQuery("SHOW TIMESERIES
root.db1.**")) {
Set<String> expectedResult = new
HashSet<>(Arrays.asList(resultTimeseries));
while (resultSet.next()) {
diff --git
a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSyntaxConventionStringLiteralIT.java
b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSyntaxConventionStringLiteralIT.java
index 6da6a3b1803..4448736a1be 100644
---
a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSyntaxConventionStringLiteralIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSyntaxConventionStringLiteralIT.java
@@ -89,24 +89,24 @@ public class IoTDBSyntaxConventionStringLiteralIT {
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
- statement.execute("CREATE TIMESERIES root.sg1.d1.s1 TEXT");
+ statement.execute("CREATE TIMESERIES root.db1.d1.s1 TEXT");
for (int i = 0; i < insertData.length; i++) {
String insertSql =
- String.format("INSERT INTO root.sg1.d1(time, s1) values (%d, %s)",
i, insertData[i]);
+ String.format("INSERT INTO root.db1.d1(time, s1) values (%d, %s)",
i, insertData[i]);
statement.execute(insertSql);
}
- try (ResultSet resultSet = statement.executeQuery("SELECT s1 FROM
root.sg1.d1")) {
+ try (ResultSet resultSet = statement.executeQuery("SELECT s1 FROM
root.db1.d1")) {
int cnt = 0;
while (resultSet.next()) {
- Assert.assertEquals(resultData[cnt],
resultSet.getString("root.sg1.d1.s1"));
+ Assert.assertEquals(resultData[cnt],
resultSet.getString("root.db1.d1.s1"));
cnt++;
}
Assert.assertEquals(insertData.length, cnt);
}
for (String insertDatum : insertData) {
- String querySql = String.format("SELECT s1 FROM root.sg1.d1 WHERE s1 =
%s", insertDatum);
+ String querySql = String.format("SELECT s1 FROM root.db1.d1 WHERE s1 =
%s", insertDatum);
try (ResultSet resultSet = statement.executeQuery(querySql)) {
Assert.assertTrue(resultSet.next());
}
@@ -147,24 +147,24 @@ public class IoTDBSyntaxConventionStringLiteralIT {
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
- statement.execute("CREATE TIMESERIES root.sg1.d1.s1 TEXT");
+ statement.execute("CREATE TIMESERIES root.db1.d1.s1 TEXT");
for (int i = 0; i < insertData.length; i++) {
String insertSql =
- String.format("INSERT INTO root.sg1.d1(time, s1) values (%d, %s)",
i, insertData[i]);
+ String.format("INSERT INTO root.db1.d1(time, s1) values (%d, %s)",
i, insertData[i]);
statement.execute(insertSql);
}
- try (ResultSet resultSet = statement.executeQuery("SELECT s1 FROM
root.sg1.d1")) {
+ try (ResultSet resultSet = statement.executeQuery("SELECT s1 FROM
root.db1.d1")) {
int cnt = 0;
while (resultSet.next()) {
- Assert.assertEquals(resultData[cnt],
resultSet.getString("root.sg1.d1.s1"));
+ Assert.assertEquals(resultData[cnt],
resultSet.getString("root.db1.d1.s1"));
cnt++;
}
Assert.assertEquals(insertData.length, cnt);
}
for (String insertDatum : insertData) {
- String querySql = String.format("SELECT s1 FROM root.sg1.d1 WHERE s1 =
%s", insertDatum);
+ String querySql = String.format("SELECT s1 FROM root.db1.d1 WHERE s1 =
%s", insertDatum);
try (ResultSet resultSet = statement.executeQuery(querySql)) {
Assert.assertTrue(resultSet.next());
}
@@ -184,14 +184,14 @@ public class IoTDBSyntaxConventionStringLiteralIT {
+ "line 1:45 mismatched input 'string' expecting {FALSE, NAN, NOW,
NULL, TRUE, '-', '+', '/', '.', STRING_LITERAL, BINARY_LITERAL,
DATETIME_LITERAL, INTEGER_LITERAL, EXPONENT_NUM_PART}";
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
- statement.execute("CREATE TIMESERIES root.sg1.d1.s1 TEXT");
+ statement.execute("CREATE TIMESERIES root.db1.d1.s1 TEXT");
} catch (SQLException e) {
fail(e.getMessage());
}
// without ' or "
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
- statement.execute("INSERT INTO root.sg1.d1(time, s1) values (1,
string)");
+ statement.execute("INSERT INTO root.db1.d1(time, s1) values (1,
string)");
fail();
} catch (SQLException e) {
Assert.assertEquals(errorMsg, e.getMessage());
@@ -204,7 +204,7 @@ public class IoTDBSyntaxConventionStringLiteralIT {
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
// wrap STRING_LITERAL with ``
- statement.execute("INSERT INTO root.sg1.d1(time, s1) values (1,
`string`)");
+ statement.execute("INSERT INTO root.db1.d1(time, s1) values (1,
`string`)");
fail();
} catch (SQLException e) {
Assert.assertEquals(errorMsg1, e.getMessage());
@@ -217,7 +217,7 @@ public class IoTDBSyntaxConventionStringLiteralIT {
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
// single ' in ''
- statement.execute("INSERT INTO root.sg1.d1(time, s1) values (1,
''string')");
+ statement.execute("INSERT INTO root.db1.d1(time, s1) values (1,
''string')");
fail();
} catch (SQLException e) {
Assert.assertEquals(errorMsg2, e.getMessage());
@@ -230,7 +230,7 @@ public class IoTDBSyntaxConventionStringLiteralIT {
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
// single " in ""
- statement.execute("INSERT INTO root.sg1.d1(time, s1) values (1,
\"\"string\")");
+ statement.execute("INSERT INTO root.db1.d1(time, s1) values (1,
\"\"string\")");
fail();
} catch (SQLException e) {
Assert.assertEquals(errorMsg3, e.getMessage());
@@ -532,11 +532,11 @@ public class IoTDBSyntaxConventionStringLiteralIT {
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
statement.execute(
- "create timeseries root.sg.a "
+ "create timeseries root.db.a "
+ "with datatype=INT64, encoding=PLAIN, compression=SNAPPY ");
- statement.execute("insert into root.sg(time, a) values (1,1)");
+ statement.execute("insert into root.db(time, a) values (1,1)");
- String selectSql = "select a as %s from root.sg";
+ String selectSql = "select a as %s from root.db";
for (int i = 0; i < alias.length; i++) {
try (ResultSet resultSet =
statement.executeQuery(String.format(selectSql, alias[i]))) {
Assert.assertEquals(res[i],
resultSet.getMetaData().getColumnName(2));
@@ -544,7 +544,7 @@ public class IoTDBSyntaxConventionStringLiteralIT {
}
try {
- statement.execute("select a as test.b from root.sg");
+ statement.execute("select a as test.b from root.db");
fail();
} catch (Exception ignored) {
}
@@ -567,10 +567,10 @@ public class IoTDBSyntaxConventionStringLiteralIT {
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
statement.execute(
- "create timeseries root.sg.a "
+ "create timeseries root.db.a "
+ "with datatype=INT64, encoding=PLAIN, compression=SNAPPY ");
- String alterSql = "ALTER timeseries root.sg.a UPSERT alias = %s";
+ String alterSql = "ALTER timeseries root.db.a UPSERT alias = %s";
for (int i = 0; i < alias.length; i++) {
statement.execute(String.format(alterSql, alias[i]));
try (ResultSet resultSet = statement.executeQuery("show timeseries")) {
@@ -580,7 +580,7 @@ public class IoTDBSyntaxConventionStringLiteralIT {
}
try {
- statement.execute("ALTER timeseries root.sg.a UPSERT alias = test.a");
+ statement.execute("ALTER timeseries root.db.a UPSERT alias = test.a");
fail();
} catch (Exception ignored) {
}
diff --git
a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBTtlIT.java
b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBTtlIT.java
index a0ad94a9944..351243e9d65 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBTtlIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBTtlIT.java
@@ -163,22 +163,22 @@ public class IoTDBTtlIT {
}
assertTrue(cnt >= 200);
}
- statement.execute("CREATE DATABASE root.sg.TTL_SG3");
- statement.execute("CREATE DATABASE root.sg.TTL_SG4");
+ statement.execute("CREATE DATABASE root.db.TTL_SG3");
+ statement.execute("CREATE DATABASE root.db.TTL_SG4");
// SG3
for (int i = 0; i < 100; i++) {
statement.execute(
String.format(
- "INSERT INTO root.sg.TTL_SG3(timestamp, s1) VALUES (%d, %d)",
now - 100 + i, i));
+ "INSERT INTO root.db.TTL_SG3(timestamp, s1) VALUES (%d, %d)",
now - 100 + i, i));
}
for (int i = 100; i < 200; i++) {
statement.execute(
String.format(
- "INSERT INTO root.sg.TTL_SG3(timestamp, s1) VALUES (%d, %d)",
+ "INSERT INTO root.db.TTL_SG3(timestamp, s1) VALUES (%d, %d)",
now - 10000000 + i, i));
}
- try (ResultSet resultSet = statement.executeQuery("SELECT s1 FROM
root.sg.TTL_SG3")) {
+ try (ResultSet resultSet = statement.executeQuery("SELECT s1 FROM
root.db.TTL_SG3")) {
int cnt = 0;
while (resultSet.next()) {
cnt++;
@@ -189,16 +189,16 @@ public class IoTDBTtlIT {
for (int i = 200; i < 300; i++) {
statement.execute(
String.format(
- "INSERT INTO root.sg.TTL_SG4(timestamp, s1) VALUES (%d, %d)",
now - 100 + i, i));
+ "INSERT INTO root.db.TTL_SG4(timestamp, s1) VALUES (%d, %d)",
now - 100 + i, i));
}
for (int i = 300; i < 400; i++) {
statement.execute(
String.format(
- "INSERT INTO root.sg.TTL_SG4(timestamp, s1) VALUES (%d, %d)",
+ "INSERT INTO root.db.TTL_SG4(timestamp, s1) VALUES (%d, %d)",
now - 10000000 + i, i));
}
- try (ResultSet resultSet = statement.executeQuery("SELECT s1 FROM
root.sg.TTL_SG4")) {
+ try (ResultSet resultSet = statement.executeQuery("SELECT s1 FROM
root.db.TTL_SG4")) {
int cnt = 0;
while (resultSet.next()) {
cnt++;
@@ -206,8 +206,8 @@ public class IoTDBTtlIT {
assertEquals(200, cnt);
}
- statement.execute("SET TTL TO root.sg.** 100000");
- try (ResultSet resultSet = statement.executeQuery("SELECT * FROM
root.sg.**")) {
+ statement.execute("SET TTL TO root.db.** 100000");
+ try (ResultSet resultSet = statement.executeQuery("SELECT * FROM
root.db.**")) {
int cnt = 0;
while (resultSet.next()) {
cnt++;
@@ -219,7 +219,7 @@ public class IoTDBTtlIT {
try {
statement.execute(
String.format(
- "INSERT INTO root.sg.TTL_SG3(timestamp, s1) VALUES (%d, %d)",
+ "INSERT INTO root.db.TTL_SG3(timestamp, s1) VALUES (%d, %d)",
now - 5000000 + i, i));
} catch (SQLException e) {
assertEquals(TSStatusCode.OUT_OF_TTL.getStatusCode(),
e.getErrorCode());
@@ -230,14 +230,14 @@ public class IoTDBTtlIT {
try {
statement.execute(
String.format(
- "INSERT INTO root.sg.TTL_SG4(timestamp, s1) VALUES (%d, %d)",
+ "INSERT INTO root.db.TTL_SG4(timestamp, s1) VALUES (%d, %d)",
now - 5000000 + i, i));
} catch (SQLException e) {
assertEquals(TSStatusCode.OUT_OF_TTL.getStatusCode(),
e.getErrorCode());
}
}
- try (ResultSet resultSet = statement.executeQuery("SELECT s1 FROM
root.sg.**")) {
+ try (ResultSet resultSet = statement.executeQuery("SELECT s1 FROM
root.db.**")) {
int cnt = 0;
while (resultSet.next()) {
cnt++;
@@ -245,20 +245,20 @@ public class IoTDBTtlIT {
assertEquals(200, cnt);
}
- statement.execute("UNSET TTL TO root.sg.**");
+ statement.execute("UNSET TTL TO root.db.**");
// make sure other nodes have applied UNSET TTL
Thread.sleep(1000);
for (int i = 0; i < 100; i++) {
statement.execute(
String.format(
- "INSERT INTO root.sg.TTL_SG3(timestamp, s1) VALUES (%d, %d)",
now - 30000 + i, i));
+ "INSERT INTO root.db.TTL_SG3(timestamp, s1) VALUES (%d, %d)",
now - 30000 + i, i));
}
for (int i = 100; i < 200; i++) {
statement.execute(
String.format(
- "INSERT INTO root.sg.TTL_SG4(timestamp, s1) VALUES (%d, %d)",
now - 30000 + i, i));
+ "INSERT INTO root.db.TTL_SG4(timestamp, s1) VALUES (%d, %d)",
now - 30000 + i, i));
}
- try (ResultSet resultSet = statement.executeQuery("SELECT s1 FROM
root.sg.**")) {
+ try (ResultSet resultSet = statement.executeQuery("SELECT s1 FROM
root.db.**")) {
int cnt = 0;
while (resultSet.next()) {
cnt++;
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 ea00bbfa646..9a6a1577eb8 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
@@ -55,19 +55,19 @@ public class IoTDBCQExecIT {
@Test
public void testCQExecution1() {
String insertTemplate =
- "INSERT INTO root.sg.d1(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.d1(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.d1.s1 WITH DATATYPE=INT64");
- statement.execute("create timeseries root.sg.d1.s1_max WITH
DATATYPE=INT64");
+ statement.execute("create timeseries root.db.d1.s1 WITH DATATYPE=INT64");
+ statement.execute("create timeseries root.db.d1.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.d1(time, s1) VALUES (0,0)");
+ statement.execute("INSERT INTO root.db.d1(time, s1) VALUES (0,0)");
statement.execute(
String.format(
@@ -99,8 +99,8 @@ public class IoTDBCQExecIT {
+ String.format("BOUNDARY %d\n", firstExecutionTime)
+ "BEGIN \n"
+ " SELECT max_value(s1) \n"
- + " INTO root.sg.d1(s1_max)\n"
- + " FROM root.sg.d1\n"
+ + " INTO root.db.d1(s1_max)\n"
+ + " FROM root.db.d1\n"
+ " GROUP BY(1s) \n"
+ "END");
@@ -121,11 +121,11 @@ public class IoTDBCQExecIT {
};
long[] expectedValue = {4, 6, 8, 10};
- try (ResultSet resultSet = statement.executeQuery("select s1_max from
root.sg.d1")) {
+ try (ResultSet resultSet = statement.executeQuery("select s1_max from
root.db.d1")) {
int cnt = 0;
while (resultSet.next()) {
assertEquals(expectedTime[cnt], resultSet.getLong(TIMESTAMP_STR));
- assertEquals(expectedValue[cnt],
resultSet.getLong("root.sg.d1.s1_max"));
+ assertEquals(expectedValue[cnt],
resultSet.getLong("root.db.d1.s1_max"));
cnt++;
}
assertEquals(expectedTime.length, cnt);
@@ -142,19 +142,19 @@ public class IoTDBCQExecIT {
@Test
public void testCQExecution2() {
String insertTemplate =
- "INSERT INTO root.sg.d2(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.d2(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.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 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(
@@ -187,8 +187,8 @@ public class IoTDBCQExecIT {
+ "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");
@@ -209,11 +209,11 @@ public class IoTDBCQExecIT {
};
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);
@@ -230,19 +230,19 @@ public class IoTDBCQExecIT {
@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();
long firstExecutionTime = now + 10_000;
long startTime = firstExecutionTime - 3_000;
- 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(
@@ -275,8 +275,8 @@ public class IoTDBCQExecIT {
+ "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");
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 80acdb14087..f29b527fa0d 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
@@ -57,19 +57,19 @@ public class IoTDBCQExecInNsIT {
@Test
public void testCQExecution1() {
String insertTemplate =
- "INSERT INTO root.sg.d1(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.d1(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.d1.s1 WITH DATATYPE=INT64");
- statement.execute("create timeseries root.sg.d1.s1_max WITH
DATATYPE=INT64");
+ statement.execute("create timeseries root.db.d1.s1 WITH DATATYPE=INT64");
+ statement.execute("create timeseries root.db.d1.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.d1(time, s1) VALUES (0,0)");
+ statement.execute("INSERT INTO root.db.d1(time, s1) VALUES (0,0)");
statement.execute(
String.format(
@@ -101,8 +101,8 @@ public class IoTDBCQExecInNsIT {
+ String.format("BOUNDARY %d\n", firstExecutionTime)
+ "BEGIN \n"
+ " SELECT max_value(s1) \n"
- + " INTO root.sg.d1(s1_max)\n"
- + " FROM root.sg.d1\n"
+ + " INTO root.db.d1(s1_max)\n"
+ + " FROM root.db.d1\n"
+ " GROUP BY(1s) \n"
+ "END");
@@ -126,11 +126,11 @@ public class IoTDBCQExecInNsIT {
};
long[] expectedValue = {4, 6, 8, 10};
- try (ResultSet resultSet = statement.executeQuery("select s1_max from
root.sg.d1")) {
+ try (ResultSet resultSet = statement.executeQuery("select s1_max from
root.db.d1")) {
int cnt = 0;
while (resultSet.next()) {
assertEquals(expectedTime[cnt], resultSet.getLong(TIMESTAMP_STR));
- assertEquals(expectedValue[cnt],
resultSet.getLong("root.sg.d1.s1_max"));
+ assertEquals(expectedValue[cnt],
resultSet.getLong("root.db.d1.s1_max"));
cnt++;
}
assertEquals(expectedTime.length, cnt);
@@ -147,14 +147,14 @@ public class IoTDBCQExecInNsIT {
@Test
public void testCQExecution2() {
String insertTemplate =
- "INSERT INTO root.sg.d2(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.d2(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.d2.s1 WITH DATATYPE=INT64");
+ statement.execute("create timeseries root.db.d2.s1 WITH DATATYPE=INT64");
statement.execute("create timeseries root.sg.d2.s1_max WITH
DATATYPE=INT64");
// firstly write one row to init data region, just for accelerating the
following insert
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 c9971af3afb..ba3ad9a8593 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
@@ -57,19 +57,19 @@ public class IoTDBCQExecInUsIT {
@Test
public void testCQExecution1() {
String insertTemplate =
- "INSERT INTO root.sg.d1(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.d1(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.d1.s1 WITH DATATYPE=INT64");
- statement.execute("create timeseries root.sg.d1.s1_max WITH
DATATYPE=INT64");
+ statement.execute("create timeseries root.db.d1.s1 WITH DATATYPE=INT64");
+ statement.execute("create timeseries root.db.d1.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.d1(time, s1) VALUES (0,0)");
+ statement.execute("INSERT INTO root.db.d1(time, s1) VALUES (0,0)");
statement.execute(
String.format(
@@ -101,8 +101,8 @@ public class IoTDBCQExecInUsIT {
+ String.format("BOUNDARY %d\n", firstExecutionTime)
+ "BEGIN \n"
+ " SELECT max_value(s1) \n"
- + " INTO root.sg.d1(s1_max)\n"
- + " FROM root.sg.d1\n"
+ + " INTO root.db.d1(s1_max)\n"
+ + " FROM root.db.d1\n"
+ " GROUP BY(1s) \n"
+ "END");
@@ -126,11 +126,11 @@ public class IoTDBCQExecInUsIT {
};
long[] expectedValue = {4, 6, 8, 10};
- try (ResultSet resultSet = statement.executeQuery("select s1_max from
root.sg.d1")) {
+ try (ResultSet resultSet = statement.executeQuery("select s1_max from
root.db.d1")) {
int cnt = 0;
while (resultSet.next()) {
assertEquals(expectedTime[cnt], resultSet.getLong(TIMESTAMP_STR));
- assertEquals(expectedValue[cnt],
resultSet.getLong("root.sg.d1.s1_max"));
+ assertEquals(expectedValue[cnt],
resultSet.getLong("root.db.d1.s1_max"));
cnt++;
}
assertEquals(expectedTime.length, cnt);
@@ -147,14 +147,14 @@ public class IoTDBCQExecInUsIT {
@Test
public void testCQExecution2() {
String insertTemplate =
- "INSERT INTO root.sg.d2(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.d2(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.d2.s1 WITH DATATYPE=INT64");
+ statement.execute("create timeseries root.db.d2.s1 WITH DATATYPE=INT64");
statement.execute("create timeseries root.sg.d2.s1_max WITH
DATATYPE=INT64");
// firstly write one row to init data region, just for accelerating the
following insert
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 399694b5e2c..a0a81380644 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
@@ -64,8 +64,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([0, 10), 30m)\n"
+ "END";
statement.execute(sql);
@@ -83,8 +83,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"
+ " WHERE time >= 0 and time <= 10\n"
+ " GROUP BY(30m)\n"
+ "END";
@@ -103,8 +103,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"
+ "END";
statement.execute(sql);
fail();
@@ -121,7 +121,7 @@ public class IoTDBCQIT {
"CREATE CQ s1_count_cq_2\n"
+ "BEGIN \n"
+ " SELECT count(s1) \n"
- + " FROM root.sg.d\n"
+ + " FROM root.db.d\n"
+ " GROUP BY(30m)\n"
+ "END";
statement.execute(sql);
@@ -141,8 +141,8 @@ public class IoTDBCQIT {
+ "RESAMPLE EVERY 50ms\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);
@@ -161,8 +161,8 @@ public class IoTDBCQIT {
+ "RESAMPLE RANGE -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);
@@ -181,7 +181,7 @@ public class IoTDBCQIT {
+ "RESAMPLE RANGE 0m\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 c2a2db78b36..a6f5dce0d88 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
@@ -65,9 +65,9 @@ public class IoTDBUDFWindowQuery2IT {
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=INT32,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=INT32,encoding=PLAIN");
} catch (SQLException throwable) {
fail(throwable.getMessage());
}
@@ -77,11 +77,11 @@ public class IoTDBUDFWindowQuery2IT {
// SessionWindow
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
- statement.execute("INSERT INTO root.sg.d1(time, s1, s2) VALUES (1, 1,
1)");
- statement.execute("INSERT INTO root.sg.d1(time, s1, s2) VALUES (2, 2,
2)");
- statement.execute("INSERT INTO root.sg.d1(time, s1, s2) VALUES (3, 3,
3)");
- statement.execute("INSERT INTO root.sg.d1(time, s1, s2) VALUES (9, 9,
9)");
- statement.execute("INSERT INTO root.sg.d1(time, s1, s2) VALUES (5, 5,
5)");
+ statement.execute("INSERT INTO root.db.d1(time, s1, s2) VALUES (1, 1,
1)");
+ statement.execute("INSERT INTO root.db.d1(time, s1, s2) VALUES (2, 2,
2)");
+ 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)");
diff --git
a/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFAlignByTimeQueryIT.java
b/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFAlignByTimeQueryIT.java
index e3955df58d6..eb0e2a74b44 100644
---
a/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFAlignByTimeQueryIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFAlignByTimeQueryIT.java
@@ -86,8 +86,8 @@ public class IoTDBUDTFAlignByTimeQueryIT {
statement.execute("CREATE TIMESERIES root.vehicle.d4.s1 with
datatype=INT32,encoding=PLAIN");
statement.execute("CREATE TIMESERIES root.vehicle.d4.s2 with
datatype=INT32,encoding=PLAIN");
// create aligned timeseries
- statement.execute(("CREATE DATABASE root.sg1"));
- statement.execute("CREATE ALIGNED TIMESERIES root.sg1(s1 INT32, s2
INT32)");
+ statement.execute(("CREATE DATABASE root.db1"));
+ statement.execute("CREATE ALIGNED TIMESERIES root.db1(s1 INT32, s2
INT32)");
} catch (SQLException throwable) {
fail(throwable.getMessage());
}
@@ -116,7 +116,7 @@ public class IoTDBUDTFAlignByTimeQueryIT {
"insert into root.vehicle.d4(timestamp,s1) values(%d,%d)", 2 *
i, 3 * i)));
statement.execute(
(String.format(
- "insert into root.sg1(timestamp,s1, s2) aligned
values(%d,%d,%d)", i, i, i)));
+ "insert into root.db1(timestamp,s1, s2) aligned
values(%d,%d,%d)", i, i, i)));
}
} catch (SQLException throwable) {
fail(throwable.getMessage());
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 61de72829cc..471aba1d927 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
@@ -55,7 +55,7 @@ import static org.junit.Assert.fail;
public class IoTDBUDTFBuiltinFunctionIT {
private static final String[] INSERTION_SQLS = {
- "insert into root.sg.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.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')",
diff --git
a/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFHybridQueryIT.java
b/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFHybridQueryIT.java
index 93e7a09bb51..297c3fe0cbc 100644
---
a/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFHybridQueryIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFHybridQueryIT.java
@@ -198,7 +198,7 @@ public class IoTDBUDTFHybridQueryIT {
public void testLastUserDefinedFunctionQuery() {
String sql =
String.format(
- "select last counter(temperature, '%s'='%s') from
root.sgcc.wf03.wt01",
+ "select last counter(temperature, '%s'='%s') from
root.dbcc.wf03.wt01",
UDFTestConstant.ACCESS_STRATEGY_KEY,
UDFTestConstant.ACCESS_STRATEGY_ROW_BY_ROW);
try (Connection connection = EnvFactory.getEnv().getConnection();
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
index 3c3d2304195..d06521e997b 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
@@ -801,15 +801,15 @@ public class ConfigManager implements IManager {
if (path.getFullPath().contains(IoTDBConstant.MULTI_LEVEL_PATH_WILDCARD)) {
return new ArrayList<>();
}
- // with database = root.sg, path = root.*.d1
- // convert path = root.sg.d1
+ // with database = root.db, path = root.*.d1
+ // convert path = root.db.d1
final List<PartialPath> innerPathList = path.alterPrefixPath(database);
if (innerPathList.isEmpty()) {
return new ArrayList<>();
}
final String[] devicePath =
Arrays.copyOf(innerPathList.get(0).getNodes(),
innerPathList.get(0).getNodeLength() - 1);
- // root.sg1.*.d1
+ // root.db1.*.d1
for (final String node : devicePath) {
if (node.contains(IoTDBConstant.ONE_LEVEL_PATH_WILDCARD)) {
return Collections.emptyList();
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/ConfigMTree.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/ConfigMTree.java
index 31ae35d0363..949a281d2fe 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/ConfigMTree.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/ConfigMTree.java
@@ -197,8 +197,8 @@ public class ConfigMTree {
* Get the database that given path pattern matches or belongs to.
*
* <p>Suppose we have (root.db1.d1.s1, root.db2.d2.s2), refer the following
cases: 1. given path
- * "root.db1", ("root.db1") will be returned. 2. given path "root.*",
("root.db1", "root.sg2")
- * will be returned. 3. given path "root.*.d1.s1", ("root.sg1", "root.sg2")
will be returned.
+ * "root.db1", ("root.db1") will be returned. 2. given path "root.*",
("root.db1", "root.db2")
+ * will be returned. 3. given path "root.*.d1.s1", ("root.db1", "root.db2")
will be returned.
*
* @param pathPattern a path pattern or a full path
* @return a list contains all databases related to given path
@@ -291,7 +291,7 @@ public class ConfigMTree {
}
/**
- * E.g., root.sg is database given [root, sg], if the give path is not a
database, throw exception
+ * E.g., root.db is database given [root, sg], if the give path is not a
database, throw exception
*/
public IDatabaseMNode<IConfigMNode> getDatabaseNodeByDatabasePath(final
PartialPath databasePath)
throws MetadataException {
@@ -322,8 +322,8 @@ public class ConfigMTree {
}
/**
- * E.g., root.sg is database given [root, sg], return the MNode of root.sg
given [root, sg,
- * device], return the MNode of root.sg Get database node, the give path
don't need to be database
+ * E.g., root.db is database given [root, sg], return the MNode of root.db
given [root, sg,
+ * device], return the MNode of root.db Get database node, the give path
don't need to be database
* path.
*/
public IDatabaseMNode<IConfigMNode> getDatabaseNodeByPath(final PartialPath
path)
@@ -1118,7 +1118,8 @@ public class ConfigMTree {
}
private void serializeDatabaseNode(
- final IDatabaseMNode<IConfigMNode> databaseNode, final OutputStream
outputStream) throws IOException {
+ final IDatabaseMNode<IConfigMNode> databaseNode, final OutputStream
outputStream)
+ throws IOException {
serializeChildren(databaseNode.getAsMNode(), outputStream);
ReadWriteIOUtils.write(DATABASE_MNODE_TYPE, outputStream);
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/impl/SchemaRegionMemoryImpl.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/impl/SchemaRegionMemoryImpl.java
index 74ec5d87bf2..9744e0aae1c 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/impl/SchemaRegionMemoryImpl.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/impl/SchemaRegionMemoryImpl.java
@@ -92,7 +92,7 @@ import
org.apache.iotdb.db.schemaengine.schemaregion.logfile.SchemaLogReader;
import org.apache.iotdb.db.schemaengine.schemaregion.logfile.SchemaLogWriter;
import
org.apache.iotdb.db.schemaengine.schemaregion.logfile.visitor.SchemaRegionPlanDeserializer;
import
org.apache.iotdb.db.schemaengine.schemaregion.logfile.visitor.SchemaRegionPlanSerializer;
-import
org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.MTreeBelowSGMemoryImpl;
+import
org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.MTreeBelowDBMemoryImpl;
import
org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.IMemMNode;
import
org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.info.TableDeviceInfo;
import org.apache.iotdb.db.schemaengine.schemaregion.read.req.IShowDevicesPlan;
@@ -215,7 +215,7 @@ public class SchemaRegionMemoryImpl implements
ISchemaRegion {
private final DataNodeSchemaQuotaManager schemaQuotaManager =
DataNodeSchemaQuotaManager.getInstance();
- private MTreeBelowSGMemoryImpl mTree;
+ private MTreeBelowDBMemoryImpl mTree;
private TagManager tagManager;
private IDeviceAttributeStore deviceAttributeStore;
private DeviceAttributeCacheUpdater deviceAttributeCacheUpdater;
@@ -275,7 +275,7 @@ public class SchemaRegionMemoryImpl implements
ISchemaRegion {
regionStatistics,
PathUtils.unQualifyDatabaseName(databaseFullPath));
tagManager = new TagManager(schemaRegionDirPath, regionStatistics);
mTree =
- new MTreeBelowSGMemoryImpl(
+ new MTreeBelowDBMemoryImpl(
PartialPath.getQualifiedDatabasePartialPath(databaseFullPath),
tagManager::readTags,
tagManager::readAttributes,
@@ -591,7 +591,7 @@ public class SchemaRegionMemoryImpl implements
ISchemaRegion {
snapshotStartTime = System.currentTimeMillis();
mTree =
- MTreeBelowSGMemoryImpl.loadFromSnapshot(
+ MTreeBelowDBMemoryImpl.loadFromSnapshot(
latestSnapshotRootDir,
databaseFullPath,
regionStatistics,
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/mem/MTreeBelowSGMemoryImpl.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/mem/MTreeBelowDBMemoryImpl.java
similarity index 99%
rename from
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/mem/MTreeBelowSGMemoryImpl.java
rename to
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/mem/MTreeBelowDBMemoryImpl.java
index 9aec147ace1..2001ffd740d 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/mem/MTreeBelowSGMemoryImpl.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/mem/MTreeBelowDBMemoryImpl.java
@@ -134,9 +134,9 @@ import static
org.apache.iotdb.commons.conf.IoTDBConstant.PATH_SEPARATOR;
* <li>Interfaces and Implementation for Template check
* </ol>
*/
-public class MTreeBelowSGMemoryImpl {
+public class MTreeBelowDBMemoryImpl {
- private static final Logger LOGGER =
LoggerFactory.getLogger(MTreeBelowSGMemoryImpl.class);
+ private static final Logger LOGGER =
LoggerFactory.getLogger(MTreeBelowDBMemoryImpl.class);
// this implementation is based on memory, thus only MTree write operation
must invoke MTreeStore
private final MemMTreeStore store;
@@ -153,7 +153,7 @@ public class MTreeBelowSGMemoryImpl {
private final MemSchemaRegionStatistics regionStatistics;
// region MTree initialization, clear and serialization
- public MTreeBelowSGMemoryImpl(
+ public MTreeBelowDBMemoryImpl(
final PartialPath databasePath,
final Function<IMeasurementMNode<IMemMNode>, Map<String, String>>
tagGetter,
final Function<IMeasurementMNode<IMemMNode>, Map<String, String>>
attributeGetter,
@@ -168,7 +168,7 @@ public class MTreeBelowSGMemoryImpl {
this.attributeGetter = attributeGetter;
}
- private MTreeBelowSGMemoryImpl(
+ private MTreeBelowDBMemoryImpl(
final PartialPath databasePath,
final MemMTreeStore store,
final Function<IMeasurementMNode<IMemMNode>, Map<String, String>>
tagGetter,
@@ -192,7 +192,7 @@ public class MTreeBelowSGMemoryImpl {
return store.createSnapshot(snapshotDir);
}
- public static MTreeBelowSGMemoryImpl loadFromSnapshot(
+ public static MTreeBelowDBMemoryImpl loadFromSnapshot(
final File snapshotDir,
final String databaseFullPath,
final MemSchemaRegionStatistics regionStatistics,
@@ -203,7 +203,7 @@ public class MTreeBelowSGMemoryImpl {
final Function<IMeasurementMNode<IMemMNode>, Map<String, String>>
tagGetter,
final Function<IMeasurementMNode<IMemMNode>, Map<String, String>>
attributeGetter)
throws IOException, IllegalPathException {
- return new MTreeBelowSGMemoryImpl(
+ return new MTreeBelowDBMemoryImpl(
PartialPath.getQualifiedDatabasePartialPath(databaseFullPath),
MemMTreeStore.loadFromSnapshot(
snapshotDir,
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 5d76255ad8d..53aa0d9f067 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
@@ -95,9 +95,9 @@ public class PartialPath extends Path implements
Comparable<Path>, Cloneable {
}
// path is root.db.`abc`, fullPath is root.db.abc
// path is root.db.`select`, fullPath is root.db.select
- // path is root.sg.`111`, fullPath is root.sg.`111`
- // path is root.sg.`a.b`, fullPath is root.sg.`a.b`
- // path is root.sg.`a``b`, fullPath is root.sg.`a``b`
+ // path is root.db.`111`, fullPath is root.db.`111`
+ // path is root.db.`a.b`, fullPath is root.db.`a.b`
+ // path is root.db.`a``b`, fullPath is root.db.`a``b`
this.fullPath = getFullPath();
}
@@ -410,8 +410,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.sg.device.*" matches path "root.sg.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"
*
* <p>Note: If the current path is a path ending with "**", and does not
have any * before it,
* like "root.a.b.c.**", then the rPath can be a path with *, and this
method returns {@code true}
@@ -439,7 +439,7 @@ 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.sg.device.*" matches path "root.sg.device.s1" whereas it does not
match "root.sg.device"
+ * "root.db.device.*" matches path "root.db.device.s1" whereas it does not
match "root.sg.device"
* and "root.sg.vehicle.s1"
*
* @param rPath a plain full path of a timeseries
diff --git
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/PathPatternTree.java
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/PathPatternTree.java
index 04e93540bbb..0bfd4027460 100644
---
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/PathPatternTree.java
+++
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/PathPatternTree.java
@@ -250,7 +250,7 @@ public class PathPatternTree {
? new ArrayList<>()
: new ArrayList<>(nodes.subList(0, nodes.size() - 1)));
} else {
- // the device of root.sg.d.** is root.sg.d and root.sg.d.**
+ // the device of root.db.d.** is root.db.d and root.db.d.**
if (nodes.size() > 2) {
resultNodesSet.add(new ArrayList<>(nodes.subList(0, nodes.size() -
1)));
}
