You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2022/08/24 03:01:36 UTC
[iotdb] branch iotdb4216 created (now e71183245f)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a change to branch iotdb4216
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at e71183245f [IOTDB-4216] Fix execute Create aligned timeseries but a non-aligned timeseries created
This branch includes the following new commits:
new e71183245f [IOTDB-4216] Fix execute Create aligned timeseries but a non-aligned timeseries created
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[iotdb] 01/01: [IOTDB-4216] Fix execute Create aligned timeseries but a non-aligned timeseries created
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch iotdb4216
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit e71183245f411e205fd882b0037b2b53a30c6070
Author: HTHou <hh...@outlook.com>
AuthorDate: Wed Aug 24 11:01:18 2022 +0800
[IOTDB-4216] Fix execute Create aligned timeseries but a non-aligned timeseries created
---
.../iotdb/AlignedTimeseriesSessionExample.java | 84 ++++++++++------------
.../service/thrift/impl/ClientRPCServiceImpl.java | 11 ---
.../db/service/thrift/impl/TSServiceImpl.java | 11 ---
3 files changed, 38 insertions(+), 68 deletions(-)
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 aa52ed2124..5d9b8cedda 100644
--- a/example/session/src/main/java/org/apache/iotdb/AlignedTimeseriesSessionExample.java
+++ b/example/session/src/main/java/org/apache/iotdb/AlignedTimeseriesSessionExample.java
@@ -66,7 +66,7 @@ public class AlignedTimeseriesSessionExample {
insertAlignedRecord();
// insertAlignedRecords();
- // insertAlignedRecordsOfOneDevices();
+ // insertAlignedRecordsOfOneDevice();
// insertAlignedStringRecord();
// insertAlignedStringRecords();
@@ -257,9 +257,9 @@ public class AlignedTimeseriesSessionExample {
private static void createAlignedTimeseries()
throws StatementExecutionException, IoTDBConnectionException {
- List<String> multiMeasurementComponents = new ArrayList<>();
+ List<String> measurements = new ArrayList<>();
for (int i = 1; i <= 2; i++) {
- multiMeasurementComponents.add("s" + i);
+ measurements.add("s" + i);
}
List<TSDataType> dataTypes = new ArrayList<>();
dataTypes.add(TSDataType.INT64);
@@ -271,14 +271,7 @@ public class AlignedTimeseriesSessionExample {
compressors.add(CompressionType.SNAPPY);
}
session.createAlignedTimeseries(
- ROOT_SG1_D1,
- multiMeasurementComponents,
- dataTypes,
- encodings,
- compressors,
- null,
- null,
- null);
+ ROOT_SG1_D1, measurements, dataTypes, encodings, compressors, null, null, null);
}
// be sure template is coordinate with tablet
@@ -421,10 +414,10 @@ public class AlignedTimeseriesSessionExample {
private static void insertAlignedRecord()
throws IoTDBConnectionException, StatementExecutionException {
// first file we have both sensots' data
- List<String> multiMeasurementComponents = new ArrayList<>();
+ List<String> measurements = new ArrayList<>();
List<TSDataType> types = new ArrayList<>();
- multiMeasurementComponents.add("s1");
- multiMeasurementComponents.add("s2");
+ measurements.add("s1");
+ measurements.add("s2");
types.add(TSDataType.INT64);
types.add(TSDataType.INT32);
@@ -432,47 +425,47 @@ public class AlignedTimeseriesSessionExample {
List<Object> values = new ArrayList<>();
values.add(time);
values.add((int) time);
- session.insertAlignedRecord(ROOT_SG1_D1, time, multiMeasurementComponents, types, values);
+ session.insertAlignedRecord(ROOT_SG1_D1, time, measurements, types, values);
}
session.executeNonQueryStatement("flush");
// second file we only have s1's data
- multiMeasurementComponents.clear();
+ measurements.clear();
types.clear();
- multiMeasurementComponents.add("s1");
+ measurements.add("s1");
types.add(TSDataType.INT64);
for (long time = 10; time < 20; time++) {
List<Object> values = new ArrayList<>();
values.add(time);
- session.insertAlignedRecord(ROOT_SG1_D1, time, multiMeasurementComponents, types, values);
+ session.insertAlignedRecord(ROOT_SG1_D1, time, measurements, types, values);
}
}
private static void insertAlignedStringRecord()
throws IoTDBConnectionException, StatementExecutionException {
- List<String> multiMeasurementComponents = new ArrayList<>();
- multiMeasurementComponents.add("s1");
- multiMeasurementComponents.add("s2");
+ List<String> measurements = new ArrayList<>();
+ measurements.add("s1");
+ measurements.add("s2");
for (long time = 0; time < 1; time++) {
List<String> values = new ArrayList<>();
values.add("3");
values.add("4");
- session.insertAlignedRecord(ROOT_SG2_D1_VECTOR5, time, multiMeasurementComponents, values);
+ session.insertAlignedRecord(ROOT_SG2_D1_VECTOR5, time, measurements, values);
}
}
private static void insertAlignedRecords()
throws IoTDBConnectionException, StatementExecutionException {
- List<String> multiSeriesIds = new ArrayList<>();
- List<List<String>> multiMeasurementComponentsList = new ArrayList<>();
+ List<String> deviceIds = new ArrayList<>();
+ List<List<String>> measurementsList = new ArrayList<>();
List<List<TSDataType>> typeList = new ArrayList<>();
List<Long> times = new ArrayList<>();
List<List<Object>> valueList = new ArrayList<>();
for (long time = 1; time < 5; time++) {
- List<String> multiMeasurementComponents = new ArrayList<>();
- multiMeasurementComponents.add("s1");
- multiMeasurementComponents.add("s2");
+ List<String> measurements = new ArrayList<>();
+ measurements.add("s1");
+ measurements.add("s2");
List<TSDataType> types = new ArrayList<>();
types.add(TSDataType.INT64);
@@ -482,51 +475,50 @@ public class AlignedTimeseriesSessionExample {
values.add(1L);
values.add(2);
- multiSeriesIds.add(ROOT_SG2_D1_VECTOR4);
+ deviceIds.add(ROOT_SG2_D1_VECTOR4);
times.add(time);
- multiMeasurementComponentsList.add(multiMeasurementComponents);
+ measurementsList.add(measurements);
typeList.add(types);
valueList.add(values);
}
- session.insertAlignedRecords(
- multiSeriesIds, times, multiMeasurementComponentsList, typeList, valueList);
+ session.insertAlignedRecords(deviceIds, times, measurementsList, typeList, valueList);
}
private static void insertAlignedStringRecords()
throws IoTDBConnectionException, StatementExecutionException {
- List<String> multiSeriesIds = new ArrayList<>();
- List<List<String>> multiMeasurementComponentsList = new ArrayList<>();
+ List<String> deviceIds = new ArrayList<>();
+ List<List<String>> measurementsList = new ArrayList<>();
List<Long> times = new ArrayList<>();
List<List<String>> valueList = new ArrayList<>();
for (long time = 1; time < 5; time++) {
- List<String> multiMeasurementComponents = new ArrayList<>();
- multiMeasurementComponents.add("s1");
- multiMeasurementComponents.add("s2");
+ List<String> measurements = new ArrayList<>();
+ measurements.add("s1");
+ measurements.add("s2");
List<String> values = new ArrayList<>();
values.add("3");
values.add("4");
- multiSeriesIds.add(ROOT_SG2_D1_VECTOR5);
+ deviceIds.add(ROOT_SG2_D1_VECTOR5);
times.add(time);
- multiMeasurementComponentsList.add(multiMeasurementComponents);
+ measurementsList.add(measurements);
valueList.add(values);
}
- session.insertAlignedRecords(multiSeriesIds, times, multiMeasurementComponentsList, valueList);
+ session.insertAlignedRecords(deviceIds, times, measurementsList, valueList);
}
- private static void insertAlignedRecordsOfOneDevices()
+ private static void insertAlignedRecordsOfOneDevice()
throws IoTDBConnectionException, StatementExecutionException {
- List<List<String>> multiMeasurementComponentsList = new ArrayList<>();
+ List<List<String>> measurementsList = new ArrayList<>();
List<List<TSDataType>> typeList = new ArrayList<>();
List<Long> times = new ArrayList<>();
List<List<Object>> valueList = new ArrayList<>();
for (long time = 10; time < 15; time++) {
- List<String> multiMeasurementComponents = new ArrayList<>();
- multiMeasurementComponents.add("s1");
- multiMeasurementComponents.add("s2");
+ List<String> measurements = new ArrayList<>();
+ measurements.add("s1");
+ measurements.add("s2");
List<TSDataType> types = new ArrayList<>();
types.add(TSDataType.INT64);
@@ -537,12 +529,12 @@ public class AlignedTimeseriesSessionExample {
values.add(2);
times.add(time);
- multiMeasurementComponentsList.add(multiMeasurementComponents);
+ measurementsList.add(measurements);
typeList.add(types);
valueList.add(values);
}
session.insertAlignedRecordsOfOneDevice(
- ROOT_SG2_D1_VECTOR4, times, multiMeasurementComponentsList, typeList, valueList);
+ ROOT_SG2_D1_VECTOR4, times, measurementsList, typeList, valueList);
}
private static void insertTabletsWithAlignedTimeseries()
diff --git a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java
index f8511ce804..c5b75f3bab 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java
@@ -385,17 +385,6 @@ public class ClientRPCServiceImpl implements IClientRPCServiceWithHandler {
return getNotLoggedInStatus();
}
- // if measurements.size() == 1, convert to create timeseries
- if (req.measurements.size() == 1) {
- return createTimeseries(
- new TSCreateTimeseriesReq(
- req.sessionId,
- req.prefixPath + "." + req.measurements.get(0),
- req.dataTypes.get(0),
- req.encodings.get(0),
- req.compressors.get(0)));
- }
-
if (AUDIT_LOGGER.isDebugEnabled()) {
AUDIT_LOGGER.debug(
"Session-{} create aligned timeseries {}.{}",
diff --git a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/TSServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/TSServiceImpl.java
index 55aa206c5b..c439813c1f 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/TSServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/TSServiceImpl.java
@@ -1750,17 +1750,6 @@ public class TSServiceImpl implements IClientRPCServiceWithHandler {
return getNotLoggedInStatus();
}
- // if measurements.size() == 1, convert to create timeseries
- if (req.measurements.size() == 1) {
- return createTimeseries(
- new TSCreateTimeseriesReq(
- req.sessionId,
- req.prefixPath + "." + req.measurements.get(0),
- req.dataTypes.get(0),
- req.encodings.get(0),
- req.compressors.get(0)));
- }
-
// check whether measurement is legal according to syntax convention
PathUtils.isLegalSingleMeasurements(req.getMeasurements());