(kylin) branch kylin5 updated: KYLIN-5957 Initialize sparkSession error for missing sync-profiler files

[liyang]

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 c94c38ff7c KYLIN-5957 Initialize sparkSession error for missing 
sync-profiler files
c94c38ff7c is described below

commit c94c38ff7c1c75b41a61812d1bd88b24ba049872
Author: Pengfei Zhan <dethr...@gmail.com>
AuthorDate: Mon Sep 2 14:39:16 2024 +0800

    KYLIN-5957 Initialize sparkSession error for missing sync-profiler files
---
 .../main/java/org/apache/kylin/common/KylinConfigBase.java |  2 --
 .../kylin/common/constant/AsyncProfilerConstants.java      |  8 ++------
 .../apache/kylin/common/asyncprofiler/AsyncProfiler.java   | 14 ++------------
 3 files changed, 4 insertions(+), 20 deletions(-)

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 abcb013395..0dbeed6f9e 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
@@ -20,8 +20,6 @@ package org.apache.kylin.common;
 
 import static java.lang.Math.toIntExact;
 import static 
org.apache.kylin.common.constant.AsyncProfilerConstants.ASYNC_PROFILER_LIB_LINUX_ARM64;
-import static 
org.apache.kylin.common.constant.AsyncProfilerConstants.ASYNC_PROFILER_LIB_LINUX_MUSL_ARM64;
-import static 
org.apache.kylin.common.constant.AsyncProfilerConstants.ASYNC_PROFILER_LIB_LINUX_MUSL_X64;
 import static 
org.apache.kylin.common.constant.AsyncProfilerConstants.ASYNC_PROFILER_LIB_LINUX_X64;
 import static 
org.apache.kylin.common.constant.Constants.KYLIN_SOURCE_JDBC_CONNECTION_URL_KEY;
 import static 
org.apache.kylin.common.constant.Constants.KYLIN_SOURCE_JDBC_DRIVER_KEY;
diff --git 
a/src/core-common/src/main/java/org/apache/kylin/common/constant/AsyncProfilerConstants.java
 
b/src/core-common/src/main/java/org/apache/kylin/common/constant/AsyncProfilerConstants.java
index a7fd759e86..b411787c56 100644
--- 
a/src/core-common/src/main/java/org/apache/kylin/common/constant/AsyncProfilerConstants.java
+++ 
b/src/core-common/src/main/java/org/apache/kylin/common/constant/AsyncProfilerConstants.java
@@ -19,14 +19,10 @@ package org.apache.kylin.common.constant;
 
 public final class AsyncProfilerConstants {
 
-    private AsyncProfilerConstants() {}
+    private AsyncProfilerConstants() {
+    }
 
     public static final String ASYNC_PROFILER_LIB_MAC = 
"libasyncProfiler-mac.so";
     public static final String ASYNC_PROFILER_LIB_LINUX_X64 = 
"libasyncProfiler-linux-x64.so";
-
-    public static final String ASYNC_PROFILER_LIB_LINUX_MUSL_X64 = 
"libasyncProfiler-linux-musl-x64.so";
-
     public static final String ASYNC_PROFILER_LIB_LINUX_ARM64 = 
"libasyncProfiler-linux-arm64.so";
-
-    public static final String ASYNC_PROFILER_LIB_LINUX_MUSL_ARM64 = 
"libasyncProfiler-linux-musl-arm64.so";
 }
diff --git 
a/src/spark-project/spark-common/src/main/java/org/apache/kylin/common/asyncprofiler/AsyncProfiler.java
 
b/src/spark-project/spark-common/src/main/java/org/apache/kylin/common/asyncprofiler/AsyncProfiler.java
index d0c9d53a0e..e3304380d4 100644
--- 
a/src/spark-project/spark-common/src/main/java/org/apache/kylin/common/asyncprofiler/AsyncProfiler.java
+++ 
b/src/spark-project/spark-common/src/main/java/org/apache/kylin/common/asyncprofiler/AsyncProfiler.java
@@ -19,8 +19,6 @@
 package org.apache.kylin.common.asyncprofiler;
 
 import static 
org.apache.kylin.common.constant.AsyncProfilerConstants.ASYNC_PROFILER_LIB_LINUX_ARM64;
-import static 
org.apache.kylin.common.constant.AsyncProfilerConstants.ASYNC_PROFILER_LIB_LINUX_MUSL_ARM64;
-import static 
org.apache.kylin.common.constant.AsyncProfilerConstants.ASYNC_PROFILER_LIB_LINUX_MUSL_X64;
 import static 
org.apache.kylin.common.constant.AsyncProfilerConstants.ASYNC_PROFILER_LIB_LINUX_X64;
 import static 
org.apache.kylin.common.constant.AsyncProfilerConstants.ASYNC_PROFILER_LIB_MAC;
 
@@ -64,19 +62,11 @@ public class AsyncProfiler {
                 logger.info("Machine's archType: {}, isMuslLibc: {}", 
archType, isMuslLibc);
                 switch (archType) {
                 case LINUX_ARM64:
-                    if (isMuslLibc) {
-                        libName = ASYNC_PROFILER_LIB_LINUX_MUSL_ARM64;
-                    } else {
-                        libName = ASYNC_PROFILER_LIB_LINUX_ARM64;
-                    }
+                    libName = ASYNC_PROFILER_LIB_LINUX_ARM64;
                     break;
                 case LINUX_X64:
                 default:
-                    if (isMuslLibc) {
-                        libName = ASYNC_PROFILER_LIB_LINUX_MUSL_X64;
-                    } else {
-                        libName = ASYNC_PROFILER_LIB_LINUX_X64;
-                    }
+                    libName = ASYNC_PROFILER_LIB_LINUX_X64;
                     break;
                 }