diff --git a/milli/src/search/new/query_graph.rs b/milli/src/search/new/query_graph.rs index cda767d75..7500a18e0 100644 --- a/milli/src/search/new/query_graph.rs +++ b/milli/src/search/new/query_graph.rs @@ -302,7 +302,7 @@ impl QueryGraph { for (_, node) in self.nodes.iter() { match &node.data { QueryNodeData::Term(t) => { - let docids = compute_query_term_subset_docids(ctx, &t.term_subset)?; + let docids = compute_query_term_subset_docids(ctx, None, &t.term_subset)?; for id in t.term_ids.clone() { term_docids .entry(id) diff --git a/milli/src/search/new/ranking_rule_graph/exactness/mod.rs b/milli/src/search/new/ranking_rule_graph/exactness/mod.rs index c5e58c635..6b670333b 100644 --- a/milli/src/search/new/ranking_rule_graph/exactness/mod.rs +++ b/milli/src/search/new/ranking_rule_graph/exactness/mod.rs @@ -58,7 +58,7 @@ impl RankingRuleGraphTrait for ExactnessGraph { } ExactnessCondition::Any(dest_node) => { let docids = - universe & compute_query_term_subset_docids(ctx, &dest_node.term_subset)?; + compute_query_term_subset_docids(ctx, Some(universe), &dest_node.term_subset)?; (docids, dest_node.clone()) } }; diff --git a/milli/src/search/new/ranking_rule_graph/proximity/compute_docids.rs b/milli/src/search/new/ranking_rule_graph/proximity/compute_docids.rs index 29a1876b4..a22ae5cd4 100644 --- a/milli/src/search/new/ranking_rule_graph/proximity/compute_docids.rs +++ b/milli/src/search/new/ranking_rule_graph/proximity/compute_docids.rs @@ -22,10 +22,8 @@ pub fn compute_docids( (left_term, right_term, *cost) } ProximityCondition::Term { term } => { - let mut docids = compute_query_term_subset_docids(ctx, &term.term_subset)?; - docids &= universe; return Ok(ComputedCondition { - docids, + docids: compute_query_term_subset_docids(ctx, Some(universe), &term.term_subset)?, universe_len: universe.len(), start_term_subset: None, end_term_subset: term.clone(), diff --git a/milli/src/search/new/ranking_rule_graph/typo/mod.rs b/milli/src/search/new/ranking_rule_graph/typo/mod.rs index 035106ac3..fbe6b0849 100644 --- a/milli/src/search/new/ranking_rule_graph/typo/mod.rs +++ b/milli/src/search/new/ranking_rule_graph/typo/mod.rs @@ -26,8 +26,7 @@ impl RankingRuleGraphTrait for TypoGraph { ) -> Result { let TypoCondition { term, .. } = condition; // maybe compute_query_term_subset_docids should accept a universe as argument - let mut docids = compute_query_term_subset_docids(ctx, &term.term_subset)?; - docids &= universe; + let docids = compute_query_term_subset_docids(ctx, Some(universe), &term.term_subset)?; Ok(ComputedCondition { docids, diff --git a/milli/src/search/new/ranking_rule_graph/words/mod.rs b/milli/src/search/new/ranking_rule_graph/words/mod.rs index 45a56829f..fbe31fcf4 100644 --- a/milli/src/search/new/ranking_rule_graph/words/mod.rs +++ b/milli/src/search/new/ranking_rule_graph/words/mod.rs @@ -25,8 +25,7 @@ impl RankingRuleGraphTrait for WordsGraph { ) -> Result { let WordsCondition { term, .. } = condition; // maybe compute_query_term_subset_docids should accept a universe as argument - let mut docids = compute_query_term_subset_docids(ctx, &term.term_subset)?; - docids &= universe; + let docids = compute_query_term_subset_docids(ctx, Some(universe), &term.term_subset)?; Ok(ComputedCondition { docids, diff --git a/milli/src/search/new/resolve_query_graph.rs b/milli/src/search/new/resolve_query_graph.rs index d992cd22f..1b53d188a 100644 --- a/milli/src/search/new/resolve_query_graph.rs +++ b/milli/src/search/new/resolve_query_graph.rs @@ -31,6 +31,7 @@ impl<'ctx> SearchContext<'ctx> { } pub fn compute_query_term_subset_docids( ctx: &mut SearchContext, + universe: Option<&RoaringBitmap>, term: &QueryTermSubset, ) -> Result { let mut docids = RoaringBitmap::new(); @@ -49,7 +50,10 @@ pub fn compute_query_term_subset_docids( } } - Ok(docids) + match universe { + Some(universe) => Ok(docids & universe), + None => Ok(docids), + } } pub fn compute_query_term_subset_docids_within_field_id( @@ -147,10 +151,7 @@ pub fn compute_query_graph_docids( term_subset, positions: _, term_ids: _, - }) => { - let node_docids = compute_query_term_subset_docids(ctx, term_subset)?; - predecessors_docids & node_docids - } + }) => compute_query_term_subset_docids(ctx, Some(&predecessors_docids), term_subset)?, QueryNodeData::Deleted => { panic!() }