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

Hotfix meilisearch#1707

Browse Source
This commit is contained in:
many 2021-09-29 14:41:56 +02:00
parent bfedbc1b6d
commit 1df5b8712b
No known key found for this signature in database
GPG Key ID: 2CEF23B75189EACA
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
milli/src/search/criteria/attribute.rs
View File

@ -192,7 +192,10 @@ impl<'t, 'q> WordLevelIterator<'t, 'q> {
in_prefix_cache: bool, in_prefix_cache: bool,
) -> heed::Result<Option<Self>> { ) -> heed::Result<Option<Self>> {
match ctx.word_position_last_level(&word, in_prefix_cache)? { match ctx.word_position_last_level(&word, in_prefix_cache)? {
Some(level) => { Some(_) => {
// HOTFIX Meilisearch#1707: it is better to only iterate over the level 0.
// A cleaner fix will be implemented soon.
let level = TreeLevel::min_value();
let interval_size = LEVEL_EXPONENTIATION_BASE.pow(Into::<u8>::into(level) as u32); let interval_size = LEVEL_EXPONENTIATION_BASE.pow(Into::<u8>::into(level) as u32);
let inner = let inner =
ctx.word_position_iterator(&word, level, in_prefix_cache, None, None)?; ctx.word_position_iterator(&word, level, in_prefix_cache, None, None)?;
@ -528,10 +531,10 @@ impl<'t, 'q> Branch<'t, 'q> {
fn cmp(&self, other: &Self) -> Ordering { fn cmp(&self, other: &Self) -> Ordering {
let self_rank = self.compute_rank(); let self_rank = self.compute_rank();
let other_rank = other.compute_rank(); let other_rank = other.compute_rank();
let left_cmp = self_rank.cmp(&other_rank).reverse(); let left_cmp = self_rank.cmp(&other_rank);
// on level: lower is better, // on level: lower is better,
// we want to dig faster into levels on interesting branches. // we want to dig faster into levels on interesting branches.
let level_cmp = self.tree_level.cmp(&other.tree_level).reverse(); let level_cmp = self.tree_level.cmp(&other.tree_level);
left_cmp.then(level_cmp).then(self.last_result.2.len().cmp(&other.last_result.2.len())) left_cmp.then(level_cmp).then(self.last_result.2.len().cmp(&other.last_result.2.len()))
} }