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
10 changes: 5 additions & 5 deletions java/lance-jni/src/blocking_dataset.rs
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ impl BlockingDataset {
#[allow(clippy::too_many_arguments)]
pub fn open(
uri: &str,
version: Option<i32>,
version: Option<u64>,
block_size: Option<i32>,
index_cache_size_bytes: i64,
metadata_cache_size_bytes: i64,
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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<Integer>
version_obj: JObject, // Optional<Long>
block_size_obj: JObject, // Optional<Integer>
index_cache_size_bytes: jlong,
metadata_cache_size_bytes: jlong,
Expand Down Expand Up @@ -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<Integer>
version_obj: JObject, // Optional<Long>
block_size_obj: JObject, // Optional<Integer>
index_cache_size_bytes: jlong,
metadata_cache_size_bytes: jlong,
Expand All @@ -1075,7 +1075,7 @@ fn inner_open_native<'local>(
storage_options_provider_obj: JObject, // Optional<StorageOptionsProvider>
) -> Result<JObject<'local>> {
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)?;
Expand Down
2 changes: 1 addition & 1 deletion java/src/main/java/org/lance/Dataset.java
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ static Dataset open(

private static native Dataset openNative(
String path,
Optional<Integer> version,
Optional<Long> version,
Optional<Integer> blockSize,
long indexCacheSize,
long metadataCacheSizeBytes,
Expand Down
8 changes: 4 additions & 4 deletions java/src/main/java/org/lance/ReadOptions.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
/** Read options for reading from a dataset. */
public class ReadOptions {

private final Optional<Integer> version;
private final Optional<Long> version;
private final Optional<Integer> blockSize;
private final long indexCacheSizeBytes;
private final long metadataCacheSizeBytes;
Expand All @@ -43,7 +43,7 @@ private ReadOptions(Builder builder) {
this.storageOptionsProvider = builder.storageOptionsProvider;
}

public Optional<Integer> getVersion() {
public Optional<Long> getVersion() {
return version;
}

Expand Down Expand Up @@ -87,7 +87,7 @@ public String toString() {

public static class Builder {

private Optional<Integer> version = Optional.empty();
private Optional<Long> version = Optional.empty();
private Optional<Integer> 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
Expand All @@ -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;
}
Expand Down