Use matrix

lancedb · Jun 12, 2024 · f2d3b88 · f2d3b88
1 parent d47b3f3
commit f2d3b88
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 75 deletions.
diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
@@ -8,7 +8,7 @@ on:
     paths:
       - java/**
       - rust/**
-      - .github/workflows/java_jni_tests.yml
+      - .github/workflows/java.yml
 
 env:
   # This env var is used by Swatinem/rust-cache@v2 for the cache
@@ -24,67 +24,28 @@ env:
   CARGO_BUILD_JOBS: "1"
 
 jobs:
-  build-and-test-java-11:
+  rust-clippy-fmt:
     runs-on: ubuntu-22.04
-    name: ubuntu-22.04 + Java 11
+    name: Rust Clippy and Fmt Check
     defaults:
       run:
-        working-directory: ./java
+        working-directory: ./java/core/lance-jni
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
       - uses: Swatinem/rust-cache@v2
         with:
-          workspaces: java/java-jni
+          workspaces: java/core/lance-jni
       - name: Run cargo fmt
         run: cargo fmt --check
-        working-directory: ./java/core/lance-jni
-      - name: Install dependencies
-        run: |
-          sudo apt update
-          sudo apt install -y protobuf-compiler libssl-dev
-      - name: Install Java 11
-        uses: actions/setup-java@v4
-        with:
-          distribution: temurin
-          java-version: 11
-          cache: "maven"
-      - name: Java Style Check
-        run: mvn checkstyle:check
       - name: Rust Clippy
-        working-directory: java/core/lance-jni
         run: cargo clippy --all-targets -- -D warnings
-      - name: Running tests with Java 11
-        run: mvn clean test
-
-  build-and-test-java-8:
-    runs-on: ubuntu-22.04
-    name: ubuntu-22.04 + Java 8
-    defaults:
-      run:
-        working-directory: ./java
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: java/java-jni
-      - name: Install dependencies
-        run: |
-          sudo apt update
-          sudo apt install -y protobuf-compiler libssl-dev
-      - name: Install Java 8
-        uses: actions/setup-java@v4
-        with:
-          distribution: temurin
-          java-version: 8
-          cache: "maven"
-      - name: Running tests with Java 8
-        run: mvn clean test
 
-  build-and-test-java-17:
+  build-and-test:
     runs-on: ubuntu-22.04
-    name: ubuntu-22.04 + Java 17
+    strategy:
+      matrix:
+        java-version: [8, 11, 17]
     defaults:
       run:
         working-directory: ./java
@@ -93,36 +54,38 @@ jobs:
         uses: actions/checkout@v4
       - uses: Swatinem/rust-cache@v2
         with:
-          workspaces: java/java-jni
+          workspaces: java/core/lance-jni
       - name: Install dependencies
         run: |
           sudo apt update
           sudo apt install -y protobuf-compiler libssl-dev
-      - name: Install Java 17
+      - name: Set up Java ${{ matrix.java-version }}
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: ${{ matrix.java-version }}
           cache: "maven"
-      - name: Running tests with Java 17
+      - name: Running tests with Java ${{ matrix.java-version }}
         run: |
-          export JAVA_TOOL_OPTIONS="$JAVA_TOOL_OPTIONS \
-          -XX:+IgnoreUnrecognizedVMOptions \
-          --add-opens=java.base/java.lang=ALL-UNNAMED \
-          --add-opens=java.base/java.lang.invoke=ALL-UNNAMED \
-          --add-opens=java.base/java.lang.reflect=ALL-UNNAMED \
-          --add-opens=java.base/java.io=ALL-UNNAMED \
-          --add-opens=java.base/java.net=ALL-UNNAMED \
-          --add-opens=java.base/java.nio=ALL-UNNAMED \
-          --add-opens=java.base/java.util=ALL-UNNAMED \
-          --add-opens=java.base/java.util.concurrent=ALL-UNNAMED \
-          --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED \
-          --add-opens=java.base/jdk.internal.ref=ALL-UNNAMED \
-          --add-opens=java.base/sun.nio.ch=ALL-UNNAMED \
-          --add-opens=java.base/sun.nio.cs=ALL-UNNAMED \
-          --add-opens=java.base/sun.security.action=ALL-UNNAMED \
-          --add-opens=java.base/sun.util.calendar=ALL-UNNAMED \
-          --add-opens=java.security.jgss/sun.security.krb5=ALL-UNNAMED \
-          -Djdk.reflect.useDirectMethodHandle=false \
-          -Dio.netty.tryReflectionSetAccessible=true"
+          if [ "${{ matrix.java-version }}" == "17" ]; then
+            export JAVA_TOOL_OPTIONS="$JAVA_TOOL_OPTIONS \
+            -XX:+IgnoreUnrecognizedVMOptions \
+            --add-opens=java.base/java.lang=ALL-UNNAMED \
+            --add-opens=java.base/java.lang.invoke=ALL-UNNAMED \
+            --add-opens=java.base/java.lang.reflect=ALL-UNNAMED \
+            --add-opens=java.base/java.io=ALL-UNNAMED \
+            --add-opens=java.base/java.net=ALL-UNNAMED \
+            --add-opens=java.base/java.nio=ALL-UNNAMED \
+            --add-opens=java.base/java.util=ALL-UNNAMED \
+            --add-opens=java.base/java.util.concurrent=ALL-UNNAMED \
+            --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED \
+            --add-opens=java.base/jdk.internal.ref=ALL-UNNAMED \
+            --add-opens=java.base/sun.nio.ch=ALL-UNNAMED \
+            --add-opens=java.base/sun.nio.cs=ALL-UNNAMED \
+            --add-opens=java.base/sun.security.action=ALL-UNNAMED \
+            --add-opens=java.base/sun.util.calendar=ALL-UNNAMED \
+            --add-opens=java.security.jgss/sun.security.krb5=ALL-UNNAMED \
+            -Djdk.reflect.useDirectMethodHandle=false \
+            -Dio.netty.tryReflectionSetAccessible=true"
+          fi
           mvn clean test
diff --git a/java/core/lance-jni/src/fragment.rs b/java/core/lance-jni/src/fragment.rs
@@ -34,10 +34,6 @@ use crate::{
     RT,
 };
 
-///////////////////
-// Write Methods //
-///////////////////
-
 //////////////////
 // Read Methods //
 //////////////////
@@ -70,6 +66,9 @@ fn inner_count_rows_native(
     Ok(res)
 }
 
+///////////////////
+// Write Methods //
+///////////////////
 #[no_mangle]
 pub extern "system" fn Java_com_lancedb_lance_Fragment_createWithFfiArray<'local>(
     mut env: JNIEnv<'local>,