update dockerfile, fix library path

Author: Jiayu Liu

Dockerfile

@@ -1,5 +1,4 @@
-# build jni
-FROM debian:bullseye as rust-builder
+FROM openjdk:11-jdk-slim-bullseye
 
 ENV DEBIAN_FRONTEND noninteractive
 
@@ -11,15 +10,6 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 
 ENV PATH="/root/.cargo/bin:$PATH"
 
-COPY datafusion-jni /usr/opt/datafusion-jni
-
-WORKDIR /usr/opt/datafusion-jni
-
-RUN cargo build --release
-
-# build java
-FROM openjdk:17-jdk-slim-bullseye AS java-builder
-
 WORKDIR /usr/opt/datafusion-java
 
 COPY build.gradle settings.gradle gradlew ./
@@ -30,16 +20,6 @@ RUN ./gradlew --version
 
 COPY . .
 
-RUN ./gradlew installDist
-
-FROM openjdk:17-jdk-slim-bullseye
-
-WORKDIR /usr/opt/datafusion-java
-
-COPY --from=rust-builder /usr/opt/datafusion-jni/target/release/libdatafusion_jni.so ./
-
-COPY --from=java-builder /usr/opt/datafusion-java/datafusion-examples/build/install/datafusion-examples ./
-
-CMD ["--class-path", "/usr/opt/datafusion-java/lib/*", "-R", "-Djava.library.path=/usr/opt/datafusion-java"]
+RUN ./gradlew cargoReleaseBuild build installDist
 
-ENTRYPOINT ["jshell"]
+ENTRYPOINT ["./datafusion-examples/build/install/datafusion-examples/bin/datafusion-examples"]

README.md

@@ -21,27 +21,11 @@ dependencies {
     implementation(
         group = "io.github.datafusion-contrib",
         name = "datafusion-java",
-        version = "0.7.1" // or latest version, checkout https://github.com/datafusion-contrib/datafusion-java/releases
+        version = "0.9.0" // or latest version, checkout https://github.com/datafusion-contrib/datafusion-java/releases
     )
 }
 ```
 
-Additionally, given this is a JNI project, you'll need to download the pre-built binary to be loaded during runtime. The pre-built libraries are compiled, signed, and verified from GitHub workflow actions, and are made available in https://repo.maven.apache.org/maven2/io/github/datafusion-contrib/datafusion-java/{a.b.c}/ where `{a.b.c}` is the latest version:
-
-- `datafusion-java-a.b.c.so` is for linux-x86_64 machines
-- `datafusion-java-a.b.c.dylib` is for macOS machines
-
-Additionally you are encouraged to check the GPG signature as well as the sha256 sum of the binaries just to be sure.
-
-Once downloaded, rename the library as `libdatafusion_jni.so` or `libdatafusion_jni.dylib` and put it to a directory readable by your application. During startup time, make sure you pass:
-
-```bash
-# or use gradle run but supply --args instead
-java -Djava.library.path=/Users/me/dir/to/jni/library/ ...
-```
-
-to the command line.
-
 To test it out, you can use this piece of demo code:
 
 <details>

datafusion-java/src/main/java/org/apache/arrow/datafusion/JNILoader.java

@@ -41,8 +41,11 @@ private static OsName getOsName() {
     }
   }
 
+  /**
+   * @return the absolute path in the jar file for the jni library
+   */
   private static String getResourceName() {
-    return String.format("lib%s.%s", libraryName, getExtension());
+    return String.format("/jni_libs/lib%s.%s", libraryName, getExtension());
   }
 
   private static String getExtension() {
@@ -54,16 +57,15 @@ private static String getExtension() {
     } else if (osName == OsName.Windows) {
       return "dll";
     }
-    throw new IllegalStateException("Cannot determin extension for " + osName);
+    throw new IllegalStateException("Cannot determine the extension for " + osName);
   }
 
   static synchronized void load() {
     if (loaded.get()) {
       logger.debug("{} already loaded, returning", libraryName);
       return;
     }
-    String resourceName = getResourceName();
-    InputStream is = JNILoader.class.getResourceAsStream(resourceName);
+    InputStream is = JNILoader.class.getResourceAsStream(getResourceName());
     if (is == null) {
       try {
         System.loadLibrary(libraryName);