[incubator-hudi] branch master updated: HUDI-212: Specify Charset to UTF-8 for IOUtils.toString (#837)

[vinoth]

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

vinoth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hudi.git


The following commit(s) were added to refs/heads/master by this push:
     new 1b79ef7  HUDI-212: Specify Charset to UTF-8 for IOUtils.toString (#837)
1b79ef7 is described below

commit 1b79ef7672031301b6269e3a7b3587ddb7c793d9
Author: leesf <490081...@qq.com>
AuthorDate: Fri Aug 16 23:27:19 2019 +0800

    HUDI-212: Specify Charset to UTF-8 for IOUtils.toString (#837)
---
 .../java/org/apache/hudi/TestHoodieClientOnCopyOnWriteStorage.java  | 6 +++---
 .../main/java/org/apache/hudi/utilities/HiveIncrementalPuller.java  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/hudi-client/src/test/java/org/apache/hudi/TestHoodieClientOnCopyOnWriteStorage.java
 
b/hudi-client/src/test/java/org/apache/hudi/TestHoodieClientOnCopyOnWriteStorage.java
index 5ed2d38..ed1458c 100644
--- 
a/hudi-client/src/test/java/org/apache/hudi/TestHoodieClientOnCopyOnWriteStorage.java
+++ 
b/hudi-client/src/test/java/org/apache/hudi/TestHoodieClientOnCopyOnWriteStorage.java
@@ -562,7 +562,7 @@ public class TestHoodieClientOnCopyOnWriteStorage extends 
TestHoodieClientBase {
     // Read from commit file
     String filename = HoodieTestUtils.getCommitFilePath(basePath, commitTime);
     FileInputStream inputStream = new FileInputStream(filename);
-    String everything = IOUtils.toString(inputStream);
+    String everything = IOUtils.toString(inputStream, "UTF-8");
     HoodieCommitMetadata metadata = 
HoodieCommitMetadata.fromJsonString(everything.toString(),
         HoodieCommitMetadata.class);
     HashMap<String, String> paths = metadata.getFileIdAndFullPaths(basePath);
@@ -600,7 +600,7 @@ public class TestHoodieClientOnCopyOnWriteStorage extends 
TestHoodieClientBase {
     // Read from commit file
     String filename = HoodieTestUtils.getCommitFilePath(basePath, commitTime);
     FileInputStream inputStream = new FileInputStream(filename);
-    String everything = IOUtils.toString(inputStream);
+    String everything = IOUtils.toString(inputStream, "UTF-8");
     HoodieCommitMetadata metadata = 
HoodieCommitMetadata.fromJsonString(everything.toString(),
         HoodieCommitMetadata.class);
     HoodieRollingStatMetadata rollingStatMetadata = 
HoodieCommitMetadata.fromJsonString(metadata.getExtraMetadata()
@@ -629,7 +629,7 @@ public class TestHoodieClientOnCopyOnWriteStorage extends 
TestHoodieClientBase {
     // Read from commit file
     filename = HoodieTestUtils.getCommitFilePath(basePath, commitTime);
     inputStream = new FileInputStream(filename);
-    everything = IOUtils.toString(inputStream);
+    everything = IOUtils.toString(inputStream, "UTF-8");
     metadata = HoodieCommitMetadata.fromJsonString(everything.toString(), 
HoodieCommitMetadata.class);
     rollingStatMetadata = 
HoodieCommitMetadata.fromJsonString(metadata.getExtraMetadata()
         .get(HoodieRollingStatMetadata.ROLLING_STAT_METADATA_KEY), 
HoodieRollingStatMetadata.class);
diff --git 
a/hudi-utilities/src/main/java/org/apache/hudi/utilities/HiveIncrementalPuller.java
 
b/hudi-utilities/src/main/java/org/apache/hudi/utilities/HiveIncrementalPuller.java
index 5f45a18..465d235 100644
--- 
a/hudi-utilities/src/main/java/org/apache/hudi/utilities/HiveIncrementalPuller.java
+++ 
b/hudi-utilities/src/main/java/org/apache/hudi/utilities/HiveIncrementalPuller.java
@@ -111,7 +111,7 @@ public class HiveIncrementalPuller {
     this.config = config;
     validateConfig(config);
     String templateContent = IOUtils.toString(
-        this.getClass().getResourceAsStream("IncrementalPull.sqltemplate"));
+        this.getClass().getResourceAsStream("IncrementalPull.sqltemplate"), 
"UTF-8");
     incrementalPullSQLtemplate = new ST(templateContent);
   }