From 6666c57880ce2a187f3680ecc06dfe3728d73fcc Mon Sep 17 00:00:00 2001 From: Tamo Date: Tue, 30 Jul 2024 11:20:42 +0200 Subject: [PATCH] reduce the number of thread spawned by milli --- meilisearch/tests/common/server.rs | 3 ++- meilisearch/tests/documents/errors.rs | 9 +++++---- meilisearch/tests/tasks/mod.rs | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/meilisearch/tests/common/server.rs b/meilisearch/tests/common/server.rs index e69b3eb6e..bedfc9283 100644 --- a/meilisearch/tests/common/server.rs +++ b/meilisearch/tests/common/server.rs @@ -2,7 +2,7 @@ use std::marker::PhantomData; use std::path::Path; -use std::str::FromStr as _; +use std::str::FromStr; use std::time::Duration; use actix_http::body::MessageBody; @@ -345,6 +345,7 @@ pub fn default_settings(dir: impl AsRef) -> Opt { // memory has to be unlimited because several meilisearch are running in test context. max_indexing_memory: MaxMemory::unlimited(), skip_index_budget: true, + // We cannot use more than 1 indexing threads otherwise some tests become non-deterministic max_indexing_threads: MaxThreads::from_str("1").unwrap(), }, experimental_enable_metrics: false, diff --git a/meilisearch/tests/documents/errors.rs b/meilisearch/tests/documents/errors.rs index 2c5f2a965..280073f51 100644 --- a/meilisearch/tests/documents/errors.rs +++ b/meilisearch/tests/documents/errors.rs @@ -651,7 +651,7 @@ async fn fetch_document_by_filter() { let server = Server::new_shared(); let index = server.unique_index(); index.update_settings_filterable_attributes(json!(["color"])).await; - index + let (task, _code) = index .add_documents( json!([ { "id": 0, "color": "red" }, @@ -662,7 +662,7 @@ async fn fetch_document_by_filter() { Some("id"), ) .await; - index.wait_task(1).await; + index.wait_task(task.uid()).await.succeeded(); let (response, code) = index.get_document_by_filter(json!(null)).await; snapshot!(code, @"400 Bad Request"); @@ -745,8 +745,9 @@ async fn fetch_document_by_filter() { #[actix_rt::test] async fn retrieve_vectors() { - let server = Server::new_shared(); - let index = server.unique_index(); + let index = shared_empty_index().await; + + // GET ALL DOCUMENTS BY QUERY let (response, _code) = index.get_all_documents_raw("?retrieveVectors=tamo").await; snapshot!(response, @r###" { diff --git a/meilisearch/tests/tasks/mod.rs b/meilisearch/tests/tasks/mod.rs index 23ba669ca..c59313885 100644 --- a/meilisearch/tests/tasks/mod.rs +++ b/meilisearch/tests/tasks/mod.rs @@ -66,8 +66,8 @@ async fn list_tasks() { async fn list_tasks_with_star_filters() { let server = Server::new().await; let index = server.index("test"); - index.create(None).await; - index.wait_task(0).await; + let (task, _code) = index.create(None).await; + index.wait_task(task.uid()).await; index .add_documents(serde_json::from_str(include_str!("../assets/test_set.json")).unwrap(), None) .await;