You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by di...@apache.org on 2025/10/17 06:20:08 UTC
(doris) branch fix_java_home created (now c4594db0d1a)
This is an automated email from the ASF dual-hosted git repository.
diwu pushed a change to branch fix_java_home
in repository https://gitbox.apache.org/repos/asf/doris.git
at c4594db0d1a fix java home inconsistency
This branch includes the following new commits:
new c4594db0d1a fix java home inconsistency
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
(doris) 01/01: fix java home inconsistency
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
diwu pushed a commit to branch fix_java_home
in repository https://gitbox.apache.org/repos/asf/doris.git
commit c4594db0d1a8bfcf585f9ec3806cae07b39518bf
Author: wudi <wu...@selectdb.com>
AuthorDate: Fri Oct 17 14:19:30 2025 +0800
fix java home inconsistency
---
.../connector_p0/spark_connector/spark_connector_arrow.groovy | 11 ++++++++---
.../spark_connector/spark_connector_read_type.groovy | 11 ++++++++---
.../suites/flink_connector_p0/flink_connector_syncdb.groovy | 11 ++++++++---
.../suites/flink_connector_p0/flink_connector_type.groovy | 10 +++++++---
4 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/regression-test/suites/connector_p0/spark_connector/spark_connector_arrow.groovy b/regression-test/suites/connector_p0/spark_connector/spark_connector_arrow.groovy
index 7d9d07e7af3..08fcc1807c4 100644
--- a/regression-test/suites/connector_p0/spark_connector/spark_connector_arrow.groovy
+++ b/regression-test/suites/connector_p0/spark_connector/spark_connector_arrow.groovy
@@ -135,11 +135,16 @@ suite("spark_connector_for_arrow", "connector") {
def download_spark_jar = "/usr/bin/curl ${getS3Url()}/regression/${jar_name} --output ${jar_name}".execute().getText()
logger.info("finish download spark doris demo ...")
- def javaPath = ["bash", "-c", "which java"].execute().text.trim()
- logger.info("System java path: ${javaPath}")
+ def systemJavaPath = ["bash", "-c", "which java"].execute().text.trim()
+ logger.info("System java path: ${systemJavaPath}")
+
+ def runtimeJavaHome = System.getProperty("java.home")
+ logger.info("Runtime java home: ${runtimeJavaHome}")
+ def javaPath = "${runtimeJavaHome}/bin/java"
def javaVersion = System.getProperty("java.version")
- logger.info("System java version: ${javaVersion}")
+ logger.info("Runtime java version: ${javaVersion}")
+
def addOpens = ""
if (javaVersion.startsWith("17")) {
addOpens = "--add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED"
diff --git a/regression-test/suites/connector_p0/spark_connector/spark_connector_read_type.groovy b/regression-test/suites/connector_p0/spark_connector/spark_connector_read_type.groovy
index 03345335105..78a157256f7 100644
--- a/regression-test/suites/connector_p0/spark_connector/spark_connector_read_type.groovy
+++ b/regression-test/suites/connector_p0/spark_connector/spark_connector_read_type.groovy
@@ -98,11 +98,16 @@ suite("spark_connector_read_type", "connector") {
def download_spark_jar = "/usr/bin/curl ${getS3Url()}/regression/spark-doris-read-jar-with-dependencies.jar --output spark-doris-read.jar".execute().getText()
logger.info("finish download spark doris demo ...")
- def javaPath = ["bash", "-c", "which java"].execute().text.trim()
- logger.info("System java path: ${javaPath}")
+ def systemJavaPath = ["bash", "-c", "which java"].execute().text.trim()
+ logger.info("System java path: ${systemJavaPath}")
+
+ def runtimeJavaHome = System.getProperty("java.home")
+ logger.info("Runtime java home: ${runtimeJavaHome}")
+ def javaPath = "${runtimeJavaHome}/bin/java"
def javaVersion = System.getProperty("java.version")
- logger.info("System java version: ${javaVersion}")
+ logger.info("Runtime java version: ${javaVersion}")
+
def addOpens = ""
if (javaVersion.startsWith("17")) {
addOpens = "--add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/sun.util.calendar=ALL-UNNAMED"
diff --git a/regression-test/suites/flink_connector_p0/flink_connector_syncdb.groovy b/regression-test/suites/flink_connector_p0/flink_connector_syncdb.groovy
index ad72bbfaa4e..6719c4591e3 100644
--- a/regression-test/suites/flink_connector_p0/flink_connector_syncdb.groovy
+++ b/regression-test/suites/flink_connector_p0/flink_connector_syncdb.groovy
@@ -74,10 +74,15 @@ PROPERTIES (
throw new Exception("File flink-doris-syncdb.jar download failed.")
}
- def javaPath = ["bash", "-c", "which java"].execute().text.trim()
- logger.info("System java path: ${javaPath}")
+ def systemJavaPath = ["bash", "-c", "which java"].execute().text.trim()
+ logger.info("System java path: ${systemJavaPath}")
+
+ def runtimeJavaHome = System.getProperty("java.home")
+ logger.info("Runtime java home: ${runtimeJavaHome}")
+ def javaPath = "${runtimeJavaHome}/bin/java"
+
def javaVersion = System.getProperty("java.version")
- logger.info("System java version: ${javaVersion}")
+ logger.info("Runtime java version: ${javaVersion}")
def addOpens = ""
if (javaVersion.startsWith("17")) {
diff --git a/regression-test/suites/flink_connector_p0/flink_connector_type.groovy b/regression-test/suites/flink_connector_p0/flink_connector_type.groovy
index d5a9d97d2bd..476acb86e24 100644
--- a/regression-test/suites/flink_connector_p0/flink_connector_type.groovy
+++ b/regression-test/suites/flink_connector_p0/flink_connector_type.groovy
@@ -124,11 +124,15 @@ VALUES
logger.info("flink-doris-case.jar download failed")
throw new Exception("File flink-doris-case.jar download failed.")
}
+ def systemJavaPath = ["bash", "-c", "which java"].execute().text.trim()
+ logger.info("System java path: ${systemJavaPath}")
+
+ def runtimeJavaHome = System.getProperty("java.home")
+ logger.info("Runtime java home: ${runtimeJavaHome}")
+ def javaPath = "${runtimeJavaHome}/bin/java"
- def javaPath = ["bash", "-c", "which java"].execute().text.trim()
- logger.info("System java path: ${javaPath}")
def javaVersion = System.getProperty("java.version")
- logger.info("System java version: ${javaVersion}")
+ logger.info("Runtime java version: ${javaVersion}")
def addOpens = ""
if (javaVersion.startsWith("17")) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org