snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-27 04:25:06 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge #249

Browse Source 
249: Enable the jemallocator dependencies only when we are running on linux r=Kerollmops a=irevoire



Co-authored-by: Tamo <tamo@meilisearch.com>
This commit is contained in:
bors[bot] 2021-06-22 12:32:44 +00:00 committed by GitHub
commit 5aea8dd75b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -132,6 +132,7 @@ dependencies = [
"criterion",
"flate2",
"heed",
"jemallocator",
"milli",
"reqwest",
]
@ -969,6 +970,7 @@ dependencies = [
"futures",
"grenad",
"heed",
"jemallocator",
"log",
"maplit",
"meilisearch-tokenizer 0.2.3",

3
benchmarks/Cargo.toml
View File

@ -8,6 +8,9 @@ publish = false
[dependencies]
milli = { path = "../milli" }
[target.'cfg(target_os = "linux")'.dependencies]
jemallocator = "0.3.2"
[dev-dependencies]
heed = "*" # we want to use the version milli uses
criterion = { version = "0.3.4", features = ["html_reports"] }

4
benchmarks/benches/songs.rs
View File

@ -5,6 +5,10 @@ use criterion::{criterion_group, criterion_main};
use milli::update::Settings;
use utils::Conf;
#[cfg(target_os = "linux")]
#[global_allocator]
static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
fn base_conf(builder: &mut Settings) {
let displayed_fields =
["id", "title", "album", "artist", "genre", "country", "released", "duration"]

4
benchmarks/benches/wiki.rs
View File

@ -5,6 +5,10 @@ use criterion::{criterion_group, criterion_main};
use milli::update::Settings;
use utils::Conf;
#[cfg(target_os = "linux")]
#[global_allocator]
static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
fn base_conf(builder: &mut Settings) {
let displayed_fields = ["title", "body", "url"].iter().map(|s| s.to_string()).collect();
builder.set_displayed_fields(displayed_fields);

4
helpers/Cargo.toml
View File

@ -8,7 +8,9 @@ edition = "2018"
anyhow = "1.0.38"
byte-unit = { version = "4.0.9", default-features = false, features = ["std"] }
heed = "0.10.6"
jemallocator = "0.3.2"
milli = { path = "../milli" }
stderrlog = "0.5.1"
structopt = { version = "0.3.21", default-features = false }
[target.'cfg(target_os = "linux")'.dependencies]
jemallocator = "0.3.2"

3
http-ui/Cargo.toml
View File

@ -42,3 +42,6 @@ funty = "=1.1"
[dev-dependencies]
maplit = "1.0.2"
serde_test = "1.0.125"
[target.'cfg(target_os = "linux")'.dependencies]
jemallocator = "0.3.2"

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

@ -36,6 +36,10 @@ use warp::Filter;
use self::update_store::UpdateStore;
#[cfg(target_os = "linux")]
#[global_allocator]
static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
static GLOBAL_THREAD_POOL: OnceCell<ThreadPool> = OnceCell::new();
#[derive(Debug, StructOpt)]

4
infos/Cargo.toml
View File

@ -9,9 +9,11 @@ anyhow = "1.0.38"
byte-unit = { version = "4.0.9", default-features = false, features = ["std"] }
csv = "1.1.5"
heed = "0.10.6"
jemallocator = "0.3.2"
milli = { path = "../milli" }
roaring = "0.6.6"
serde_json = "1.0.62"
stderrlog = "0.5.1"
structopt = { version = "0.3.21", default-features = false }
[target.'cfg(target_os = "linux")'.dependencies]
jemallocator = "0.3.2"

4
search/Cargo.toml
View File

@ -8,9 +8,11 @@ edition = "2018"
anyhow = "1.0.38"
byte-unit = { version = "4.0.9", default-features = false, features = ["std"] }
heed = "0.10.6"
jemallocator = "0.3.2"
log = "0.4.14"
milli = { path = "../milli" }
serde_json = "1.0.62"
stderrlog = "0.5.1"
structopt = { version = "0.3.21", default-features = false }
[target.'cfg(target_os = "linux")'.dependencies]
jemallocator = "0.3.2"