From 3ddfe84744c6de51fa87726e8c66a2a2a2b75e18 Mon Sep 17 00:00:00 2001
From: yagagagaga <zhangminkefromflydish@gmail.com>
Date: Mon, 2 Sep 2024 13:11:58 +0800
Subject: [PATCH 1/2] [chore](conf) Specify UTF8 as the default charset.
 (#39521)

According the [JEP 400](https://openjdk.org/jeps/400), UTF-8 was be used
as the default charset of the JavaSE 18. But when you use the version
below 18, the default charset depends on your locale. Usually, it can
work well in many sence, but Apache Doris only supports UTF-8 as its
charset, which may occur some decoding incorrectly.

So it is necessary to set UTF8 as the default JDK charset.

(cherry picked from commit 48991df34f0cf0f6889cf8887ee1a716afdeb70c)
---
 conf/be.conf | 10 +++++-----
 conf/fe.conf |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/conf/be.conf b/conf/be.conf
index cd66596501f21a..20678fb271f302 100644
--- a/conf/be.conf
+++ b/conf/be.conf
@@ -20,13 +20,13 @@ CUR_DATE=`date +%Y%m%d-%H%M%S`
 # Log dir
 LOG_DIR="${DORIS_HOME}/log/"
 
-JAVA_OPTS="-Xmx1024m -DlogPath=$LOG_DIR/jni.log -Xloggc:$DORIS_HOME/log/be.gc.log.$CUR_DATE -Djavax.security.auth.useSubjectCredsOnly=false -Dsun.security.krb5.debug=true -Dsun.java.command=DorisBE -XX:-CriticalJNINatives"
+JAVA_OPTS="-Dfile.encoding=UTF-8 -Xmx1024m -DlogPath=$LOG_DIR/jni.log -Xloggc:$DORIS_HOME/log/be.gc.log.$CUR_DATE -Djavax.security.auth.useSubjectCredsOnly=false -Dsun.security.krb5.debug=true -Dsun.java.command=DorisBE -XX:-CriticalJNINatives"
 
 # For jdk 9+, this JAVA_OPTS will be used as default JVM options
-JAVA_OPTS_FOR_JDK_9="-Xmx1024m -DlogPath=$DORIS_HOME/log/jni.log -Xlog:gc:$LOG_DIR/be.gc.log.$CUR_DATE -Djavax.security.auth.useSubjectCredsOnly=false -Dsun.security.krb5.debug=true -Dsun.java.command=DorisBE -XX:-CriticalJNINatives"
+JAVA_OPTS_FOR_JDK_9="-Dfile.encoding=UTF-8 -Xmx1024m -DlogPath=$DORIS_HOME/log/jni.log -Xlog:gc:$LOG_DIR/be.gc.log.$CUR_DATE -Djavax.security.auth.useSubjectCredsOnly=false -Dsun.security.krb5.debug=true -Dsun.java.command=DorisBE -XX:-CriticalJNINatives"
 
 # For jdk 17+, this JAVA_OPTS will be used as default JVM options
-JAVA_OPTS_FOR_JDK_17="-Xmx1024m -DlogPath=$LOG_DIR/jni.log -Xlog:gc:$LOG_DIR/be.gc.log.$CUR_DATE -Djavax.security.auth.useSubjectCredsOnly=false -Dsun.security.krb5.debug=true -Dsun.java.command=DorisBE -XX:-CriticalJNINatives --add-opens=java.base/java.net=ALL-UNNAMED"
+JAVA_OPTS_FOR_JDK_17="-Dfile.encoding=UTF-8 -Xmx1024m -DlogPath=$LOG_DIR/jni.log -Xlog:gc:$LOG_DIR/be.gc.log.$CUR_DATE -Djavax.security.auth.useSubjectCredsOnly=false -Dsun.security.krb5.debug=true -Dsun.java.command=DorisBE -XX:-CriticalJNINatives --add-opens=java.base/java.net=ALL-UNNAMED"
 
 # since 1.2, the JAVA_HOME need to be set to run BE process.
 # JAVA_HOME=/path/to/jdk/
@@ -51,7 +51,7 @@ ssl_certificate_path = "$DORIS_HOME/conf/cert.pem"
 ssl_private_key_path = "$DORIS_HOME/conf/key.pem"
 
 
-# Choose one if there are more than one ip except loopback address. 
+# Choose one if there are more than one ip except loopback address.
 # Note that there should at most one ip match this list.
 # If no ip match this rule, will choose one randomly.
 # use CIDR format, e.g. 10.10.10.0/24 or IP format, e.g. 10.10.10.1
@@ -81,7 +81,7 @@ sys_log_level = INFO
 # sys_log_roll_num = 10
 # sys_log_verbose_modules = *
 # log_buffer_level = -1
-# palo_cgroups 
+# palo_cgroups
 
 # aws sdk log level
 #    Off = 0,
diff --git a/conf/fe.conf b/conf/fe.conf
index 845dce87cdb6b4..bbdbf77d07eb65 100644
--- a/conf/fe.conf
+++ b/conf/fe.conf
@@ -30,16 +30,16 @@ LOG_DIR = ${DORIS_HOME}/log
 # JAVA_OPTS="-Dsun.security.krb5.debug=true -Djavax.security.auth.useSubjectCredsOnly=false -Xss4m -Xmx8192m -XX:+UseMembar -XX:SurvivorRatio=8 -XX:MaxTenuringThreshold=7 -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+CMSClassUnloadingEnabled -XX:-CMSParallelRemarkEnabled -XX:CMSInitiatingOccupancyFraction=80 -XX:SoftRefLRUPolicyMSPerMB=0 -Xloggc:$DORIS_HOME/log/fe.gc.log.$CUR_DATE"
 
 # G1 JAVA OPTS
-JAVA_OPTS="-Djavax.security.auth.useSubjectCredsOnly=false -Xss4m -Xmx8192m -XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -XX:MaxGCPauseMillis=200 -XX:+PrintGCDateStamps -XX:+PrintGCDetails -Xloggc:$LOG_DIR/fe.gc.log.$CUR_DATE -Dlog4j2.formatMsgNoLookups=true"
+JAVA_OPTS="-Dfile.encoding=UTF-8 -Djavax.security.auth.useSubjectCredsOnly=false -Xss4m -Xmx8192m -XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -XX:MaxGCPauseMillis=200 -XX:+PrintGCDateStamps -XX:+PrintGCDetails -Xloggc:$LOG_DIR/fe.gc.log.$CUR_DATE -Dlog4j2.formatMsgNoLookups=true"
 
 # For jdk 9+, this JAVA_OPTS_FOR_JDK_9 will be used as default CMS JVM options
 # JAVA_OPTS_FOR_JDK_9="-Dsun.security.krb5.debug=true -Djavax.security.auth.useSubjectCredsOnly=false -Xss4m -Xmx8192m -XX:SurvivorRatio=8 -XX:MaxTenuringThreshold=7 -XX:+CMSClassUnloadingEnabled -XX:-CMSParallelRemarkEnabled -XX:CMSInitiatingOccupancyFraction=80 -XX:SoftRefLRUPolicyMSPerMB=0 -Xlog:gc*:$DORIS_HOME/log/fe.gc.log.$CUR_DATE:time"
 
 # For jdk 9+, this JAVA_OPTS_FOR_JDK_9 will be used as default G1 JVM options
-JAVA_OPTS_FOR_JDK_9="-Djavax.security.auth.useSubjectCredsOnly=false -Xss4m -Xmx8192m -XX:+UseG1GC -XX:MaxGCPauseMillis=200 -Xlog:gc*:$LOG_DIR/fe.gc.log.$CUR_DATE:time -Dlog4j2.formatMsgNoLookups=true"
+JAVA_OPTS_FOR_JDK_9="-Dfile.encoding=UTF-8 -Djavax.security.auth.useSubjectCredsOnly=false -Xss4m -Xmx8192m -XX:+UseG1GC -XX:MaxGCPauseMillis=200 -Xlog:gc*:$LOG_DIR/fe.gc.log.$CUR_DATE:time -Dlog4j2.formatMsgNoLookups=true"
 
 # For jdk 17+, this JAVA_OPTS will be used as default JVM options
-JAVA_OPTS_FOR_JDK_17="-Djavax.security.auth.useSubjectCredsOnly=false -XX:+UseZGC -Xmx8192m -Xms8192m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=$LOG_DIR/ -Xlog:gc*:$LOG_DIR/fe.gc.log.$CUR_DATE:time"
+JAVA_OPTS_FOR_JDK_17="-Dfile.encoding=UTF-8 -Djavax.security.auth.useSubjectCredsOnly=false -XX:+UseZGC -Xmx8192m -Xms8192m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=$LOG_DIR/ -Xlog:gc*:$LOG_DIR/fe.gc.log.$CUR_DATE:time"
 
 ##
 ## the lowercase properties are read by main program.

From 7b602bcb658e1eb672af2f72fb2cde27067ce20d Mon Sep 17 00:00:00 2001
From: yagagagaga <zhangminkefromflydish@gmail.com>
Date: Wed, 11 Sep 2024 16:11:10 +0800
Subject: [PATCH 2/2] Update be.conf

---
 conf/be.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/be.conf b/conf/be.conf
index 20678fb271f302..49afef47462ffb 100644
--- a/conf/be.conf
+++ b/conf/be.conf
@@ -51,7 +51,7 @@ ssl_certificate_path = "$DORIS_HOME/conf/cert.pem"
 ssl_private_key_path = "$DORIS_HOME/conf/key.pem"
 
 
-# Choose one if there are more than one ip except loopback address.
+# Choose one if there are more than one ip except loopback address. 
 # Note that there should at most one ip match this list.
 # If no ip match this rule, will choose one randomly.
 # use CIDR format, e.g. 10.10.10.0/24 or IP format, e.g. 10.10.10.1
@@ -81,7 +81,7 @@ sys_log_level = INFO
 # sys_log_roll_num = 10
 # sys_log_verbose_modules = *
 # log_buffer_level = -1
-# palo_cgroups
+# palo_cgroups 
 
 # aws sdk log level
 #    Off = 0,