[iotdb] branch rel/1.1 updated: add default charset setting in start-datanode.bat and print default charset when starting (#10051)

[xingtanzjr]

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

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


The following commit(s) were added to refs/heads/rel/1.1 by this push:
     new fb01c6ab735 add default charset setting in start-datanode.bat and 
print default charset when starting (#10051)
fb01c6ab735 is described below

commit fb01c6ab73535bef98ae493834781941ac8fd75c
Author: Zhang.Jinrui <xingtan...@gmail.com>
AuthorDate: Tue Jun 6 01:04:28 2023 +0800

    add default charset setting in start-datanode.bat and print default charset 
when starting (#10051)
---
 .../main/java/org/apache/iotdb/confignode/service/ConfigNode.java    | 5 +++++
 server/src/assembly/resources/sbin/start-datanode.bat                | 4 +++-
 server/src/main/java/org/apache/iotdb/db/service/DataNode.java       | 2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git 
a/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java 
b/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
index 920247956a3..ffbb668238f 100644
--- 
a/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
+++ 
b/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
@@ -55,6 +55,7 @@ import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.charset.Charset;
 import java.util.concurrent.TimeUnit;
 
 public class ConfigNode implements ConfigNodeMBean {
@@ -88,6 +89,10 @@ public class ConfigNode implements ConfigNodeMBean {
         ConfigNodeConstant.GLOBAL_NAME
             + " environment variables: "
             + ConfigNodeConfig.getEnvironmentVariables());
+    LOGGER.info(
+        "{} default charset is: {}",
+        ConfigNodeConstant.GLOBAL_NAME,
+        Charset.defaultCharset().displayName());
     new ConfigNodeCommandLine().doMain(args);
   }
 
diff --git a/server/src/assembly/resources/sbin/start-datanode.bat 
b/server/src/assembly/resources/sbin/start-datanode.bat
index ea66a366320..be35b5573db 100755
--- a/server/src/assembly/resources/sbin/start-datanode.bat
+++ b/server/src/assembly/resources/sbin/start-datanode.bat
@@ -205,7 +205,9 @@ set JAVA_OPTS=-ea^
  -DIOTDB_HOME="%IOTDB_HOME%"^
  -DTSFILE_HOME="%IOTDB_HOME%"^
  -DTSFILE_CONF="%IOTDB_CONF%"^
- -DIOTDB_CONF="%IOTDB_CONF%"
+ -DIOTDB_CONF="%IOTDB_CONF%"^
+ -Dsun.jnu.encoding=UTF-8^
+ -Dfile.encoding=UTF-8
 
 @REM 
----------------------------------------------------------------------------
 @REM ***** CLASSPATH library setting *****
diff --git a/server/src/main/java/org/apache/iotdb/db/service/DataNode.java 
b/server/src/main/java/org/apache/iotdb/db/service/DataNode.java
index 7747bcdd08a..71b7092dc9b 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/DataNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/DataNode.java
@@ -90,6 +90,7 @@ import org.slf4j.LoggerFactory;
 import java.io.File;
 import java.io.IOException;
 import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -143,6 +144,7 @@ public class DataNode implements DataNodeMBean {
 
   public static void main(String[] args) {
     logger.info("IoTDB-DataNode environment variables: {}", 
IoTDBConfig.getEnvironmentVariables());
+    logger.info("IoTDB-DataNode default charset is: {}", 
Charset.defaultCharset().displayName());
     new DataNodeServerCommandLine().doMain(args);
   }