refactor(tvix/castore): use Directory struct separate from proto one
This uses our own data type to deal with Directories in the castore model. It makes some undesired states unrepresentable, removing the need for conversions and checking in various places: - In the protobuf, blake3 digests could have a wrong length, as proto doesn't know fixed-size fields. We now use `B3Digest`, which makes cloning cheaper, and removes the need to do size-checking everywhere. - In the protobuf, we had three different lists for `files`, `symlinks` and `directories`. This was mostly a protobuf size optimization, but made interacting with them a bit awkward. This has now been replaced with a list of enums, and convenience iterators to get various nodes, and add new ones. Change-Id: I7b92691bb06d77ff3f58a5ccea94a22c16f84f04 Reviewed-on: https://cl.tvl.fyi/c/depot/+/12057 Tested-by: BuildkiteCI Reviewed-by: flokli <flokli@flokli.de>
This commit is contained in:
parent
5d3f3158d6
commit
3ca0b53840
53 changed files with 1429 additions and 1377 deletions
|
|
@ -1,3 +1,4 @@
|
|||
use bstr::ByteSlice;
|
||||
use thiserror::Error;
|
||||
use tokio::task::JoinError;
|
||||
use tonic::Status;
|
||||
|
|
@ -12,6 +13,46 @@ pub enum Error {
|
|||
StorageError(String),
|
||||
}
|
||||
|
||||
/// Errors that can occur during the validation of [Directory] messages.
|
||||
#[derive(Debug, thiserror::Error, PartialEq)]
|
||||
pub enum ValidateDirectoryError {
|
||||
/// Elements are not in sorted order
|
||||
#[error("{:?} is not sorted", .0.as_bstr())]
|
||||
WrongSorting(Vec<u8>),
|
||||
/// Multiple elements with the same name encountered
|
||||
#[error("{:?} is a duplicate name", .0.as_bstr())]
|
||||
DuplicateName(Vec<u8>),
|
||||
/// Invalid node
|
||||
#[error("invalid node with name {:?}: {:?}", .0.as_bstr(), .1.to_string())]
|
||||
InvalidNode(Vec<u8>, ValidateNodeError),
|
||||
#[error("Total size exceeds u32::MAX")]
|
||||
SizeOverflow,
|
||||
}
|
||||
|
||||
/// Errors that occur during Node validation
|
||||
#[derive(Debug, thiserror::Error, PartialEq)]
|
||||
pub enum ValidateNodeError {
|
||||
#[error("No node set")]
|
||||
NoNodeSet,
|
||||
/// Invalid digest length encountered
|
||||
#[error("invalid digest length: {0}")]
|
||||
InvalidDigestLen(usize),
|
||||
/// Invalid name encountered
|
||||
#[error("Invalid name: {}", .0.as_bstr())]
|
||||
InvalidName(bytes::Bytes),
|
||||
/// Invalid symlink target
|
||||
#[error("Invalid symlink target: {}", .0.as_bstr())]
|
||||
InvalidSymlinkTarget(bytes::Bytes),
|
||||
}
|
||||
|
||||
impl From<crate::digests::Error> for ValidateNodeError {
|
||||
fn from(e: crate::digests::Error) -> Self {
|
||||
match e {
|
||||
crate::digests::Error::InvalidDigestLen(n) => ValidateNodeError::InvalidDigestLen(n),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl From<JoinError> for Error {
|
||||
fn from(value: JoinError) -> Self {
|
||||
Error::StorageError(value.to_string())
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue