diff --git a/crates/index-scheduler/src/lib.rs b/crates/index-scheduler/src/lib.rs index 41c407494..4605be6eb 100644 --- a/crates/index-scheduler/src/lib.rs +++ b/crates/index-scheduler/src/lib.rs @@ -240,9 +240,12 @@ impl IndexScheduler { }; let env = unsafe { - let options = heed::EnvOpenOptions::new(); - let mut options = options.read_txn_without_tls(); - options.max_dbs(Self::nb_db()).map_size(budget.task_db_size).open(&options.tasks_path) + let env_options = heed::EnvOpenOptions::new(); + let mut env_options = env_options.read_txn_without_tls(); + env_options + .max_dbs(Self::nb_db()) + .map_size(budget.task_db_size) + .open(&options.tasks_path) }?; // We **must** starts by upgrading the version because it'll also upgrade the required database before we can open them diff --git a/crates/index-scheduler/src/upgrade/mod.rs b/crates/index-scheduler/src/upgrade/mod.rs index 596d9a0c0..86ca755b8 100644 --- a/crates/index-scheduler/src/upgrade/mod.rs +++ b/crates/index-scheduler/src/upgrade/mod.rs @@ -1,5 +1,5 @@ use anyhow::bail; -use meilisearch_types::heed::{Env, RwTxn, WithTls, WithoutTls}; +use meilisearch_types::heed::{Env, RwTxn, WithoutTls}; use meilisearch_types::tasks::{Details, KindWithContent, Status, Task}; use meilisearch_types::versioning::{VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH}; use time::OffsetDateTime; diff --git a/crates/meilitool/Cargo.toml b/crates/meilitool/Cargo.toml index ffd13da34..485177838 100644 --- a/crates/meilitool/Cargo.toml +++ b/crates/meilitool/Cargo.toml @@ -10,7 +10,6 @@ license.workspace = true [dependencies] anyhow = "1.0.95" -arroy_v04_to_v05 = { package = "arroy", git = "https://github.com/meilisearch/arroy/", tag = "DO-NOT-DELETE-upgrade-v04-to-v05" } clap = { version = "4.5.24", features = ["derive"] } dump = { path = "../dump" } file-store = { path = "../file-store" } diff --git a/crates/meilitool/src/upgrade/v1_11.rs b/crates/meilitool/src/upgrade/v1_11.rs index 44aeb125f..dea768dd5 100644 --- a/crates/meilitool/src/upgrade/v1_11.rs +++ b/crates/meilitool/src/upgrade/v1_11.rs @@ -76,7 +76,7 @@ pub fn v1_10_to_v1_11( try_opening_poly_database(&index_env, &index_wtxn, db_name::VECTOR_ARROY) .with_context(|| format!("while updating date format for index `{uid}`"))?; - arroy_v04_to_v05::ugrade_from_prev_version( + meilisearch_types::milli::arroy::upgrade::cosine_from_0_4_to_0_5( &index_rtxn, index_read_database, &mut index_wtxn, diff --git a/crates/milli/Cargo.toml b/crates/milli/Cargo.toml index 5f4da149b..8985f2bb7 100644 --- a/crates/milli/Cargo.toml +++ b/crates/milli/Cargo.toml @@ -32,7 +32,7 @@ grenad = { version = "0.5.0", default-features = false, features = [ "rayon", "tempfile", ] } -heed = { version = "0.22.0", branch = "bump-versions", git = "https://github.com/meilisearch/heed", default-features = false, features = [ +heed = { version = "0.22.0", branch = "main", git = "https://github.com/meilisearch/heed", default-features = false, features = [ "serde-json", "serde-bincode", ] } diff --git a/crates/milli/src/lib.rs b/crates/milli/src/lib.rs index 85540c82e..1a6977585 100644 --- a/crates/milli/src/lib.rs +++ b/crates/milli/src/lib.rs @@ -83,6 +83,8 @@ pub use self::search::{ }; pub use self::update::ChannelCongestion; +pub use arroy; + pub type Result = std::result::Result; pub type Attribute = u32;