From 2f7f3ddbd1bc532cd52caa2ac9ffd53239b8e78c Mon Sep 17 00:00:00 2001 From: ManyTheFish Date: Wed, 7 May 2025 16:33:44 +0200 Subject: [PATCH] Use unstable arroy version containing incremental indexing --- Cargo.lock | 3 +-- crates/milli/Cargo.toml | 3 ++- crates/milli/src/progress.rs | 13 ++++++++----- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 96cfcf76c..f414d2ff4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -394,8 +394,7 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "arroy" version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08e6111f351d004bd13e95ab540721272136fd3218b39d3ec95a2ea1c4e6a0a6" +source = "git+https://github.com/meilisearch/arroy.git?rev=5b748bac2c69c65a97980901b02067a3a545e357#5b748bac2c69c65a97980901b02067a3a545e357" dependencies = [ "bytemuck", "byteorder", diff --git a/crates/milli/Cargo.toml b/crates/milli/Cargo.toml index a2a020587..480045ea0 100644 --- a/crates/milli/Cargo.toml +++ b/crates/milli/Cargo.toml @@ -87,7 +87,8 @@ rhai = { git = "https://github.com/rhaiscript/rhai", rev = "ef3df63121d27aacd838 "no_time", "sync", ] } -arroy = "0.6.1" +# arroy = "0.6.1" +arroy = { git = "https://github.com/meilisearch/arroy.git", rev = "5b748bac2c69c65a97980901b02067a3a545e357" } # incremental update rand = "0.8.5" tracing = "0.1.41" ureq = { version = "2.12.1", features = ["json"] } diff --git a/crates/milli/src/progress.rs b/crates/milli/src/progress.rs index 75dafa8ec..315880e57 100644 --- a/crates/milli/src/progress.rs +++ b/crates/milli/src/progress.rs @@ -266,12 +266,15 @@ impl Step for arroy::MainStep { "writing the descendants and metadata" } arroy::MainStep::RetrieveTheUpdatedItems => "retrieve the updated items", - arroy::MainStep::RetrievingTheTreeAndItemNodes => "retrieving the tree and item nodes", - arroy::MainStep::UpdatingTheTrees => "updating the trees", - arroy::MainStep::CreateNewTrees => "create new trees", - arroy::MainStep::WritingNodesToDatabase => "writing nodes to database", - arroy::MainStep::DeleteExtraneousTrees => "delete extraneous trees", arroy::MainStep::WriteTheMetadata => "write the metadata", + arroy::MainStep::RetrievingTheItemsIds => "retrieving the items ids", + arroy::MainStep::RetrievingTheUsedTreeNodes => "retrieving the used tree nodes", + arroy::MainStep::DeletingExtraTrees => "deleting extra trees", + arroy::MainStep::RemoveItemsFromExistingTrees => "remove items from existing trees", + arroy::MainStep::InsertItemsInCurrentTrees => "insert items in current trees", + arroy::MainStep::IncrementalIndexLargeDescendants => { + "incremental index large descendants" + } } .into() }