This is an automated email from the ASF dual-hosted git repository. xxyu pushed a commit to branch kylin5_beta in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 96e5cd9a66057b44b79a134898d5af175e2109af Author: XiaoxiangYu <x...@apache.org> AuthorDate: Mon Jul 24 17:48:44 2023 +0800 Minor: Fix async-profiler script --- .../async-profiler-lib/download-async-profiler.sh | 34 +++++++++++++++++++++- build/release/compress.sh | 5 ++-- build/sbin/download-spark-user.sh | 2 +- 3 files changed, 36 insertions(+), 5 deletions(-) diff --git a/build/async-profiler-lib/download-async-profiler.sh b/build/async-profiler-lib/download-async-profiler.sh index bbb33b26a1..06c3eb0fb5 100644 --- a/build/async-profiler-lib/download-async-profiler.sh +++ b/build/async-profiler-lib/download-async-profiler.sh @@ -17,5 +17,37 @@ # * limitations under the License. # */ # +package_version="2.9" -wget https://github.com/jvm-profiling-tools/async-profiler/releases/download/v2.9/async-profiler-2.9-linux-x64.tar.gz \ No newline at end of file +package_x64="async-profiler-${package_version}-linux-x64" +package_arm64="async-profiler-${package_version}-linux-arm64" + +file_suffix=".tar.gz" +package_full_x64="${package_x64}${file_suffix}" +package_full_arm64="${package_arm64}${file_suffix}" + +wget https://github.com/jvm-profiling-tools/async-profiler/releases/download/v${package_version}/${package_full_x64} +wget https://github.com/jvm-profiling-tools/async-profiler/releases/download/v${package_version}/${package_full_arm64} + +if [ `md5sum ${package_full_x64} | awk '{print $1}'` != "29127cee36b7acf069d31603b4558361" ] +then + echo "md5 check failed for ${package_full_x64}" + exit 1 +fi + +if [ `md5sum ${package_full_arm64} | awk '{print $1}'` != "d31a70d2c176146a46dffc15948040ed" ] +then + echo "md5 check failed for ${package_full_arm64}" + exit 1 +fi + +tar -zxf ${package_full_x64} +tar -zxf ${package_full_arm64} + +cp ${package_x64}/build/libasyncProfiler.so libasyncProfiler-linux-x64.so +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 diff --git a/build/release/compress.sh b/build/release/compress.sh index e0d646fb40..7e573e62ef 100755 --- a/build/release/compress.sh +++ b/build/release/compress.sh @@ -48,10 +48,9 @@ fi ## copy async profiler native files bash async-profiler-lib/download-async-profiler.sh -cp -rf async-profiler-2.9-linux-x64.tar.gz "${package_name}"/lib/libasyncProfiler-linux-x64.so #cp -rf async-profiler-lib/libasyncProfiler-mac.so "${package_name}"/lib/libasyncProfiler-mac.so -#cp -rf async-profiler-lib/libasyncProfiler-linux-x64.so "${package_name}"/lib/libasyncProfiler-linux-x64.so -#cp -rf async-profiler-lib/libasyncProfiler-linux-arm64.so "${package_name}"/lib/libasyncProfiler-linux-arm64.so +cp -rf async-profiler-lib/libasyncProfiler-linux-x64.so "${package_name}"/lib/libasyncProfiler-linux-x64.so +cp -rf async-profiler-lib/libasyncProfiler-linux-arm64.so "${package_name}"/lib/libasyncProfiler-linux-arm64.so # Add ssb data preparation files mkdir -p ${package_name}/tool/ssb diff --git a/build/sbin/download-spark-user.sh b/build/sbin/download-spark-user.sh index d168dd5839..a44b656563 100755 --- a/build/sbin/download-spark-user.sh +++ b/build/sbin/download-spark-user.sh @@ -33,7 +33,7 @@ if [[ -d ${KYLIN_HOME}/spark ]]; then exit 1 fi -spark_version_in_binary=3.2.0-4.6.3.0 +spark_version_in_binary=3.2.0-kylin-4.6.9.0 spark_pkg_name=spark-newten-"`echo ${spark_version_in_binary}| sed "s/-kylin//g"`" spark_pkg_file_name="${spark_pkg_name}.tgz"