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

refactor(tvix/store/blobsvc): move from Vec<u8> to B3Digest

Browse source 
Change-Id: I809bab75221f81b6023cfe75c2fe9e589c1e9192
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8605
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
This commit is contained in:
Florian Klink 2023-05-22 14:42:57 +03:00 • committed by clbot
parent b8ff08b1b0
commit 066179651c
9 changed files with 79 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

33
tvix/store/src/nar/renderer.rs
View file

@ -1,15 +1,13 @@
use std::io::{self, BufReader};
use super::RenderError;
use crate::{
blobservice::BlobService,
directoryservice::DirectoryService,
proto::{self, NamedNode},
B3Digest,
};
use data_encoding::BASE64;
use nix_compat::nar;
use super::RenderError;
use std::io::{self, BufReader};
use tracing::warn;
/// A NAR renderer, using a blob_service, chunk_service and directory_service
/// to render a NAR to a writer.
@ -58,19 +56,26 @@ impl<BS: BlobService, DS: DirectoryService> NARRenderer<BS, DS> {
.map_err(RenderError::NARWriterError)?;
}
proto::node::Node::File(proto_file_node) => {
let digest: [u8; 32] =
proto_file_node.digest.to_owned().try_into().map_err(|_e| {
RenderError::StoreError(crate::Error::StorageError(
"invalid digest len in file node".to_string(),
))
})?;
let digest = B3Digest::from_vec(proto_file_node.digest.clone()).map_err(|_e| {
warn!(
file_node = ?proto_file_node,
"invalid digest length in file node",
);
// TODO: handle error
let mut blob_reader = match self.blob_service.open_read(&digest).unwrap() {
RenderError::StoreError(crate::Error::StorageError(
"invalid digest len in file node".to_string(),
))
})?;
let mut blob_reader = match self
.blob_service
.open_read(&digest)
.map_err(|e| RenderError::StoreError(e))?
{
Some(blob_reader) => Ok(BufReader::new(blob_reader)),
None => Err(RenderError::NARWriterError(io::Error::new(
io::ErrorKind::NotFound,
format!("blob with digest {} not found", BASE64.encode(&digest)),
format!("blob with digest {} not found", &digest),
))),
}?;