Copilot commented on code in PR #15961:
URL: https://github.com/apache/iotdb/pull/15961#discussion_r2214775299
##########
scripts/tools/tsfile/validate-tsfile.sh:
##########
@@ -40,12 +40,14 @@ else
JAVA=java
fi
+JVM_OPTS="-Dsun.jnu.encoding=UTF-8 -Dfile.encoding=UTF-8"
+
CLASSPATH=""
for f in ${IOTDB_HOME}/lib/*.jar; do
CLASSPATH=${CLASSPATH}":"$f
done
MAIN_CLASS=org.apache.iotdb.db.tools.validate.TsFileValidationTool
-"$JAVA" -cp "$CLASSPATH" "$MAIN_CLASS" "$@"
+"$JAVA" "$JVM_OPTS" -cp "$CLASSPATH" "$MAIN_CLASS" "$@"
Review Comment:
The JVM_OPTS variable should not be quoted when used as it contains multiple
arguments. The correct syntax should be `"$JAVA" $JVM_OPTS -cp "$CLASSPATH"
"$MAIN_CLASS" "$@"` to allow proper expansion of the options.
```suggestion
"$JAVA" $JVM_OPTS -cp "$CLASSPATH" "$MAIN_CLASS" "$@"
```
##########
scripts/conf/confignode-env.sh:
##########
@@ -319,9 +319,10 @@ if [[ ! "$CONFIGNODE_JMX_OPTS" =~ -Xms ]]; then
CONFIGNODE_JMX_OPTS="$CONFIGNODE
if [[ ! "$CONFIGNODE_JMX_OPTS" =~ -Xmx ]]; then
CONFIGNODE_JMX_OPTS="$CONFIGNODE_JMX_OPTS -Xmx${ON_HEAP_MEMORY}"; fi
if [[ ! "$CONFIGNODE_JMX_OPTS" =~ -XX:MaxDirectMemorySize ]]; then
CONFIGNODE_JMX_OPTS="$CONFIGNODE_JMX_OPTS
-XX:MaxDirectMemorySize=${OFF_HEAP_MEMORY}"; fi
CONFIGNODE_JMX_OPTS="$CONFIGNODE_JMX_OPTS
-Djdk.nio.maxCachedBufferSize=${MAX_CACHED_BUFFER_SIZE}"
-IOTDB_JMX_OPTS="$IOTDB_JMX_OPTS -XX:+CrashOnOutOfMemoryError"
+CONFIGNODE_JMX_OPTS="$CONFIGNODE_JMX_OPTS -XX:+CrashOnOutOfMemoryError"
Review Comment:
The variable name has been corrected from IOTDB_JMX_OPTS to
CONFIGNODE_JMX_OPTS, but this change appears unrelated to the UTF-8 encoding
purpose of this PR and could represent an unintended fix of an existing bug.
##########
scripts/tools/tsfile/split-tsfile-tool.sh:
##########
@@ -40,12 +40,14 @@ else
JAVA=java
fi
+JVM_OPTS="-Dsun.jnu.encoding=UTF-8 -Dfile.encoding=UTF-8"
+
CLASSPATH=""
for f in ${IOTDB_HOME}/lib/*.jar; do
CLASSPATH=${CLASSPATH}":"$f
done
MAIN_CLASS=org.apache.iotdb.db.tools.TsFileSplitTool
-"$JAVA" -cp "$CLASSPATH" "$MAIN_CLASS" "$@"
+"$JAVA" "$JVM_OPTS" -cp "$CLASSPATH" "$MAIN_CLASS" "$@"
Review Comment:
The JVM_OPTS variable should not be quoted when used as it contains multiple
arguments. The correct syntax should be `"$JAVA" $JVM_OPTS -cp "$CLASSPATH"
"$MAIN_CLASS" "$@"` to allow proper expansion of the options.
```suggestion
"$JAVA" $JVM_OPTS -cp "$CLASSPATH" "$MAIN_CLASS" "$@"
```
##########
scripts/tools/schema/print-schema-log.sh:
##########
@@ -40,12 +40,14 @@ else
JAVA=java
fi
+JVM_OPTS="-Dsun.jnu.encoding=UTF-8 -Dfile.encoding=UTF-8"
+
CLASSPATH=""
for f in ${IOTDB_HOME}/lib/*.jar; do
CLASSPATH=${CLASSPATH}":"$f
done
MAIN_CLASS=org.apache.iotdb.db.tools.schema.MLogParser
-"$JAVA" -cp "$CLASSPATH" "$MAIN_CLASS" "$@"
+"$JAVA" "$JVM_OPTS" -cp "$CLASSPATH" "$MAIN_CLASS" "$@"
Review Comment:
The JVM_OPTS variable should not be quoted when used as it contains multiple
arguments. The correct syntax should be `"$JAVA" $JVM_OPTS -cp "$CLASSPATH"
"$MAIN_CLASS" "$@"` to allow proper expansion of the options.
```suggestion
"$JAVA" $JVM_OPTS -cp "$CLASSPATH" "$MAIN_CLASS" "$@"
```
##########
scripts/conf/windows/confignode-env.bat:
##########
@@ -121,7 +121,8 @@ set /a
MAX_CACHED_BUFFER_SIZE=%off_heap_memory_size_in_mb%/%IO_THREADS_NUMBER%*1
set CONFIGNODE_HEAP_OPTS=-Xmx%ON_HEAP_MEMORY% -Xms%ON_HEAP_MEMORY%
set CONFIGNODE_HEAP_OPTS=%CONFIGNODE_HEAP_OPTS%
-XX:MaxDirectMemorySize=%OFF_HEAP_MEMORY%
set CONFIGNODE_HEAP_OPTS=%CONFIGNODE_HEAP_OPTS%
-Djdk.nio.maxCachedBufferSize=%MAX_CACHED_BUFFER_SIZE%
-set IOTDB_HEAP_OPTS=%IOTDB_HEAP_OPTS% -XX:+CrashOnOutOfMemoryError
+set CONFIGNODE_HEAP_OPTS=%CONFIGNODE_HEAP_OPTS% -XX:+CrashOnOutOfMemoryError
Review Comment:
The variable name has been corrected from IOTDB_HEAP_OPTS to
CONFIGNODE_HEAP_OPTS, but this change appears unrelated to the UTF-8 encoding
purpose of this PR and could represent an unintended fix of an existing bug.
##########
scripts/tools/tsfile/settle-tsfile.sh:
##########
@@ -37,12 +37,14 @@ else
JAVA=java
fi
+JVM_OPTS="-Dsun.jnu.encoding=UTF-8 -Dfile.encoding=UTF-8"
+
CLASSPATH=""
for f in ${IOTDB_HOME}/lib/*.jar; do
CLASSPATH=${CLASSPATH}":"$f
done
MAIN_CLASS=org.apache.iotdb.db.tools.settle.TsFileSettleByCompactionTool
-"$JAVA" -cp "$CLASSPATH" "$MAIN_CLASS" "$@"
+"$JAVA" "$JVM_OPTS" -cp "$CLASSPATH" "$MAIN_CLASS" "$@"
Review Comment:
The JVM_OPTS variable should not be quoted when used as it contains multiple
arguments. The correct syntax should be `"$JAVA" $JVM_OPTS -cp "$CLASSPATH"
"$MAIN_CLASS" "$@"` to allow proper expansion of the options.
```suggestion
"$JAVA" $JVM_OPTS -cp "$CLASSPATH" "$MAIN_CLASS" "$@"
```
##########
scripts/conf/confignode-env.sh:
##########
@@ -319,9 +319,10 @@ if [[ ! "$CONFIGNODE_JMX_OPTS" =~ -Xms ]]; then
CONFIGNODE_JMX_OPTS="$CONFIGNODE
if [[ ! "$CONFIGNODE_JMX_OPTS" =~ -Xmx ]]; then
CONFIGNODE_JMX_OPTS="$CONFIGNODE_JMX_OPTS -Xmx${ON_HEAP_MEMORY}"; fi
if [[ ! "$CONFIGNODE_JMX_OPTS" =~ -XX:MaxDirectMemorySize ]]; then
CONFIGNODE_JMX_OPTS="$CONFIGNODE_JMX_OPTS
-XX:MaxDirectMemorySize=${OFF_HEAP_MEMORY}"; fi
CONFIGNODE_JMX_OPTS="$CONFIGNODE_JMX_OPTS
-Djdk.nio.maxCachedBufferSize=${MAX_CACHED_BUFFER_SIZE}"
-IOTDB_JMX_OPTS="$IOTDB_JMX_OPTS -XX:+CrashOnOutOfMemoryError"
+CONFIGNODE_JMX_OPTS="$CONFIGNODE_JMX_OPTS -XX:+CrashOnOutOfMemoryError"
+CONFIGNODE_JMX_OPTS="$CONFIGNODE_JMX_OPTS -Dsun.jnu.encoding=UTF-8
-Dfile.encoding=UTF-8"
# if you want to dump the heap memory while OOM happening, you can use the
following command, remember to replace
${heap_dump_dir}/confignode_heapdump.hprof with your own file path and the
folder where this file is located needs to be created in advance
-#IOTDB_JMX_OPTS="$IOTDB_JMX_OPTS -XX:+HeapDumpOnOutOfMemoryError
-XX:HeapDumpPath=${heap_dump_dir}/confignode_heapdump.hprof"
+#CONFIGNODE_JMX_OPTS="$CONFIGNODE_JMX_OPTS -XX:+HeapDumpOnOutOfMemoryError
-XX:HeapDumpPath=${heap_dump_dir}/confignode_heapdump.hprof"
Review Comment:
The variable name in the comment has been corrected from IOTDB_JMX_OPTS to
CONFIGNODE_JMX_OPTS, but this change appears unrelated to the UTF-8 encoding
purpose of this PR and could represent an unintended fix of an existing bug.
##########
scripts/tools/tsfile/print-iotdb-data-dir.sh:
##########
@@ -41,12 +41,14 @@ else
JAVA=java
fi
+JVM_OPTS="-Dsun.jnu.encoding=UTF-8 -Dfile.encoding=UTF-8"
+
CLASSPATH=""
for f in ${IOTDB_HOME}/lib/*.jar; do
CLASSPATH=${CLASSPATH}":"$f
done
MAIN_CLASS=org.apache.iotdb.db.tools.IoTDBDataDirViewer
-"$JAVA" -cp "$CLASSPATH"
"-Dlogback.configurationFile=${IOTDB_HOME}/conf/logback-tool.xml" "$MAIN_CLASS"
"$@"
+"$JAVA" "$JVM_OPTS" -cp "$CLASSPATH"
"-Dlogback.configurationFile=${IOTDB_HOME}/conf/logback-tool.xml" "$MAIN_CLASS"
"$@"
Review Comment:
The JVM_OPTS variable should not be quoted when used as it contains multiple
arguments. The correct syntax should be `"$JAVA" $JVM_OPTS -cp "$CLASSPATH"
"-Dlogback.configurationFile=${IOTDB_HOME}/conf/logback-tool.xml" "$MAIN_CLASS"
"$@"` to allow proper expansion of the options.
```suggestion
"$JAVA" $JVM_OPTS -cp "$CLASSPATH"
"-Dlogback.configurationFile=${IOTDB_HOME}/conf/logback-tool.xml" "$MAIN_CLASS"
"$@"
```
##########
scripts/tools/tsfile/check-overlap-sequence-files-and-repair.sh:
##########
@@ -40,12 +40,14 @@ else
JAVA=java
fi
+JVM_OPTS="-Dsun.jnu.encoding=UTF-8 -Dfile.encoding=UTF-8"
+
CLASSPATH=""
for f in ${IOTDB_HOME}/lib/*.jar; do
CLASSPATH=${CLASSPATH}":"$f
done
MAIN_CLASS=org.apache.iotdb.db.tools.validate.TsFileOverlapValidationAndRepairTool
-"$JAVA" -cp "$CLASSPATH" "$MAIN_CLASS" "$@"
+"$JAVA" "$JVM_OPTS" -cp "$CLASSPATH" "$MAIN_CLASS" "$@"
Review Comment:
The JVM_OPTS variable should not be quoted when used as it contains multiple
arguments. The correct syntax should be `"$JAVA" $JVM_OPTS -cp "$CLASSPATH"
"$MAIN_CLASS" "$@"` to allow proper expansion of the options.
```suggestion
"$JAVA" $JVM_OPTS -cp "$CLASSPATH" "$MAIN_CLASS" "$@"
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
