Xikui Wang has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/1982

Change subject: [ASTERIXDB-2076][TEST] Fix encoding issue in 
HyracksVirtualCluster
......................................................................

[ASTERIXDB-2076][TEST] Fix encoding issue in HyracksVirtualCluster

- user model changes: no
- storage format changes: no
- interface changes: no

Details:
Without forcing encoding option, the NCServiceExecutionIT will fail
due to the encoding issue on some machines.

Change-Id: I1a09b7aca59e289d2f9593a3ddcf6e98802ebc8d
---
M 
hyracks-fullstack/hyracks/hyracks-server/src/main/java/org/apache/hyracks/server/process/HyracksCCProcess.java
M 
hyracks-fullstack/hyracks/hyracks-server/src/main/java/org/apache/hyracks/server/process/HyracksNCServiceProcess.java
2 files changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/82/1982/1

diff --git 
a/hyracks-fullstack/hyracks/hyracks-server/src/main/java/org/apache/hyracks/server/process/HyracksCCProcess.java
 
b/hyracks-fullstack/hyracks/hyracks-server/src/main/java/org/apache/hyracks/server/process/HyracksCCProcess.java
index b2aa2d1..a3ae2ba 100644
--- 
a/hyracks-fullstack/hyracks/hyracks-server/src/main/java/org/apache/hyracks/server/process/HyracksCCProcess.java
+++ 
b/hyracks-fullstack/hyracks/hyracks-server/src/main/java/org/apache/hyracks/server/process/HyracksCCProcess.java
@@ -19,6 +19,7 @@
 package org.apache.hyracks.server.process;
 
 import java.io.File;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 
 import org.apache.hyracks.control.cc.CCDriver;
@@ -41,6 +42,8 @@
     protected void addJvmArgs(List<String> cList) {
         // CC needs more than default memory
         cList.add("-Xmx1024m");
+        // Make sure CC talks in UTF-8
+        cList.add("-Dfile.encoding="+ StandardCharsets.UTF_8);
         
//cList.add("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005");
     }
 }
diff --git 
a/hyracks-fullstack/hyracks/hyracks-server/src/main/java/org/apache/hyracks/server/process/HyracksNCServiceProcess.java
 
b/hyracks-fullstack/hyracks/hyracks-server/src/main/java/org/apache/hyracks/server/process/HyracksNCServiceProcess.java
index 39971ad..fd9b07d 100644
--- 
a/hyracks-fullstack/hyracks/hyracks-server/src/main/java/org/apache/hyracks/server/process/HyracksNCServiceProcess.java
+++ 
b/hyracks-fullstack/hyracks/hyracks-server/src/main/java/org/apache/hyracks/server/process/HyracksNCServiceProcess.java
@@ -21,6 +21,7 @@
 import org.apache.hyracks.control.nc.service.NCService;
 
 import java.io.File;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 
 public class HyracksNCServiceProcess extends HyracksServerProcess {
@@ -41,5 +42,6 @@
     protected void addJvmArgs(List<String> cList) {
         // NCService needs little memory
         cList.add("-Xmx128m");
+        cList.add("-Dfile.encoding="+ StandardCharsets.UTF_8);
     }
 }

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1982
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1a09b7aca59e289d2f9593a3ddcf6e98802ebc8d
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Xikui Wang <[email protected]>

Reply via email to