[incubator-iotdb] branch rel/0.10 updated: fix measurementId with comma (#1689)

[qiaojialin]

This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch rel/0.10
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git


The following commit(s) were added to refs/heads/rel/0.10 by this push:
     new 0724d6e  fix measurementId with comma (#1689)
0724d6e is described below

commit 0724d6e35ce51f913c21dacd331ba243f99845c0
Author: Haonan <hhao...@outlook.com>
AuthorDate: Sat Sep 5 14:02:47 2020 +0800

    fix measurementId with comma (#1689)
---
 .../org/apache/iotdb/db/metadata/MManager.java     | 22 ++++++++++++++++++++++
 .../apache/iotdb/db/qp/executor/PlanExecutor.java  |  4 ++--
 2 files changed, 24 insertions(+), 2 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 cb2a2fb..d510e2c 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
@@ -232,6 +232,20 @@ public class MManager {
     String[] args = cmd.trim().split(",", -1);
     switch (args[0]) {
       case MetadataOperationType.CREATE_TIMESERIES:
+        if (args.length > 8) {
+          String[] tmpArgs = new String[8];
+          tmpArgs[0] = args[0];
+          int i = 1;
+          tmpArgs[1] = "";
+          for (; i < args.length - 7; i++) {
+            tmpArgs[1] += args[i] + ",";
+          }
+          tmpArgs[1] += args[i++];
+          for (int j = 2; j < 8; j++) {
+            tmpArgs[j] = args[i++];
+          }
+          args = tmpArgs;
+        }
         Map<String, String> props = new HashMap<>();
         if (!args[5].isEmpty()) {
           String[] keyValues = args[5].split("&");
@@ -261,6 +275,14 @@ public class MManager {
         createTimeseries(plan, offset);
         break;
       case MetadataOperationType.DELETE_TIMESERIES:
+        if (args.length > 2) {
+          String tmp = "";
+          for (int i = 1; i < args.length - 1; i++) {
+            tmp += args[i] + ",";
+          }
+          tmp += args[args.length];
+          args[1] = tmp;
+        }
         String failedTimeseries = deleteTimeseries(args[1]);
         if (!failedTimeseries.isEmpty()) {
           throw new DeleteFailedException(failedTimeseries);
diff --git 
a/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java 
b/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java
index 875d339..c087da2 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java
@@ -908,8 +908,8 @@ public class PlanExecutor implements IPlanExecutor {
           if (!insertPlan.isInferType()) {
             checkType(insertPlan, i, measurementNode.getSchema().getType());
           }
-        } catch (MetadataException e) {
-          logger.warn("meet error when check {}.{}, message: {}", deviceId, 
measurement, e.getMessage());
+        } catch (Exception e) {
+          logger.error("meet error when check {}.{}, message: {}", deviceId, 
measurement, e.getMessage());
           if (enablePartialInsert) {
             insertPlan.markMeasurementInsertionFailed(i);
           } else {