diff --git a/Cargo.toml b/Cargo.toml index faf870b8..63675132 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,9 +5,10 @@ exclude = ["python"] resolver = "2" [workspace.dependencies] -lance = { "version" = "=0.8.14", "features" = ["dynamodb"] } -lance-linalg = { "version" = "=0.8.14" } -lance-testing = { "version" = "=0.8.14" } +lance = { "version" = "=0.8.15", "features" = ["dynamodb"] } +lance-linalg = { "version" = "=0.8.15" } +lance-index = { "version" = "=0.8.15" } +lance-testing = { "version" = "=0.8.15" } # Note that this one does not include pyarrow arrow = { version = "47.0.0", optional = false } arrow-array = "47.0" diff --git a/rust/ffi/node/Cargo.toml b/rust/ffi/node/Cargo.toml index c7d09e5e..39572af2 100644 --- a/rust/ffi/node/Cargo.toml +++ b/rust/ffi/node/Cargo.toml @@ -20,6 +20,7 @@ futures = "0.3" half = { workspace = true } lance = { workspace = true } lance-linalg = { workspace = true } +lance-index = { workspace = true } vectordb = { path = "../../vectordb" } tokio = { version = "1.23", features = ["rt-multi-thread"] } neon = {version = "0.10.1", default-features = false, features = ["channel-api", "napi-6", "promise-api", "task-api"] } diff --git a/rust/ffi/node/src/index/vector.rs b/rust/ffi/node/src/index/vector.rs index 1055b94a..e26238e5 100644 --- a/rust/ffi/node/src/index/vector.rs +++ b/rust/ffi/node/src/index/vector.rs @@ -12,7 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -use lance::index::vector::{ivf::IvfBuildParams, pq::PQBuildParams}; +use lance::index::vector::pq::PQBuildParams; +use lance_index::vector::ivf::IvfBuildParams; use lance_linalg::distance::MetricType; use neon::context::FunctionContext; use neon::prelude::*; diff --git a/rust/ffi/node/src/lib.rs b/rust/ffi/node/src/lib.rs index 6de89c31..ed9045dd 100644 --- a/rust/ffi/node/src/lib.rs +++ b/rust/ffi/node/src/lib.rs @@ -183,9 +183,10 @@ fn database_open_table(mut cx: FunctionContext) -> JsResult { let aws_region = get_aws_region(&mut cx, 4)?; let params = ReadParams { - store_options: Some(ObjectStoreParams::with_aws_credentials( - aws_creds, aws_region, - )), + store_options: Some(ObjectStoreParams{ + aws_credentials: aws_creds, + ..ObjectStoreParams::default() + }), ..ReadParams::default() }; diff --git a/rust/ffi/node/src/table.rs b/rust/ffi/node/src/table.rs index f44a50bc..231fafee 100644 --- a/rust/ffi/node/src/table.rs +++ b/rust/ffi/node/src/table.rs @@ -67,9 +67,10 @@ impl JsTable { let aws_region = get_aws_region(&mut cx, 6)?; let params = WriteParams { - store_params: Some(ObjectStoreParams::with_aws_credentials( - aws_creds, aws_region, - )), + store_params: Some(ObjectStoreParams{ + aws_credentials: aws_creds, + ..ObjectStoreParams::default() + }), mode, ..WriteParams::default() }; @@ -109,9 +110,10 @@ impl JsTable { let aws_region = get_aws_region(&mut cx, 5)?; let params = WriteParams { - store_params: Some(ObjectStoreParams::with_aws_credentials( - aws_creds, aws_region, - )), + store_params: Some(ObjectStoreParams{ + aws_credentials: aws_creds, + ..ObjectStoreParams::default() + }), mode: write_mode, ..WriteParams::default() }; diff --git a/rust/vectordb/Cargo.toml b/rust/vectordb/Cargo.toml index 0ba83049..e3e9e68a 100644 --- a/rust/vectordb/Cargo.toml +++ b/rust/vectordb/Cargo.toml @@ -22,6 +22,7 @@ snafu = { workspace = true } half = { workspace = true } lance = { workspace = true } lance-linalg = { workspace = true } +lance-index = { workspace = true } lance-testing = { workspace = true } tokio = { version = "1.23", features = ["rt-multi-thread"] } log = { workspace = true } diff --git a/rust/vectordb/src/index/vector.rs b/rust/vectordb/src/index/vector.rs index 90ed38fb..973c9160 100644 --- a/rust/vectordb/src/index/vector.rs +++ b/rust/vectordb/src/index/vector.rs @@ -13,9 +13,9 @@ // limitations under the License. use lance::format::{Index, Manifest}; -use lance::index::vector::ivf::IvfBuildParams; use lance::index::vector::pq::PQBuildParams; use lance::index::vector::VectorIndexParams; +use lance_index::vector::ivf::IvfBuildParams; use lance_linalg::distance::MetricType; pub trait VectorIndexBuilder { @@ -136,7 +136,6 @@ impl VectorIndex { mod tests { use super::*; - use lance::index::vector::ivf::IvfBuildParams; use lance::index::vector::pq::PQBuildParams; use lance::index::vector::StageParams; diff --git a/rust/vectordb/src/table.rs b/rust/vectordb/src/table.rs index 57f4f24b..a181d960 100644 --- a/rust/vectordb/src/table.rs +++ b/rust/vectordb/src/table.rs @@ -13,6 +13,7 @@ // limitations under the License. use chrono::Duration; +use lance_index::IndexType; use std::sync::Arc; use arrow_array::{Float32Array, RecordBatchReader}; @@ -22,7 +23,7 @@ use lance::dataset::optimize::{ compact_files, CompactionMetrics, CompactionOptions, IndexRemapperOptions, }; use lance::dataset::{Dataset, WriteParams}; -use lance::index::{DatasetIndexExt, IndexType}; +use lance::index::DatasetIndexExt; use lance::io::object_store::WrappingObjectStore; use std::path::Path;