This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new e8f4323e0f [Fix](jdbcCatalog) fix typo of some variable #22214
e8f4323e0f is described below
commit e8f4323e0f64a783c540481378fc070096037256
Author: Tiewei Fang <[email protected]>
AuthorDate: Wed Jul 26 08:34:45 2023 +0800
[Fix](jdbcCatalog) fix typo of some variable #22214
---
bin/run-fs-benchmark.sh | 2 +-
bin/start_be.sh | 2 +-
conf/be.conf | 4 ++--
docs/en/community/developer-guide/mac-dev/be-clion-dev.md | 2 +-
docs/zh-CN/community/developer-guide/mac-dev/be-clion-dev.md | 2 +-
.../src/main/java/org/apache/doris/jdbc/JdbcExecutor.java | 10 +++++-----
run-be-ut.sh | 4 ++--
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/bin/run-fs-benchmark.sh b/bin/run-fs-benchmark.sh
index fe3ab8bc15..a0823d0563 100755
--- a/bin/run-fs-benchmark.sh
+++ b/bin/run-fs-benchmark.sh
@@ -234,7 +234,7 @@ java_version="$(
CUR_DATE=$(date +%Y%m%d-%H%M%S)
LOG_PATH="-DlogPath=${DORIS_HOME}/log/jni.log"
COMMON_OPTS="-Dsun.java.command=DorisBE -XX:-CriticalJNINatives"
-JDBC_OPTS="-DJDBC_MIN_POOL=1 -DJDBC_MAX_POOL=100 -DJDBC_MAX_IDEL_TIME=300000"
+JDBC_OPTS="-DJDBC_MIN_POOL=1 -DJDBC_MAX_POOL=100 -DJDBC_MAX_IDLE_TIME=300000"
if [[ "${java_version}" -gt 8 ]]; then
if [[ -z ${JAVA_OPTS_FOR_JDK_9} ]]; then
diff --git a/bin/start_be.sh b/bin/start_be.sh
index 0aeea47961..07e99f59ff 100755
--- a/bin/start_be.sh
+++ b/bin/start_be.sh
@@ -270,7 +270,7 @@ java_version="$(
CUR_DATE=$(date +%Y%m%d-%H%M%S)
LOG_PATH="-DlogPath=${DORIS_HOME}/log/jni.log"
COMMON_OPTS="-Dsun.java.command=DorisBE -XX:-CriticalJNINatives"
-JDBC_OPTS="-DJDBC_MIN_POOL=1 -DJDBC_MAX_POOL=100 -DJDBC_MAX_IDEL_TIME=300000
-DJDBC_MAX_WAIT_TIME=5000"
+JDBC_OPTS="-DJDBC_MIN_POOL=1 -DJDBC_MAX_POOL=100 -DJDBC_MAX_IDLE_TIME=300000
-DJDBC_MAX_WAIT_TIME=5000"
if [[ "${java_version}" -gt 8 ]]; then
if [[ -z ${JAVA_OPTS_FOR_JDK_9} ]]; then
diff --git a/conf/be.conf b/conf/be.conf
index ddc7a2b517..5041b901f2 100644
--- a/conf/be.conf
+++ b/conf/be.conf
@@ -19,10 +19,10 @@ CUR_DATE=`date +%Y%m%d-%H%M%S`
PPROF_TMPDIR="$DORIS_HOME/log/"
-JAVA_OPTS="-Xmx1024m -DlogPath=$DORIS_HOME/log/jni.log
-Xloggc:$DORIS_HOME/log/be.gc.log.$CUR_DATE -Dsun.java.command=DorisBE
-XX:-CriticalJNINatives -DJDBC_MIN_POOL=1 -DJDBC_MAX_POOL=100
-DJDBC_MAX_IDEL_TIME=300000 -DJDBC_MAX_WAIT_TIME=5000"
+JAVA_OPTS="-Xmx1024m -DlogPath=$DORIS_HOME/log/jni.log
-Xloggc:$DORIS_HOME/log/be.gc.log.$CUR_DATE -Dsun.java.command=DorisBE
-XX:-CriticalJNINatives -DJDBC_MIN_POOL=1 -DJDBC_MAX_POOL=100
-DJDBC_MAX_IDLE_TIME=300000 -DJDBC_MAX_WAIT_TIME=5000"
# 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:$DORIS_HOME/log/be.gc.log.$CUR_DATE -Dsun.java.command=DorisBE
-XX:-CriticalJNINatives -DJDBC_MIN_POOL=1 -DJDBC_MAX_POOL=100
-DJDBC_MAX_IDEL_TIME=300000 -DJDBC_MAX_WAIT_TIME=5000"
+JAVA_OPTS_FOR_JDK_9="-Xmx1024m -DlogPath=$DORIS_HOME/log/jni.log
-Xlog:gc:$DORIS_HOME/log/be.gc.log.$CUR_DATE -Dsun.java.command=DorisBE
-XX:-CriticalJNINatives -DJDBC_MIN_POOL=1 -DJDBC_MAX_POOL=100
-DJDBC_MAX_IDLE_TIME=300000 -DJDBC_MAX_WAIT_TIME=5000"
# since 1.2, the JAVA_HOME need to be set to run BE process.
# JAVA_HOME=/path/to/jdk/
diff --git a/docs/en/community/developer-guide/mac-dev/be-clion-dev.md
b/docs/en/community/developer-guide/mac-dev/be-clion-dev.md
index 6d1faad722..0e506ae2c6 100644
--- a/docs/en/community/developer-guide/mac-dev/be-clion-dev.md
+++ b/docs/en/community/developer-guide/mac-dev/be-clion-dev.md
@@ -58,7 +58,7 @@ The Doris directory value of the environment variable points
to the directory co
Environment variable reference:
```
-JAVA_OPTS=-Xmx1024m -DlogPath=$DORIS_HOME/log/jni.log
-Dsun.java.command=DorisBE -XX:-CriticalJNINatives -DJDBC_MIN_POOL=1
-DJDBC_MAX_POOL=100 -DJDBC_MAX_IDEL_TIME=300000;
+JAVA_OPTS=-Xmx1024m -DlogPath=$DORIS_HOME/log/jni.log
-Dsun.java.command=DorisBE -XX:-CriticalJNINatives -DJDBC_MIN_POOL=1
-DJDBC_MAX_POOL=100 -DJDBC_MAX_IDLE_TIME=300000;
LOG_DIR=~/DorisDev/doris-run/be/log;
NLS_LANG=AMERICAN_AMERICA.AL32UTF8;
ODBCSYSINI=~/DorisDev/doris-run/be/conf;
diff --git a/docs/zh-CN/community/developer-guide/mac-dev/be-clion-dev.md
b/docs/zh-CN/community/developer-guide/mac-dev/be-clion-dev.md
index de27fdd0fc..d554f032a4 100644
--- a/docs/zh-CN/community/developer-guide/mac-dev/be-clion-dev.md
+++ b/docs/zh-CN/community/developer-guide/mac-dev/be-clion-dev.md
@@ -58,7 +58,7 @@ under the License.
环境变量参考：
```
-JAVA_OPTS=-Xmx1024m -DlogPath=$DORIS_HOME/log/jni.log
-Dsun.java.command=DorisBE -XX:-CriticalJNINatives -DJDBC_MIN_POOL=1
-DJDBC_MAX_POOL=100 -DJDBC_MAX_IDEL_TIME=300000;
+JAVA_OPTS=-Xmx1024m -DlogPath=$DORIS_HOME/log/jni.log
-Dsun.java.command=DorisBE -XX:-CriticalJNINatives -DJDBC_MIN_POOL=1
-DJDBC_MAX_POOL=100 -DJDBC_MAX_IDLE_TIME=300000;
LOG_DIR=~/DorisDev/doris-run/be/log;
NLS_LANG=AMERICAN_AMERICA.AL32UTF8;
ODBCSYSINI=~/DorisDev/doris-run/be/conf;
diff --git
a/fe/be-java-extensions/jdbc-scanner/src/main/java/org/apache/doris/jdbc/JdbcExecutor.java
b/fe/be-java-extensions/jdbc-scanner/src/main/java/org/apache/doris/jdbc/JdbcExecutor.java
index 56ad752a8a..0716a10dc2 100644
---
a/fe/be-java-extensions/jdbc-scanner/src/main/java/org/apache/doris/jdbc/JdbcExecutor.java
+++
b/fe/be-java-extensions/jdbc-scanner/src/main/java/org/apache/doris/jdbc/JdbcExecutor.java
@@ -88,7 +88,7 @@ public class JdbcExecutor {
private int minPoolSize;
private int maxPoolSize;
private int minIdleSize;
- private int maxIdelTime;
+ private int maxIdleTime;
private int maxWaitTime;
private TOdbcTableType tableType;
@@ -103,12 +103,12 @@ public class JdbcExecutor {
tableType = request.table_type;
minPoolSize = Integer.valueOf(System.getProperty("JDBC_MIN_POOL",
"1"));
maxPoolSize = Integer.valueOf(System.getProperty("JDBC_MAX_POOL",
"100"));
- maxIdelTime = Integer.valueOf(System.getProperty("JDBC_MAX_IDEL_TIME",
"300000"));
+ maxIdleTime = Integer.valueOf(System.getProperty("JDBC_MAX_IDLE_TIME",
"300000"));
maxWaitTime = Integer.valueOf(System.getProperty("JDBC_MAX_WAIT_TIME",
"5000"));
minIdleSize = minPoolSize > 0 ? 1 : 0;
LOG.info("JdbcExecutor set minPoolSize = " + minPoolSize
+ ", maxPoolSize = " + maxPoolSize
- + ", maxIdelTime = " + maxIdelTime
+ + ", maxIdleTime = " + maxIdleTime
+ ", maxWaitTime = " + maxWaitTime
+ ", minIdleSize = " + minIdleSize);
init(request.driver_path, request.statement, request.batch_size,
request.jdbc_driver_class,
@@ -423,8 +423,8 @@ public class JdbcExecutor {
ds.setTestWhileIdle(true);
ds.setTestOnBorrow(false);
setValidationQuery(ds, tableType);
- ds.setTimeBetweenEvictionRunsMillis(maxIdelTime / 5);
- ds.setMinEvictableIdleTimeMillis(maxIdelTime);
+ ds.setTimeBetweenEvictionRunsMillis(maxIdleTime / 5);
+ ds.setMinEvictableIdleTimeMillis(maxIdleTime);
druidDataSource = ds;
// here is a cache of datasource, which using the
string(jdbcUrl + jdbcUser +
// jdbcPassword) as key.
diff --git a/run-be-ut.sh b/run-be-ut.sh
index ad3be370c5..02fe5f368e 100755
--- a/run-be-ut.sh
+++ b/run-be-ut.sh
@@ -342,7 +342,7 @@ java_version="$(
CUR_DATE=$(date +%Y%m%d-%H%M%S)
LOG_PATH="-DlogPath=${DORIS_TEST_BINARY_DIR}/log/jni.log"
COMMON_OPTS="-Dsun.java.command=DorisBETEST -XX:-CriticalJNINatives"
-JDBC_OPTS="-DJDBC_MIN_POOL=1 -DJDBC_MAX_POOL=100 -DJDBC_MAX_IDEL_TIME=300000"
+JDBC_OPTS="-DJDBC_MIN_POOL=1 -DJDBC_MAX_POOL=100 -DJDBC_MAX_IDLE_TIME=300000"
if [[ "${java_version}" -gt 8 ]]; then
if [[ -z ${JAVA_OPTS} ]]; then
@@ -376,7 +376,7 @@ export LIBHDFS_OPTS="${final_java_opt}"
export DORIS_HOME="${DORIS_TEST_BINARY_DIR}/"
export
ASAN_OPTIONS=symbolize=1:abort_on_error=1:disable_coredump=0:unmap_shadow_on_exit=1:detect_container_overflow=0
export UBSAN_OPTIONS=print_stacktrace=1
-export JAVA_OPTS="-Xmx1024m -DlogPath=${DORIS_HOME}/log/jni.log
-Xloggc:${DORIS_HOME}/log/be.gc.log.${CUR_DATE} -Dsun.java.command=DorisBE
-XX:-CriticalJNINatives -DJDBC_MIN_POOL=1 -DJDBC_MAX_POOL=100
-DJDBC_MAX_IDEL_TIME=300000"
+export JAVA_OPTS="-Xmx1024m -DlogPath=${DORIS_HOME}/log/jni.log
-Xloggc:${DORIS_HOME}/log/be.gc.log.${CUR_DATE} -Dsun.java.command=DorisBE
-XX:-CriticalJNINatives -DJDBC_MIN_POOL=1 -DJDBC_MAX_POOL=100
-DJDBC_MAX_IDLE_TIME=300000"
# find all executable test files
test="${DORIS_TEST_BINARY_DIR}/doris_be_test"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
