From ce56287e423ea457b56316fc36b8cc5a3e1fe79c Mon Sep 17 00:00:00 2001 From: zhaohehuhu Date: Thu, 30 Jul 2026 15:18:49 +0800 Subject: [PATCH 1/2] add build branch and build reversion info Signed-off-by: zhaohehuhu --- auron-build.sh | 6 ++++++ .../main/scala/org/apache/auron/common/AuronBuildInfo.scala | 4 ++++ .../main/scala/org/apache/spark/sql/auron/ShimsImpl.scala | 2 ++ 3 files changed, 12 insertions(+) diff --git a/auron-build.sh b/auron-build.sh index 2fffcabf5..00b3a4837 100755 --- a/auron-build.sh +++ b/auron-build.sh @@ -529,6 +529,8 @@ mkdir -p "$(dirname "$BUILD_INFO_FILE")" JAVA_VERSION=$(java -version 2>&1 | head -n 1 | awk '{print $3}' | tr -d '"') PROJECT_VERSION=$(./build/mvn help:evaluate -N -Dexpression=project.version -Pspark-${SPARK_VER} -q -DforceStdout 2>/dev/null) RUST_VERSION=$(rustc --version | awk '{print $2}') +BUILD_BRANCH=$(git rev-parse --abbrev-ref HEAD 2>/dev/null) +BUILD_REVISION=$(git rev-parse HEAD 2>/dev/null) get_build_info() { case "$1" in @@ -543,6 +545,8 @@ get_build_info() { "flink.version") echo "${FLINK_VER}" ;; "iceberg.version") echo "${ICEBERG_VER}" ;; "hudi.version") echo "${HUDI_VER}" ;; + "build.branch") echo "${BUILD_BRANCH}" ;; + "build.revision") echo "${BUILD_REVISION}" ;; "build.timestamp") echo "$(date -u +"%Y-%m-%dT%H:%M:%SZ")" ;; *) echo "" ;; esac @@ -560,6 +564,8 @@ for key in \ "paimon.version" \ "flink.version" \ "iceberg.version" \ + "build.branch" \ + "build.revision" \ "build.timestamp"; do value="$(get_build_info "$key")" if [[ -n "$value" ]]; then diff --git a/common/src/main/scala/org/apache/auron/common/AuronBuildInfo.scala b/common/src/main/scala/org/apache/auron/common/AuronBuildInfo.scala index ffdb9ec39..9ef26e1cb 100644 --- a/common/src/main/scala/org/apache/auron/common/AuronBuildInfo.scala +++ b/common/src/main/scala/org/apache/auron/common/AuronBuildInfo.scala @@ -50,6 +50,8 @@ object AuronBuildInfo { val UNIFFLE_VERSION_STRING: String = "Uniffle Version" val PAIMON_VERSION_STRING: String = "Paimon Version" val ICEBERG_VERSION_STRING: String = "Iceberg Version" + val BUILD_BRANCH_STRING: String = "Build Branch" + val BUILD_REVISION_STRING: String = "Build Revision" val BUILD_DATE_STRING: String = "Build Timestamp" val VERSION: String = props.getProperty("project.version", unknown) @@ -62,5 +64,7 @@ object AuronBuildInfo { val PAIMON_VERSION: String = props.getProperty("paimon.version", unknown) val ICEBERG_VERSION: String = props.getProperty("iceberg.version", unknown) val FLINK_VERSION: String = props.getProperty("flink.version", unknown) + val BUILD_BRANCH: String = props.getProperty("build.branch", unknown) + val BUILD_REVISION: String = props.getProperty("build.revision", unknown) val BUILD_DATE: String = props.getProperty("build.timestamp", unknown) } diff --git a/spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/auron/ShimsImpl.scala b/spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/auron/ShimsImpl.scala index 99a9e088b..a5eb81168 100644 --- a/spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/auron/ShimsImpl.scala +++ b/spark-extension-shims-spark/src/main/scala/org/apache/spark/sql/auron/ShimsImpl.scala @@ -199,6 +199,8 @@ class ShimsImpl extends Shims with Logging { auronBuildInfo.put(AuronBuildInfo.PAIMON_VERSION_STRING, AuronBuildInfo.PAIMON_VERSION) auronBuildInfo.put(AuronBuildInfo.ICEBERG_VERSION_STRING, AuronBuildInfo.ICEBERG_VERSION) auronBuildInfo.put(AuronBuildInfo.FLINK_VERSION_STRING, AuronBuildInfo.FLINK_VERSION) + auronBuildInfo.put(AuronBuildInfo.BUILD_BRANCH_STRING, AuronBuildInfo.BUILD_BRANCH) + auronBuildInfo.put(AuronBuildInfo.BUILD_REVISION_STRING, AuronBuildInfo.BUILD_REVISION) auronBuildInfo.put(AuronBuildInfo.BUILD_DATE_STRING, AuronBuildInfo.BUILD_DATE) auronBuildInfo.retain { case (_, v) => v != null && v.nonEmpty } val event = AuronBuildInfoEvent(auronBuildInfo) From c14edfd7d3ed3b8238f7621366062d6bfe91ea89 Mon Sep 17 00:00:00 2001 From: zhaohehuhu Date: Mon, 3 Aug 2026 15:35:57 +0800 Subject: [PATCH 2/2] refactor Signed-off-by: zhaohehuhu --- auron-build.sh | 10 ++++++++-- dev/docker-build/docker-compose.yml | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/auron-build.sh b/auron-build.sh index 00b3a4837..95350b48d 100755 --- a/auron-build.sh +++ b/auron-build.sh @@ -69,6 +69,10 @@ print_help() { echo " -h, --help Show this help message" echo + echo "Environment variables:" + echo " AURON_BUILD_BRANCH Override detected Git branch in generated build info" + echo " AURON_BUILD_REVISION Override detected Git revision in generated build info" + echo echo "Examples:" echo " $0 --pre --sparkver ${SUPPORTED_SPARK_VERSIONS[*]: -1}" \ "--scalaver ${SUPPORTED_SCALA_VERSIONS[*]: -1} -DskipBuildNative" @@ -529,8 +533,8 @@ mkdir -p "$(dirname "$BUILD_INFO_FILE")" JAVA_VERSION=$(java -version 2>&1 | head -n 1 | awk '{print $3}' | tr -d '"') PROJECT_VERSION=$(./build/mvn help:evaluate -N -Dexpression=project.version -Pspark-${SPARK_VER} -q -DforceStdout 2>/dev/null) RUST_VERSION=$(rustc --version | awk '{print $2}') -BUILD_BRANCH=$(git rev-parse --abbrev-ref HEAD 2>/dev/null) -BUILD_REVISION=$(git rev-parse HEAD 2>/dev/null) +BUILD_BRANCH="${AURON_BUILD_BRANCH:-$(git rev-parse --abbrev-ref HEAD 2>/dev/null)}" +BUILD_REVISION="${AURON_BUILD_REVISION:-$(git rev-parse HEAD 2>/dev/null)}" get_build_info() { case "$1" in @@ -606,6 +610,8 @@ if [[ "$USE_DOCKER" == true ]]; then echo "[INFO] Compiling inside Docker container..." export AURON_BUILD_ARGS="${BUILD_ARGS[*]}" + export AURON_BUILD_BRANCH="${BUILD_BRANCH}" + export AURON_BUILD_REVISION="${BUILD_REVISION}" export BUILD_CONTEXT="./${IMAGE_NAME}" # Spark 4.x requires JDK 17+, auto-set if not specified if [[ -z "$AURON_JAVA_VERSION" && "$SPARK_VER" == 4.* ]]; then diff --git a/dev/docker-build/docker-compose.yml b/dev/docker-build/docker-compose.yml index e8e938f37..c84edb154 100644 --- a/dev/docker-build/docker-compose.yml +++ b/dev/docker-build/docker-compose.yml @@ -33,6 +33,8 @@ services: environment: RUSTFLAGS: "-C target-cpu=skylake" AURON_BUILD_ARGS: "${AURON_BUILD_ARGS}" + AURON_BUILD_BRANCH: "${AURON_BUILD_BRANCH}" + AURON_BUILD_REVISION: "${AURON_BUILD_REVISION}" AURON_JAVA_VERSION: "${AURON_JAVA_VERSION:-8}" command: > bash -c '