Blob store cleanup: say the bytes differ when the sizes match #359

Merged
jcoffey-dev merged 1 commits from fix/cleanup-different-detail into main 2026-11-10 19:07:59 +00:00
+23 -5
View File
@@ -113,6 +113,16 @@ pub async fn start(
Ok(Ok(()))
}
/// OC-4: what a `different` problem says. Two copies of the same size
/// differ in their bytes, so the sizes alone would read as a match.
fn different_detail(current: usize, old: usize) -> String {
if current == old {
format!("the current blob store's {current} bytes differ from the old one's")
} else {
format!("the current blob store has {current} bytes, the old one {old}")
}
}
/// OC-3: whether the two stores share a place: one a sharded set with the
/// other among its members, or a probe written to the current store found
/// in the old one.
@@ -320,11 +330,7 @@ impl Run<'_> {
ProblemKind::Different,
key,
&holder,
format!(
"the current blob store has {} bytes, the old one {}",
kept.len(),
old.len()
),
different_detail(kept.len(), old.len()),
);
return self.save(false).await;
}
@@ -528,4 +534,16 @@ mod tests {
let _ = std::fs::remove_dir_all(&dir);
let _ = std::fs::remove_dir_all(format!("{path}-other"));
}
#[test]
fn a_different_copy_of_the_same_size_says_the_bytes_differ() {
assert_eq!(
different_detail(12, 12),
"the current blob store's 12 bytes differ from the old one's"
);
assert_eq!(
different_detail(12, 10),
"the current blob store has 12 bytes, the old one 10"
);
}
}