From d31da26a51daeea45ae5a8bad203bcb1d38330e9 Mon Sep 17 00:00:00 2001
From: Kerollmops <clement@meilisearch.com>
Date: Sat, 11 Jul 2020 23:51:32 +0200
Subject: [PATCH] Avoid cloning RoraringBitmaps when unecessary

---
 src/lib.rs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 42f63de51..9d1240a1a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -228,15 +228,22 @@ impl Index {
             for positions in positions {
                 let before = Instant::now();
 
+                // Precompute the potentially missing unions
+                positions.iter().enumerate().for_each(|(word, pos)| {
+                    union_cache.entry((word, *pos)).or_insert_with(|| unions_word_pos(word, *pos));
+                });
+
+                // Retrieve the unions along with the popularity of it.
                 let mut to_intersect: Vec<_> = positions.iter()
                     .enumerate()
                     .map(|(word, pos)| {
-                        let docids = union_cache.entry((word, *pos)).or_insert_with(|| unions_word_pos(word, *pos));
-                        // FIXME don't clone here
-                        (docids.len(), docids.clone())
+                        let docids = union_cache.get(&(word, *pos)).unwrap();
+                        (docids.len(), docids)
                     })
                     .collect();
 
+                // Sort the unions by popuarity to help reduce
+                // the number of documents as soon as possible.
                 to_intersect.sort_unstable_by_key(|(l, _)| *l);
                 let elapsed_retrieving = before.elapsed();