lanyuanxiaoyao/hudi
1
0
Fork 0
Code Activity

HUDI-212: Specify Charset to UTF-8 for IOUtils.toString (#837)

Browse Source
This commit is contained in:
leesf
2019-08-16 23:27:19 +08:00
committed by vinoth chandar
parent 8f5e7ad5d9
commit 1b79ef7672
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hudi-client/src/test/java/org/apache/hudi/TestHoodieClientOnCopyOnWriteStorage.java
View File

@@ -562,7 +562,7 @@ public class TestHoodieClientOnCopyOnWriteStorage extends TestHoodieClientBase {
// Read from commit file // Read from commit file
String filename = HoodieTestUtils.getCommitFilePath(basePath, commitTime); String filename = HoodieTestUtils.getCommitFilePath(basePath, commitTime);
FileInputStream inputStream = new FileInputStream(filename); FileInputStream inputStream = new FileInputStream(filename);
String everything = IOUtils.toString(inputStream); String everything = IOUtils.toString(inputStream, "UTF-8");
HoodieCommitMetadata metadata = HoodieCommitMetadata.fromJsonString(everything.toString(), HoodieCommitMetadata metadata = HoodieCommitMetadata.fromJsonString(everything.toString(),
HoodieCommitMetadata.class); HoodieCommitMetadata.class);
HashMap<String, String> paths = metadata.getFileIdAndFullPaths(basePath); HashMap<String, String> paths = metadata.getFileIdAndFullPaths(basePath);
@@ -600,7 +600,7 @@ public class TestHoodieClientOnCopyOnWriteStorage extends TestHoodieClientBase {
// Read from commit file // Read from commit file
String filename = HoodieTestUtils.getCommitFilePath(basePath, commitTime); String filename = HoodieTestUtils.getCommitFilePath(basePath, commitTime);
FileInputStream inputStream = new FileInputStream(filename); FileInputStream inputStream = new FileInputStream(filename);
String everything = IOUtils.toString(inputStream); String everything = IOUtils.toString(inputStream, "UTF-8");
HoodieCommitMetadata metadata = HoodieCommitMetadata.fromJsonString(everything.toString(), HoodieCommitMetadata metadata = HoodieCommitMetadata.fromJsonString(everything.toString(),
HoodieCommitMetadata.class); HoodieCommitMetadata.class);
HoodieRollingStatMetadata rollingStatMetadata = HoodieCommitMetadata.fromJsonString(metadata.getExtraMetadata() HoodieRollingStatMetadata rollingStatMetadata = HoodieCommitMetadata.fromJsonString(metadata.getExtraMetadata()
@@ -629,7 +629,7 @@ public class TestHoodieClientOnCopyOnWriteStorage extends TestHoodieClientBase {
// Read from commit file // Read from commit file
filename = HoodieTestUtils.getCommitFilePath(basePath, commitTime); filename = HoodieTestUtils.getCommitFilePath(basePath, commitTime);
inputStream = new FileInputStream(filename); inputStream = new FileInputStream(filename);
everything = IOUtils.toString(inputStream); everything = IOUtils.toString(inputStream, "UTF-8");
metadata = HoodieCommitMetadata.fromJsonString(everything.toString(), HoodieCommitMetadata.class); metadata = HoodieCommitMetadata.fromJsonString(everything.toString(), HoodieCommitMetadata.class);
rollingStatMetadata = HoodieCommitMetadata.fromJsonString(metadata.getExtraMetadata() rollingStatMetadata = HoodieCommitMetadata.fromJsonString(metadata.getExtraMetadata()
.get(HoodieRollingStatMetadata.ROLLING_STAT_METADATA_KEY), HoodieRollingStatMetadata.class); .get(HoodieRollingStatMetadata.ROLLING_STAT_METADATA_KEY), HoodieRollingStatMetadata.class);

2
hudi-utilities/src/main/java/org/apache/hudi/utilities/HiveIncrementalPuller.java
View File

@@ -111,7 +111,7 @@ public class HiveIncrementalPuller {
this.config = config; this.config = config;
validateConfig(config); validateConfig(config);
String templateContent = IOUtils.toString( String templateContent = IOUtils.toString(
this.getClass().getResourceAsStream("IncrementalPull.sqltemplate")); this.getClass().getResourceAsStream("IncrementalPull.sqltemplate"), "UTF-8");
incrementalPullSQLtemplate = new ST(templateContent); incrementalPullSQLtemplate = new ST(templateContent);
} }