This is an automated email from the ASF dual-hosted git repository. zykkk pushed a commit to branch doris-jdk17 in repository https://gitbox.apache.org/repos/asf/doris.git
commit 2afa2cdec351de804e1589d1adcb02c2b399e0cc Author: Tiewei Fang <[email protected]> AuthorDate: Fri Jan 26 13:03:24 2024 +0800 [Fix](JDK17) Fix start_be.sh (#30300) --- bin/start_be.sh | 2 +- fe/fe-core/src/main/java/org/apache/doris/load/ExportJob.java | 2 +- regression-test/pipeline/external/conf/regression-conf.groovy | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bin/start_be.sh b/bin/start_be.sh index 16258dde48d..1aed3e746b1 100755 --- a/bin/start_be.sh +++ b/bin/start_be.sh @@ -308,7 +308,7 @@ COMMON_OPTS="-Dsun.java.command=DorisBE -XX:-CriticalJNINatives" if [[ "${java_version}" -gt 16 ]]; then if [[ -z ${JAVA_OPTS_FOR_JDK_17} ]]; then - JAVA_OPTS_FOR_JDK_17="-Xmx1024m -XX:+UseZGC ${LOG_PATH} -Xlog:gc:${DORIS_HOME}/log/be.gc.log.${CUR_DATE} ${COMMON_OPTS} --add-opens=java.base/java.net=ALL-UNNAMED" + JAVA_OPTS_FOR_JDK_17="-Xmx1024m ${LOG_PATH} -Xlog:gc:${DORIS_HOME}/log/be.gc.log.${CUR_DATE} ${COMMON_OPTS} --add-opens=java.base/java.net=ALL-UNNAMED" fi final_java_opt="${JAVA_OPTS_FOR_JDK_17}" elif [[ "${java_version}" -gt 8 ]]; then diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/ExportJob.java b/fe/fe-core/src/main/java/org/apache/doris/load/ExportJob.java index 0ae513d1db6..0f3e30591c0 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/ExportJob.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/ExportJob.java @@ -394,7 +394,7 @@ public class ExportJob implements Writable { } /** - * Generate outfile select stmt + * Generate select outfile stmtement * @throws UserException */ private void generateQueryStmt() throws UserException { diff --git a/regression-test/pipeline/external/conf/regression-conf.groovy b/regression-test/pipeline/external/conf/regression-conf.groovy index 99a8666fbc9..432c836a9e5 100644 --- a/regression-test/pipeline/external/conf/regression-conf.groovy +++ b/regression-test/pipeline/external/conf/regression-conf.groovy @@ -55,9 +55,9 @@ testDirectories = "" // this groups will not be executed excludeGroups = "" // this suites will not be executed -excludeSuites = "test_cast_string_to_array,test_broker_load,test_spark_load,test_analyze_stats_p1,test_refresh_mtmv" +excludeSuites = "test_cast_string_to_array,test_broker_load,test_spark_load,test_analyze_stats_p1,test_refresh_mtmv,test_catalog_hive_orc,test_catalog_hive_parquet,test_information_schema_external" // this directories will not be executed -excludeDirectories = "" +excludeDirectories = "workload_manager_p1,nereids_rules_p0/subquery" customConf1 = "test_custom_conf_value" @@ -80,6 +80,7 @@ pg_14_port=7121 oracle_11_port=1521 sqlserver_2022_port=1433 clickhouse_22_port=8123 +mariadb_10_port=3326 // hive catalog test config // To enable jdbc test, you need first start hive container. @@ -87,6 +88,7 @@ clickhouse_22_port=8123 enableHiveTest=true hms_port=7141 hive_pg_port=5432 +hiveServerPort=10000 enableEsTest=true es_6_port="19200/" --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
