Fix: computation of initial universe, code organisation

milli/src/search/new/ranking_rule_graph/edge_docids_cache.rs

@@ -41,11 +41,12 @@ impl<G: RankingRuleGraphTrait> EdgeDocidsCache<G> {
             EdgeDetails::Unconditional => Ok(BitmapOrAllRef::All),
             EdgeDetails::Data(details) => {
                 if self.cache.contains_key(&edge_index) {
+                    // TODO: should we update the bitmap in the cache if the new universe
+                    // reduces it?
                     return Ok(BitmapOrAllRef::Bitmap(&self.cache[&edge_index]));
                 }
                 // TODO: maybe universe doesn't belong here
                 let docids = universe & G::compute_docids(index, txn, db_cache, details)?;
-
                 let _ = self.cache.insert(edge_index, docids);
                 let docids = &self.cache[&edge_index];
                 Ok(BitmapOrAllRef::Bitmap(docids))

milli/src/search/new/ranking_rule_graph/mod.rs

@@ -1,19 +1,22 @@
-pub mod build;
-pub mod cheapest_paths;
-pub mod edge_docids_cache;
-pub mod empty_paths_cache;
-pub mod paths_map;
-pub mod proximity;
-pub mod resolve_paths;
-pub mod typo;
+mod build;
+mod cheapest_paths;
+mod edge_docids_cache;
+mod empty_paths_cache;
+mod paths_map;
+mod proximity;
+mod resolve_paths;
+mod typo;
+
+pub use edge_docids_cache::EdgeDocidsCache;
+pub use empty_paths_cache::EmptyPathsCache;
+pub use proximity::ProximityGraph;
+pub use typo::TypoGraph;
 
 use std::ops::ControlFlow;
 
 use heed::RoTxn;
 use roaring::RoaringBitmap;
 
-use self::empty_paths_cache::EmptyPathsCache;
-
 use super::db_cache::DatabaseCache;
 use super::logger::SearchLogger;
 use super::{QueryGraph, QueryNode};

milli/src/search/new/ranking_rule_graph/proximity/build.rs

@@ -105,6 +105,7 @@ pub fn visit_to_node<'transaction, 'from_data>(
     assert!(!updb1);
 
     let derivations1 = derivations1.all_derivations_except_prefix_db();
+    // TODO: eventually, we want to get rid of the uses from `orginal`
     let original_word_2 = derivations2.original.clone();
     let mut cost_proximity_word_pairs = BTreeMap::<u8, BTreeMap<u8, Vec<WordPair>>>::new();