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 2d9e40e7172 partial
2d9e40e7172 is described below
commit 2d9e40e7172d3506f4d7c8f1fcb859e85d9a8b4d
Author: Caideyipi <[email protected]>
AuthorDate: Thu Jan 8 12:22:19 2026 +0800
partial
---
.../iotdb/SyntaxConventionRelatedExample.java | 16 ++---
.../iotdb/AlignedTimeseriesSessionExample.java | 16 ++---
.../iotdb/HybridTimeseriesSessionExample.java | 12 ++--
.../main/java/org/apache/iotdb/SessionExample.java | 84 +++++++++++-----------
.../iotdb/SyntaxConventionRelatedExample.java | 24 +++----
.../session/it/IoTDBSessionAlignedInsertIT.java | 46 ++++++------
6 files changed, 99 insertions(+), 99 deletions(-)
diff --git
a/example/jdbc/src/main/java/org/apache/iotdb/SyntaxConventionRelatedExample.java
b/example/jdbc/src/main/java/org/apache/iotdb/SyntaxConventionRelatedExample.java
index 2042ce8e725..4d1ea498ef0 100644
---
a/example/jdbc/src/main/java/org/apache/iotdb/SyntaxConventionRelatedExample.java
+++
b/example/jdbc/src/main/java/org/apache/iotdb/SyntaxConventionRelatedExample.java
@@ -37,28 +37,28 @@ public class SyntaxConventionRelatedExample {
* when using session API, path is represented using String. The path should
be written as
* "root.db1.select".
*/
- private static final String ROOT_SG1_KEYWORD_EXAMPLE = "root.db1.select";
+ private static final String ROOT_DB1_KEYWORD_EXAMPLE = "root.db1.select";
/**
* if you want to create a time series named root.db1.111, a possible SQL
statement would be like:
* create timeseries root.db1.`111` with datatype=FLOAT, encoding=RLE The
path should be written
* as "root.db1.`111`".
*/
- private static final String ROOT_SG1_DIGITS_EXAMPLE = "root.db1.`111`";
+ private static final String ROOT_DB1_DIGITS_EXAMPLE = "root.db1.`111`";
/**
* if you want to create a time series named root.db1.`a"b'c``, a possible
SQL statement would be
* like: create timeseries root.db1.`a"b'c``` with datatype=FLOAT,
encoding=RLE The path should be
* written as "root.db1.`a"b`c```".
*/
- private static final String ROOT_SG1_SPECIAL_CHARACTER_EXAMPLE =
"root.db1.`a\"b'c```";
+ private static final String ROOT_DB1_SPECIAL_CHARACTER_EXAMPLE =
"root.db1.`a\"b'c```";
/**
* if you want to create a time series named root.db1.a, a possible SQL
statement would be like:
* create timeseries root.db1.a with datatype=FLOAT, encoding=RLE The path
should be written as
* "root.db1.a".
*/
- private static final String ROOT_SG1_NORMAL_NODE_EXAMPLE = "root.db1.a";
+ private static final String ROOT_DB1_NORMAL_NODE_EXAMPLE = "root.db1.a";
public static final String CREATE =
"CREATE TIMESERIES %s WITH DATATYPE=INT64, ENCODING=RLE,
COMPRESSOR=SNAPPY";
@@ -78,10 +78,10 @@ public class SyntaxConventionRelatedExample {
// create time series
statement.execute(String.format("CREATE DATABASE %s", DEVICE));
- statement.execute(String.format(CREATE, ROOT_SG1_DIGITS_EXAMPLE));
- statement.execute(String.format(CREATE, ROOT_SG1_KEYWORD_EXAMPLE));
- statement.execute(String.format(CREATE, ROOT_SG1_NORMAL_NODE_EXAMPLE));
- statement.execute(String.format(CREATE,
ROOT_SG1_SPECIAL_CHARACTER_EXAMPLE));
+ statement.execute(String.format(CREATE, ROOT_DB1_DIGITS_EXAMPLE));
+ statement.execute(String.format(CREATE, ROOT_DB1_KEYWORD_EXAMPLE));
+ statement.execute(String.format(CREATE, ROOT_DB1_NORMAL_NODE_EXAMPLE));
+ statement.execute(String.format(CREATE,
ROOT_DB1_SPECIAL_CHARACTER_EXAMPLE));
// show timeseries
ResultSet resultSet = statement.executeQuery("show timeseries
root.db1.*");
diff --git
a/example/session/src/main/java/org/apache/iotdb/AlignedTimeseriesSessionExample.java
b/example/session/src/main/java/org/apache/iotdb/AlignedTimeseriesSessionExample.java
index ea135cd89e3..6e459de589b 100644
---
a/example/session/src/main/java/org/apache/iotdb/AlignedTimeseriesSessionExample.java
+++
b/example/session/src/main/java/org/apache/iotdb/AlignedTimeseriesSessionExample.java
@@ -311,7 +311,7 @@ public class AlignedTimeseriesSessionExample {
alias.add(null);
session.createAlignedTimeseries(
- ROOT_SG1_D1,
+ ROOT_DB1_D1,
measurements,
dataTypes,
encodings,
@@ -385,7 +385,7 @@ public class AlignedTimeseriesSessionExample {
schemaList.add(new MeasurementSchema("s2", TSDataType.INT32));
<<<<<<< refs/remotes/upstream/clean
- Tablet tablet = new Tablet(ROOT_SG1_D1_VECTOR2, schemaList);
+ Tablet tablet = new Tablet(ROOT_DB1_D1_VECTOR2, schemaList);
=======
Tablet tablet = new Tablet(ROOT_DB1_D1_VECTOR2, schemaList);
long[] timestamps = tablet.timestamps;
@@ -645,14 +645,14 @@ public class AlignedTimeseriesSessionExample {
schemaList3.add(new MeasurementSchema("s1", TSDataType.INT64));
schemaList3.add(new MeasurementSchema("s2", TSDataType.INT64));
- Tablet tablet1 = new Tablet(ROOT_SG2_D1_VECTOR6, schemaList1, 100);
- Tablet tablet2 = new Tablet(ROOT_SG2_D1_VECTOR7, schemaList2, 100);
- Tablet tablet3 = new Tablet(ROOT_SG2_D1_VECTOR8, schemaList3, 100);
+ Tablet tablet1 = new Tablet(ROOT_DB2_D1_VECTOR6, schemaList1, 100);
+ Tablet tablet2 = new Tablet(ROOT_DB2_D1_VECTOR7, schemaList2, 100);
+ Tablet tablet3 = new Tablet(ROOT_DB2_D1_VECTOR8, schemaList3, 100);
Map<String, Tablet> tabletMap = new HashMap<>();
- tabletMap.put(ROOT_SG2_D1_VECTOR6, tablet1);
- tabletMap.put(ROOT_SG2_D1_VECTOR7, tablet2);
- tabletMap.put(ROOT_SG2_D1_VECTOR8, tablet3);
+ tabletMap.put(ROOT_DB2_D1_VECTOR6, tablet1);
+ tabletMap.put(ROOT_DB2_D1_VECTOR7, tablet2);
+ tabletMap.put(ROOT_DB2_D1_VECTOR8, tablet3);
// Method 1 to add tablet data
long timestamp = System.currentTimeMillis();
diff --git
a/example/session/src/main/java/org/apache/iotdb/HybridTimeseriesSessionExample.java
b/example/session/src/main/java/org/apache/iotdb/HybridTimeseriesSessionExample.java
index eea0fe3cce6..2e4d052e931 100644
---
a/example/session/src/main/java/org/apache/iotdb/HybridTimeseriesSessionExample.java
+++
b/example/session/src/main/java/org/apache/iotdb/HybridTimeseriesSessionExample.java
@@ -44,9 +44,9 @@ public class HybridTimeseriesSessionExample {
LoggerFactory.getLogger(HybridTimeseriesSessionExample.class);
private static Session session;
- private static final String ROOT_SG1_ALIGNEDDEVICE =
"root.db_1.aligned_device";
- private static final String ROOT_SG1_D1 = "root.db_1.d1";
- private static final String ROOT_SG1_D2 = "root.db_1.d2";
+ private static final String ROOT_DB1_ALIGNEDDEVICE =
"root.db_1.aligned_device";
+ private static final String ROOT_DB1_D1 = "root.db_1.d1";
+ private static final String ROOT_DB1_D2 = "root.db_1.d2";
public static void main(String[] args)
throws IoTDBConnectionException, StatementExecutionException {
@@ -56,9 +56,9 @@ public class HybridTimeseriesSessionExample {
// set session fetchSize
session.setFetchSize(10000);
- insertRecord(ROOT_SG1_D2, 0, 100);
+ insertRecord(ROOT_DB1_D2, 0, 100);
insertTabletWithAlignedTimeseriesMethod(0, 100);
- insertRecord(ROOT_SG1_D1, 0, 100);
+ insertRecord(ROOT_DB1_D1, 0, 100);
session.executeNonQueryStatement("flush");
selectTest();
@@ -84,7 +84,7 @@ public class HybridTimeseriesSessionExample {
schemaList.add(new MeasurementSchema("s1", TSDataType.INT64));
schemaList.add(new MeasurementSchema("s2", TSDataType.INT32));
- Tablet tablet = new Tablet(ROOT_SG1_ALIGNEDDEVICE, schemaList);
+ Tablet tablet = new Tablet(ROOT_DB1_ALIGNEDDEVICE, schemaList);
long timestamp = minTime;
for (long row = minTime; row < maxTime; row++) {
diff --git a/example/session/src/main/java/org/apache/iotdb/SessionExample.java
b/example/session/src/main/java/org/apache/iotdb/SessionExample.java
index ab3962604c4..e0484e96d56 100644
--- a/example/session/src/main/java/org/apache/iotdb/SessionExample.java
+++ b/example/session/src/main/java/org/apache/iotdb/SessionExample.java
@@ -54,13 +54,13 @@ public class SessionExample {
private static Session session;
private static Session sessionEnableRedirect;
- private static final String ROOT_SG1_D1_S1 = "root.db1.d1.s1";
- private static final String ROOT_SG1_D1_S2 = "root.db1.d1.s2";
- private static final String ROOT_SG1_D1_S3 = "root.db1.d1.s3";
- private static final String ROOT_SG1_D1_S4 = "root.db1.d1.s4";
- private static final String ROOT_SG1_D1_S5 = "root.db1.d1.s5";
- private static final String ROOT_SG1_D1 = "root.db1.d1";
- private static final String ROOT_SG1 = "root.db1";
+ private static final String ROOT_DB1_D1_S1 = "root.db1.d1.s1";
+ private static final String ROOT_DB1_D1_S2 = "root.db1.d1.s2";
+ private static final String ROOT_DB1_D1_S3 = "root.db1.d1.s3";
+ private static final String ROOT_DB1_D1_S4 = "root.db1.d1.s4";
+ private static final String ROOT_DB1_D1_S5 = "root.db1.d1.s5";
+ private static final String ROOT_DB1_D1 = "root.db1.d1";
+ private static final String ROOT_DB1 = "root.db1";
private static final String LOCAL_HOST = "127.0.0.1";
public static final String SELECT_D1 = "select * from root.db1.d1";
@@ -150,27 +150,27 @@ public class SessionExample {
private static void createTimeseries()
throws IoTDBConnectionException, StatementExecutionException {
- if (!session.checkTimeseriesExists(ROOT_SG1_D1_S1)) {
+ if (!session.checkTimeseriesExists(ROOT_DB1_D1_S1)) {
session.createTimeseries(
- ROOT_SG1_D1_S1, TSDataType.INT64, TSEncoding.RLE,
CompressionType.SNAPPY);
+ ROOT_DB1_D1_S1, TSDataType.INT64, TSEncoding.RLE,
CompressionType.SNAPPY);
}
- if (!session.checkTimeseriesExists(ROOT_SG1_D1_S2)) {
+ if (!session.checkTimeseriesExists(ROOT_DB1_D1_S2)) {
session.createTimeseries(
- ROOT_SG1_D1_S2, TSDataType.INT64, TSEncoding.RLE,
CompressionType.SNAPPY);
+ ROOT_DB1_D1_S2, TSDataType.INT64, TSEncoding.RLE,
CompressionType.SNAPPY);
}
- if (!session.checkTimeseriesExists(ROOT_SG1_D1_S3)) {
+ if (!session.checkTimeseriesExists(ROOT_DB1_D1_S3)) {
session.createTimeseries(
- ROOT_SG1_D1_S3, TSDataType.INT64, TSEncoding.RLE,
CompressionType.SNAPPY);
+ ROOT_DB1_D1_S3, TSDataType.INT64, TSEncoding.RLE,
CompressionType.SNAPPY);
}
// create timeseries with tags and attributes
- if (!session.checkTimeseriesExists(ROOT_SG1_D1_S4)) {
+ if (!session.checkTimeseriesExists(ROOT_DB1_D1_S4)) {
Map<String, String> tags = new HashMap<>();
tags.put("tag1", "v1");
Map<String, String> attributes = new HashMap<>();
attributes.put("description", "v1");
session.createTimeseries(
- ROOT_SG1_D1_S4,
+ ROOT_DB1_D1_S4,
TSDataType.INT64,
TSEncoding.RLE,
CompressionType.SNAPPY,
@@ -181,7 +181,7 @@ public class SessionExample {
}
// create timeseries with SDT property, SDT will take place when flushing
- if (!session.checkTimeseriesExists(ROOT_SG1_D1_S5)) {
+ if (!session.checkTimeseriesExists(ROOT_DB1_D1_S5)) {
// COMPDEV is required
// COMPMAXTIME and COMPMINTIME are optional and their unit is ms
Map<String, String> props = new HashMap<>();
@@ -190,7 +190,7 @@ public class SessionExample {
props.put("COMPMINTIME", "2");
props.put("COMPMAXTIME", "10");
session.createTimeseries(
- ROOT_SG1_D1_S5,
+ ROOT_DB1_D1_S5,
TSDataType.INT64,
TSEncoding.RLE,
CompressionType.SNAPPY,
@@ -308,7 +308,7 @@ public class SessionExample {
}
private static void insertRecord() throws IoTDBConnectionException,
StatementExecutionException {
- String deviceId = ROOT_SG1_D1;
+ String deviceId = ROOT_DB1_D1;
List<String> measurements = new ArrayList<>();
List<TSDataType> types = new ArrayList<>();
measurements.add("s1");
@@ -354,7 +354,7 @@ public class SessionExample {
private static void insertStrRecord()
throws IoTDBConnectionException, StatementExecutionException {
- String deviceId = ROOT_SG1_D1;
+ String deviceId = ROOT_DB1_D1;
List<String> measurements = new ArrayList<>();
measurements.add("s1");
measurements.add("s2");
@@ -371,7 +371,7 @@ public class SessionExample {
private static void insertRecordInObject()
throws IoTDBConnectionException, StatementExecutionException {
- String deviceId = ROOT_SG1_D1;
+ String deviceId = ROOT_DB1_D1;
List<String> measurements = new ArrayList<>();
List<TSDataType> types = new ArrayList<>();
measurements.add("s1");
@@ -387,7 +387,7 @@ public class SessionExample {
}
private static void insertRecords() throws IoTDBConnectionException,
StatementExecutionException {
- String deviceId = ROOT_SG1_D1;
+ String deviceId = ROOT_DB1_D1;
List<String> measurements = new ArrayList<>();
measurements.add("s1");
measurements.add("s2");
@@ -447,7 +447,7 @@ public class SessionExample {
schemaList.add(new MeasurementSchema("s2", TSDataType.INT64));
schemaList.add(new MeasurementSchema("s3", TSDataType.INT64));
- Tablet tablet = new Tablet(ROOT_SG1_D1, schemaList, 100);
+ Tablet tablet = new Tablet(ROOT_DB1_D1, schemaList, 100);
long timestamp = System.currentTimeMillis();
@@ -488,7 +488,7 @@ public class SessionExample {
schemaList.add(new MeasurementSchema("s2", TSDataType.INT64));
schemaList.add(new MeasurementSchema("s3", TSDataType.INT64));
- Tablet tablet = new Tablet(ROOT_SG1_D1, schemaList, 100);
+ Tablet tablet = new Tablet(ROOT_DB1_D1, schemaList, 100);
long timestamp = System.currentTimeMillis();
@@ -543,7 +543,7 @@ public class SessionExample {
schemaList.add(new MeasurementSchema("s2", TSDataType.INT64));
schemaList.add(new MeasurementSchema("s3", TSDataType.INT64));
- Tablet tablet = new Tablet(ROOT_SG1_D1, schemaList, 100);
+ Tablet tablet = new Tablet(ROOT_DB1_D1, schemaList, 100);
insertTablet1(schemaList, tablet);
}
@@ -583,12 +583,12 @@ public class SessionExample {
schemaList.add(new MeasurementSchema("s2", TSDataType.INT64));
schemaList.add(new MeasurementSchema("s3", TSDataType.INT64));
- Tablet tablet1 = new Tablet(ROOT_SG1_D1, schemaList, 100);
+ Tablet tablet1 = new Tablet(ROOT_DB1_D1, schemaList, 100);
Tablet tablet2 = new Tablet("root.db1.d2", schemaList, 100);
Tablet tablet3 = new Tablet("root.sg1.d3", schemaList, 100);
Map<String, Tablet> tabletMap = new HashMap<>();
- tabletMap.put(ROOT_SG1_D1, tablet1);
+ tabletMap.put(ROOT_DB1_D1, tablet1);
tabletMap.put("root.sg1.d2", tablet2);
tabletMap.put("root.sg1.d3", tablet3);
@@ -675,7 +675,7 @@ public class SessionExample {
}
private static void deleteData() throws IoTDBConnectionException,
StatementExecutionException {
- String path = ROOT_SG1_D1_S1;
+ String path = ROOT_DB1_D1_S1;
long deleteTime = 99;
session.deleteData(path, deleteTime);
}
@@ -683,9 +683,9 @@ public class SessionExample {
private static void deleteTimeseries()
throws IoTDBConnectionException, StatementExecutionException {
List<String> paths = new ArrayList<>();
- paths.add(ROOT_SG1_D1_S1);
- paths.add(ROOT_SG1_D1_S2);
- paths.add(ROOT_SG1_D1_S3);
+ paths.add(ROOT_DB1_D1_S1);
+ paths.add(ROOT_DB1_D1_S2);
+ paths.add(ROOT_DB1_D1_S3);
session.deleteTimeseries(paths);
}
@@ -740,9 +740,9 @@ public class SessionExample {
private static void rawDataQuery() throws IoTDBConnectionException,
StatementExecutionException {
List<String> paths = new ArrayList<>();
- paths.add(ROOT_SG1_D1_S1);
- paths.add(ROOT_SG1_D1_S2);
- paths.add(ROOT_SG1_D1_S3);
+ paths.add(ROOT_DB1_D1_S1);
+ paths.add(ROOT_DB1_D1_S2);
+ paths.add(ROOT_DB1_D1_S3);
long startTime = 10L;
long endTime = 200L;
long timeOut = 60000;
@@ -754,9 +754,9 @@ public class SessionExample {
private static void lastDataQuery() throws IoTDBConnectionException,
StatementExecutionException {
List<String> paths = new ArrayList<>();
- paths.add(ROOT_SG1_D1_S1);
- paths.add(ROOT_SG1_D1_S2);
- paths.add(ROOT_SG1_D1_S3);
+ paths.add(ROOT_DB1_D1_S1);
+ paths.add(ROOT_DB1_D1_S2);
+ paths.add(ROOT_DB1_D1_S3);
try (SessionDataSet dataSet = session.executeLastDataQuery(paths, 3,
60000)) {
printDataSet(dataSet);
}
@@ -771,7 +771,7 @@ public class SessionExample {
paths.add("s3");
try (SessionDataSet dataSet =
sessionEnableRedirect.executeLastDataQueryForOneDevice(
- ROOT_SG1, ROOT_SG1_D1, paths, true)) {
+ ROOT_DB1, ROOT_DB1_D1, paths, true)) {
printDataSet(dataSet);
}
}
@@ -789,9 +789,9 @@ public class SessionExample {
private static void aggregationQuery()
throws IoTDBConnectionException, StatementExecutionException {
List<String> paths = new ArrayList<>();
- paths.add(ROOT_SG1_D1_S1);
- paths.add(ROOT_SG1_D1_S2);
- paths.add(ROOT_SG1_D1_S3);
+ paths.add(ROOT_DB1_D1_S1);
+ paths.add(ROOT_DB1_D1_S2);
+ paths.add(ROOT_DB1_D1_S3);
List<TAggregationType> aggregations = new ArrayList<>();
aggregations.add(TAggregationType.COUNT);
@@ -804,8 +804,8 @@ public class SessionExample {
private static void groupByQuery() throws IoTDBConnectionException,
StatementExecutionException {
List<String> paths = new ArrayList<>();
- paths.add(ROOT_SG1_D1_S1);
- paths.add(ROOT_SG1_D1_S2);
+ paths.add(ROOT_DB1_D1_S1);
+ paths.add(ROOT_DB1_D1_S2);
paths.add(ROOT_SG1_D1_S3);
List<TAggregationType> aggregations = new ArrayList<>();
diff --git
a/example/session/src/main/java/org/apache/iotdb/SyntaxConventionRelatedExample.java
b/example/session/src/main/java/org/apache/iotdb/SyntaxConventionRelatedExample.java
index caa1dcbda6a..53066a214d7 100644
---
a/example/session/src/main/java/org/apache/iotdb/SyntaxConventionRelatedExample.java
+++
b/example/session/src/main/java/org/apache/iotdb/SyntaxConventionRelatedExample.java
@@ -54,28 +54,28 @@ public class SyntaxConventionRelatedExample {
* when using session API, path is represented using String. The path should
be written as
* "root.db1.select".
*/
- private static final String ROOT_SG1_KEYWORD_EXAMPLE = "root.db1.select";
+ private static final String ROOT_DB1_KEYWORD_EXAMPLE = "root.db1.select";
/**
* if you want to create a time series named root.db1.111, a possible SQL
statement would be like:
* create timeseries root.db1.`111` with datatype=FLOAT, encoding=RLE The
path should be written
* as "root.db1.`111`".
*/
- private static final String ROOT_SG1_DIGITS_EXAMPLE = "root.db1.`111`";
+ private static final String ROOT_DB1_DIGITS_EXAMPLE = "root.db1.`111`";
/**
* if you want to create a time series named root.db1.`a"b'c``, a possible
SQL statement would be
* like: create timeseries root.db1.`a"b'c``` with datatype=FLOAT,
encoding=RLE The path should be
* written as "root.db1.`a"b`c```".
*/
- private static final String ROOT_SG1_SPECIAL_CHARACTER_EXAMPLE =
"root.db1.`a\"b'c```";
+ private static final String ROOT_DB1_SPECIAL_CHARACTER_EXAMPLE =
"root.db1.`a\"b'c```";
/**
* if you want to create a time series named root.db1.a, a possible SQL
statement would be like:
* create timeseries root.sg1.a with datatype=FLOAT, encoding=RLE The path
should be written as
* "root.sg1.a".
*/
- private static final String ROOT_SG1_NORMAL_NODE_EXAMPLE = "root.sg1.a";
+ private static final String ROOT_DB1_NORMAL_NODE_EXAMPLE = "root.sg1.a";
public static void main(String[] args)
throws IoTDBConnectionException, StatementExecutionException {
@@ -133,24 +133,24 @@ public class SyntaxConventionRelatedExample {
private static void createTimeSeries()
throws IoTDBConnectionException, StatementExecutionException {
- if (!session.checkTimeseriesExists(ROOT_SG1_KEYWORD_EXAMPLE)) {
+ if (!session.checkTimeseriesExists(ROOT_DB1_KEYWORD_EXAMPLE)) {
session.createTimeseries(
- ROOT_SG1_KEYWORD_EXAMPLE, TSDataType.FLOAT, TSEncoding.RLE,
CompressionType.SNAPPY);
+ ROOT_DB1_KEYWORD_EXAMPLE, TSDataType.FLOAT, TSEncoding.RLE,
CompressionType.SNAPPY);
}
- if (!session.checkTimeseriesExists(ROOT_SG1_DIGITS_EXAMPLE)) {
+ if (!session.checkTimeseriesExists(ROOT_DB1_DIGITS_EXAMPLE)) {
session.createTimeseries(
- ROOT_SG1_DIGITS_EXAMPLE, TSDataType.FLOAT, TSEncoding.RLE,
CompressionType.SNAPPY);
+ ROOT_DB1_DIGITS_EXAMPLE, TSDataType.FLOAT, TSEncoding.RLE,
CompressionType.SNAPPY);
}
- if (!session.checkTimeseriesExists(ROOT_SG1_SPECIAL_CHARACTER_EXAMPLE)) {
+ if (!session.checkTimeseriesExists(ROOT_DB1_SPECIAL_CHARACTER_EXAMPLE)) {
session.createTimeseries(
- ROOT_SG1_SPECIAL_CHARACTER_EXAMPLE,
+ ROOT_DB1_SPECIAL_CHARACTER_EXAMPLE,
TSDataType.FLOAT,
TSEncoding.RLE,
CompressionType.SNAPPY);
}
- if (!session.checkTimeseriesExists(ROOT_SG1_NORMAL_NODE_EXAMPLE)) {
+ if (!session.checkTimeseriesExists(ROOT_DB1_NORMAL_NODE_EXAMPLE)) {
session.createTimeseries(
- ROOT_SG1_NORMAL_NODE_EXAMPLE, TSDataType.FLOAT, TSEncoding.RLE,
CompressionType.SNAPPY);
+ ROOT_DB1_NORMAL_NODE_EXAMPLE, TSDataType.FLOAT, TSEncoding.RLE,
CompressionType.SNAPPY);
}
}
}
diff --git
a/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionAlignedInsertIT.java
b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionAlignedInsertIT.java
index 2340cf3f326..08858e0a53f 100644
---
a/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionAlignedInsertIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionAlignedInsertIT.java
@@ -48,9 +48,9 @@ import static org.junit.Assert.fail;
@Category({LocalStandaloneIT.class, ClusterIT.class})
public class IoTDBSessionAlignedInsertIT {
- private static final String ROOT_SG1_D1_VECTOR1 = "root.sg_1.d1.vector";
- private static final String ROOT_SG1_D1 = "root.sg_1.d1";
- private static final String ROOT_SG1_D2 = "root.sg_1.d2";
+ private static final String ROOT_DB1_D1_VECTOR1 = "root.sg_1.d1.vector";
+ private static final String ROOT_DB1_D1 = "root.sg_1.d1";
+ private static final String ROOT_DB1_D2 = "root.sg_1.d2";
private static final double DELTA_DOUBLE = 1e-7d;
@Before
@@ -72,8 +72,8 @@ public class IoTDBSessionAlignedInsertIT {
SessionDataSet dataSet = session.executeQueryStatement("select * from
root.sg_1.d1.vector");
assertEquals(dataSet.getColumnNames().size(), 3);
assertEquals(dataSet.getColumnNames().get(0), "Time");
- assertEquals(dataSet.getColumnNames().get(1), ROOT_SG1_D1_VECTOR1 +
".s1");
- assertEquals(dataSet.getColumnNames().get(2), ROOT_SG1_D1_VECTOR1 +
".s2");
+ assertEquals(dataSet.getColumnNames().get(1), ROOT_DB1_D1_VECTOR1 +
".s1");
+ assertEquals(dataSet.getColumnNames().get(2), ROOT_DB1_D1_VECTOR1 +
".s2");
long time = 0;
while (dataSet.hasNext()) {
RowRecord rowRecord = dataSet.next();
@@ -116,12 +116,12 @@ public class IoTDBSessionAlignedInsertIT {
@Test
public void insertAlignedRecordTest() {
try (ISession session = EnvFactory.getEnv().getSessionConnection()) {
- insertAlignedRecord(session, ROOT_SG1_D1_VECTOR1);
+ insertAlignedRecord(session, ROOT_DB1_D1_VECTOR1);
session.executeNonQueryStatement("flush");
SessionDataSet dataSet = session.executeQueryStatement("select s2 from
root.sg_1.d1.vector");
assertEquals(2, dataSet.getColumnNames().size());
assertEquals("Time", dataSet.getColumnNames().get(0));
- assertEquals(dataSet.getColumnNames().get(1), ROOT_SG1_D1_VECTOR1 +
".s2");
+ assertEquals(dataSet.getColumnNames().get(1), ROOT_DB1_D1_VECTOR1 +
".s2");
long time = 0;
while (dataSet.hasNext()) {
RowRecord rowRecord = dataSet.next();
@@ -140,12 +140,12 @@ public class IoTDBSessionAlignedInsertIT {
@Test
public void insertAlignedStringRecordTest() {
try (ISession session = EnvFactory.getEnv().getSessionConnection()) {
- insertAlignedStringRecord(session, ROOT_SG1_D1_VECTOR1);
+ insertAlignedStringRecord(session, ROOT_DB1_D1_VECTOR1);
session.executeNonQueryStatement("flush");
SessionDataSet dataSet = session.executeQueryStatement("select s2 from
root.sg_1.d1.vector");
assertEquals(2, dataSet.getColumnNames().size());
assertEquals("Time", dataSet.getColumnNames().get(0));
- assertEquals(ROOT_SG1_D1_VECTOR1 + ".s2",
dataSet.getColumnNames().get(1));
+ assertEquals(ROOT_DB1_D1_VECTOR1 + ".s2",
dataSet.getColumnNames().get(1));
long time = 0;
while (dataSet.hasNext()) {
RowRecord rowRecord = dataSet.next();
@@ -164,12 +164,12 @@ public class IoTDBSessionAlignedInsertIT {
@Test
public void insertAlignedStringRecordsTest() {
try (ISession session = EnvFactory.getEnv().getSessionConnection()) {
- insertAlignedStringRecords(session, ROOT_SG1_D1_VECTOR1);
+ insertAlignedStringRecords(session, ROOT_DB1_D1_VECTOR1);
session.executeNonQueryStatement("flush");
SessionDataSet dataSet = session.executeQueryStatement("select s2 from
root.sg_1.d1.vector");
assertEquals(2, dataSet.getColumnNames().size());
assertEquals("Time", dataSet.getColumnNames().get(0));
- assertEquals(dataSet.getColumnNames().get(1), ROOT_SG1_D1_VECTOR1 +
".s2");
+ assertEquals(dataSet.getColumnNames().get(1), ROOT_DB1_D1_VECTOR1 +
".s2");
long time = 0;
while (dataSet.hasNext()) {
RowRecord rowRecord = dataSet.next();
@@ -188,12 +188,12 @@ public class IoTDBSessionAlignedInsertIT {
@Test
public void insertAlignedRecordsTest() {
try (ISession session = EnvFactory.getEnv().getSessionConnection()) {
- insertAlignedRecords(session, ROOT_SG1_D1_VECTOR1);
+ insertAlignedRecords(session, ROOT_DB1_D1_VECTOR1);
session.executeNonQueryStatement("flush");
SessionDataSet dataSet = session.executeQueryStatement("select s2 from
root.sg_1.d1.vector");
assertEquals(2, dataSet.getColumnNames().size());
assertEquals("Time", dataSet.getColumnNames().get(0));
- assertEquals(dataSet.getColumnNames().get(1), ROOT_SG1_D1_VECTOR1 +
".s2");
+ assertEquals(dataSet.getColumnNames().get(1), ROOT_DB1_D1_VECTOR1 +
".s2");
long time = 0;
while (dataSet.hasNext()) {
RowRecord rowRecord = dataSet.next();
@@ -212,12 +212,12 @@ public class IoTDBSessionAlignedInsertIT {
@Test
public void insertAlignedRecordsOfOneDeviceTest() {
try (ISession session = EnvFactory.getEnv().getSessionConnection()) {
- insertAlignedRecordsOfOneDevice(session, ROOT_SG1_D1_VECTOR1);
+ insertAlignedRecordsOfOneDevice(session, ROOT_DB1_D1_VECTOR1);
session.executeNonQueryStatement("flush");
SessionDataSet dataSet = session.executeQueryStatement("select s2 from
root.sg_1.d1.vector");
assertEquals(2, dataSet.getColumnNames().size());
assertEquals("Time", dataSet.getColumnNames().get(0));
- assertEquals(dataSet.getColumnNames().get(1), ROOT_SG1_D1_VECTOR1 +
".s2");
+ assertEquals(dataSet.getColumnNames().get(1), ROOT_DB1_D1_VECTOR1 +
".s2");
long time = 0;
while (dataSet.hasNext()) {
RowRecord rowRecord = dataSet.next();
@@ -236,14 +236,14 @@ public class IoTDBSessionAlignedInsertIT {
@Test
public void nonAlignedSingleSelectTest() {
try (ISession session = EnvFactory.getEnv().getSessionConnection()) {
- insertNonAlignedRecord(session, ROOT_SG1_D1);
+ insertNonAlignedRecord(session, ROOT_DB1_D1);
insertTabletWithAlignedTimeseriesMethod(session);
- insertNonAlignedRecord(session, ROOT_SG1_D2);
+ insertNonAlignedRecord(session, ROOT_DB1_D2);
session.executeNonQueryStatement("flush");
SessionDataSet dataSet = session.executeQueryStatement("select s2 from
root.sg_1.d1.vector");
assertEquals(2, dataSet.getColumnNames().size());
assertEquals("Time", dataSet.getColumnNames().get(0));
- assertEquals(dataSet.getColumnNames().get(1), ROOT_SG1_D1_VECTOR1 +
".s2");
+ assertEquals(dataSet.getColumnNames().get(1), ROOT_DB1_D1_VECTOR1 +
".s2");
long time = 0;
while (dataSet.hasNext()) {
RowRecord rowRecord = dataSet.next();
@@ -262,15 +262,15 @@ public class IoTDBSessionAlignedInsertIT {
@Test
public void nonAlignedVectorSelectTest() {
try (ISession session = EnvFactory.getEnv().getSessionConnection()) {
- insertNonAlignedRecord(session, ROOT_SG1_D1);
+ insertNonAlignedRecord(session, ROOT_DB1_D1);
insertTabletWithAlignedTimeseriesMethod(session);
- insertNonAlignedRecord(session, ROOT_SG1_D2);
+ insertNonAlignedRecord(session, ROOT_DB1_D2);
session.executeNonQueryStatement("flush");
SessionDataSet dataSet = session.executeQueryStatement("select * from
root.sg_1.d1.vector");
assertEquals(3, dataSet.getColumnNames().size());
assertEquals("Time", dataSet.getColumnNames().get(0));
- assertEquals(ROOT_SG1_D1_VECTOR1 + ".s1",
dataSet.getColumnNames().get(1));
- assertEquals(ROOT_SG1_D1_VECTOR1 + ".s2",
dataSet.getColumnNames().get(2));
+ assertEquals(ROOT_DB1_D1_VECTOR1 + ".s1",
dataSet.getColumnNames().get(1));
+ assertEquals(ROOT_DB1_D1_VECTOR1 + ".s2",
dataSet.getColumnNames().get(2));
long time = 0;
while (dataSet.hasNext()) {
RowRecord rowRecord = dataSet.next();
@@ -296,7 +296,7 @@ public class IoTDBSessionAlignedInsertIT {
schemaList.add(new MeasurementSchema("s1", TSDataType.INT64));
schemaList.add(new MeasurementSchema("s2", TSDataType.INT32));
- Tablet tablet = new Tablet(ROOT_SG1_D1_VECTOR1, schemaList);
+ Tablet tablet = new Tablet(ROOT_DB1_D1_VECTOR1, schemaList);
long timestamp = 0;
for (long row = 0; row < 100; row++) {
