-
Notifications
You must be signed in to change notification settings - Fork 82
Speed up the word prefix databases computation time #436
Conversation
f45a56c
to
bda0c67
Compare
45f647a
to
c5a4e46
Compare
6226243
to
51d1e64
Compare
// We extract and mmap our chunk file to be able to get it for next processes. | ||
let mut file = chunk.into_inner(); | ||
let mmap = unsafe { memmap2::Mmap::map(&file)? }; | ||
let cursor_mmap = CursorClonableMmap::new(ClonableMmap::from(mmap)); | ||
let chunk = grenad::Reader::new(cursor_mmap)?; | ||
word_docids.push(chunk); | ||
|
||
// We reconstruct our typed-chunk back. | ||
file.rewind()?; | ||
let chunk = grenad::Reader::new(file)?; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
could you factorize this in a function?
Is into_clonable_grenad could suit this case?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done by bumping the grenad version to v0.4.1 and then changing the behavior of the into_cloneable_grenad
(renamed as_cloneable_grenad
) by naming it take a reference of a grenad::Reader
. Doing so reduced the complexity of this quoted code part.
Is this PR breaking? (API break or DB break) |
There shouldn't be any breaking change either on the Rust API or the written formats here. If there are any it's a bug. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All good to me, Thanks!
I'll merge then, thank you for your review! |
let current_prefix_fst = self.index.words_prefixes_fst(self.wtxn)?; | ||
|
||
// We retrieve the common words between the previous and new prefix word fst. | ||
let common_prefix_fst_words = fst_stream_into_vec( | ||
previous_words_prefixes_fst.op().add(¤t_prefix_fst).intersection(), | ||
); | ||
let common_prefix_fst_words: Vec<_> = common_prefix_fst_words | ||
.as_slice() | ||
.linear_group_by_key(|x| x.chars().nth(0).unwrap()) | ||
.collect(); | ||
|
||
// We retrieve the newly added words between the previous and new prefix word fst. | ||
let new_prefix_fst_words = fst_stream_into_vec( | ||
current_prefix_fst.op().add(&previous_words_prefixes_fst).difference(), | ||
); | ||
|
||
// We compute the set of prefixes that are no more part of the prefix fst. | ||
let del_prefix_fst_words = fst_stream_into_hashset( | ||
previous_words_prefixes_fst.op().add(¤t_prefix_fst).difference(), | ||
); | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We must stop creating enormous Vec
s when we process the first update. In this code snippet, on an initial update, we compute the difference between the previous prefix fst (empty) and the current prefix fst (big) and store the result in a Vec
and an HashSet
(takes time and space).
456: Remove useless grenad merging r=Kerollmops a=Kerollmops This PR must be merged after #454. This PR removes the part of code that was merging all of the grenad Readers merging that we don't need as the indexer should have merged them and, therefore, we should only have one final grenad Reader. We reduce the amount of CPU usage and memory pressure we were doing uselessly. `@ManyTheFish` are you sure I can skip merging the `word_docids` database? Here is the benchmark comparison with the previously merged PR #454: ``` group indexing_reintroduce-appending-sorted-values_c05e42a8 indexing_remove-useless-grenad-merging_d5b8b5a2 ----- ----------------------------------------------------- ----------------------------------------------- indexing/Indexing movies with default settings 1.06 16.6±1.04s ? ?/sec 1.00 15.7±0.93s ? ?/sec indexing/Indexing songs with default settings 1.16 60.1±7.07s ? ?/sec 1.00 51.7±5.98s ? ?/sec indexing/Indexing songs without faceted numbers 1.06 55.4±6.14s ? ?/sec 1.00 52.2±4.13s ? ?/sec ``` And the comparison with multi-batch indexing before #436, we can see that we gain time for benchmarks that index datasets in multiple batches but there is _so much_ variance that it's not clear. ``` group indexing_benchmark-multi-batch-indexing-before-speed-up_45f52620 indexing_remove-useless-grenad-merging_d5b8b5a2 ----- ---------------------------------------------------------------- ----------------------------------------------- indexing/Indexing geo_point 1.07 6.6±0.08s ? ?/sec 1.00 6.2±0.11s ? ?/sec indexing/Indexing songs in three batches with default settings 1.12 57.7±2.14s ? ?/sec 1.00 51.5±3.80s ? ?/sec indexing/Indexing songs with default settings 1.00 47.5±2.52s ? ?/sec 1.09 51.7±5.98s ? ?/sec indexing/Indexing songs without any facets 1.00 43.5±1.43s ? ?/sec 1.12 48.8±3.73s ? ?/sec indexing/Indexing songs without faceted numbers 1.00 47.1±2.23s ? ?/sec 1.11 52.2±4.13s ? ?/sec indexing/Indexing wiki 1.00 917.3±30.01s ? ?/sec 1.09 998.7±38.92s ? ?/sec indexing/Indexing wiki in three batches 1.09 1091.2±32.73s ? ?/sec 1.00 996.5±15.70s ? ?/sec ``` What do you think `@irevoire?` Should we change the benchmarks to make them do more runs? Co-authored-by: Kerollmops <clement@meilisearch.com>
457: Avoid iterating on big databases when useless r=Kerollmops a=Kerollmops This PR makes the prefix database updates to avoid iterating on big grenad files when it is unnecessary. We introduced this regression in #436 but it went unnoticed. --- According to the following benchmark results, we take more time when we index documents in one run than before #436. It looks like it is probably due to the fact that, now, instead of computing the prefixes database by iterating on the LMDB we directly iterate on the grenad file. Those could be slower to iterate on and could be the slowdown cause. I just pushed a commit that tests this branch with the new unreleased version of grenad where some work was done to speed up the iteration on grenad files. [The benchmarks for this last commit](https://github.com/meilisearch/milli/actions/runs/1927187408) are currently running. You can [see the diff](meilisearch/grenad@v0.4.1...main) between the v0.4 and the unreleased v0.5 version of grenad. ```diff group indexing_benchmark-multi-batch-indexing-before-speed-up_45f52620 indexing_stop-iterating-on-big-grenad-files_ac8b85c4 ----- ---------------------------------------------------------------- ---------------------------------------------------- + indexing/Indexing songs in three batches with default settings 1.12 57.7±2.14s ? ?/sec 1.00 51.3±2.76s ? ?/sec - indexing/Indexing wiki 1.00 917.3±30.01s ? ?/sec 1.10 1008.4±38.27s ? ?/sec + indexing/Indexing wiki in three batches 1.10 1091.2±32.73s ? ?/sec 1.00 995.5±24.33s ? ?/sec ``` Co-authored-by: Kerollmops <clement@meilisearch.com>
This PR depends on the fixes done in #431 and must be merged after it.
In this PR we will bring the
WordPrefixPairProximityDocids
,WordPrefixDocids
and,WordPrefixPositionDocids
update structures to a new era, a better era, where computing the word prefix pair proximities costs much fewer CPU cycles, an era where this update structure can use the, previously computed, set of new word docids from the newly indexed batch of documents.The
WordPrefixPairProximityDocids
is an update structure, which means that it is an object that we feed with some parameters and which modifies the LMDB database of an index when asked for. This structure specifically computes the list of word prefix pair proximities, which correspond to a list of pairs of words associated with a proximity (the distance between both words) where the second word is not a word but a prefix e.g.s
,se
,a
. This word prefix pair proximity is associated with the list of documents ids which contains the pair of words and prefix at the given proximity.The origin of the performances issue that this struct brings is related to the fact that it starts its job from the beginning, it clears the LMDB database before rewriting everything from scratch, using the other LMDB databases to achieve that. I hope you understand that this is absolutely not an optimized way of doing things.