snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-07-31 19:00:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify graph-based ranking rule impl

Browse Source
This commit is contained in:
Loïc Lecrenier
2023-03-19 15:03:57 +01:00
parent dd491320e5
commit 825f742000
7 changed files with 77 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
milli/src/search/new/logger/detailed.rs
View File

@ -44,17 +44,17 @@ pub enum SearchEvents {
ProximityState {
graph: RankingRuleGraph<ProximityGraph>,
paths: Vec<Vec<Interned<ProximityCondition>>>,
dead_end_path_cache: DeadEndsCache<ProximityCondition>,
dead_ends_cache: DeadEndsCache<ProximityCondition>,
universe: RoaringBitmap,
distances: MappedInterner<Vec<(u16, SmallBitmap<ProximityCondition>)>, QueryNode>,
distances: MappedInterner<Vec<u16>, QueryNode>,
cost: u16,
},
TypoState {
graph: RankingRuleGraph<TypoGraph>,
paths: Vec<Vec<Interned<TypoCondition>>>,
dead_end_path_cache: DeadEndsCache<TypoCondition>,
dead_ends_cache: DeadEndsCache<TypoCondition>,
universe: RoaringBitmap,
distances: MappedInterner<Vec<(u16, SmallBitmap<TypoCondition>)>, QueryNode>,
distances: MappedInterner<Vec<u16>, QueryNode>,
cost: u16,
},
RankingRuleSkipBucket {
@ -170,15 +170,15 @@ impl SearchLogger<QueryGraph> for DetailedSearchLogger {
&mut self,
query_graph: &RankingRuleGraph<ProximityGraph>,
paths_map: &[Vec<Interned<ProximityCondition>>],
dead_end_path_cache: &DeadEndsCache<ProximityCondition>,
dead_ends_cache: &DeadEndsCache<ProximityCondition>,
universe: &RoaringBitmap,
distances: &MappedInterner<Vec<(u16, SmallBitmap<ProximityCondition>)>, QueryNode>,
distances: &MappedInterner<Vec<u16>, QueryNode>,
cost: u16,
) {
self.events.push(SearchEvents::ProximityState {
graph: query_graph.clone(),
paths: paths_map.to_vec(),
dead_end_path_cache: dead_end_path_cache.clone(),
dead_ends_cache: dead_ends_cache.clone(),
universe: universe.clone(),
distances: distances.clone(),
cost,
@ -189,15 +189,15 @@ impl SearchLogger<QueryGraph> for DetailedSearchLogger {
&mut self,
query_graph: &RankingRuleGraph<TypoGraph>,
paths_map: &[Vec<Interned<TypoCondition>>],
dead_end_path_cache: &DeadEndsCache<TypoCondition>,
dead_ends_cache: &DeadEndsCache<TypoCondition>,
universe: &RoaringBitmap,
distances: &MappedInterner<Vec<(u16, SmallBitmap<TypoCondition>)>, QueryNode>,
distances: &MappedInterner<Vec<u16>, QueryNode>,
cost: u16,
) {
self.events.push(SearchEvents::TypoState {
graph: query_graph.clone(),
paths: paths_map.to_vec(),
dead_end_path_cache: dead_end_path_cache.clone(),
dead_ends_cache: dead_ends_cache.clone(),
universe: universe.clone(),
distances: distances.clone(),
cost,
@ -357,7 +357,7 @@ results.{cur_ranking_rule}{cur_activated_id} {{
SearchEvents::ProximityState {
graph,
paths,
dead_end_path_cache,
dead_ends_cache,
universe,
distances,
cost,
@ -373,7 +373,7 @@ results.{cur_ranking_rule}{cur_activated_id} {{
ctx,
graph,
paths,
dead_end_path_cache,
dead_ends_cache,
distances.clone(),
&mut new_file,
);
@ -390,7 +390,7 @@ results.{cur_ranking_rule}{cur_activated_id} {{
SearchEvents::TypoState {
graph,
paths,
dead_end_path_cache,
dead_ends_cache,
universe,
distances,
cost,
@ -406,7 +406,7 @@ results.{cur_ranking_rule}{cur_activated_id} {{
ctx,
graph,
paths,
dead_end_path_cache,
dead_ends_cache,
distances.clone(),
&mut new_file,
);
@ -429,7 +429,7 @@ results.{cur_ranking_rule}{cur_activated_id} {{
ctx: &mut SearchContext,
node_idx: Interned<QueryNode>,
node: &QueryNode,
distances: &[(u16, SmallBitmap<R::Condition>)],
distances: &[u16],
file: &mut File,
) {
match &node.data {
@ -490,9 +490,8 @@ shape: class"
let p = ctx.word_interner.get(*use_prefix_db);
writeln!(file, "use prefix DB : {p}").unwrap();
}
for (d, edges) in distances.iter() {
writeln!(file, "\"distance {d}\" : {:?}", edges.iter().collect::<Vec<_>>())
.unwrap();
for d in distances.iter() {
writeln!(file, "\"d_{d}\" : distance").unwrap();
}
writeln!(file, "}}").unwrap();
@ -527,8 +526,8 @@ shape: class"
ctx: &mut SearchContext,
graph: &RankingRuleGraph<R>,
paths: &[Vec<Interned<R::Condition>>],
dead_end_paths_cache: &DeadEndsCache<R::Condition>,
distances: MappedInterner<Vec<(u16, SmallBitmap<R::Condition>)>, QueryNode>,
_dead_ends_cache: &DeadEndsCache<R::Condition>,
distances: MappedInterner<Vec<u16>, QueryNode>,
file: &mut File,
) {
writeln!(file, "direction: right").unwrap();

17
milli/src/search/new/logger/mod.rs
View File

@ -8,7 +8,6 @@ use super::query_graph::QueryNode;
use super::ranking_rule_graph::{
DeadEndsCache, ProximityCondition, ProximityGraph, RankingRuleGraph, TypoCondition, TypoGraph,
};
use super::small_bitmap::SmallBitmap;
use super::{RankingRule, RankingRuleQueryTrait};
/// Trait for structure logging the execution of a search query.
@ -66,9 +65,9 @@ pub trait SearchLogger<Q: RankingRuleQueryTrait> {
&mut self,
query_graph: &RankingRuleGraph<ProximityGraph>,
paths: &[Vec<Interned<ProximityCondition>>],
dead_end_path_cache: &DeadEndsCache<ProximityCondition>,
dead_ends_cache: &DeadEndsCache<ProximityCondition>,
universe: &RoaringBitmap,
distances: &MappedInterner<Vec<(u16, SmallBitmap<ProximityCondition>)>, QueryNode>,
distances: &MappedInterner<Vec<u16>, QueryNode>,
cost: u16,
);
@ -77,9 +76,9 @@ pub trait SearchLogger<Q: RankingRuleQueryTrait> {
&mut self,
query_graph: &RankingRuleGraph<TypoGraph>,
paths: &[Vec<Interned<TypoCondition>>],
dead_end_path_cache: &DeadEndsCache<TypoCondition>,
dead_ends_cache: &DeadEndsCache<TypoCondition>,
universe: &RoaringBitmap,
distances: &MappedInterner<Vec<(u16, SmallBitmap<TypoCondition>)>, QueryNode>,
distances: &MappedInterner<Vec<u16>, QueryNode>,
cost: u16,
);
}
@ -137,9 +136,9 @@ impl<Q: RankingRuleQueryTrait> SearchLogger<Q> for DefaultSearchLogger {
&mut self,
_query_graph: &RankingRuleGraph<ProximityGraph>,
_paths_map: &[Vec<Interned<ProximityCondition>>],
_dead_end_path_cache: &DeadEndsCache<ProximityCondition>,
_dead_ends_cache: &DeadEndsCache<ProximityCondition>,
_universe: &RoaringBitmap,
_distances: &MappedInterner<Vec<(u16, SmallBitmap<ProximityCondition>)>, QueryNode>,
_distances: &MappedInterner<Vec<u16>, QueryNode>,
_cost: u16,
) {
}
@ -148,9 +147,9 @@ impl<Q: RankingRuleQueryTrait> SearchLogger<Q> for DefaultSearchLogger {
&mut self,
_query_graph: &RankingRuleGraph<TypoGraph>,
_paths: &[Vec<Interned<TypoCondition>>],
_dead_end_path_cache: &DeadEndsCache<TypoCondition>,
_dead_ends_cache: &DeadEndsCache<TypoCondition>,
_universe: &RoaringBitmap,
_distances: &MappedInterner<Vec<(u16, SmallBitmap<TypoCondition>)>, QueryNode>,
_distances: &MappedInterner<Vec<u16>, QueryNode>,
_cost: u16,
) {
}