maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix/castore): drop {Directory,File,Symlink}Node

Browse source 
Add a `SymlinkTarget` type to represent validated symlink targets.
With this, no invalid states are representable, so we can make `Node` be
just an enum of all three kind of types, and allow access to these
fields directly.

Change-Id: I20bdd480c8d5e64a827649f303c97023b7e390f2
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12216
Reviewed-by: benjaminedwardwebb <benjaminedwardwebb@gmail.com>
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: Connor Brewster <cbrewster@hey.com>
Tested-by: BuildkiteCI
This commit is contained in:
Florian Klink 2024-08-16 02:24:12 +03:00 • committed by clbot
parent 49b173786c
commit 8ea7d2b60e
27 changed files with 555 additions and 461 deletions
Download patch file Download diff file Expand all files Collapse all files

64
tvix/castore/src/proto/mod.rs
View file

@ -157,21 +157,25 @@ impl From<&crate::Directory> for Directory {
for (name, node) in directory.nodes() {
match node {
crate::Node::File(n) => files.push(FileNode {
crate::Node::File {
digest,
size,
executable,
} => files.push(FileNode {
name: name.clone(),
digest: n.digest().to_owned().into(),
size: n.size(),
executable: n.executable(),
digest: digest.to_owned().into(),
size: *size,
executable: *executable,
}),
crate::Node::Directory(n) => directories.push(DirectoryNode {
crate::Node::Directory { digest, size } => directories.push(DirectoryNode {
name: name.clone(),
digest: n.digest().to_owned().into(),
size: n.size(),
digest: digest.to_owned().into(),
size: *size,
}),
crate::Node::Symlink(n) => {
crate::Node::Symlink { target } => {
symlinks.push(SymlinkNode {
name: name.clone(),
target: n.target().to_owned(),
target: target.to_owned().into(),
});
}
}
@ -192,7 +196,10 @@ impl Node {
let digest = B3Digest::try_from(n.digest)
.map_err(|e| DirectoryError::InvalidNode(n.name.to_owned(), e.into()))?;
let node = crate::Node::Directory(crate::DirectoryNode::new(digest, n.size));
let node = crate::Node::Directory {
digest,
size: n.size,
};
Ok((n.name, node))
}
@ -200,16 +207,22 @@ impl Node {
let digest = B3Digest::try_from(n.digest)
.map_err(|e| DirectoryError::InvalidNode(n.name.to_owned(), e.into()))?;
let node = crate::Node::File(crate::FileNode::new(digest, n.size, n.executable));
let node = crate::Node::File {
digest,
size: n.size,
executable: n.executable,
};
Ok((n.name, node))
}
node::Node::Symlink(n) => {
let node = crate::Node::Symlink(
crate::SymlinkNode::new(n.target)
let node = crate::Node::Symlink {
target: n
.target
.try_into()
.map_err(|e| DirectoryError::InvalidNode(n.name.to_owned(), e))?,
);
};
Ok((n.name, node))
}
@ -218,27 +231,30 @@ impl Node {
/// Construsts a [Node] from a name and [crate::Node].
pub fn from_name_and_node(name: bytes::Bytes, n: crate::Node) -> Self {
// TODO: make these pub(crate) so we can avoid cloning?
match n {
crate::Node::Directory(directory_node) => Self {
crate::Node::Directory { digest, size } => Self {
node: Some(node::Node::Directory(DirectoryNode {
name,
digest: directory_node.digest().to_owned().into(),
size: directory_node.size(),
digest: digest.into(),
size,
})),
},
crate::Node::File(file_node) => Self {
crate::Node::File {
digest,
size,
executable,
} => Self {
node: Some(node::Node::File(FileNode {
name,
digest: file_node.digest().to_owned().into(),
size: file_node.size(),
executable: file_node.executable(),
digest: digest.into(),
size,
executable,
})),
},
crate::Node::Symlink(symlink_node) => Self {
crate::Node::Symlink { target } => Self {
node: Some(node::Node::Symlink(SymlinkNode {
name,
target: symlink_node.target().to_owned(),
target: target.into(),
})),
},
}