From 19585f1a4ffccbe6df51b94c70b818427c22eae4 Mon Sep 17 00:00:00 2001 From: dureuill Date: Mon, 10 Jun 2024 07:59:36 +0000 Subject: [PATCH 1/2] Update version for the next release (v1.8.2) in Cargo.toml --- Cargo.lock | 34 +++++++++++++++++----------------- Cargo.toml | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ab060ac93..b7419052a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -494,7 +494,7 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "benchmarks" -version = "1.8.1" +version = "1.8.2" dependencies = [ "anyhow", "bytes", @@ -639,7 +639,7 @@ dependencies = [ [[package]] name = "build-info" -version = "1.8.1" +version = "1.8.2" dependencies = [ "anyhow", "time", @@ -1539,7 +1539,7 @@ dependencies = [ [[package]] name = "dump" -version = "1.8.1" +version = "1.8.2" dependencies = [ "anyhow", "big_s", @@ -1787,7 +1787,7 @@ dependencies = [ [[package]] name = "file-store" -version = "1.8.1" +version = "1.8.2" dependencies = [ "faux", "tempfile", @@ -1810,7 +1810,7 @@ dependencies = [ [[package]] name = "filter-parser" -version = "1.8.1" +version = "1.8.2" dependencies = [ "insta", "nom", @@ -1830,7 +1830,7 @@ dependencies = [ [[package]] name = "flatten-serde-json" -version = "1.8.1" +version = "1.8.2" dependencies = [ "criterion", "serde_json", @@ -1948,7 +1948,7 @@ dependencies = [ [[package]] name = "fuzzers" -version = "1.8.1" +version = "1.8.2" dependencies = [ "arbitrary", "clap", @@ -2442,7 +2442,7 @@ checksum = "206ca75c9c03ba3d4ace2460e57b189f39f43de612c2f85836e65c929701bb2d" [[package]] name = "index-scheduler" -version = "1.8.1" +version = "1.8.2" dependencies = [ "anyhow", "big_s", @@ -2638,7 +2638,7 @@ dependencies = [ [[package]] name = "json-depth-checker" -version = "1.8.1" +version = "1.8.2" dependencies = [ "criterion", "serde_json", @@ -3275,7 +3275,7 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "meili-snap" -version = "1.8.1" +version = "1.8.2" dependencies = [ "insta", "md5", @@ -3284,7 +3284,7 @@ dependencies = [ [[package]] name = "meilisearch" -version = "1.8.1" +version = "1.8.2" dependencies = [ "actix-cors", "actix-http", @@ -3377,7 +3377,7 @@ dependencies = [ [[package]] name = "meilisearch-auth" -version = "1.8.1" +version = "1.8.2" dependencies = [ "base64 0.21.7", "enum-iterator", @@ -3396,7 +3396,7 @@ dependencies = [ [[package]] name = "meilisearch-types" -version = "1.8.1" +version = "1.8.2" dependencies = [ "actix-web", "anyhow", @@ -3426,7 +3426,7 @@ dependencies = [ [[package]] name = "meilitool" -version = "1.8.1" +version = "1.8.2" dependencies = [ "anyhow", "clap", @@ -3465,7 +3465,7 @@ dependencies = [ [[package]] name = "milli" -version = "1.8.1" +version = "1.8.2" dependencies = [ "arroy", "big_s", @@ -3906,7 +3906,7 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "permissive-json-pointer" -version = "1.8.1" +version = "1.8.2" dependencies = [ "big_s", "serde_json", @@ -6074,7 +6074,7 @@ dependencies = [ [[package]] name = "xtask" -version = "1.8.1" +version = "1.8.2" dependencies = [ "anyhow", "build-info", diff --git a/Cargo.toml b/Cargo.toml index eadef3a1b..486e24668 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ members = [ ] [workspace.package] -version = "1.8.1" +version = "1.8.2" authors = [ "Quentin de Quelen ", "Clément Renault ", From 50f8218a5d877fd0309cf6432ad5e6d204dc9a68 Mon Sep 17 00:00:00 2001 From: Louis Dureuil Date: Wed, 5 Jun 2024 18:26:36 +0200 Subject: [PATCH 2/2] Asynchronously drop permits --- meilisearch/src/search_queue.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meilisearch/src/search_queue.rs b/meilisearch/src/search_queue.rs index 6d5044d20..152b900be 100644 --- a/meilisearch/src/search_queue.rs +++ b/meilisearch/src/search_queue.rs @@ -40,8 +40,9 @@ pub struct Permit { impl Drop for Permit { fn drop(&mut self) { + let sender = self.sender.clone(); // if the channel is closed then the whole instance is down - let _ = futures::executor::block_on(self.sender.send(())); + std::mem::drop(tokio::spawn(async move { sender.send(()).await })); } }