web search done right
update segment paths to new folder during move
Mikkel Denker19dab37daaef
diff --git a/crates/core/src/entrypoint/webgraph.rs b/crates/core/src/entrypoint/webgraph.rsindex 6ca96659..45363d72 100644--- a/crates/core/src/entrypoint/webgraph.rs+++ b/crates/core/src/entrypoint/webgraph.rs@@ -240,9 +240,14 @@ impl Webgraph {}r.recv().unwrap();- let res = (worker.host_graph.finalize(), worker.page_graph.finalize());+ let mut host = worker.host_graph.finalize();+ host.optimize_read();++ let mut page = worker.page_graph.finalize();+ page.optimize_read();+s.send(()).unwrap();- res+ (host, page)}));}diff --git a/crates/core/src/webgraph/mod.rs b/crates/core/src/webgraph/mod.rsindex 1d91822a..5cc633fc 100644--- a/crates/core/src/webgraph/mod.rs+++ b/crates/core/src/webgraph/mod.rs@@ -446,11 +446,14 @@ pub mod tests {graph.merge(other).unwrap();}+ graph.optimize_read();+assert_eq!(graph.distances(Node::from("A")).get(&Node::from("H")),Some(&7));}+#[test]fn merge_cycle() {let mut graphs = Vec::new();diff --git a/crates/speedy-kv/src/lib.rs b/crates/speedy-kv/src/lib.rsindex 5c9b2cee..3f3d4afd 100644--- a/crates/speedy-kv/src/lib.rs+++ b/crates/speedy-kv/src/lib.rs@@ -387,7 +387,7 @@ impl<K, V> Db<K, V> {pub fn merge(&mut self, other: Self) -> Result<()> {let other_folder = other.folder().to_path_buf();- for segment in other.segments {+ for mut segment in other.segments {segment.move_to(self.folder())?;self.segments.push(segment);}diff --git a/crates/speedy-kv/src/segment.rs b/crates/speedy-kv/src/segment.rsindex 34b7bffc..1bda74e3 100644--- a/crates/speedy-kv/src/segment.rs+++ b/crates/speedy-kv/src/segment.rs@@ -189,7 +189,7 @@ impl<K, V> Segment<K, V> {// cleanup old segmentsfor segment in segments {- std::fs::remove_file(segment.blob_index.path())?;+ std::fs::remove_file(dbg!(segment.blob_index.path()))?;std::fs::remove_file(segment.id_index.path())?;std::fs::remove_file(segment.store.path())?;std::fs::remove_file(segment.bloom_path())?;@@ -267,7 +267,7 @@ impl<K, V> Segment<K, V> {self.folder.join(Self::bloom_file_name(self.uuid))}- pub fn move_to<P: AsRef<Path>>(&self, new_folder: P) -> Result<()> {+ pub fn move_to<P: AsRef<Path>>(&mut self, new_folder: P) -> Result<()> {if !new_folder.as_ref().exists() {std::fs::create_dir_all(&new_folder)?;}@@ -295,6 +295,8 @@ impl<K, V> Segment<K, V> {new_folder.as_ref().join(Self::bloom_file_name(self.uuid)),)?;+ *self = Segment::open(self.uuid, new_folder)?;+Ok(())}}