From 82cbcf6d07100ed5558c809bf55eabcff8fff522 Mon Sep 17 00:00:00 2001 From: Bert Date: Wed, 24 Jan 2024 08:41:28 -0500 Subject: [PATCH] Bump lance 0.9.9 (#851) --- Cargo.toml | 8 ++++---- python/pyproject.toml | 2 +- rust/ffi/node/src/lib.rs | 2 +- rust/ffi/node/src/table.rs | 2 +- rust/vectordb/src/connection.rs | 2 +- rust/vectordb/src/index/vector.rs | 2 +- rust/vectordb/src/io/object_store.rs | 4 ++-- rust/vectordb/src/lib.rs | 2 +- rust/vectordb/src/table.rs | 4 ++-- rust/vectordb/src/utils.rs | 6 ++---- 10 files changed, 16 insertions(+), 18 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 91da8a74..0dd1a401 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,10 +11,10 @@ license = "Apache-2.0" repository = "https://github.com/lancedb/lancedb" [workspace.dependencies] -lance = { "version" = "=0.9.7", "features" = ["dynamodb"] } -lance-index = { "version" = "=0.9.7" } -lance-linalg = { "version" = "=0.9.7" } -lance-testing = { "version" = "=0.9.7" } +lance = { "version" = "=0.9.9", "features" = ["dynamodb"] } +lance-index = { "version" = "=0.9.9" } +lance-linalg = { "version" = "=0.9.9" } +lance-testing = { "version" = "=0.9.9" } # Note that this one does not include pyarrow arrow = { version = "49.0.0", optional = false } arrow-array = "49.0" diff --git a/python/pyproject.toml b/python/pyproject.toml index ec8e8a54..076b6de7 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -3,7 +3,7 @@ name = "lancedb" version = "0.5.1" dependencies = [ "deprecation", - "pylance==0.9.7", + "pylance==0.9.9", "ratelimiter~=1.0", "retry>=0.9.2", "tqdm>=4.27.0", diff --git a/rust/ffi/node/src/lib.rs b/rust/ffi/node/src/lib.rs index 3fcd5c5a..9547e044 100644 --- a/rust/ffi/node/src/lib.rs +++ b/rust/ffi/node/src/lib.rs @@ -15,7 +15,7 @@ use std::sync::Arc; use async_trait::async_trait; -use lance::io::object_store::ObjectStoreParams; +use lance::io::ObjectStoreParams; use neon::prelude::*; use object_store::aws::{AwsCredential, AwsCredentialProvider}; use object_store::CredentialProvider; diff --git a/rust/ffi/node/src/table.rs b/rust/ffi/node/src/table.rs index 47c49ce9..0364b7e6 100644 --- a/rust/ffi/node/src/table.rs +++ b/rust/ffi/node/src/table.rs @@ -15,7 +15,7 @@ use arrow_array::{RecordBatch, RecordBatchIterator}; use lance::dataset::optimize::CompactionOptions; use lance::dataset::{WriteMode, WriteParams}; -use lance::io::object_store::ObjectStoreParams; +use lance::io::ObjectStoreParams; use crate::arrow::{arrow_buffer_to_record_batch, record_batch_to_buffer}; use neon::prelude::*; diff --git a/rust/vectordb/src/connection.rs b/rust/vectordb/src/connection.rs index 1e8308bc..9d1816d7 100644 --- a/rust/vectordb/src/connection.rs +++ b/rust/vectordb/src/connection.rs @@ -21,7 +21,7 @@ use std::sync::Arc; use arrow_array::RecordBatchReader; use lance::dataset::WriteParams; -use lance::io::object_store::{ObjectStore, WrappingObjectStore}; +use lance::io::{ObjectStore, WrappingObjectStore}; use object_store::local::LocalFileSystem; use snafu::prelude::*; diff --git a/rust/vectordb/src/index/vector.rs b/rust/vectordb/src/index/vector.rs index 418b43c4..881612c9 100644 --- a/rust/vectordb/src/index/vector.rs +++ b/rust/vectordb/src/index/vector.rs @@ -14,9 +14,9 @@ use serde::Deserialize; -use lance::format::{Index, Manifest}; use lance::index::vector::pq::PQBuildParams; use lance::index::vector::VectorIndexParams; +use lance::table::format::{Index, Manifest}; use lance_index::vector::ivf::IvfBuildParams; use lance_linalg::distance::MetricType; diff --git a/rust/vectordb/src/io/object_store.rs b/rust/vectordb/src/io/object_store.rs index 7e812821..dc027bc2 100644 --- a/rust/vectordb/src/io/object_store.rs +++ b/rust/vectordb/src/io/object_store.rs @@ -23,7 +23,7 @@ use std::{ use bytes::Bytes; use futures::{stream::BoxStream, FutureExt, StreamExt}; -use lance::io::object_store::WrappingObjectStore; +use lance::io::WrappingObjectStore; use object_store::{ path::Path, Error, GetOptions, GetResult, ListResult, MultipartId, ObjectMeta, ObjectStore, PutOptions, PutResult, Result, @@ -338,7 +338,7 @@ mod test { use crate::connection::{Connection, Database}; use arrow_array::PrimitiveArray; use futures::TryStreamExt; - use lance::{dataset::WriteParams, io::object_store::ObjectStoreParams}; + use lance::{dataset::WriteParams, io::ObjectStoreParams}; use lance_testing::datagen::{BatchGenerator, IncrementingInt32, RandomVector}; use object_store::local::LocalFileSystem; use tempfile; diff --git a/rust/vectordb/src/lib.rs b/rust/vectordb/src/lib.rs index ac753597..64c5434a 100644 --- a/rust/vectordb/src/lib.rs +++ b/rust/vectordb/src/lib.rs @@ -141,7 +141,7 @@ pub mod query; pub mod table; pub mod utils; -pub use connection::Connection; +pub use connection::{Connection, Database}; pub use error::{Error, Result}; pub use table::Table; diff --git a/rust/vectordb/src/table.rs b/rust/vectordb/src/table.rs index ee3f32ae..8901f2bf 100644 --- a/rust/vectordb/src/table.rs +++ b/rust/vectordb/src/table.rs @@ -26,7 +26,7 @@ use lance::dataset::optimize::{ compact_files, CompactionMetrics, CompactionOptions, IndexRemapperOptions, }; use lance::dataset::{Dataset, UpdateBuilder, WriteParams}; -use lance::io::object_store::WrappingObjectStore; +use lance::io::WrappingObjectStore; use lance_index::DatasetIndexExt; use std::path::Path; @@ -492,7 +492,7 @@ mod tests { use futures::TryStreamExt; use lance::dataset::{Dataset, WriteMode}; use lance::index::vector::pq::PQBuildParams; - use lance::io::object_store::{ObjectStoreParams, WrappingObjectStore}; + use lance::io::{ObjectStoreParams, WrappingObjectStore}; use lance_index::vector::ivf::IvfBuildParams; use rand::Rng; use tempfile::tempdir; diff --git a/rust/vectordb/src/utils.rs b/rust/vectordb/src/utils.rs index c0afa5d1..12183d7e 100644 --- a/rust/vectordb/src/utils.rs +++ b/rust/vectordb/src/utils.rs @@ -1,9 +1,7 @@ use std::sync::Arc; -use lance::{ - dataset::{ReadParams, WriteParams}, - io::object_store::{ObjectStoreParams, WrappingObjectStore}, -}; +use lance::dataset::{ReadParams, WriteParams}; +use lance::io::{ObjectStoreParams, WrappingObjectStore}; use crate::error::{Error, Result};