You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2019/07/17 09:41:23 UTC
[incubator-iotdb] branch rel/0.8 updated: solve issue 140: support
UTF-8 in TsFile
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch rel/0.8
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/rel/0.8 by this push:
new b8fd6a8 solve issue 140: support UTF-8 in TsFile
b8fd6a8 is described below
commit b8fd6a8a765f820e3d2d866c6629cc3cde78f1e0
Author: Zihan Meng <40...@users.noreply.github.com>
AuthorDate: Wed Jul 17 14:01:43 2019 +0800
solve issue 140: support UTF-8 in TsFile
---
.../main/java/org/apache/iotdb/tsfile/file/header/ChunkHeader.java | 2 +-
.../src/main/java/org/apache/iotdb/tsfile/utils/ReadWriteIOUtils.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/ChunkHeader.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/ChunkHeader.java
index 8af0fc3..d7e724f 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/ChunkHeader.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/ChunkHeader.java
@@ -69,7 +69,7 @@ public class ChunkHeader {
}
public static int getSerializedSize(String measurementID) {
- return Byte.BYTES + Integer.BYTES + getSerializedSize(measurementID.length());
+ return Byte.BYTES + Integer.BYTES + getSerializedSize(measurementID.getBytes().length);
}
private static int getSerializedSize(int measurementIdLength) {
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/ReadWriteIOUtils.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/ReadWriteIOUtils.java
index d8e9f63..1f79b24 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/ReadWriteIOUtils.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/ReadWriteIOUtils.java
@@ -229,8 +229,8 @@ public class ReadWriteIOUtils {
*/
public static int write(String s, OutputStream outputStream) throws IOException {
int len = 0;
- len += write(s.length(), outputStream);
byte[] bytes = s.getBytes();
+ len += write(bytes.length, outputStream);
outputStream.write(bytes);
len += bytes.length;
return len;
@@ -243,8 +243,8 @@ public class ReadWriteIOUtils {
*/
public static int write(String s, ByteBuffer buffer) {
int len = 0;
- len += write(s.length(), buffer);
byte[] bytes = s.getBytes();
+ len += write(bytes.length, buffer);
buffer.put(bytes);
len += bytes.length;
return len;