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

Update query term structure to allow for laziness

Browse Source
This commit is contained in:
Loïc Lecrenier 2023-03-30 09:52:47 +02:00
parent 3a818c5e87
commit 9507ff5e31
4 changed files with 625 additions and 306 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
milli/src/search/new/graph_based_ranking_rule.rs
View File

@ -373,7 +373,7 @@ impl<'ctx, G: RankingRuleGraphTrait> RankingRule<'ctx, QueryGraph> for GraphBase
if new_term.is_empty() { if new_term.is_empty() {
nodes_to_remove.push(node_id); nodes_to_remove.push(node_id);
} else { } else {
term.value = ctx.term_interner.insert(new_term); term.value = ctx.term_interner.push(new_term);
} }
} }
} }

3
milli/src/search/new/mod.rs
View File

@ -32,6 +32,7 @@ use resolve_query_graph::{resolve_query_graph, QueryTermDocIdsCache};
use roaring::RoaringBitmap; use roaring::RoaringBitmap;
use words::Words; use words::Words;
use self::interner::Interner;
use self::ranking_rules::{BoxRankingRule, RankingRule}; use self::ranking_rules::{BoxRankingRule, RankingRule};
use self::sort::Sort; use self::sort::Sort;
use crate::{ use crate::{
@ -46,7 +47,7 @@ pub struct SearchContext<'ctx> {
pub db_cache: DatabaseCache<'ctx>, pub db_cache: DatabaseCache<'ctx>,
pub word_interner: DedupInterner<String>, pub word_interner: DedupInterner<String>,
pub phrase_interner: DedupInterner<Phrase>, pub phrase_interner: DedupInterner<Phrase>,
pub term_interner: DedupInterner<QueryTerm>, pub term_interner: Interner<QueryTerm>,
// think about memory usage of that field (roaring bitmaps in a hashmap) // think about memory usage of that field (roaring bitmaps in a hashmap)
pub term_docids: QueryTermDocIdsCache, pub term_docids: QueryTermDocIdsCache,
} }

854
milli/src/search/new/query_term.rs
View File

File diff suppressed because it is too large Load Diff

2
milli/src/search/new/ranking_rule_graph/typo/mod.rs
View File

@ -128,7 +128,7 @@ impl RankingRuleGraphTrait for TypoGraph {
nbr_typos as u8 + base_cost, nbr_typos as u8 + base_cost,
Some( Some(
conditions_interner conditions_interner
.insert(TypoCondition { term: term_interner.insert(new_term) }), .insert(TypoCondition { term: term_interner.push(new_term) }),
), ),
)) ))
} }