You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by zy...@apache.org on 2023/02/17 06:08:17 UTC
[iotdb] branch rel/0.13 updated: [To rel/0.13] Fix alias check when CreateAlignedTimeSeries (#9082)
This is an automated email from the ASF dual-hosted git repository.
zyk pushed a commit to branch rel/0.13
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/0.13 by this push:
new d09657eb97 [To rel/0.13] Fix alias check when CreateAlignedTimeSeries (#9082)
d09657eb97 is described below
commit d09657eb977f7b5224fecee950fdbb63edb26c77
Author: Marcos_Zyk <38...@users.noreply.github.com>
AuthorDate: Fri Feb 17 14:08:11 2023 +0800
[To rel/0.13] Fix alias check when CreateAlignedTimeSeries (#9082)
---
server/src/main/java/org/apache/iotdb/db/metadata/MManager.java | 5 +++++
.../apache/iotdb/db/qp/physical/sys/CreateAlignedTimeSeriesPlan.java | 4 ++--
.../java/org/apache/iotdb/db/service/thrift/impl/TSServiceImpl.java | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java b/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
index a4f9dadbb5..4b032b351f 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
@@ -695,6 +695,11 @@ public class MManager {
}
int seriesCount = plan.getMeasurements().size();
+ List<String> aliasList = plan.getAliasList();
+ if (aliasList != null && !aliasList.isEmpty() && aliasList.size() != seriesCount) {
+ throw new MetadataException("The size of alias list must equals num of measurements.");
+ }
+
if (seriesNumerMonitor != null && !seriesNumerMonitor.addTimeSeries(seriesCount)) {
throw new SeriesNumberOverflowException();
}
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateAlignedTimeSeriesPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateAlignedTimeSeriesPlan.java
index 2e9f408a1b..7d935e0b29 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateAlignedTimeSeriesPlan.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateAlignedTimeSeriesPlan.java
@@ -161,7 +161,7 @@ public class CreateAlignedTimeSeriesPlan extends PhysicalPlan {
}
// alias
- if (aliasList != null) {
+ if (aliasList != null && !aliasList.isEmpty()) {
stream.write(1);
for (String alias : aliasList) {
ReadWriteIOUtils.write(alias, stream);
@@ -194,7 +194,7 @@ public class CreateAlignedTimeSeriesPlan extends PhysicalPlan {
}
// alias
- if (aliasList != null) {
+ if (aliasList != null && !aliasList.isEmpty()) {
buffer.put((byte) 1);
for (String alias : aliasList) {
ReadWriteIOUtils.write(alias, buffer);
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 20984d4459..ad9e992faa 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
@@ -1789,7 +1789,7 @@ public class TSServiceImpl implements TSIService.Iface {
dataTypes,
encodings,
compressors,
- req.measurementAlias);
+ null);
TSStatus status = serviceProvider.checkAuthority(plan, session);
return status != null ? status : executeNonQueryPlan(plan);
} catch (IoTDBException e) {