diff --git a/Cargo.lock b/Cargo.lock index f09679dd..2f88e958 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3044,8 +3044,8 @@ checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" [[package]] name = "fsst" -version = "0.38.3-beta.8" -source = "git+https://github.com/lancedb/lance.git?tag=v0.38.3-beta.8#da0f612dbd4437266486a105c0f16b07dcc2289c" +version = "0.38.3-beta.9" +source = "git+https://github.com/lancedb/lance.git?tag=v0.38.3-beta.9#5f603515786cdc3b5aadb3313131bf686d5e932b" dependencies = [ "arrow-array", "rand 0.9.2", @@ -4229,8 +4229,8 @@ dependencies = [ [[package]] name = "lance" -version = "0.38.3-beta.8" -source = "git+https://github.com/lancedb/lance.git?tag=v0.38.3-beta.8#da0f612dbd4437266486a105c0f16b07dcc2289c" +version = "0.38.3-beta.9" +source = "git+https://github.com/lancedb/lance.git?tag=v0.38.3-beta.9#5f603515786cdc3b5aadb3313131bf686d5e932b" dependencies = [ "arrow", "arrow-arith", @@ -4293,8 +4293,8 @@ dependencies = [ [[package]] name = "lance-arrow" -version = "0.38.3-beta.8" -source = "git+https://github.com/lancedb/lance.git?tag=v0.38.3-beta.8#da0f612dbd4437266486a105c0f16b07dcc2289c" +version = "0.38.3-beta.9" +source = "git+https://github.com/lancedb/lance.git?tag=v0.38.3-beta.9#5f603515786cdc3b5aadb3313131bf686d5e932b" dependencies = [ "arrow-array", "arrow-buffer", @@ -4312,8 +4312,8 @@ dependencies = [ [[package]] name = "lance-bitpacking" -version = "0.38.3-beta.8" -source = "git+https://github.com/lancedb/lance.git?tag=v0.38.3-beta.8#da0f612dbd4437266486a105c0f16b07dcc2289c" +version = "0.38.3-beta.9" +source = "git+https://github.com/lancedb/lance.git?tag=v0.38.3-beta.9#5f603515786cdc3b5aadb3313131bf686d5e932b" dependencies = [ "arrayref", "paste", @@ -4322,8 +4322,8 @@ dependencies = [ [[package]] name = "lance-core" -version = "0.38.3-beta.8" -source = "git+https://github.com/lancedb/lance.git?tag=v0.38.3-beta.8#da0f612dbd4437266486a105c0f16b07dcc2289c" +version = "0.38.3-beta.9" +source = "git+https://github.com/lancedb/lance.git?tag=v0.38.3-beta.9#5f603515786cdc3b5aadb3313131bf686d5e932b" dependencies = [ "arrow-array", "arrow-buffer", @@ -4359,8 +4359,8 @@ dependencies = [ [[package]] name = "lance-datafusion" -version = "0.38.3-beta.8" -source = "git+https://github.com/lancedb/lance.git?tag=v0.38.3-beta.8#da0f612dbd4437266486a105c0f16b07dcc2289c" +version = "0.38.3-beta.9" +source = "git+https://github.com/lancedb/lance.git?tag=v0.38.3-beta.9#5f603515786cdc3b5aadb3313131bf686d5e932b" dependencies = [ "arrow", "arrow-array", @@ -4389,8 +4389,8 @@ dependencies = [ [[package]] name = "lance-datagen" -version = "0.38.3-beta.8" -source = "git+https://github.com/lancedb/lance.git?tag=v0.38.3-beta.8#da0f612dbd4437266486a105c0f16b07dcc2289c" +version = "0.38.3-beta.9" +source = "git+https://github.com/lancedb/lance.git?tag=v0.38.3-beta.9#5f603515786cdc3b5aadb3313131bf686d5e932b" dependencies = [ "arrow", "arrow-array", @@ -4407,8 +4407,8 @@ dependencies = [ [[package]] name = "lance-encoding" -version = "0.38.3-beta.8" -source = "git+https://github.com/lancedb/lance.git?tag=v0.38.3-beta.8#da0f612dbd4437266486a105c0f16b07dcc2289c" +version = "0.38.3-beta.9" +source = "git+https://github.com/lancedb/lance.git?tag=v0.38.3-beta.9#5f603515786cdc3b5aadb3313131bf686d5e932b" dependencies = [ "arrow-arith", "arrow-array", @@ -4445,8 +4445,8 @@ dependencies = [ [[package]] name = "lance-file" -version = "0.38.3-beta.8" -source = "git+https://github.com/lancedb/lance.git?tag=v0.38.3-beta.8#da0f612dbd4437266486a105c0f16b07dcc2289c" +version = "0.38.3-beta.9" +source = "git+https://github.com/lancedb/lance.git?tag=v0.38.3-beta.9#5f603515786cdc3b5aadb3313131bf686d5e932b" dependencies = [ "arrow-arith", "arrow-array", @@ -4479,8 +4479,8 @@ dependencies = [ [[package]] name = "lance-index" -version = "0.38.3-beta.8" -source = "git+https://github.com/lancedb/lance.git?tag=v0.38.3-beta.8#da0f612dbd4437266486a105c0f16b07dcc2289c" +version = "0.38.3-beta.9" +source = "git+https://github.com/lancedb/lance.git?tag=v0.38.3-beta.9#5f603515786cdc3b5aadb3313131bf686d5e932b" dependencies = [ "arrow", "arrow-arith", @@ -4542,8 +4542,8 @@ dependencies = [ [[package]] name = "lance-io" -version = "0.38.3-beta.8" -source = "git+https://github.com/lancedb/lance.git?tag=v0.38.3-beta.8#da0f612dbd4437266486a105c0f16b07dcc2289c" +version = "0.38.3-beta.9" +source = "git+https://github.com/lancedb/lance.git?tag=v0.38.3-beta.9#5f603515786cdc3b5aadb3313131bf686d5e932b" dependencies = [ "arrow", "arrow-arith", @@ -4583,8 +4583,8 @@ dependencies = [ [[package]] name = "lance-linalg" -version = "0.38.3-beta.8" -source = "git+https://github.com/lancedb/lance.git?tag=v0.38.3-beta.8#da0f612dbd4437266486a105c0f16b07dcc2289c" +version = "0.38.3-beta.9" +source = "git+https://github.com/lancedb/lance.git?tag=v0.38.3-beta.9#5f603515786cdc3b5aadb3313131bf686d5e932b" dependencies = [ "arrow-array", "arrow-buffer", @@ -4607,8 +4607,8 @@ dependencies = [ [[package]] name = "lance-namespace" -version = "0.38.3-beta.8" -source = "git+https://github.com/lancedb/lance.git?tag=v0.38.3-beta.8#da0f612dbd4437266486a105c0f16b07dcc2289c" +version = "0.38.3-beta.9" +source = "git+https://github.com/lancedb/lance.git?tag=v0.38.3-beta.9#5f603515786cdc3b5aadb3313131bf686d5e932b" dependencies = [ "arrow", "async-trait", @@ -4620,8 +4620,8 @@ dependencies = [ [[package]] name = "lance-namespace-impls" -version = "0.38.3-beta.8" -source = "git+https://github.com/lancedb/lance.git?tag=v0.38.3-beta.8#da0f612dbd4437266486a105c0f16b07dcc2289c" +version = "0.38.3-beta.9" +source = "git+https://github.com/lancedb/lance.git?tag=v0.38.3-beta.9#5f603515786cdc3b5aadb3313131bf686d5e932b" dependencies = [ "arrow", "arrow-ipc", @@ -4653,8 +4653,8 @@ dependencies = [ [[package]] name = "lance-table" -version = "0.38.3-beta.8" -source = "git+https://github.com/lancedb/lance.git?tag=v0.38.3-beta.8#da0f612dbd4437266486a105c0f16b07dcc2289c" +version = "0.38.3-beta.9" +source = "git+https://github.com/lancedb/lance.git?tag=v0.38.3-beta.9#5f603515786cdc3b5aadb3313131bf686d5e932b" dependencies = [ "arrow", "arrow-array", @@ -4692,8 +4692,8 @@ dependencies = [ [[package]] name = "lance-testing" -version = "0.38.3-beta.8" -source = "git+https://github.com/lancedb/lance.git?tag=v0.38.3-beta.8#da0f612dbd4437266486a105c0f16b07dcc2289c" +version = "0.38.3-beta.9" +source = "git+https://github.com/lancedb/lance.git?tag=v0.38.3-beta.9#5f603515786cdc3b5aadb3313131bf686d5e932b" dependencies = [ "arrow-array", "arrow-schema", @@ -4743,6 +4743,7 @@ dependencies = [ "http 1.3.1", "http-body 1.0.1", "lance", + "lance-arrow", "lance-core", "lance-datafusion", "lance-datagen", diff --git a/Cargo.toml b/Cargo.toml index 6670e3fe..1cf72578 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,19 +15,20 @@ categories = ["database-implementations"] rust-version = "1.78.0" [workspace.dependencies] -lance = { "version" = "=0.38.3-beta.8", default-features = false, "tag" = "v0.38.3-beta.8", "git" = "https://github.com/lancedb/lance.git" } -lance-core = { "version" = "=0.38.3-beta.8", "tag" = "v0.38.3-beta.8", "git" = "https://github.com/lancedb/lance.git" } -lance-datagen = { "version" = "=0.38.3-beta.8", "tag" = "v0.38.3-beta.8", "git" = "https://github.com/lancedb/lance.git" } -lance-file = { "version" = "=0.38.3-beta.8", "tag" = "v0.38.3-beta.8", "git" = "https://github.com/lancedb/lance.git" } -lance-io = { "version" = "=0.38.3-beta.8", default-features = false, "tag" = "v0.38.3-beta.8", "git" = "https://github.com/lancedb/lance.git" } -lance-index = { "version" = "=0.38.3-beta.8", "tag" = "v0.38.3-beta.8", "git" = "https://github.com/lancedb/lance.git" } -lance-linalg = { "version" = "=0.38.3-beta.8", "tag" = "v0.38.3-beta.8", "git" = "https://github.com/lancedb/lance.git" } -lance-namespace = { "version" = "=0.38.3-beta.8", "tag" = "v0.38.3-beta.8", "git" = "https://github.com/lancedb/lance.git" } -lance-namespace-impls = { "version" = "=0.38.3-beta.8", "tag" = "v0.38.3-beta.8", "git" = "https://github.com/lancedb/lance.git" } -lance-table = { "version" = "=0.38.3-beta.8", "tag" = "v0.38.3-beta.8", "git" = "https://github.com/lancedb/lance.git" } -lance-testing = { "version" = "=0.38.3-beta.8", "tag" = "v0.38.3-beta.8", "git" = "https://github.com/lancedb/lance.git" } -lance-datafusion = { "version" = "=0.38.3-beta.8", "tag" = "v0.38.3-beta.8", "git" = "https://github.com/lancedb/lance.git" } -lance-encoding = { "version" = "=0.38.3-beta.8", "tag" = "v0.38.3-beta.8", "git" = "https://github.com/lancedb/lance.git" } +lance = { "version" = "=0.38.3-beta.9", default-features = false, "tag" = "v0.38.3-beta.9", "git" = "https://github.com/lancedb/lance.git" } +lance-arrow = { "version" = "=0.38.3-beta.9", "tag" = "v0.38.3-beta.9", "git" = "https://github.com/lancedb/lance.git" } +lance-core = { "version" = "=0.38.3-beta.9", "tag" = "v0.38.3-beta.9", "git" = "https://github.com/lancedb/lance.git" } +lance-datagen = { "version" = "=0.38.3-beta.9", "tag" = "v0.38.3-beta.9", "git" = "https://github.com/lancedb/lance.git" } +lance-file = { "version" = "=0.38.3-beta.9", "tag" = "v0.38.3-beta.9", "git" = "https://github.com/lancedb/lance.git" } +lance-io = { "version" = "=0.38.3-beta.9", default-features = false, "tag" = "v0.38.3-beta.9", "git" = "https://github.com/lancedb/lance.git" } +lance-index = { "version" = "=0.38.3-beta.9", "tag" = "v0.38.3-beta.9", "git" = "https://github.com/lancedb/lance.git" } +lance-linalg = { "version" = "=0.38.3-beta.9", "tag" = "v0.38.3-beta.9", "git" = "https://github.com/lancedb/lance.git" } +lance-namespace = { "version" = "=0.38.3-beta.9", "tag" = "v0.38.3-beta.9", "git" = "https://github.com/lancedb/lance.git" } +lance-namespace-impls = { "version" = "=0.38.3-beta.9", "tag" = "v0.38.3-beta.9", "git" = "https://github.com/lancedb/lance.git" } +lance-table = { "version" = "=0.38.3-beta.9", "tag" = "v0.38.3-beta.9", "git" = "https://github.com/lancedb/lance.git" } +lance-testing = { "version" = "=0.38.3-beta.9", "tag" = "v0.38.3-beta.9", "git" = "https://github.com/lancedb/lance.git" } +lance-datafusion = { "version" = "=0.38.3-beta.9", "tag" = "v0.38.3-beta.9", "git" = "https://github.com/lancedb/lance.git" } +lance-encoding = { "version" = "=0.38.3-beta.9", "tag" = "v0.38.3-beta.9", "git" = "https://github.com/lancedb/lance.git" } ahash = "0.8" # Note that this one does not include pyarrow arrow = { version = "56.2", optional = false } @@ -64,4 +65,4 @@ semver = "1.0.25" crunchy = "0.2.4" chrono = "0.4" # Workaround for: https://github.com/Lokathor/bytemuck/issues/306 -bytemuck_derive = ">=1.8.1, <1.9.0" \ No newline at end of file +bytemuck_derive = ">=1.8.1, <1.9.0" diff --git a/rust/lancedb/Cargo.toml b/rust/lancedb/Cargo.toml index c2f61380..705726b4 100644 --- a/rust/lancedb/Cargo.toml +++ b/rust/lancedb/Cargo.toml @@ -32,6 +32,7 @@ snafu = { workspace = true } half = { workspace = true } lazy_static.workspace = true lance = { workspace = true } +lance-arrow = { workspace = true } lance-core = { workspace = true } lance-datafusion.workspace = true lance-datagen = { workspace = true } diff --git a/rust/lancedb/src/connection.rs b/rust/lancedb/src/connection.rs index decaa05d..0c60121b 100644 --- a/rust/lancedb/src/connection.rs +++ b/rust/lancedb/src/connection.rs @@ -1188,7 +1188,7 @@ mod tests { use arrow_schema::{DataType, Field, Schema}; use datafusion_physical_plan::stream::RecordBatchStreamAdapter; use futures::{stream, TryStreamExt}; - use lance::error::{ArrowResult, DataFusionResult}; + use lance_core::error::{ArrowResult, DataFusionResult}; use lance_testing::datagen::{BatchGenerator, IncrementingInt32}; use tempfile::tempdir; diff --git a/rust/lancedb/src/data/sanitize.rs b/rust/lancedb/src/data/sanitize.rs index 35af8e5b..91b9aea9 100644 --- a/rust/lancedb/src/data/sanitize.rs +++ b/rust/lancedb/src/data/sanitize.rs @@ -12,7 +12,7 @@ use arrow_array::{ use arrow_cast::{can_cast_types, cast}; use arrow_schema::{ArrowError, DataType, Field, Schema}; use half::f16; -use lance::arrow::{DataTypeExt, FixedSizeListArrayExt}; +use lance_arrow::{DataTypeExt, FixedSizeListArrayExt}; use log::warn; use num_traits::cast::AsPrimitive; @@ -189,7 +189,7 @@ mod tests { }; use arrow_schema::Field; use half::f16; - use lance::arrow::FixedSizeListArrayExt; + use lance_arrow::FixedSizeListArrayExt; #[test] fn test_coerce_list_to_fixed_size_list() { diff --git a/rust/lancedb/src/dataloader/permutation/reader.rs b/rust/lancedb/src/dataloader/permutation/reader.rs index d68d88a6..2e901ffa 100644 --- a/rust/lancedb/src/dataloader/permutation/reader.rs +++ b/rust/lancedb/src/dataloader/permutation/reader.rs @@ -18,9 +18,9 @@ use arrow::array::AsArray; use arrow::datatypes::UInt64Type; use arrow_array::{RecordBatch, UInt64Array}; use futures::{StreamExt, TryStreamExt}; -use lance::arrow::RecordBatchExt; use lance::dataset::scanner::DatasetRecordBatchStream; -use lance::error::LanceOptionExt; +use lance_arrow::RecordBatchExt; +use lance_core::error::LanceOptionExt; use lance_core::ROW_ID; use std::collections::HashMap; use std::sync::Arc; diff --git a/rust/lancedb/src/dataloader/permutation/split.rs b/rust/lancedb/src/dataloader/permutation/split.rs index d01db4c4..e7dc5283 100644 --- a/rust/lancedb/src/dataloader/permutation/split.rs +++ b/rust/lancedb/src/dataloader/permutation/split.rs @@ -13,7 +13,7 @@ use arrow_array::{Array, BooleanArray, RecordBatch, UInt64Array}; use arrow_schema::{DataType, Field, Schema}; use datafusion_common::hash_utils::create_hashes; use futures::{StreamExt, TryStreamExt}; -use lance::arrow::SchemaExt; +use lance_arrow::SchemaExt; use crate::{ arrow::{SendableRecordBatchStream, SimpleRecordBatchStream}, diff --git a/rust/lancedb/src/embeddings.rs b/rust/lancedb/src/embeddings.rs index 70ab530c..85bc0fdf 100644 --- a/rust/lancedb/src/embeddings.rs +++ b/rust/lancedb/src/embeddings.rs @@ -10,7 +10,7 @@ pub mod sentence_transformers; #[cfg(feature = "bedrock")] pub mod bedrock; -use lance::arrow::RecordBatchExt; +use lance_arrow::RecordBatchExt; use std::{ borrow::Cow, collections::{HashMap, HashSet}, diff --git a/rust/lancedb/src/query.rs b/rust/lancedb/src/query.rs index 34151e3b..6551822c 100644 --- a/rust/lancedb/src/query.rs +++ b/rust/lancedb/src/query.rs @@ -11,10 +11,8 @@ use datafusion_expr::Expr; use datafusion_physical_plan::ExecutionPlan; use futures::{stream, try_join, FutureExt, TryFutureExt, TryStreamExt}; use half::f16; -use lance::{ - arrow::RecordBatchExt, - dataset::{scanner::DatasetRecordBatchStream, ROW_ID}, -}; +use lance::dataset::{scanner::DatasetRecordBatchStream, ROW_ID}; +use lance_arrow::RecordBatchExt; use lance_datafusion::exec::execute_plan; use lance_index::scalar::inverted::SCORE_COL; use lance_index::scalar::FullTextSearchQuery; diff --git a/rust/lancedb/src/table.rs b/rust/lancedb/src/table.rs index 6cfea7dd..b4e09624 100644 --- a/rust/lancedb/src/table.rs +++ b/rust/lancedb/src/table.rs @@ -2626,7 +2626,7 @@ impl BaseTable for NativeTable { .await { Ok(stats) => stats, - Err(lance::error::Error::IndexNotFound { .. }) => return Ok(None), + Err(lance::Error::IndexNotFound { .. }) => return Ok(None), Err(e) => return Err(Error::from(e)), };