From 7d2f26a6db7d0fb4c02ef7bf53c7291447c2830d Mon Sep 17 00:00:00 2001 From: Kerollmops Date: Tue, 11 Mar 2025 15:32:54 +0100 Subject: [PATCH] Move to the latest version of arroy --- Cargo.lock | 12 ++++++------ crates/index-scheduler/Cargo.toml | 2 +- crates/milli/Cargo.toml | 2 +- crates/milli/src/error.rs | 3 ++- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9d27c6ae1..9dc865c97 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -394,8 +394,8 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "arroy" -version = "0.5.0" -source = "git+https://github.com/meilisearch/arroy?branch=update-heed-to-0-22#3b307a0e042c7527396ac36e6e88fc14372482da" +version = "0.6.0" +source = "git+https://github.com/meilisearch/arroy?branch=main#80a7f1ba60bd7d88d55ce958a7579d664fc769ce" dependencies = [ "bytemuck", "byteorder", @@ -2551,7 +2551,7 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "heed" version = "0.22.0" -source = "git+https://github.com/meilisearch/heed?branch=main#a3c6f002925630d4e5c808e58e62a121887094f5" +source = "git+https://github.com/meilisearch/heed?branch=main#2988ff87aaf493c46f81a0f011618a1b336b8d30" dependencies = [ "bitflags 2.9.0", "byteorder", @@ -2568,12 +2568,12 @@ dependencies = [ [[package]] name = "heed-traits" version = "0.20.0" -source = "git+https://github.com/meilisearch/heed?branch=main#a3c6f002925630d4e5c808e58e62a121887094f5" +source = "git+https://github.com/meilisearch/heed?branch=main#2988ff87aaf493c46f81a0f011618a1b336b8d30" [[package]] name = "heed-types" version = "0.21.0" -source = "git+https://github.com/meilisearch/heed?branch=main#a3c6f002925630d4e5c808e58e62a121887094f5" +source = "git+https://github.com/meilisearch/heed?branch=main#2988ff87aaf493c46f81a0f011618a1b336b8d30" dependencies = [ "bincode", "byteorder", @@ -3699,7 +3699,7 @@ checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856" [[package]] name = "lmdb-master-sys" version = "0.2.5" -source = "git+https://github.com/meilisearch/heed?branch=main#a3c6f002925630d4e5c808e58e62a121887094f5" +source = "git+https://github.com/meilisearch/heed?branch=main#2988ff87aaf493c46f81a0f011618a1b336b8d30" dependencies = [ "cc", "doxygen-rs", diff --git a/crates/index-scheduler/Cargo.toml b/crates/index-scheduler/Cargo.toml index bcbf1bb06..e1440fd62 100644 --- a/crates/index-scheduler/Cargo.toml +++ b/crates/index-scheduler/Cargo.toml @@ -44,7 +44,7 @@ ureq = "2.12.1" uuid = { version = "1.11.0", features = ["serde", "v4"] } [dev-dependencies] -arroy = { git = "https://github.com/meilisearch/arroy", branch = "update-heed-to-0-22" } +arroy = { git = "https://github.com/meilisearch/arroy", branch = "main" } big_s = "1.0.2" crossbeam-channel = "0.5.14" # fixed version due to format breakages in v1.40 diff --git a/crates/milli/Cargo.toml b/crates/milli/Cargo.toml index 8985f2bb7..6cb2639e6 100644 --- a/crates/milli/Cargo.toml +++ b/crates/milli/Cargo.toml @@ -87,7 +87,7 @@ rhai = { git = "https://github.com/rhaiscript/rhai", rev = "ef3df63121d27aacd838 "no_time", "sync", ] } -arroy = { git = "https://github.com/meilisearch/arroy", branch = "update-heed-to-0-22" } +arroy = { git = "https://github.com/meilisearch/arroy", branch = "main" } rand = "0.8.5" tracing = "0.1.41" ureq = { version = "2.12.1", features = ["json"] } diff --git a/crates/milli/src/error.rs b/crates/milli/src/error.rs index 3dfd3ce0b..355a5495c 100644 --- a/crates/milli/src/error.rs +++ b/crates/milli/src/error.rs @@ -349,7 +349,8 @@ impl From for Error { | arroy::Error::UnmatchingDistance { .. } | arroy::Error::NeedBuild(_) | arroy::Error::MissingKey { .. } - | arroy::Error::MissingMetadata(_) => { + | arroy::Error::MissingMetadata(_) + | arroy::Error::CannotDecodeKeyMode { .. } => { Error::InternalError(InternalError::ArroyError(value)) } }