snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-23 10:37:41 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge #384

Browse Source 
384: Replace memmap with memmap2 r=Kerollmops a=palfrey

[memmap is unmaintained](https://rustsec.org/advisories/RUSTSEC-2020-0077.html) and needs replacing. memmap2 is a drop-in replacement fork that's well maintained. Note that the version numbers got reset on fork, hence the lower values.

Co-authored-by: Tom Parker-Shemilt <palfrey@tevp.net>
This commit is contained in:
bors[bot] 2021-10-13 13:47:23 +00:00 committed by GitHub
commit c7db4176f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
http-ui/Cargo.toml
View File

@ -11,7 +11,7 @@ byte-unit = { version = "4.0.9", default-features = false, features = ["std"] }
crossbeam-channel = "0.5.0" crossbeam-channel = "0.5.0"
heed = { git = "https://github.com/Kerollmops/heed", tag = "v0.12.1" } heed = { git = "https://github.com/Kerollmops/heed", tag = "v0.12.1" }
meilisearch-tokenizer = { git = "https://github.com/meilisearch/tokenizer.git", tag = "v0.2.5" } meilisearch-tokenizer = { git = "https://github.com/meilisearch/tokenizer.git", tag = "v0.2.5" }
memmap = "0.7.0" memmap2 = "0.5.0"
milli = { path = "../milli" } milli = { path = "../milli" }
once_cell = "1.5.2" once_cell = "1.5.2"
rayon = "1.5.0" rayon = "1.5.0"

2
http-ui/src/main.rs
View File

@ -868,7 +868,7 @@ async fn main() -> anyhow::Result<()> {
} }
let file = file.into_std().await; let file = file.into_std().await;
let mmap = unsafe { memmap::Mmap::map(&file).expect("can't map file") }; let mmap = unsafe { memmap2::Mmap::map(&file).expect("can't map file") };
let method = match update_method.as_deref() { let method = match update_method.as_deref() {
Some("replace") => String::from("replace"), Some("replace") => String::from("replace"),

2
milli/Cargo.toml
View File

@ -23,7 +23,7 @@ human_format = "1.0.3"
levenshtein_automata = { version = "0.2.0", features = ["fst_automaton"] } levenshtein_automata = { version = "0.2.0", features = ["fst_automaton"] }
linked-hash-map = "0.5.4" linked-hash-map = "0.5.4"
meilisearch-tokenizer = { git = "https://github.com/meilisearch/tokenizer.git", tag = "v0.2.5" } meilisearch-tokenizer = { git = "https://github.com/meilisearch/tokenizer.git", tag = "v0.2.5" }
memmap = "0.7.0" memmap2 = "0.5.0"
obkv = "0.2.0" obkv = "0.2.0"
once_cell = "1.5.2" once_cell = "1.5.2"
ordered-float = "2.1.1" ordered-float = "2.1.1"

2
milli/src/update/index_documents/helpers/clonable_mmap.rs
View File

@ -1,6 +1,6 @@
use std::sync::Arc; use std::sync::Arc;
use memmap::Mmap; use memmap2::Mmap;
/// Wrapper around Mmap allowing to virtualy clone grenad-chunks /// Wrapper around Mmap allowing to virtualy clone grenad-chunks
/// in a parallel process like the indexing. /// in a parallel process like the indexing.

2
milli/src/update/index_documents/helpers/grenad_helpers.rs
View File

@ -70,7 +70,7 @@ pub unsafe fn into_clonable_grenad(
reader: grenad::Reader<File>, reader: grenad::Reader<File>,
) -> Result<grenad::Reader<CursorClonableMmap>> { ) -> Result<grenad::Reader<CursorClonableMmap>> {
let file = reader.into_inner(); let file = reader.into_inner();
let mmap = memmap::Mmap::map(&file)?; let mmap = memmap2::Mmap::map(&file)?;
let cursor = io::Cursor::new(ClonableMmap::from(mmap)); let cursor = io::Cursor::new(ClonableMmap::from(mmap));
let reader = grenad::Reader::new(cursor)?; let reader = grenad::Reader::new(cursor)?;
Ok(reader) Ok(reader)