Skip to content

Rework clean and iter_objects for topological traversal #1288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jrray wants to merge 2 commits into
base: push-volovwxpnxry
Choose a base branch
from
Open

Rework clean and iter_objects for topological traversal #1288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5dc451
Rework clean and iter_objects for topological traversal
jrray Oct 24, 2025
8fecf80
Add test that clean does not leave dangling pointers
jrray Oct 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 24 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ nonempty = "0.12.0"
once_cell = "1.8"
parsedbuf = { path = "crates/parsedbuf" }
paste = "1.0"
petgraph = "0.8.3"
pin-project-lite = "0.2.0"
procfs = "0.16.0"
progress_bar_derive_macro = { path = "crates/progress_bar_derive_macro" }
Expand Down
1 change: 1 addition & 0 deletions crates/spfs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ nonempty = "0.8.1"
num_cpus = "1.13.1"
once_cell = { workspace = true }
parsedbuf = { path = "../parsedbuf" }
petgraph = { workspace = true }
pin-project-lite = { workspace = true }
progress_bar_derive_macro = { workspace = true }
prost = { workspace = true }
Expand Down
10 changes: 5 additions & 5 deletions crates/spfs/src/check.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use once_cell::sync::OnceCell;
use progress_bar_derive_macro::ProgressBar;
use tokio::sync::Semaphore;

use crate::graph::{AnnotationValue, FoundDigest};
use crate::graph::{AnnotationValue, RichDigest};
use crate::prelude::*;
use crate::sync::SyncPolicy;
use crate::sync::reporter::{Summary, SyncObjectResult, SyncPayloadResult};
Expand Down Expand Up @@ -124,8 +124,8 @@ where
.find_digests(&graph::DigestSearchCriteria::All)
.filter_map(|res| async move {
match res {
Ok(FoundDigest::Object(digest)) => Some(Ok(digest)),
Ok(FoundDigest::Payload(_digest)) => {
Ok(RichDigest::Object(digest)) => Some(Ok(digest)),
Ok(RichDigest::Payload(_digest)) => {
// Payloads are skipped on the basis that they have no
// child objects.
None
Expand Down Expand Up @@ -231,11 +231,11 @@ where
partial: encoding::PartialDigest,
) -> Result<CheckItemResult> {
match self.repo.resolve_full_digest(&partial).await? {
FoundDigest::Object(digest) => self
RichDigest::Object(digest) => self
.check_object_digest(digest)
.await
.map(CheckItemResult::Object),
FoundDigest::Payload(digest) => self
RichDigest::Payload(digest) => self
.check_payload(digest)
.await
.map(CheckItemResult::Payload),
Expand Down
Loading
Loading