Merge remote-tracking branch 'origin/main' into sync-propagation

n0-computer · Oct 8, 2023 · 0f3c06b · 0f3c06b
2 parents 44a6155 + 898b0f7
commit 0f3c06b
Show file tree

Hide file tree

Showing 35 changed files with 631 additions and 1,027 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/iroh-bytes/Cargo.toml b/iroh-bytes/Cargo.toml
@@ -22,7 +22,7 @@ flume = "0.10.14"
 futures = "0.3.25"
 genawaiter = { version = "0.99.1", features = ["futures03"] }
 hex = "0.4.3"
-iroh-io = { version = "0.3.0" }
+iroh-io = { version = "0.3.0", features = ["stats"] }
 multibase = "0.9.1"
 num_cpus = "1.15.0"
 once_cell = "1.17.0"

diff --git a/iroh-bytes/src/baomap.rs b/iroh-bytes/src/baomap.rs
@@ -2,7 +2,7 @@
 use std::{collections::BTreeSet, io, path::PathBuf, sync::Arc};
 
 use crate::{
-    collection::CollectionParser,
+    hashseq::parse_hash_seq,
     util::{
         progress::{IdGenerator, ProgressSender},
         BlobFormat, HashAndFormat, RpcError, Tag,
@@ -234,11 +234,10 @@ pub trait Store: ReadableStore + PartialMap {
     /// in the gc_sweep phase.
     fn gc_mark<'a>(
         &'a self,
-        cp: impl CollectionParser + 'a,
         extra_roots: impl IntoIterator<Item = io::Result<HashAndFormat>> + 'a,
     ) -> LocalBoxStream<'a, GcMarkEvent> {
         Gen::new(|co| async move {
-            if let Err(e) = gc_mark_task(self, cp, extra_roots, &co).await {
+            if let Err(e) = gc_mark_task(self, extra_roots, &co).await {
                 co.yield_(GcMarkEvent::Error(e)).await;
             }
         })
@@ -367,7 +366,6 @@ impl Drop for TempTag {
 /// Implementation of the gc method.
 async fn gc_mark_task<'a>(
     store: &'a impl Store,
-    cp: impl CollectionParser + 'a,
     extra_roots: impl IntoIterator<Item = io::Result<HashAndFormat>> + 'a,
     co: &Co<GcMarkEvent>,
 ) -> anyhow::Result<()> {
@@ -418,11 +416,11 @@ async fn gc_mark_task<'a>(
                     warn!("gc: {} creating data reader failed", hash);
                     continue;
                 };
-                let Ok((mut iter, stats)) = cp.parse(reader).await else {
+                let Ok((mut iter, count)) = parse_hash_seq(reader).await else {
                     warn!("gc: {} parse failed", hash);
                     continue;
                 };
-                info!("parsed collection {} {:?}", hash, stats);
+                info!("parsed collection {} {:?}", hash, count);
                 loop {
                     let item = match iter.next().await {
                         Ok(Some(item)) => item,

diff --git a/iroh-bytes/src/collection.rs b/iroh-bytes/src/collection.rs