From 1e81d72b5fc4624d6dc7c7eeb54dc3fed55a5698 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= <clement@meilisearch.com>
Date: Mon, 14 Oct 2024 18:18:59 +0200
Subject: [PATCH] Use the fixed version of the Rhai crate

---
 Cargo.lock                                    |  8 ++--
 index-scheduler/src/batch.rs                  | 43 +------------------
 milli/Cargo.toml                              |  2 +-
 .../update/new/indexer/update_by_function.rs  |  2 +-
 4 files changed, 6 insertions(+), 49 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 961ebab28..5cd1f3976 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4618,9 +4618,8 @@ dependencies = [
 
 [[package]]
 name = "rhai"
-version = "1.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61797318be89b1a268a018a92a7657096d83f3ecb31418b9e9c16dcbb043b702"
+version = "1.20.0"
+source = "git+https://github.com/rhaiscript/rhai?rev=ef3df63121d27aacd838f366f2b83fd65f20a1e4#ef3df63121d27aacd838f366f2b83fd65f20a1e4"
 dependencies = [
  "ahash 0.8.11",
  "bitflags 2.6.0",
@@ -4637,8 +4636,7 @@ dependencies = [
 [[package]]
 name = "rhai_codegen"
 version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5a11a05ee1ce44058fa3d5961d05194fdbe3ad6b40f904af764d81b86450e6b"
+source = "git+https://github.com/rhaiscript/rhai?rev=ef3df63121d27aacd838f366f2b83fd65f20a1e4#ef3df63121d27aacd838f366f2b83fd65f20a1e4"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/index-scheduler/src/batch.rs b/index-scheduler/src/batch.rs
index 978ef9ec6..328a5aed7 100644
--- a/index-scheduler/src/batch.rs
+++ b/index-scheduler/src/batch.rs
@@ -1355,7 +1355,7 @@ impl IndexScheduler {
                     }
                 }
 
-                if !tasks.iter().all(|res| res.error.is_some()) {
+                if tasks.iter().any(|res| res.error.is_none()) {
                     /// TODO create a pool if needed
                     // let pool = indexer_config.thread_pool.unwrap();
                     let pool = rayon::ThreadPoolBuilder::new().build().unwrap();
@@ -1791,44 +1791,3 @@ impl IndexScheduler {
         Ok(content_files_to_delete)
     }
 }
-
-fn edit_documents_by_function<'a>(
-    wtxn: &mut RwTxn<'a>,
-    filter: &Option<serde_json::Value>,
-    context: Option<Object>,
-    code: &str,
-    indexer_config: &IndexerConfig,
-    must_stop_processing: MustStopProcessing,
-    index: &'a Index,
-) -> Result<(u64, u64)> {
-    let candidates = match filter.as_ref().map(Filter::from_json) {
-        Some(Ok(Some(filter))) => filter.evaluate(wtxn, index).map_err(|err| match err {
-            milli::Error::UserError(milli::UserError::InvalidFilter(_)) => {
-                Error::from(err).with_custom_error_code(Code::InvalidDocumentFilter)
-            }
-            e => e.into(),
-        })?,
-        None | Some(Ok(None)) => index.documents_ids(wtxn)?,
-        Some(Err(e)) => return Err(e.into()),
-    };
-
-    let config = IndexDocumentsConfig {
-        update_method: IndexDocumentsMethod::ReplaceDocuments,
-        ..Default::default()
-    };
-
-    let mut builder = milli::update::IndexDocuments::new(
-        wtxn,
-        index,
-        indexer_config,
-        config,
-        |indexing_step| tracing::debug!(update = ?indexing_step),
-        || must_stop_processing.get(),
-    )?;
-
-    let (new_builder, count) = builder.edit_documents(&candidates, context, code)?;
-    builder = new_builder;
-
-    let _ = builder.execute()?;
-    Ok(count.unwrap())
-}
diff --git a/milli/Cargo.toml b/milli/Cargo.toml
index fc522994e..46633bdec 100644
--- a/milli/Cargo.toml
+++ b/milli/Cargo.toml
@@ -81,7 +81,7 @@ hf-hub = { git = "https://github.com/dureuill/hf-hub.git", branch = "rust_tls",
 ] }
 tiktoken-rs = "0.5.9"
 liquid = "0.26.6"
-rhai = { version = "1.19.0", features = [
+rhai = { git = "https://github.com/rhaiscript/rhai", rev = "ef3df63121d27aacd838f366f2b83fd65f20a1e4", features = [
     "serde",
     "no_module",
     "no_custom_syntax",
diff --git a/milli/src/update/new/indexer/update_by_function.rs b/milli/src/update/new/indexer/update_by_function.rs
index d2e5126d0..6bde29b45 100644
--- a/milli/src/update/new/indexer/update_by_function.rs
+++ b/milli/src/update/new/indexer/update_by_function.rs
@@ -141,7 +141,7 @@ impl<'index> DocumentChanges<'index> for UpdateByFunctionChanges<'index> {
                     //
                     // Future: Use a custom function rhai function to track changes.
                     //         <https://docs.rs/rhai/latest/rhai/struct.Engine.html#method.register_indexer_set>
-                    if dbg!(json_document) != dbg!(rhaimap_to_object(new_rhai_document)) {
+                    if json_document != rhaimap_to_object(new_rhai_document) {
                         let mut global_fields_ids_map = new_fields_ids_map.borrow_mut();
                         let new_document_id = self
                             .primary_key