snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-10-31 07:56:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #256

Browse Source 
256: Update heed and milli r=irevoire a=curquiza



Co-authored-by: Clémentine Urquizar <clementine@meilisearch.com>
This commit is contained in:
bors[bot]
2021-06-29 08:49:22 +00:00
committed by GitHub
parent 712abf4c5f c09e610bb5
commit f12ace3fbf
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
meilisearch-http/Cargo.toml
View File

@@ -42,7 +42,7 @@ fst = "0.4.5"
futures = "0.3.7"
futures-util = "0.3.8"
grenad = { git = "https://github.com/Kerollmops/grenad.git", rev = "3adcb26" }
heed = "0.10.6"
heed = { git = "https://github.com/Kerollmops/heed", tag = "v0.12.0" }
http = "0.2.1"
indexmap = { version = "1.3.2", features = ["serde-1"] }
itertools = "0.10.0"
@@ -51,7 +51,7 @@ main_error = "0.1.0"
meilisearch-error = { path = "../meilisearch-error" }
meilisearch-tokenizer = { git = "https://github.com/meilisearch/tokenizer.git", tag = "v0.2.3" }
memmap = "0.7.0"
milli = { git = "https://github.com/meilisearch/milli.git", tag = "v0.6.0" }
milli = { git = "https://github.com/meilisearch/milli.git", tag = "v0.7.0" }
mime = "0.3.16"
num_cpus = "1.13.0"
once_cell = "1.5.2"

8
meilisearch-http/src/index_controller/update_actor/store/mod.rs
View File

@@ -439,7 +439,9 @@ impl UpdateStore {
while let Some(Ok(((_, uuid, _), pending))) = pendings.next() {
if uuid == index_uuid {
pendings.del_current()?;
unsafe {
pendings.del_current()?;
}
let mut pending = pending.decode()?;
if let Some(update_uuid) = pending.content.take() {
uuids_to_remove.push(update_uuid);
@@ -456,7 +458,9 @@ impl UpdateStore {
.lazily_decode_data();
while let Some(_) = updates.next() {
updates.del_current()?;
unsafe {
updates.del_current()?;
}
}
drop(updates);