Bug fix + Lint

apache · Aug 12, 2024 · 60b02a0 · 60b02a0
1 parent 7e7e8e2
commit 60b02a0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderCentos7.scala b/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderCentos7.scala
@@ -24,8 +24,10 @@ class SharedLibraryLoaderCentos7 extends SharedLibraryLoader {
     loader.loadAndCreateLink("libboost_thread.so.1.84.0", "libboost_thread.so", false)
     loader.loadAndCreateLink("libboost_system.so.1.84.0", "libboost_system.so", false)
     loader.loadAndCreateLink("libboost_regex.so.1.84.0", "libboost_regex.so", false)
-    loader.loadAndCreateLink
-      ("libboost_program_options.so.1.84.0", "libboost_program_options.so", false)
+    loader.loadAndCreateLink(
+      "libboost_program_options.so.1.84.0",
+      "libboost_program_options.so",
+      false)
     loader.loadAndCreateLink("libboost_filesystem.so.1.84.0", "libboost_filesystem.so", false)
     loader.loadAndCreateLink("libboost_context.so.1.84.0", "libboost_context.so", false)
     loader.loadAndCreateLink("libdouble-conversion.so.1", "libdouble-conversion.so", false)

diff --git a/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderCentos8.scala b/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderCentos8.scala
@@ -27,8 +27,10 @@ class SharedLibraryLoaderCentos8 extends SharedLibraryLoader {
     loader.loadAndCreateLink("libicuuc.so.60", "libicuuc.so", false)
     loader.loadAndCreateLink("libicui18n.so.60", "libicui18n.so", false)
     loader.loadAndCreateLink("libboost_regex.so.1.84.0", "libboost_regex.so", false)
-    loader.loadAndCreateLink
-      ("libboost_program_options.so.1.84.0", "libboost_program_options.so", false)
+    loader.loadAndCreateLink(
+      "libboost_program_options.so.1.84.0",
+      "libboost_program_options.so",
+      false)
     loader.loadAndCreateLink("libboost_filesystem.so.1.84.0", "libboost_filesystem.so", false)
     loader.loadAndCreateLink("libboost_context.so.1.84.0", "libboost_context.so", false)
     loader.loadAndCreateLink("libdouble-conversion.so.3", "libdouble-conversion.so", false)

diff --git a/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderCentos9.scala b/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderCentos9.scala
@@ -27,8 +27,10 @@ class SharedLibraryLoaderCentos9 extends SharedLibraryLoader {
     loader.loadAndCreateLink("libicuuc.so.67", "libicuuc.so", false)
     loader.loadAndCreateLink("libicui18n.so.67", "libicui18n.so", false)
     loader.loadAndCreateLink("libboost_regex.so.1.84.0", "libboost_regex.so", false)
-    loader.loadAndCreateLink
-      ("libboost_program_options.so.1.84.0", "libboost_program_options.so", false)
+    loader.loadAndCreateLink(
+      "libboost_program_options.so.1.84.0",
+      "libboost_program_options.so",
+      false)
     loader.loadAndCreateLink("libboost_filesystem.so.1.84.0", "libboost_filesystem.so", false)
     loader.loadAndCreateLink("libboost_context.so.1.84.0", "libboost_context.so", false)
     loader.loadAndCreateLink("libdouble-conversion.so.3", "libdouble-conversion.so", false)

diff --git a/gluten-core/src/main/java/org/apache/gluten/vectorized/JniLibLoader.java b/gluten-core/src/main/java/org/apache/gluten/vectorized/JniLibLoader.java
@@ -169,7 +169,7 @@ public void load(String libName, boolean requireUnload) {
         LOG.debug("Library {} has already been loaded, skipping", libName);
         return;
       }
-      File file = moveToWorkDir(workDir, System.mapLibraryName(libName));
+      File file = moveToWorkDir(workDir, libName);
       loadWithLink(file.getAbsolutePath(), null, requireUnload);
       loadedLibraries.add(libName);
       LOG.info("Successfully loaded library {}", libName);