Skip to content

GH-657: Set JNA library loading symbol visibility #658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

GH-657: Set JNA library loading symbol visibility #658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c6ee296
Fix package error for jna include.
lriggs Dec 13, 2024
734af16
DX-88565 Fixed gandiva native library loading option to be global
DenisTarasyuk Apr 16, 2024
eb3cfd2
Dremio updates
lriggs Feb 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions gandiva/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@
requires org.apache.arrow.memory.core;
requires org.apache.arrow.vector;
requires org.slf4j;
requires com.sun.jna;
}
9 changes: 9 additions & 0 deletions gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/JniLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,14 @@

import static java.util.UUID.randomUUID;

import com.sun.jna.Library;
import com.sun.jna.NativeLibrary;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
import java.util.Collections;
import java.util.Locale;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
Expand All @@ -32,6 +35,9 @@
class JniLoader {
private static final String LIBRARY_NAME = "gandiva_jni";

private static final int RTLD_GLOBAL = 0x00100;
private static final int RTLD_LAZY = 0x00001;

private static volatile JniLoader INSTANCE;
private static volatile long defaultConfiguration = 0L;
private static final ConcurrentMap<ConfigurationBuilder.ConfigOptions, Long> configurationMap =
Expand Down Expand Up @@ -69,6 +75,9 @@ private static void loadGandivaLibraryFromJar(final String tmpDir)
final String libraryToLoad =
LIBRARY_NAME + "/" + getNormalizedArch() + "/" + System.mapLibraryName(LIBRARY_NAME);
final File libraryFile = moveFileFromJarToTemp(tmpDir, libraryToLoad, LIBRARY_NAME);
NativeLibrary.getInstance(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't the NativeLibrary instance need to be disposed somewhere?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not also leveraging java.library.path system prop ?

libraryFile.getAbsolutePath(),
Collections.singletonMap(Library.OPTION_OPEN_FLAGS, new Integer(RTLD_LAZY | RTLD_GLOBAL)));
System.load(libraryFile.getAbsolutePath());
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this still necessary if we're using the JNA version?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this is strictly required with JNA imho.

}

Expand Down
Loading