Conversation
labbott
commented
Apr 28, 2026
Comment on lines
-641
to
-648
| #[derive(Copy, Clone, Debug, PartialEq, Eq)] | ||
| pub enum HubrisArchiveDoneness { | ||
| /// Fully load archive | ||
| Cook, | ||
| /// Load archive into memory, but do not otherwise process | ||
| Raw, | ||
| } | ||
|
|
Contributor
Author
There was a problem hiding this comment.
Getting rid of this works fine but it makes the CI tests take longer, probably because they now have to do the full hubris archive load for extract. I think I'm going to bring this back and fix extract instead.
labbott
force-pushed
the
hubtools
branch
2 times, most recently
from
c4c3a45 to
a871a18
Compare
Early hubris archives were tagged with version v1.0.0. Newer versions are a single integer. Rather than hack around this in the version parsing, just remove the old cores.
labbott
commented
Apr 29, 2026
Comment on lines
+1400
to
+1407
| let mut objects = (0..hubris.file_count()?) | ||
| .into_par_iter() | ||
| .map(|i| -> Result<Option<(usize, String, Vec<u8>)>> { | ||
| // ZipArchive is cheap to clone since the backing is cheap | ||
| let mut archive = archive.clone(); | ||
| let mut file = archive.by_index(i)?; | ||
| let path = Path::new(file.name()); | ||
| let archive = hubris.clone(); | ||
|
|
||
| let (name, data) = archive.extract_file_by_index(i)?; | ||
| let path = Path::new(&name); |
Contributor
Author
There was a problem hiding this comment.
I wrote some of this code a few years ago but had a cryptic commit message about it being too slow. If I had to guess it was this code which was too slow (maybe before we even had parallel iteration) but we basically match mainline if we let the archive be cloneable oxidecomputer/hubtools#63
Contributor
There was a problem hiding this comment.
Following up on my comments from the hubtools PR, I don't think the cloning is necessary here:
Suggested change
| let mut objects = (0..hubris.file_count()?) | |
| .into_par_iter() | |
| .map(|i| -> Result<Option<(usize, String, Vec<u8>)>> { | |
| // ZipArchive is cheap to clone since the backing is cheap | |
| let mut archive = archive.clone(); | |
| let mut file = archive.by_index(i)?; | |
| let path = Path::new(file.name()); | |
| let archive = hubris.clone(); | |
| let (name, data) = archive.extract_file_by_index(i)?; | |
| let path = Path::new(&name); | |
| let mut objects = (0..hubris.file_count()?) | |
| .into_par_iter() | |
| .map(|i| -> Result<Option<(usize, String, Vec<u8>)>> { | |
| let (name, data) = hubris.extract_file_by_index(i)?; | |
| let path = Path::new(&name); |
Contributor
Author
There was a problem hiding this comment.
Ahhhh I see now that there were mutable shenanigans going on with the ZipArchive but that's not the case here.
mkeeter
reviewed
Apr 29, 2026
Comment on lines
+1508
to
+1511
| let archive = RawHubrisArchive::from_vec(hubris.zip.clone())?; | ||
|
|
||
| // ZipArchive is cheap to clone since the backing is cheap | ||
| let (name, data) = archive.extract_file_by_index(i)?; |
Contributor
There was a problem hiding this comment.
Similarly,
Suggested change
| let archive = RawHubrisArchive::from_vec(hubris.zip.clone())?; | |
| // ZipArchive is cheap to clone since the backing is cheap | |
| let (name, data) = archive.extract_file_by_index(i)?; | |
| let (name, data) = hubris.extract_file_by_index(i)?; |
When humility/hubris were first developed we didn't have many details of the hubris archive beyond "it's a zip". We've since developed a separate library for hubris manipulation. Let humility use it too.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When humility/hubris were first developed we didn't have many details of the hubris archive beyond "it's a zip". We've since developed a separate library for hubris manipulation. Let humility use it too.