searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2024-07-02 00:59:07 +02:00
Code Issues Releases Wiki Activity

Fix bug in cheapest path algorithm

Browse Source
This commit is contained in:
Loïc Lecrenier 2023-05-16 17:01:30 +02:00
parent 5758268866
commit ec8f685d84
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
milli/src/search/new/ranking_rule_graph/cheapest_paths.rs
View File

@ -209,7 +209,7 @@ impl<G: RankingRuleGraphTrait> RankingRuleGraph<G> {
self.traverse_breadth_first_backward(self.query_graph.end_node, |cur_node| { self.traverse_breadth_first_backward(self.query_graph.end_node, |cur_node| {
if cur_node == self.query_graph.end_node { if cur_node == self.query_graph.end_node {
*costs_to_end.get_mut(self.query_graph.end_node) = vec![0]; *costs_to_end.get_mut(self.query_graph.end_node) = vec![0];
return true; return;
} }
let mut self_costs = Vec::<u64>::new(); let mut self_costs = Vec::<u64>::new();
@ -226,7 +226,6 @@ impl<G: RankingRuleGraphTrait> RankingRuleGraph<G> {
self_costs.dedup(); self_costs.dedup();
*costs_to_end.get_mut(cur_node) = self_costs; *costs_to_end.get_mut(cur_node) = self_costs;
true
}); });
costs_to_end costs_to_end
} }
@ -246,19 +245,18 @@ impl<G: RankingRuleGraphTrait> RankingRuleGraph<G> {
for cost in costs.get(edge.dest_node).iter() { for cost in costs.get(edge.dest_node).iter() {
costs_to_remove.remove(&(*cost + edge.cost as u64)); costs_to_remove.remove(&(*cost + edge.cost as u64));
if costs_to_remove.is_empty() { if costs_to_remove.is_empty() {
return false; return;
} }
} }
} }
if costs_to_remove.is_empty() { if costs_to_remove.is_empty() {
return false; return;
} }
let mut new_costs = BTreeSet::from_iter(costs.get(cur_node).iter().copied()); let mut new_costs = BTreeSet::from_iter(costs.get(cur_node).iter().copied());
for c in costs_to_remove { for c in costs_to_remove {
new_costs.remove(&c); new_costs.remove(&c);
} }
*costs.get_mut(cur_node) = new_costs.into_iter().collect(); *costs.get_mut(cur_node) = new_costs.into_iter().collect();
true
}); });
} }
@ -269,7 +267,7 @@ impl<G: RankingRuleGraphTrait> RankingRuleGraph<G> {
pub fn traverse_breadth_first_backward( pub fn traverse_breadth_first_backward(
&self, &self,
from: Interned<QueryNode>, from: Interned<QueryNode>,
mut visit: impl FnMut(Interned<QueryNode>) -> bool, mut visit: impl FnMut(Interned<QueryNode>),
) { ) {
let mut reachable = SmallBitmap::for_interned_values_in(&self.query_graph.nodes); let mut reachable = SmallBitmap::for_interned_values_in(&self.query_graph.nodes);
{ {
@ -312,13 +310,11 @@ impl<G: RankingRuleGraphTrait> RankingRuleGraph<G> {
continue; continue;
} }
unreachable_or_visited.insert(cur_node); unreachable_or_visited.insert(cur_node);
if visit(cur_node) { visit(cur_node);
for prev_node in self.query_graph.nodes.get(cur_node).predecessors.iter() { for prev_node in self.query_graph.nodes.get(cur_node).predecessors.iter() {
if !enqueued.contains(prev_node) && !unreachable_or_visited.contains(prev_node) if !enqueued.contains(prev_node) && !unreachable_or_visited.contains(prev_node) {
{ stack.push_back(prev_node);
stack.push_back(prev_node); enqueued.insert(prev_node);
enqueued.insert(prev_node);
}
} }
} }
} }