resolve phrase

milli/src/search/criteria/mod.rs

@@ -307,14 +307,7 @@ pub fn resolve_query_tree(
         use Operation::{And, Or, Phrase, Query};
 
         match query_tree {
-            And(ops) => {
-                let candidates = ops
-                    .iter()
-                    .map(|op| resolve_operation(ctx, op, wdcache))
-                    .collect::<Result<Vec<_>>>()?;
-
-                Ok(candidates.and())
-            }
+            And(ops) => ops.into_iter().map(|op| resolve_operation(ctx, op, wdcache)).and(),
             Or(_, ops) => ops.into_iter().map(|op| resolve_operation(ctx, op, wdcache)).or(),
             Phrase(words) => resolve_phrase(ctx, &words),
             Query(q) => Ok(query_docids(ctx, q, wdcache)?),
@@ -326,7 +319,6 @@ pub fn resolve_query_tree(
 
 pub fn resolve_phrase(ctx: &dyn Context, phrase: &[String]) -> Result<RoaringBitmap> {
     let mut candidates = RoaringBitmap::new();
-    let mut first_iter = true;
     let winsize = phrase.len().min(7);
 
     for win in phrase.windows(winsize) {
@@ -345,18 +337,11 @@ pub fn resolve_phrase(ctx: &dyn Context, phrase: &[String]) -> Result<RoaringBit
 
         // We sort the bitmaps so that we perform the small intersections first, which is faster.
         bitmaps.sort_unstable_by(|a, b| a.len().cmp(&b.len()));
+        candidates &= bitmaps.and();
 
-        for bitmap in bitmaps {
-            if first_iter {
-                candidates = bitmap;
-                first_iter = false;
-            } else {
-                candidates &= bitmap;
-            }
-            // There will be no match, return early
-            if candidates.is_empty() {
-                break;
-            }
+        // There will be no match, return early
+        if candidates.is_empty() {
+            break;
         }
     }
     Ok(candidates)