[iotdb] branch rel/0.11 updated: add charset UTF-8 (#2155)

[qi...@apache.org]

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

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


The following commit(s) were added to refs/heads/rel/0.11 by this push:
     new 595d631  add charset UTF-8 (#2155)
595d631 is described below

commit 595d6311228f5c475e5aff24105bb14e9e5a34cc
Author: Xiangwei Wei <34...@users.noreply.github.com>
AuthorDate: Tue Dec 1 21:23:07 2020 +0800

    add charset UTF-8 (#2155)
    
    (cherry picked from commit 467897e5d5af84d6975fc05ddc1a2a6b89893ec9)
---
 .../src/main/java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/service-rpc/src/main/java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java b/service-rpc/src/main/java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java
index 95b9128..eb4aa77 100644
--- a/service-rpc/src/main/java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java
+++ b/service-rpc/src/main/java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java
@@ -19,6 +19,7 @@
 
 package org.apache.iotdb.rpc;
 
+import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
 import java.sql.Timestamp;
 import java.util.ArrayList;
@@ -415,7 +416,11 @@ public class IoTDBRpcDataSet {
       case DOUBLE:
         return String.valueOf(BytesUtils.bytesToDouble(values[index]));
       case TEXT:
-        return new String(values[index]);
+        try {
+          return new String(values[index], "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+          return new String(values[index]);
+        }
       default:
         return null;
     }