This is an automated email from the ASF dual-hosted git repository.
liyang pushed a commit to branch kylin5
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/kylin5 by this push:
new d4ce488cd1 KYLIN-5957 Initialize sparkSession error for missing
sync-profiler files
d4ce488cd1 is described below
commit d4ce488cd17fd4a0bb1011655cc9d0ea23195fab
Author: Pengfei Zhan <[email protected]>
AuthorDate: Thu Aug 29 19:45:23 2024 +0800
KYLIN-5957 Initialize sparkSession error for missing sync-profiler files
---
build/async-profiler-lib/download-async-profiler.sh | 2 +-
build/release/compress.sh | 4 ++--
build/release/download-spark.sh | 1 -
.../src/main/java/org/apache/kylin/common/KylinConfigBase.java | 5 +----
4 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/build/async-profiler-lib/download-async-profiler.sh
b/build/async-profiler-lib/download-async-profiler.sh
old mode 100644
new mode 100755
index 06c3eb0fb5..ca87f68c82
--- a/build/async-profiler-lib/download-async-profiler.sh
+++ b/build/async-profiler-lib/download-async-profiler.sh
@@ -50,4 +50,4 @@ cp ${package_arm64}/build/libasyncProfiler.so
libasyncProfiler-linux-arm64.so
rm -rf ${package_full_x64}
rm -rf ${package_full_arm64}
rm -rf ${package_x64}
-rm -rf ${package_arm64}
\ No newline at end of file
+rm -rf ${package_arm64}
diff --git a/build/release/compress.sh b/build/release/compress.sh
index 2552765bff..25bbd20c21 100755
--- a/build/release/compress.sh
+++ b/build/release/compress.sh
@@ -29,7 +29,7 @@ cd build/
rm -rf ${package_name}
mkdir ${package_name}
-cp -rf VERSION SPARK_VERSION commit_SHA1 lib ${package_name}/
+cp -rf VERSION commit_SHA1 lib ${package_name}/
cp ../LICENSE ${package_name}/
cp ../NOTICE ${package_name}/
@@ -86,7 +86,7 @@ cp -rf sbin/ ${package_name}/sbin/
spark_version_pom=`mvn -f ../pom.xml help:evaluate -Dexpression=spark.version
| grep -E '^[0-9]+\.[0-9]+\.[0-9]+' `
echo "Prepare download spark scripts for end user with version
${spark_version_pom}."
-sed -i "s/SPARK_VERSION_IN_BINARY/${spark_version_pom}/g"
../build/sbin/download-spark-user.sh
+echo "$spark_version_pom" > ${package_name}/SPARK_VERSION
rm -rf ext lib commit_SHA1 VERSION # keep the spark folder on purpose
diff --git a/build/release/download-spark.sh b/build/release/download-spark.sh
index d0cc6712a0..b552e5d14c 100755
--- a/build/release/download-spark.sh
+++ b/build/release/download-spark.sh
@@ -27,7 +27,6 @@ rm -rf build/spark
spark_version_pom=`mvn -f pom.xml help:evaluate -Dexpression=spark.version |
grep -E '^[0-9]+\.[0-9]+\.[0-9]+' `
spark_pkg_name=spark-newten-"`echo ${spark_version_pom}| sed "s/-kylin//g"`"
spark_pkg_file_name="${spark_pkg_name}.tgz"
-echo "$spark_version_pom" > build/SPARK_VERSION
echo "spark_pkg_file_name : "${spark_pkg_file_name}
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
b/src/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
index 0f01e8c1c8..abcb013395 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
@@ -2975,10 +2975,7 @@ public abstract class KylinConfigBase implements
Serializable {
String kylinHome = getKylinHomeWithoutWarn();
File libX64 = new File(kylinHome + "/lib/" +
ASYNC_PROFILER_LIB_LINUX_X64);
File libArm64 = new File(kylinHome + "/lib/" +
ASYNC_PROFILER_LIB_LINUX_ARM64);
- File libX64Musl = new File(kylinHome + "/lib/" +
ASYNC_PROFILER_LIB_LINUX_MUSL_X64);
- File libArm64Musl = new File(kylinHome + "/lib/" +
ASYNC_PROFILER_LIB_LINUX_MUSL_ARM64);
- return libX64.getCanonicalPath() + "," + libArm64.getCanonicalPath() +
"," + libX64Musl.getCanonicalPath() + ","
- + libArm64Musl.getCanonicalPath();
+ return libX64.getCanonicalPath() + "," + libArm64.getCanonicalPath();
}
private String getLogPropertyFile(String filename) {
