This is an automated email from the ASF dual-hosted git repository.
maruilei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/auron.git
The following commit(s) were added to refs/heads/master by this push:
new ef625c26 [AURON #1612] Filter out empty build-info values to improve
Spark UI display (#1615)
ef625c26 is described below
commit ef625c260f9979b163a86f74ac6342c4a266b335
Author: Ruilei Ma <[email protected]>
AuthorDate: Sun Nov 16 17:45:57 2025 +0800
[AURON #1612] Filter out empty build-info values to improve Spark UI
display (#1615)
---
auron-build.sh | 34 +++++++++++++---------
.../org/apache/auron/common/AuronBuildInfo.scala | 2 +-
.../org/apache/spark/sql/auron/ShimsImpl.scala | 1 +
3 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/auron-build.sh b/auron-build.sh
index 9172cf80..8da47c1a 100755
--- a/auron-build.sh
+++ b/auron-build.sh
@@ -395,19 +395,27 @@ 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}')
-{
- echo "spark.version=${SPARK_VER}"
- echo "rust.version=${RUST_VERSION}"
- echo "java.version=${JAVA_VERSION}"
- echo "project.version=${PROJECT_VERSION}"
- echo "scala.version=${SCALA_VER}"
- echo "celeborn.version=${CELEBORN_VER}"
- echo "uniffle.version=${UNIFFLE_VER}"
- echo "paimon.version=${PAIMON_VER}"
- echo "flink.version=${FLINK_VER}"
- echo "iceberg.version=${ICEBERG_VER}"
- echo "build.timestamp=$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
-} > "$BUILD_INFO_FILE"
+declare -A build_info=(
+ ["spark.version"]="${SPARK_VER}"
+ ["rust.version"]="${RUST_VERSION}"
+ ["java.version"]="${JAVA_VERSION}"
+ ["project.version"]="${PROJECT_VERSION}"
+ ["scala.version"]="${SCALA_VER}"
+ ["celeborn.version"]="${CELEBORN_VER}"
+ ["uniffle.version"]="${UNIFFLE_VER}"
+ ["paimon.version"]="${PAIMON_VER}"
+ ["flink.version"]="${FLINK_VER}"
+ ["iceberg.version"]="${ICEBERG_VER}"
+ ["build.timestamp"]="$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
+)
+
+true > "$BUILD_INFO_FILE"
+for key in "${!build_info[@]}"; do
+ value="${build_info[$key]}"
+ if [[ -n "$value" ]]; then
+ echo "$key=$value" >> "$BUILD_INFO_FILE"
+ fi
+done
# -----------------------------------------------------------------------------
# Section: Build Info Display
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 87ea2cbb..a0e3f372 100644
--- a/common/src/main/scala/org/apache/auron/common/AuronBuildInfo.scala
+++ b/common/src/main/scala/org/apache/auron/common/AuronBuildInfo.scala
@@ -30,7 +30,7 @@ object AuronBuildInfo {
throw new Exception(s"Can not load the core build file: $buildFile")
}
- private val unknown = "NULL"
+ private val unknown = ""
private val props = new Properties()
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 0ab39213..6aa669de 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
@@ -192,6 +192,7 @@ class ShimsImpl extends Shims with Logging {
auronBuildInfo.put(AuronBuildInfo.PAIMON_VERSION_STRING,
AuronBuildInfo.PAIMON_VERSION)
auronBuildInfo.put(AuronBuildInfo.FLINK_VERSION_STRING,
AuronBuildInfo.FLINK_VERSION)
auronBuildInfo.put(AuronBuildInfo.BUILD_DATE_STRING,
AuronBuildInfo.BUILD_DATE)
+ auronBuildInfo.retain { case (_, v) => v != null && v.nonEmpty }
val event = AuronBuildInfoEvent(auronBuildInfo)
AuronEventUtils.post(sparkContext, event)
}