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

Misc adjustments

Browse Source
This commit is contained in:
F. Levi 2024-09-14 10:14:07 +03:00
parent a2a16bf846
commit 51085206cc
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
milli/src/search/new/matches/mod.rs
View File

@ -387,7 +387,7 @@ impl<'t, 'tokenizer> Matcher<'t, 'tokenizer, '_, '_> {
let mut order_score = 0; let mut order_score = 0;
let mut distance_score = 0; let mut distance_score = 0;
// Count score for phrases // count score for phrases
let tally_phrase_scores = let tally_phrase_scores =
|fwp: &usize, lwp: &usize, order_score: &mut i16, distance_score: &mut i16| { |fwp: &usize, lwp: &usize, order_score: &mut i16, distance_score: &mut i16| {
let words_in_phrase_minus_one = (lwp - fwp) as i16; let words_in_phrase_minus_one = (lwp - fwp) as i16;
@ -450,11 +450,11 @@ impl<'t, 'tokenizer> Matcher<'t, 'tokenizer, '_, '_> {
// if next match would make interval gross more than crop_size, // if next match would make interval gross more than crop_size,
// we compare the current interval with the best one, // we compare the current interval with the best one,
// then we increase `interval_first` until next match can be added. // then we increase `interval_first` until next match can be added.
let next_match_word_pos = next_match.get_last_word_pos(); let next_match_last_word_pos = next_match.get_last_word_pos();
let mut interval_first_match_word_pos = let mut interval_first_match_first_word_pos =
matches[interval_first].get_first_word_pos(); matches[interval_first].get_first_word_pos();
if next_match_word_pos - interval_first_match_word_pos >= crop_size { if next_match_last_word_pos - interval_first_match_first_word_pos >= crop_size {
let interval_score = let interval_score =
self.match_interval_score(&matches[interval_first..=interval_last]); self.match_interval_score(&matches[interval_first..=interval_last]);
@ -467,10 +467,12 @@ impl<'t, 'tokenizer> Matcher<'t, 'tokenizer, '_, '_> {
// advance start of the interval while interval is longer than crop_size. // advance start of the interval while interval is longer than crop_size.
loop { loop {
interval_first += 1; interval_first += 1;
interval_first_match_word_pos = interval_first_match_first_word_pos =
matches[interval_first].get_first_word_pos(); matches[interval_first].get_first_word_pos();
if next_match_word_pos - interval_first_match_word_pos < crop_size { if next_match_last_word_pos - interval_first_match_first_word_pos
< crop_size
{
break; break;
} }
} }