diff --git a/Cargo.lock b/Cargo.lock index e27f9f271..307c89225 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3455,8 +3455,8 @@ checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" [[package]] name = "fsst" -version = "12.0.0-beta.2" -source = "git+https://github.com/lance-format/lance.git?tag=v12.0.0-beta.2#dafa4642658d996b3e31dde91e02f72db7860d7e" +version = "11.0.0-rc.2" +source = "git+https://github.com/lance-format/lance.git?tag=v11.0.0-rc.2#20e99c87c3bbf6575109ba6ea9608141495bf608" dependencies = [ "arrow-array", "rand 0.9.5", @@ -4815,8 +4815,8 @@ checksum = "e037a2e1d8d5fdbd49b16a4ea09d5d6401c1f29eca5ff29d03d3824dba16256a" [[package]] name = "lance" -version = "12.0.0-beta.2" -source = "git+https://github.com/lance-format/lance.git?tag=v12.0.0-beta.2#dafa4642658d996b3e31dde91e02f72db7860d7e" +version = "11.0.0-rc.2" +source = "git+https://github.com/lance-format/lance.git?tag=v11.0.0-rc.2#20e99c87c3bbf6575109ba6ea9608141495bf608" dependencies = [ "arc-swap", "arrow", @@ -4888,8 +4888,8 @@ dependencies = [ [[package]] name = "lance-arrow" -version = "12.0.0-beta.2" -source = "git+https://github.com/lance-format/lance.git?tag=v12.0.0-beta.2#dafa4642658d996b3e31dde91e02f72db7860d7e" +version = "11.0.0-rc.2" +source = "git+https://github.com/lance-format/lance.git?tag=v11.0.0-rc.2#20e99c87c3bbf6575109ba6ea9608141495bf608" dependencies = [ "arrow-array", "arrow-buffer", @@ -4911,7 +4911,7 @@ dependencies = [ [[package]] name = "lance-arrow-scalar" version = "58.0.0" -source = "git+https://github.com/lance-format/lance.git?tag=v12.0.0-beta.2#dafa4642658d996b3e31dde91e02f72db7860d7e" +source = "git+https://github.com/lance-format/lance.git?tag=v11.0.0-rc.2#20e99c87c3bbf6575109ba6ea9608141495bf608" dependencies = [ "arrow-array", "arrow-buffer", @@ -4925,7 +4925,7 @@ dependencies = [ [[package]] name = "lance-arrow-stats" version = "58.0.0" -source = "git+https://github.com/lance-format/lance.git?tag=v12.0.0-beta.2#dafa4642658d996b3e31dde91e02f72db7860d7e" +source = "git+https://github.com/lance-format/lance.git?tag=v11.0.0-rc.2#20e99c87c3bbf6575109ba6ea9608141495bf608" dependencies = [ "arrow-array", "arrow-schema", @@ -4934,8 +4934,8 @@ dependencies = [ [[package]] name = "lance-bitpacking" -version = "12.0.0-beta.2" -source = "git+https://github.com/lance-format/lance.git?tag=v12.0.0-beta.2#dafa4642658d996b3e31dde91e02f72db7860d7e" +version = "11.0.0-rc.2" +source = "git+https://github.com/lance-format/lance.git?tag=v11.0.0-rc.2#20e99c87c3bbf6575109ba6ea9608141495bf608" dependencies = [ "arrayref", "crunchy", @@ -4945,8 +4945,8 @@ dependencies = [ [[package]] name = "lance-core" -version = "12.0.0-beta.2" -source = "git+https://github.com/lance-format/lance.git?tag=v12.0.0-beta.2#dafa4642658d996b3e31dde91e02f72db7860d7e" +version = "11.0.0-rc.2" +source = "git+https://github.com/lance-format/lance.git?tag=v11.0.0-rc.2#20e99c87c3bbf6575109ba6ea9608141495bf608" dependencies = [ "arrow-array", "arrow-buffer", @@ -4983,8 +4983,8 @@ dependencies = [ [[package]] name = "lance-datafusion" -version = "12.0.0-beta.2" -source = "git+https://github.com/lance-format/lance.git?tag=v12.0.0-beta.2#dafa4642658d996b3e31dde91e02f72db7860d7e" +version = "11.0.0-rc.2" +source = "git+https://github.com/lance-format/lance.git?tag=v11.0.0-rc.2#20e99c87c3bbf6575109ba6ea9608141495bf608" dependencies = [ "arrow", "arrow-array", @@ -5013,8 +5013,8 @@ dependencies = [ [[package]] name = "lance-datagen" -version = "12.0.0-beta.2" -source = "git+https://github.com/lance-format/lance.git?tag=v12.0.0-beta.2#dafa4642658d996b3e31dde91e02f72db7860d7e" +version = "11.0.0-rc.2" +source = "git+https://github.com/lance-format/lance.git?tag=v11.0.0-rc.2#20e99c87c3bbf6575109ba6ea9608141495bf608" dependencies = [ "arrow", "arrow-array", @@ -5031,8 +5031,8 @@ dependencies = [ [[package]] name = "lance-derive" -version = "12.0.0-beta.2" -source = "git+https://github.com/lance-format/lance.git?tag=v12.0.0-beta.2#dafa4642658d996b3e31dde91e02f72db7860d7e" +version = "11.0.0-rc.2" +source = "git+https://github.com/lance-format/lance.git?tag=v11.0.0-rc.2#20e99c87c3bbf6575109ba6ea9608141495bf608" dependencies = [ "proc-macro2", "quote", @@ -5041,8 +5041,8 @@ dependencies = [ [[package]] name = "lance-encoding" -version = "12.0.0-beta.2" -source = "git+https://github.com/lance-format/lance.git?tag=v12.0.0-beta.2#dafa4642658d996b3e31dde91e02f72db7860d7e" +version = "11.0.0-rc.2" +source = "git+https://github.com/lance-format/lance.git?tag=v11.0.0-rc.2#20e99c87c3bbf6575109ba6ea9608141495bf608" dependencies = [ "arrow-arith", "arrow-array", @@ -5075,8 +5075,8 @@ dependencies = [ [[package]] name = "lance-file" -version = "12.0.0-beta.2" -source = "git+https://github.com/lance-format/lance.git?tag=v12.0.0-beta.2#dafa4642658d996b3e31dde91e02f72db7860d7e" +version = "11.0.0-rc.2" +source = "git+https://github.com/lance-format/lance.git?tag=v11.0.0-rc.2#20e99c87c3bbf6575109ba6ea9608141495bf608" dependencies = [ "arrow-arith", "arrow-array", @@ -5107,8 +5107,8 @@ dependencies = [ [[package]] name = "lance-index" -version = "12.0.0-beta.2" -source = "git+https://github.com/lance-format/lance.git?tag=v12.0.0-beta.2#dafa4642658d996b3e31dde91e02f72db7860d7e" +version = "11.0.0-rc.2" +source = "git+https://github.com/lance-format/lance.git?tag=v11.0.0-rc.2#20e99c87c3bbf6575109ba6ea9608141495bf608" dependencies = [ "arc-swap", "arrow", @@ -5172,8 +5172,8 @@ dependencies = [ [[package]] name = "lance-index-core" -version = "12.0.0-beta.2" -source = "git+https://github.com/lance-format/lance.git?tag=v12.0.0-beta.2#dafa4642658d996b3e31dde91e02f72db7860d7e" +version = "11.0.0-rc.2" +source = "git+https://github.com/lance-format/lance.git?tag=v11.0.0-rc.2#20e99c87c3bbf6575109ba6ea9608141495bf608" dependencies = [ "arrow-array", "arrow-schema", @@ -5195,8 +5195,8 @@ dependencies = [ [[package]] name = "lance-io" -version = "12.0.0-beta.2" -source = "git+https://github.com/lance-format/lance.git?tag=v12.0.0-beta.2#dafa4642658d996b3e31dde91e02f72db7860d7e" +version = "11.0.0-rc.2" +source = "git+https://github.com/lance-format/lance.git?tag=v11.0.0-rc.2#20e99c87c3bbf6575109ba6ea9608141495bf608" dependencies = [ "arrow", "arrow-array", @@ -5236,8 +5236,8 @@ dependencies = [ [[package]] name = "lance-linalg" -version = "12.0.0-beta.2" -source = "git+https://github.com/lance-format/lance.git?tag=v12.0.0-beta.2#dafa4642658d996b3e31dde91e02f72db7860d7e" +version = "11.0.0-rc.2" +source = "git+https://github.com/lance-format/lance.git?tag=v11.0.0-rc.2#20e99c87c3bbf6575109ba6ea9608141495bf608" dependencies = [ "arrow-array", "arrow-schema", @@ -5251,8 +5251,8 @@ dependencies = [ [[package]] name = "lance-namespace" -version = "12.0.0-beta.2" -source = "git+https://github.com/lance-format/lance.git?tag=v12.0.0-beta.2#dafa4642658d996b3e31dde91e02f72db7860d7e" +version = "11.0.0-rc.2" +source = "git+https://github.com/lance-format/lance.git?tag=v11.0.0-rc.2#20e99c87c3bbf6575109ba6ea9608141495bf608" dependencies = [ "arrow", "async-trait", @@ -5264,8 +5264,8 @@ dependencies = [ [[package]] name = "lance-namespace-impls" -version = "12.0.0-beta.2" -source = "git+https://github.com/lance-format/lance.git?tag=v12.0.0-beta.2#dafa4642658d996b3e31dde91e02f72db7860d7e" +version = "11.0.0-rc.2" +source = "git+https://github.com/lance-format/lance.git?tag=v11.0.0-rc.2#20e99c87c3bbf6575109ba6ea9608141495bf608" dependencies = [ "arrow", "arrow-ipc", @@ -5318,8 +5318,8 @@ dependencies = [ [[package]] name = "lance-select" -version = "12.0.0-beta.2" -source = "git+https://github.com/lance-format/lance.git?tag=v12.0.0-beta.2#dafa4642658d996b3e31dde91e02f72db7860d7e" +version = "11.0.0-rc.2" +source = "git+https://github.com/lance-format/lance.git?tag=v11.0.0-rc.2#20e99c87c3bbf6575109ba6ea9608141495bf608" dependencies = [ "arrow-array", "arrow-buffer", @@ -5333,8 +5333,8 @@ dependencies = [ [[package]] name = "lance-table" -version = "12.0.0-beta.2" -source = "git+https://github.com/lance-format/lance.git?tag=v12.0.0-beta.2#dafa4642658d996b3e31dde91e02f72db7860d7e" +version = "11.0.0-rc.2" +source = "git+https://github.com/lance-format/lance.git?tag=v11.0.0-rc.2#20e99c87c3bbf6575109ba6ea9608141495bf608" dependencies = [ "arrow", "arrow-array", @@ -5374,8 +5374,8 @@ dependencies = [ [[package]] name = "lance-testing" -version = "12.0.0-beta.2" -source = "git+https://github.com/lance-format/lance.git?tag=v12.0.0-beta.2#dafa4642658d996b3e31dde91e02f72db7860d7e" +version = "11.0.0-rc.2" +source = "git+https://github.com/lance-format/lance.git?tag=v11.0.0-rc.2#20e99c87c3bbf6575109ba6ea9608141495bf608" dependencies = [ "arrow-array", "arrow-schema", @@ -5388,8 +5388,8 @@ dependencies = [ [[package]] name = "lance-tokenizer" -version = "12.0.0-beta.2" -source = "git+https://github.com/lance-format/lance.git?tag=v12.0.0-beta.2#dafa4642658d996b3e31dde91e02f72db7860d7e" +version = "11.0.0-rc.2" +source = "git+https://github.com/lance-format/lance.git?tag=v11.0.0-rc.2#20e99c87c3bbf6575109ba6ea9608141495bf608" dependencies = [ "frostem", "icu_segmenter", diff --git a/Cargo.toml b/Cargo.toml index a16f0412c..6b484e941 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,20 +13,20 @@ categories = ["database-implementations"] rust-version = "1.91.0" [workspace.dependencies] -lance = { "version" = "=12.0.0-beta.2", default-features = false, "tag" = "v12.0.0-beta.2", "git" = "https://github.com/lance-format/lance.git" } -lance-core = { "version" = "=12.0.0-beta.2", "tag" = "v12.0.0-beta.2", "git" = "https://github.com/lance-format/lance.git" } -lance-datagen = { "version" = "=12.0.0-beta.2", "tag" = "v12.0.0-beta.2", "git" = "https://github.com/lance-format/lance.git" } -lance-file = { "version" = "=12.0.0-beta.2", "tag" = "v12.0.0-beta.2", "git" = "https://github.com/lance-format/lance.git" } -lance-io = { "version" = "=12.0.0-beta.2", default-features = false, "tag" = "v12.0.0-beta.2", "git" = "https://github.com/lance-format/lance.git" } -lance-index = { "version" = "=12.0.0-beta.2", "tag" = "v12.0.0-beta.2", "git" = "https://github.com/lance-format/lance.git" } -lance-linalg = { "version" = "=12.0.0-beta.2", "tag" = "v12.0.0-beta.2", "git" = "https://github.com/lance-format/lance.git" } -lance-namespace = { "version" = "=12.0.0-beta.2", "tag" = "v12.0.0-beta.2", "git" = "https://github.com/lance-format/lance.git" } -lance-namespace-impls = { "version" = "=12.0.0-beta.2", default-features = false, "tag" = "v12.0.0-beta.2", "git" = "https://github.com/lance-format/lance.git" } -lance-table = { "version" = "=12.0.0-beta.2", "tag" = "v12.0.0-beta.2", "git" = "https://github.com/lance-format/lance.git" } -lance-testing = { "version" = "=12.0.0-beta.2", "tag" = "v12.0.0-beta.2", "git" = "https://github.com/lance-format/lance.git" } -lance-datafusion = { "version" = "=12.0.0-beta.2", "tag" = "v12.0.0-beta.2", "git" = "https://github.com/lance-format/lance.git" } -lance-encoding = { "version" = "=12.0.0-beta.2", "tag" = "v12.0.0-beta.2", "git" = "https://github.com/lance-format/lance.git" } -lance-arrow = { "version" = "=12.0.0-beta.2", "tag" = "v12.0.0-beta.2", "git" = "https://github.com/lance-format/lance.git" } +lance = { "version" = "=11.0.0-rc.2", default-features = false, "tag" = "v11.0.0-rc.2", "git" = "https://github.com/lance-format/lance.git" } +lance-core = { "version" = "=11.0.0-rc.2", "tag" = "v11.0.0-rc.2", "git" = "https://github.com/lance-format/lance.git" } +lance-datagen = { "version" = "=11.0.0-rc.2", "tag" = "v11.0.0-rc.2", "git" = "https://github.com/lance-format/lance.git" } +lance-file = { "version" = "=11.0.0-rc.2", "tag" = "v11.0.0-rc.2", "git" = "https://github.com/lance-format/lance.git" } +lance-io = { "version" = "=11.0.0-rc.2", default-features = false, "tag" = "v11.0.0-rc.2", "git" = "https://github.com/lance-format/lance.git" } +lance-index = { "version" = "=11.0.0-rc.2", "tag" = "v11.0.0-rc.2", "git" = "https://github.com/lance-format/lance.git" } +lance-linalg = { "version" = "=11.0.0-rc.2", "tag" = "v11.0.0-rc.2", "git" = "https://github.com/lance-format/lance.git" } +lance-namespace = { "version" = "=11.0.0-rc.2", "tag" = "v11.0.0-rc.2", "git" = "https://github.com/lance-format/lance.git" } +lance-namespace-impls = { "version" = "=11.0.0-rc.2", default-features = false, "tag" = "v11.0.0-rc.2", "git" = "https://github.com/lance-format/lance.git" } +lance-table = { "version" = "=11.0.0-rc.2", "tag" = "v11.0.0-rc.2", "git" = "https://github.com/lance-format/lance.git" } +lance-testing = { "version" = "=11.0.0-rc.2", "tag" = "v11.0.0-rc.2", "git" = "https://github.com/lance-format/lance.git" } +lance-datafusion = { "version" = "=11.0.0-rc.2", "tag" = "v11.0.0-rc.2", "git" = "https://github.com/lance-format/lance.git" } +lance-encoding = { "version" = "=11.0.0-rc.2", "tag" = "v11.0.0-rc.2", "git" = "https://github.com/lance-format/lance.git" } +lance-arrow = { "version" = "=11.0.0-rc.2", "tag" = "v11.0.0-rc.2", "git" = "https://github.com/lance-format/lance.git" } lancedb = { path = "rust/lancedb", default-features = false } ahash = "0.8" # Note that this one does not include pyarrow diff --git a/java/pom.xml b/java/pom.xml index a2cec19c0..7a29c23c7 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -28,7 +28,7 @@ UTF-8 15.0.0 - 12.0.0-beta.2 + 11.0.0-rc.2 false 2.30.0 1.7 diff --git a/rust/lancedb/src/io/object_store.rs b/rust/lancedb/src/io/object_store.rs index c4a9a4f7e..d594bd857 100644 --- a/rust/lancedb/src/io/object_store.rs +++ b/rust/lancedb/src/io/object_store.rs @@ -10,7 +10,7 @@ use lance::io::WrappingObjectStore; use object_store::{ CopyOptions, Error, GetOptions, GetResult, ListResult, MultipartUpload, ObjectMeta, ObjectStore, ObjectStoreExt, PutMultipartOptions, PutOptions, PutPayload, PutResult, Result, - UploadPart, list::PaginatedListStore, path::Path, + UploadPart, path::Path, }; use async_trait::async_trait; @@ -187,14 +187,6 @@ impl WrappingObjectStore for MirroringObjectStoreWrapper { secondary: self.secondary.clone(), }) } - - fn wrap_paginated( - &self, - _store_prefix: &str, - original: Arc, - ) -> Option> { - Some(original) - } } // windows pathing can't be simply concatenated diff --git a/rust/lancedb/src/io/object_store/io_tracking.rs b/rust/lancedb/src/io/object_store/io_tracking.rs index 7f9750216..bd4f8f54a 100644 --- a/rust/lancedb/src/io/object_store/io_tracking.rs +++ b/rust/lancedb/src/io/object_store/io_tracking.rs @@ -12,7 +12,7 @@ use lance::io::WrappingObjectStore; use object_store::{ CopyOptions, GetOptions, GetResult, ListResult, MultipartUpload, ObjectMeta, ObjectStore, PutMultipartOptions, PutOptions, PutPayload, PutResult, RenameOptions, Result as OSResult, - UploadPart, list::PaginatedListStore, path::Path, + UploadPart, path::Path, }; #[derive(Debug, Default)] @@ -57,14 +57,6 @@ impl WrappingObjectStore for IoStatsHolder { stats: self.0.clone(), }) } - - fn wrap_paginated( - &self, - _store_prefix: &str, - original: Arc, - ) -> Option> { - Some(original) - } } impl IoTrackingStore { diff --git a/rust/lancedb/src/remote/table.rs b/rust/lancedb/src/remote/table.rs index 1afc2615a..df1db900a 100644 --- a/rust/lancedb/src/remote/table.rs +++ b/rust/lancedb/src/remote/table.rs @@ -5734,9 +5734,8 @@ mod tests { )) .execute() .await; - let err = match result { - Ok(_) => panic!("legacy remote query unexpectedly succeeded"), - Err(err) => err, + let Err(err) = result else { + panic!("legacy remote query unexpectedly succeeded") }; assert!( diff --git a/rust/lancedb/src/table.rs b/rust/lancedb/src/table.rs index 8436657ca..9f63b20eb 100644 --- a/rust/lancedb/src/table.rs +++ b/rust/lancedb/src/table.rs @@ -4183,14 +4183,6 @@ mod tests { parent_list_calls: self.parent_list_calls.clone(), }) } - - fn wrap_paginated( - &self, - _store_prefix: &str, - _original: Arc, - ) -> Option> { - None - } } #[tokio::test] @@ -4294,14 +4286,6 @@ mod tests { self.called.store(true, Ordering::Relaxed); original } - - fn wrap_paginated( - &self, - _store_prefix: &str, - original: Arc, - ) -> Option> { - Some(original) - } } #[tokio::test] diff --git a/rust/lancedb/src/table/query/lsm.rs b/rust/lancedb/src/table/query/lsm.rs index 5c340cc35..255d649b1 100644 --- a/rust/lancedb/src/table/query/lsm.rs +++ b/rust/lancedb/src/table/query/lsm.rs @@ -298,7 +298,7 @@ async fn build_read_context( for shard_id in shard_ids { let manifest_store = ShardManifestStore::new(store.clone(), &base_path, shard_id, scan_batch_size); - if let Some(manifest) = manifest_store.latest().await? { + if let Some(manifest) = manifest_store.read_latest().await? { snapshots.push(snapshot_from_manifest(shard_id, &manifest, &exclude)); } }