snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-10-26 05:26:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Plug the NoPanicThreadPool in the tests and benchmarks

Browse Source
This commit is contained in:
Clément Renault
2024-11-27 17:04:49 +01:00
parent e83534a430
commit da650f834e
10 changed files with 52 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
crates/benchmarks/benches/indexing.rs
View File

@@ -157,6 +157,7 @@ fn indexing_songs_default(c: &mut Criterion) {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&milli::ThreadPoolNoAbortBuilder::new().build().unwrap(),
config.grenad_parameters(), config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -223,6 +224,7 @@ fn reindexing_songs_default(c: &mut Criterion) {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&milli::ThreadPoolNoAbortBuilder::new().build().unwrap(),
config.grenad_parameters(), config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -267,6 +269,7 @@ fn reindexing_songs_default(c: &mut Criterion) {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&milli::ThreadPoolNoAbortBuilder::new().build().unwrap(),
config.grenad_parameters(), config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -335,6 +338,7 @@ fn deleting_songs_in_batches_default(c: &mut Criterion) {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&milli::ThreadPoolNoAbortBuilder::new().build().unwrap(),
config.grenad_parameters(), config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -411,6 +415,7 @@ fn indexing_songs_in_three_batches_default(c: &mut Criterion) {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&milli::ThreadPoolNoAbortBuilder::new().build().unwrap(),
config.grenad_parameters(), config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -455,6 +460,7 @@ fn indexing_songs_in_three_batches_default(c: &mut Criterion) {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&milli::ThreadPoolNoAbortBuilder::new().build().unwrap(),
config.grenad_parameters(), config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -495,6 +501,7 @@ fn indexing_songs_in_three_batches_default(c: &mut Criterion) {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&milli::ThreadPoolNoAbortBuilder::new().build().unwrap(),
config.grenad_parameters(), config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -562,6 +569,7 @@ fn indexing_songs_without_faceted_numbers(c: &mut Criterion) {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&milli::ThreadPoolNoAbortBuilder::new().build().unwrap(),
config.grenad_parameters(), config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -628,6 +636,7 @@ fn indexing_songs_without_faceted_fields(c: &mut Criterion) {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&milli::ThreadPoolNoAbortBuilder::new().build().unwrap(),
config.grenad_parameters(), config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -694,6 +703,7 @@ fn indexing_wiki(c: &mut Criterion) {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&milli::ThreadPoolNoAbortBuilder::new().build().unwrap(),
config.grenad_parameters(), config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -759,6 +769,7 @@ fn reindexing_wiki(c: &mut Criterion) {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&milli::ThreadPoolNoAbortBuilder::new().build().unwrap(),
config.grenad_parameters(), config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -803,6 +814,7 @@ fn reindexing_wiki(c: &mut Criterion) {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&milli::ThreadPoolNoAbortBuilder::new().build().unwrap(),
config.grenad_parameters(), config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -870,6 +882,7 @@ fn deleting_wiki_in_batches_default(c: &mut Criterion) {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&milli::ThreadPoolNoAbortBuilder::new().build().unwrap(),
config.grenad_parameters(), config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -946,6 +959,7 @@ fn indexing_wiki_in_three_batches(c: &mut Criterion) {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&milli::ThreadPoolNoAbortBuilder::new().build().unwrap(),
config.grenad_parameters(), config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -991,6 +1005,7 @@ fn indexing_wiki_in_three_batches(c: &mut Criterion) {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&milli::ThreadPoolNoAbortBuilder::new().build().unwrap(),
config.grenad_parameters(), config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -1032,6 +1047,7 @@ fn indexing_wiki_in_three_batches(c: &mut Criterion) {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&milli::ThreadPoolNoAbortBuilder::new().build().unwrap(),
config.grenad_parameters(), config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -1098,6 +1114,7 @@ fn indexing_movies_default(c: &mut Criterion) {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&milli::ThreadPoolNoAbortBuilder::new().build().unwrap(),
config.grenad_parameters(), config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -1163,6 +1180,7 @@ fn reindexing_movies_default(c: &mut Criterion) {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&milli::ThreadPoolNoAbortBuilder::new().build().unwrap(),
config.grenad_parameters(), config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -1207,6 +1225,7 @@ fn reindexing_movies_default(c: &mut Criterion) {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&milli::ThreadPoolNoAbortBuilder::new().build().unwrap(),
config.grenad_parameters(), config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -1274,6 +1293,7 @@ fn deleting_movies_in_batches_default(c: &mut Criterion) {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&milli::ThreadPoolNoAbortBuilder::new().build().unwrap(),
config.grenad_parameters(), config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -1321,6 +1341,7 @@ fn delete_documents_from_ids(index: Index, document_ids_to_delete: Vec<RoaringBi
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&milli::ThreadPoolNoAbortBuilder::new().build().unwrap(),
config.grenad_parameters(), config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -1385,6 +1406,7 @@ fn indexing_movies_in_three_batches(c: &mut Criterion) {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&milli::ThreadPoolNoAbortBuilder::new().build().unwrap(),
config.grenad_parameters(), config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -1429,6 +1451,7 @@ fn indexing_movies_in_three_batches(c: &mut Criterion) {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&milli::ThreadPoolNoAbortBuilder::new().build().unwrap(),
config.grenad_parameters(), config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -1469,6 +1492,7 @@ fn indexing_movies_in_three_batches(c: &mut Criterion) {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&milli::ThreadPoolNoAbortBuilder::new().build().unwrap(),
config.grenad_parameters(), config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -1558,6 +1582,7 @@ fn indexing_nested_movies_default(c: &mut Criterion) {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&milli::ThreadPoolNoAbortBuilder::new().build().unwrap(),
config.grenad_parameters(), config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -1648,6 +1673,7 @@ fn deleting_nested_movies_in_batches_default(c: &mut Criterion) {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&milli::ThreadPoolNoAbortBuilder::new().build().unwrap(),
config.grenad_parameters(), config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -1730,6 +1756,7 @@ fn indexing_nested_movies_without_faceted_fields(c: &mut Criterion) {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&milli::ThreadPoolNoAbortBuilder::new().build().unwrap(),
config.grenad_parameters(), config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -1796,6 +1823,7 @@ fn indexing_geo(c: &mut Criterion) {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&milli::ThreadPoolNoAbortBuilder::new().build().unwrap(),
config.grenad_parameters(), config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -1861,6 +1889,7 @@ fn reindexing_geo(c: &mut Criterion) {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&milli::ThreadPoolNoAbortBuilder::new().build().unwrap(),
config.grenad_parameters(), config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -1905,6 +1934,7 @@ fn reindexing_geo(c: &mut Criterion) {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&milli::ThreadPoolNoAbortBuilder::new().build().unwrap(),
config.grenad_parameters(), config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -1972,6 +2002,7 @@ fn deleting_geo_in_batches_default(c: &mut Criterion) {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&milli::ThreadPoolNoAbortBuilder::new().build().unwrap(),
config.grenad_parameters(), config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,

1
crates/benchmarks/benches/utils.rs
View File

@@ -117,6 +117,7 @@ pub fn base_setup(conf: &Conf) -> Index {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&milli::ThreadPoolNoAbortBuilder::new().build().unwrap(),
config.grenad_parameters(), config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,

1
crates/fuzzers/src/bin/fuzz-indexing.rs
View File

@@ -135,6 +135,7 @@ fn main() {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&milli::ThreadPoolNoAbortBuilder::new().build().unwrap(),
indexer_config.grenad_parameters(), indexer_config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,

3
crates/milli/src/index.rs
View File

@@ -1821,6 +1821,7 @@ pub(crate) mod tests {
indexer::index( indexer::index(
wtxn, wtxn,
&self.inner, &self.inner,
&crate::ThreadPoolNoAbortBuilder::new().build().unwrap(),
indexer_config.grenad_parameters(), indexer_config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -1911,6 +1912,7 @@ pub(crate) mod tests {
indexer::index( indexer::index(
wtxn, wtxn,
&self.inner, &self.inner,
&crate::ThreadPoolNoAbortBuilder::new().build().unwrap(),
indexer_config.grenad_parameters(), indexer_config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -1991,6 +1993,7 @@ pub(crate) mod tests {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index.inner, &index.inner,
&crate::ThreadPoolNoAbortBuilder::new().build().unwrap(),
indexer_config.grenad_parameters(), indexer_config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,

1
crates/milli/src/search/new/tests/integration.rs
View File

@@ -83,6 +83,7 @@ pub fn setup_search_index_with_criteria(criteria: &[Criterion]) -> Index {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&crate::ThreadPoolNoAbortBuilder::new().build().unwrap(),
config.grenad_parameters(), config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,

11
crates/milli/src/update/index_documents/mod.rs
View File

@@ -2155,6 +2155,7 @@ mod tests {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index.inner, &index.inner,
&crate::ThreadPoolNoAbortBuilder::new().build().unwrap(),
indexer_config.grenad_parameters(), indexer_config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -2216,6 +2217,7 @@ mod tests {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index.inner, &index.inner,
&crate::ThreadPoolNoAbortBuilder::new().build().unwrap(),
indexer_config.grenad_parameters(), indexer_config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -2268,6 +2270,7 @@ mod tests {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index.inner, &index.inner,
&crate::ThreadPoolNoAbortBuilder::new().build().unwrap(),
indexer_config.grenad_parameters(), indexer_config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -2319,6 +2322,7 @@ mod tests {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index.inner, &index.inner,
&crate::ThreadPoolNoAbortBuilder::new().build().unwrap(),
indexer_config.grenad_parameters(), indexer_config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -2372,6 +2376,7 @@ mod tests {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index.inner, &index.inner,
&crate::ThreadPoolNoAbortBuilder::new().build().unwrap(),
indexer_config.grenad_parameters(), indexer_config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -2430,6 +2435,7 @@ mod tests {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index.inner, &index.inner,
&crate::ThreadPoolNoAbortBuilder::new().build().unwrap(),
indexer_config.grenad_parameters(), indexer_config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -2481,6 +2487,7 @@ mod tests {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index.inner, &index.inner,
&crate::ThreadPoolNoAbortBuilder::new().build().unwrap(),
indexer_config.grenad_parameters(), indexer_config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -2532,6 +2539,7 @@ mod tests {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index.inner, &index.inner,
&crate::ThreadPoolNoAbortBuilder::new().build().unwrap(),
indexer_config.grenad_parameters(), indexer_config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -2725,6 +2733,7 @@ mod tests {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index.inner, &index.inner,
&crate::ThreadPoolNoAbortBuilder::new().build().unwrap(),
indexer_config.grenad_parameters(), indexer_config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -2783,6 +2792,7 @@ mod tests {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index.inner, &index.inner,
&crate::ThreadPoolNoAbortBuilder::new().build().unwrap(),
indexer_config.grenad_parameters(), indexer_config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,
@@ -2838,6 +2848,7 @@ mod tests {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index.inner, &index.inner,
&crate::ThreadPoolNoAbortBuilder::new().build().unwrap(),
indexer_config.grenad_parameters(), indexer_config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,

1
crates/milli/tests/search/facet_distribution.rs
View File

@@ -64,6 +64,7 @@ fn test_facet_distribution_with_no_facet_values() {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&milli::ThreadPoolNoAbortBuilder::new().build().unwrap(),
config.grenad_parameters(), config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,

1
crates/milli/tests/search/mod.rs
View File

@@ -101,6 +101,7 @@ pub fn setup_search_index_with_criteria(criteria: &[Criterion]) -> Index {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&milli::ThreadPoolNoAbortBuilder::new().build().unwrap(),
config.grenad_parameters(), config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,

1
crates/milli/tests/search/query_criteria.rs
View File

@@ -333,6 +333,7 @@ fn criteria_ascdesc() {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&milli::ThreadPoolNoAbortBuilder::new().build().unwrap(),
config.grenad_parameters(), config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,

1
crates/milli/tests/search/typo_tolerance.rs
View File

@@ -142,6 +142,7 @@ fn test_typo_disabled_on_word() {
indexer::index( indexer::index(
&mut wtxn, &mut wtxn,
&index, &index,
&milli::ThreadPoolNoAbortBuilder::new().build().unwrap(),
config.grenad_parameters(), config.grenad_parameters(),
&db_fields_ids_map, &db_fields_ids_map,
new_fields_ids_map, new_fields_ids_map,