mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix/castore): add into_nodes(), implement consuming proto conv

Browse source 
Provide a into_nodes() function on a Directory, which consumes self and
returns owned PathComponent and Node.

Use it to provide a proper conversion from Directory to the proto
variant that doesn't clone.

There's no need for the one taking only &Directory, we don't use it
anywhere, and once someone needs that they might as well clone Directory
before converting it.

Update all other users of the `.nodes()` function to use `.into_nodes()`
where applicable, and avoid some more cloning there.

Change-Id: Id4577b9eb173c012e225337458898d3937112bcb
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12218
Tested-by: BuildkiteCI
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: Connor Brewster <cbrewster@hey.com>
This commit is contained in:
Florian Klink 2024-08-16 18:12:39 +03:00 • committed by clbot
parent 5ec93b57e6
commit 21ceef4934
5 changed files with 24 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

11
tvix/glue/src/tvix_store_io.rs
View file

@ -561,16 +561,11 @@ impl EvalIO for TvixStoreIO {
async move { self.directory_service.as_ref().get(&digest).await }
})? {
let mut children: Vec<(bytes::Bytes, FileType)> = Vec::new();
// TODO: into_nodes() to avoid cloning
for (name, node) in directory.nodes() {
for (name, node) in directory.into_nodes() {
children.push(match node {
Node::Directory { .. } => {
(name.clone().into(), FileType::Directory)
}
Node::Directory { .. } => (name.into(), FileType::Directory),
Node::File { .. } => (name.clone().into(), FileType::Regular),
Node::Symlink { .. } => {
(name.clone().into(), FileType::Symlink)
}
Node::Symlink { .. } => (name.into(), FileType::Symlink),
})
}
Ok(children)