From da650f834ee4fcb12d4a38a0e545f548bb06660f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Wed, 27 Nov 2024 17:04:49 +0100 Subject: [PATCH] Plug the NoPanicThreadPool in the tests and benchmarks --- crates/benchmarks/benches/indexing.rs | 31 +++++++++++++++++++ crates/benchmarks/benches/utils.rs | 1 + crates/fuzzers/src/bin/fuzz-indexing.rs | 1 + crates/milli/src/index.rs | 3 ++ .../milli/src/search/new/tests/integration.rs | 1 + .../milli/src/update/index_documents/mod.rs | 11 +++++++ .../milli/tests/search/facet_distribution.rs | 1 + crates/milli/tests/search/mod.rs | 1 + crates/milli/tests/search/query_criteria.rs | 1 + crates/milli/tests/search/typo_tolerance.rs | 1 + 10 files changed, 52 insertions(+) diff --git a/crates/benchmarks/benches/indexing.rs b/crates/benchmarks/benches/indexing.rs index 2f33c3454..d3f307be3 100644 --- a/crates/benchmarks/benches/indexing.rs +++ b/crates/benchmarks/benches/indexing.rs @@ -157,6 +157,7 @@ fn indexing_songs_default(c: &mut Criterion) { indexer::index( &mut wtxn, &index, + &milli::ThreadPoolNoAbortBuilder::new().build().unwrap(), config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, @@ -223,6 +224,7 @@ fn reindexing_songs_default(c: &mut Criterion) { indexer::index( &mut wtxn, &index, + &milli::ThreadPoolNoAbortBuilder::new().build().unwrap(), config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, @@ -267,6 +269,7 @@ fn reindexing_songs_default(c: &mut Criterion) { indexer::index( &mut wtxn, &index, + &milli::ThreadPoolNoAbortBuilder::new().build().unwrap(), config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, @@ -335,6 +338,7 @@ fn deleting_songs_in_batches_default(c: &mut Criterion) { indexer::index( &mut wtxn, &index, + &milli::ThreadPoolNoAbortBuilder::new().build().unwrap(), config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, @@ -411,6 +415,7 @@ fn indexing_songs_in_three_batches_default(c: &mut Criterion) { indexer::index( &mut wtxn, &index, + &milli::ThreadPoolNoAbortBuilder::new().build().unwrap(), config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, @@ -455,6 +460,7 @@ fn indexing_songs_in_three_batches_default(c: &mut Criterion) { indexer::index( &mut wtxn, &index, + &milli::ThreadPoolNoAbortBuilder::new().build().unwrap(), config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, @@ -495,6 +501,7 @@ fn indexing_songs_in_three_batches_default(c: &mut Criterion) { indexer::index( &mut wtxn, &index, + &milli::ThreadPoolNoAbortBuilder::new().build().unwrap(), config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, @@ -562,6 +569,7 @@ fn indexing_songs_without_faceted_numbers(c: &mut Criterion) { indexer::index( &mut wtxn, &index, + &milli::ThreadPoolNoAbortBuilder::new().build().unwrap(), config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, @@ -628,6 +636,7 @@ fn indexing_songs_without_faceted_fields(c: &mut Criterion) { indexer::index( &mut wtxn, &index, + &milli::ThreadPoolNoAbortBuilder::new().build().unwrap(), config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, @@ -694,6 +703,7 @@ fn indexing_wiki(c: &mut Criterion) { indexer::index( &mut wtxn, &index, + &milli::ThreadPoolNoAbortBuilder::new().build().unwrap(), config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, @@ -759,6 +769,7 @@ fn reindexing_wiki(c: &mut Criterion) { indexer::index( &mut wtxn, &index, + &milli::ThreadPoolNoAbortBuilder::new().build().unwrap(), config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, @@ -803,6 +814,7 @@ fn reindexing_wiki(c: &mut Criterion) { indexer::index( &mut wtxn, &index, + &milli::ThreadPoolNoAbortBuilder::new().build().unwrap(), config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, @@ -870,6 +882,7 @@ fn deleting_wiki_in_batches_default(c: &mut Criterion) { indexer::index( &mut wtxn, &index, + &milli::ThreadPoolNoAbortBuilder::new().build().unwrap(), config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, @@ -946,6 +959,7 @@ fn indexing_wiki_in_three_batches(c: &mut Criterion) { indexer::index( &mut wtxn, &index, + &milli::ThreadPoolNoAbortBuilder::new().build().unwrap(), config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, @@ -991,6 +1005,7 @@ fn indexing_wiki_in_three_batches(c: &mut Criterion) { indexer::index( &mut wtxn, &index, + &milli::ThreadPoolNoAbortBuilder::new().build().unwrap(), config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, @@ -1032,6 +1047,7 @@ fn indexing_wiki_in_three_batches(c: &mut Criterion) { indexer::index( &mut wtxn, &index, + &milli::ThreadPoolNoAbortBuilder::new().build().unwrap(), config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, @@ -1098,6 +1114,7 @@ fn indexing_movies_default(c: &mut Criterion) { indexer::index( &mut wtxn, &index, + &milli::ThreadPoolNoAbortBuilder::new().build().unwrap(), config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, @@ -1163,6 +1180,7 @@ fn reindexing_movies_default(c: &mut Criterion) { indexer::index( &mut wtxn, &index, + &milli::ThreadPoolNoAbortBuilder::new().build().unwrap(), config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, @@ -1207,6 +1225,7 @@ fn reindexing_movies_default(c: &mut Criterion) { indexer::index( &mut wtxn, &index, + &milli::ThreadPoolNoAbortBuilder::new().build().unwrap(), config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, @@ -1274,6 +1293,7 @@ fn deleting_movies_in_batches_default(c: &mut Criterion) { indexer::index( &mut wtxn, &index, + &milli::ThreadPoolNoAbortBuilder::new().build().unwrap(), config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, @@ -1321,6 +1341,7 @@ fn delete_documents_from_ids(index: Index, document_ids_to_delete: Vec Index { indexer::index( &mut wtxn, &index, + &milli::ThreadPoolNoAbortBuilder::new().build().unwrap(), config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, diff --git a/crates/fuzzers/src/bin/fuzz-indexing.rs b/crates/fuzzers/src/bin/fuzz-indexing.rs index f335938b9..ee927940f 100644 --- a/crates/fuzzers/src/bin/fuzz-indexing.rs +++ b/crates/fuzzers/src/bin/fuzz-indexing.rs @@ -135,6 +135,7 @@ fn main() { indexer::index( &mut wtxn, &index, + &milli::ThreadPoolNoAbortBuilder::new().build().unwrap(), indexer_config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, diff --git a/crates/milli/src/index.rs b/crates/milli/src/index.rs index fe83877a7..268d33cd9 100644 --- a/crates/milli/src/index.rs +++ b/crates/milli/src/index.rs @@ -1821,6 +1821,7 @@ pub(crate) mod tests { indexer::index( wtxn, &self.inner, + &crate::ThreadPoolNoAbortBuilder::new().build().unwrap(), indexer_config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, @@ -1911,6 +1912,7 @@ pub(crate) mod tests { indexer::index( wtxn, &self.inner, + &crate::ThreadPoolNoAbortBuilder::new().build().unwrap(), indexer_config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, @@ -1991,6 +1993,7 @@ pub(crate) mod tests { indexer::index( &mut wtxn, &index.inner, + &crate::ThreadPoolNoAbortBuilder::new().build().unwrap(), indexer_config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, diff --git a/crates/milli/src/search/new/tests/integration.rs b/crates/milli/src/search/new/tests/integration.rs index 79668b34b..5db5b400b 100644 --- a/crates/milli/src/search/new/tests/integration.rs +++ b/crates/milli/src/search/new/tests/integration.rs @@ -83,6 +83,7 @@ pub fn setup_search_index_with_criteria(criteria: &[Criterion]) -> Index { indexer::index( &mut wtxn, &index, + &crate::ThreadPoolNoAbortBuilder::new().build().unwrap(), config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, diff --git a/crates/milli/src/update/index_documents/mod.rs b/crates/milli/src/update/index_documents/mod.rs index 186cc501d..3988b311c 100644 --- a/crates/milli/src/update/index_documents/mod.rs +++ b/crates/milli/src/update/index_documents/mod.rs @@ -2155,6 +2155,7 @@ mod tests { indexer::index( &mut wtxn, &index.inner, + &crate::ThreadPoolNoAbortBuilder::new().build().unwrap(), indexer_config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, @@ -2216,6 +2217,7 @@ mod tests { indexer::index( &mut wtxn, &index.inner, + &crate::ThreadPoolNoAbortBuilder::new().build().unwrap(), indexer_config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, @@ -2268,6 +2270,7 @@ mod tests { indexer::index( &mut wtxn, &index.inner, + &crate::ThreadPoolNoAbortBuilder::new().build().unwrap(), indexer_config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, @@ -2319,6 +2322,7 @@ mod tests { indexer::index( &mut wtxn, &index.inner, + &crate::ThreadPoolNoAbortBuilder::new().build().unwrap(), indexer_config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, @@ -2372,6 +2376,7 @@ mod tests { indexer::index( &mut wtxn, &index.inner, + &crate::ThreadPoolNoAbortBuilder::new().build().unwrap(), indexer_config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, @@ -2430,6 +2435,7 @@ mod tests { indexer::index( &mut wtxn, &index.inner, + &crate::ThreadPoolNoAbortBuilder::new().build().unwrap(), indexer_config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, @@ -2481,6 +2487,7 @@ mod tests { indexer::index( &mut wtxn, &index.inner, + &crate::ThreadPoolNoAbortBuilder::new().build().unwrap(), indexer_config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, @@ -2532,6 +2539,7 @@ mod tests { indexer::index( &mut wtxn, &index.inner, + &crate::ThreadPoolNoAbortBuilder::new().build().unwrap(), indexer_config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, @@ -2725,6 +2733,7 @@ mod tests { indexer::index( &mut wtxn, &index.inner, + &crate::ThreadPoolNoAbortBuilder::new().build().unwrap(), indexer_config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, @@ -2783,6 +2792,7 @@ mod tests { indexer::index( &mut wtxn, &index.inner, + &crate::ThreadPoolNoAbortBuilder::new().build().unwrap(), indexer_config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, @@ -2838,6 +2848,7 @@ mod tests { indexer::index( &mut wtxn, &index.inner, + &crate::ThreadPoolNoAbortBuilder::new().build().unwrap(), indexer_config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, diff --git a/crates/milli/tests/search/facet_distribution.rs b/crates/milli/tests/search/facet_distribution.rs index 61d0697ff..418cdc356 100644 --- a/crates/milli/tests/search/facet_distribution.rs +++ b/crates/milli/tests/search/facet_distribution.rs @@ -64,6 +64,7 @@ fn test_facet_distribution_with_no_facet_values() { indexer::index( &mut wtxn, &index, + &milli::ThreadPoolNoAbortBuilder::new().build().unwrap(), config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, diff --git a/crates/milli/tests/search/mod.rs b/crates/milli/tests/search/mod.rs index 1287b59d5..08b22d7b6 100644 --- a/crates/milli/tests/search/mod.rs +++ b/crates/milli/tests/search/mod.rs @@ -101,6 +101,7 @@ pub fn setup_search_index_with_criteria(criteria: &[Criterion]) -> Index { indexer::index( &mut wtxn, &index, + &milli::ThreadPoolNoAbortBuilder::new().build().unwrap(), config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, diff --git a/crates/milli/tests/search/query_criteria.rs b/crates/milli/tests/search/query_criteria.rs index 3e56eeff0..8401f0444 100644 --- a/crates/milli/tests/search/query_criteria.rs +++ b/crates/milli/tests/search/query_criteria.rs @@ -333,6 +333,7 @@ fn criteria_ascdesc() { indexer::index( &mut wtxn, &index, + &milli::ThreadPoolNoAbortBuilder::new().build().unwrap(), config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map, diff --git a/crates/milli/tests/search/typo_tolerance.rs b/crates/milli/tests/search/typo_tolerance.rs index 7ac9a1e4b..dbee296ee 100644 --- a/crates/milli/tests/search/typo_tolerance.rs +++ b/crates/milli/tests/search/typo_tolerance.rs @@ -142,6 +142,7 @@ fn test_typo_disabled_on_word() { indexer::index( &mut wtxn, &index, + &milli::ThreadPoolNoAbortBuilder::new().build().unwrap(), config.grenad_parameters(), &db_fields_ids_map, new_fields_ids_map,