[incubator-iotdb] branch rel/0.9 updated: [To rel/0.9] fix null message in thrift TSStatusType (#1210)

[qiaojialin]

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

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


The following commit(s) were added to refs/heads/rel/0.9 by this push:
     new b99c6ee  [To rel/0.9] fix null message in thrift TSStatusType (#1210)
b99c6ee is described below

commit b99c6eef75b4c0399ac1753ee30016fc6f3ed9c2
Author: Jialin Qiao <qj...@mails.tsinghua.edu.cn>
AuthorDate: Fri May 15 16:03:55 2020 +0800

    [To rel/0.9] fix null message in thrift TSStatusType (#1210)
    
    * fix null message in thrift
---
 .../iotdb/db/engine/memtable/AbstractMemTable.java       | 16 ++++++----------
 .../java/org/apache/iotdb/db/service/TSServiceImpl.java  |  6 ++++--
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git 
a/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
 
b/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
index 54b329d..f5b173c 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
@@ -83,18 +83,14 @@ public abstract class AbstractMemTable implements IMemTable 
{
 
   @Override
   public void insert(InsertPlan insertPlan) throws QueryProcessException {
-    try {
-      for (int i = 0; i < insertPlan.getValues().length; i++) {
+    for (int i = 0; i < insertPlan.getValues().length; i++) {
 
-        Object value = parseValue(insertPlan.getDataTypes()[i], 
insertPlan.getValues()[i]);
-        write(insertPlan.getDeviceId(), insertPlan.getMeasurements()[i],
-            insertPlan.getDataTypes()[i], insertPlan.getTime(), value);
-      }
-      long recordSizeInByte = MemUtils.getRecordSize(insertPlan);
-      memSize += recordSizeInByte;
-    } catch (RuntimeException e) {
-      throw new QueryProcessException(e.getMessage());
+      Object value = parseValue(insertPlan.getDataTypes()[i], 
insertPlan.getValues()[i]);
+      write(insertPlan.getDeviceId(), insertPlan.getMeasurements()[i],
+          insertPlan.getDataTypes()[i], insertPlan.getTime(), value);
     }
+    long recordSizeInByte = MemUtils.getRecordSize(insertPlan);
+    memSize += recordSizeInByte;
   }
 
   private static Object parseValue(TSDataType dataType, String value) throws 
QueryProcessException {
diff --git 
a/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java 
b/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
index 23c4368..3ae173a 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
@@ -320,7 +320,8 @@ public class TSServiceImpl implements TSIService.Iface, 
ServerContext {
    * @param appendMessage appending message
    */
   private TSStatus getStatus(TSStatusCode statusType, String appendMessage) {
-    TSStatusType statusCodeAndMessage = new 
TSStatusType(statusType.getStatusCode(), appendMessage);
+    TSStatusType statusCodeAndMessage = new 
TSStatusType(statusType.getStatusCode(),
+        appendMessage == null ? "null" : appendMessage);
     return new TSStatus(statusCodeAndMessage);
   }
 
@@ -1404,7 +1405,8 @@ public class TSServiceImpl implements TSIService.Iface, 
ServerContext {
       execRet = executeNonQuery(plan);
     } catch (QueryProcessException e) {
       logger.debug("meet error while processing non-query. ", e);
-      return new TSStatus(new TSStatusType(e.getErrorCode(), e.getMessage()));
+      return new TSStatus(
+          new TSStatusType(e.getErrorCode(), e.getMessage() == null ? "null" : 
e.getMessage()));
     }
 
     return execRet ? getStatus(TSStatusCode.SUCCESS_STATUS, "Execute 
successfully")