From b9365ad199ec22cb35ca9f545f50a57e93005043 Mon Sep 17 00:00:00 2001 From: majin1102 Date: Thu, 5 Feb 2026 19:31:30 +0800 Subject: [PATCH] fix(java): align version from int to long --- java/lance-jni/src/blocking_dataset.rs | 10 +++++----- java/src/main/java/org/lance/Dataset.java | 2 +- java/src/main/java/org/lance/ReadOptions.java | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/java/lance-jni/src/blocking_dataset.rs b/java/lance-jni/src/blocking_dataset.rs index 001bf36a546..354141d69a4 100644 --- a/java/lance-jni/src/blocking_dataset.rs +++ b/java/lance-jni/src/blocking_dataset.rs @@ -125,7 +125,7 @@ impl BlockingDataset { #[allow(clippy::too_many_arguments)] pub fn open( uri: &str, - version: Option, + version: Option, block_size: Option, index_cache_size_bytes: i64, metadata_cache_size_bytes: i64, @@ -165,7 +165,7 @@ impl BlockingDataset { let mut builder = DatasetBuilder::from_uri(uri).with_read_params(params); if let Some(ver) = version { - builder = builder.with_version(ver as u64); + builder = builder.with_version(ver); } if let Some(serialized_manifest) = serialized_manifest { @@ -1038,7 +1038,7 @@ pub extern "system" fn Java_org_lance_Dataset_openNative<'local>( mut env: JNIEnv<'local>, _obj: JObject, path: JString, - version_obj: JObject, // Optional + version_obj: JObject, // Optional block_size_obj: JObject, // Optional index_cache_size_bytes: jlong, metadata_cache_size_bytes: jlong, @@ -1066,7 +1066,7 @@ pub extern "system" fn Java_org_lance_Dataset_openNative<'local>( fn inner_open_native<'local>( env: &mut JNIEnv<'local>, path: JString, - version_obj: JObject, // Optional + version_obj: JObject, // Optional block_size_obj: JObject, // Optional index_cache_size_bytes: jlong, metadata_cache_size_bytes: jlong, @@ -1075,7 +1075,7 @@ fn inner_open_native<'local>( storage_options_provider_obj: JObject, // Optional ) -> Result> { let path_str: String = path.extract(env)?; - let version = env.get_int_opt(&version_obj)?; + let version = env.get_u64_opt(&version_obj)?; let block_size = env.get_int_opt(&block_size_obj)?; let jmap = JMap::from_env(env, &storage_options_obj)?; let storage_options = to_rust_map(env, &jmap)?; diff --git a/java/src/main/java/org/lance/Dataset.java b/java/src/main/java/org/lance/Dataset.java index 52785a70262..7ac360d7488 100644 --- a/java/src/main/java/org/lance/Dataset.java +++ b/java/src/main/java/org/lance/Dataset.java @@ -341,7 +341,7 @@ static Dataset open( private static native Dataset openNative( String path, - Optional version, + Optional version, Optional blockSize, long indexCacheSize, long metadataCacheSizeBytes, diff --git a/java/src/main/java/org/lance/ReadOptions.java b/java/src/main/java/org/lance/ReadOptions.java index 0a7a0343a79..ae7ec4a8e67 100644 --- a/java/src/main/java/org/lance/ReadOptions.java +++ b/java/src/main/java/org/lance/ReadOptions.java @@ -25,7 +25,7 @@ /** Read options for reading from a dataset. */ public class ReadOptions { - private final Optional version; + private final Optional version; private final Optional blockSize; private final long indexCacheSizeBytes; private final long metadataCacheSizeBytes; @@ -43,7 +43,7 @@ private ReadOptions(Builder builder) { this.storageOptionsProvider = builder.storageOptionsProvider; } - public Optional getVersion() { + public Optional getVersion() { return version; } @@ -87,7 +87,7 @@ public String toString() { public static class Builder { - private Optional version = Optional.empty(); + private Optional version = Optional.empty(); private Optional blockSize = Optional.empty(); private long indexCacheSizeBytes = 6 * 1024 * 1024 * 1024; // Default to 6 GiB like Rust private long metadataCacheSizeBytes = 1024 * 1024 * 1024; // Default to 1 GiB like Rust @@ -101,7 +101,7 @@ public static class Builder { * @param version the version of the dataset * @return this builder */ - public Builder setVersion(int version) { + public Builder setVersion(long version) { this.version = Optional.of(version); return this; }