Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/java-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -194,11 +194,11 @@ jobs:
with:
ref: ${{ inputs.ref }}
- uses: Swatinem/rust-cache@v2
- name: Set up Java 8
- name: Set up Java 11
uses: actions/setup-java@v4
with:
distribution: corretto
java-version: 8
java-version: 11
cache: "maven"
server-id: ossrh
server-username: SONATYPE_USER
Expand Down Expand Up @@ -228,7 +228,7 @@ jobs:
working-directory: java
run: |
mvn --batch-mode -DskipTests -Drust.release.build=true package
- name: Publish with Java 8
- name: Publish with Java 11
if: |
github.event_name == 'release' ||
inputs.mode == 'release'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
timeout-minutes: 60
strategy:
matrix:
java-version: [8, 11, 17]
java-version: [11, 17, 21]
name: Build and Test with Java ${{ matrix.java-version }}
steps:
- name: Checkout repository
Expand Down
2 changes: 1 addition & 1 deletion java/AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ lint rust: `cargo clippy --tests --manifest-path ./lance-jni/Cargo.toml`
compile: `./mvnw compile`
test: `./mvnw test`

JDK: pom.xml targets Java 8 (`maven.compiler.release` 8); align Rust toolchain with repository `rust-toolchain.toml`.
JDK: pom.xml targets Java 11 (`maven.compiler.release` 11); align Rust toolchain with repository `rust-toolchain.toml`.
10 changes: 5 additions & 5 deletions java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<arrow.version>15.0.0</arrow.version>
<arrow.version>18.3.0</arrow.version>
<substrait.version>0.28.1</substrait.version>
<spotless.skip>false</spotless.skip>
<spotless.version>2.30.0</spotless.version>
<spotless.java.googlejavaformat.version>1.7</spotless.java.googlejavaformat.version>
<spotless.version>2.43.0</spotless.version>
<spotless.java.googlejavaformat.version>1.22.0</spotless.java.googlejavaformat.version>
<scala.version>2.12.19</scala.version>
<scala.binary.version>2.12</scala.binary.version>
<!-- Please also update .scalafmt.conf when you change it here -->
Expand Down Expand Up @@ -419,8 +419,8 @@
<jdk>[11,)</jdk>
</activation>
<properties>
<!-- Ping release target to JDK8 to link only against Java 8 APIs -->
<maven.compiler.release>8</maven.compiler.release>
<!-- Ping release target to JDK11 to link only against Java 11 APIs -->
<maven.compiler.release>11</maven.compiler.release>
</properties>
<build>
<plugins>
Expand Down
8 changes: 6 additions & 2 deletions java/src/main/java/org/lance/Dataset.java
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,9 @@ public List<Version> listVersions() {

private native List<Version> nativeListVersions();

/** @return the latest version of the dataset. */
/**
* @return the latest version of the dataset.
*/
public long latestVersion() {
try (LockManager.WriteLock writeLock = lockManager.acquireWriteLock()) {
Preconditions.checkArgument(nativeDatasetHandle != 0, "Dataset is closed");
Expand Down Expand Up @@ -957,7 +959,9 @@ public Optional<Transaction> readTransaction() {

private native Transaction nativeReadTransaction();

/** @return all the created indexes names */
/**
* @return all the created indexes names
*/
public List<String> listIndexes() {
try (LockManager.ReadLock readLock = lockManager.acquireReadLock()) {
Preconditions.checkArgument(nativeDatasetHandle != 0, "Dataset is closed");
Expand Down
4 changes: 3 additions & 1 deletion java/src/main/java/org/lance/Fragment.java
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,9 @@ public int getId() {
return fragmentMetadata.getId();
}

/** @return row counts in this Fragment */
/**
* @return row counts in this Fragment
*/
public int countRows() {
return countRowsNative(dataset, fragmentMetadata.getId());
}
Expand Down
2 changes: 2 additions & 0 deletions java/src/test/java/org/lance/TestUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,7 @@ public List<FragmentMetadata> createNewFragment(int rowCount, int maxRowsPerFile
}
return fragmentMetas;
}

/**
* Test method to update columns. Note that for simplicity, the updated column rowid is fixed
* with [0, updateNum). Please only use this method to test the first fragment.
Expand Down Expand Up @@ -606,6 +607,7 @@ public static final class BlobTestDataset {

/** Lance blob metadata key required by Rust. */
private static final String BLOB_META_KEY = "lance-encoding:blob";

/** Lance blob metadata value. */
private static final String BLOB_META_TRUE = "true";

Expand Down
Loading