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

refactor(tvix/glue): take &CAHash, not CAHash

Browse source 
We use a bit less cloning that way.

Change-Id: I28bf99577e4a481e35fbf99d0724adab5502a1bd
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11874
Reviewed-by: Connor Brewster <cbrewster@hey.com>
Tested-by: BuildkiteCI
Reviewed-by: Ilan Joselevich <personal@ilanjoselevich.com>
This commit is contained in:
Florian Klink 2024-06-25 21:48:45 +03:00 committed by flokli
parent 78eb22c54d
commit 540e566900
3 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tvix/glue/src/builtins/import.rs
View file

@ -284,26 +284,28 @@ mod import_builtins {
}
};
let obtained_hash = ca_hash.hash().clone().into_owned();
let (path_info, _hash, output_path) = state.tokio_handle.block_on(async {
state
.node_to_path_info(name.as_ref(), path.as_ref(), ca_hash, root_node)
.node_to_path_info(name.as_ref(), path.as_ref(), &ca_hash, root_node)
.await
})?;
if let Some(expected_sha256) = expected_sha256 {
if obtained_hash != expected_sha256 {
if *ca_hash.hash() != expected_sha256 {
Err(ImportError::HashMismatch(
path.to_string_lossy().to_string(),
expected_sha256,
obtained_hash,
ca_hash.hash().into_owned(),
))?;
}
}
let _: tvix_store::proto::PathInfo = state.tokio_handle.block_on(async {
// This is necessary to cause the coercion of the error type.
Ok::<_, std::io::Error>(state.path_info_service.as_ref().put(path_info).await?)
state
.tokio_handle
.block_on(async { state.path_info_service.as_ref().put(path_info).await })
.map_err(|e| tvix_eval::ErrorKind::IO {
path: Some(path.to_path_buf()),
error: Rc::new(e.into()),
})?;
// We need to attach context to the final output path.
@ -339,7 +341,7 @@ mod import_builtins {
.register_node_in_path_info_service(
name,
&p,
CAHash::Nar(NixHash::Sha256(nar_sha256)),
&CAHash::Nar(NixHash::Sha256(nar_sha256)),
root_node,
)
.await

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

@ -357,7 +357,7 @@ impl TvixStoreIO {
&self,
name: &str,
path: &Path,
ca: CAHash,
ca: &CAHash,
root_node: Node,
) -> io::Result<(PathInfo, NixHash, StorePath)> {
// Ask the PathInfoService for the NAR size and sha256
@ -372,7 +372,7 @@ impl TvixStoreIO {
// Calculate the output path. This might still fail, as some names are illegal.
let output_path =
nix_compat::store_path::build_ca_path(name, &ca, Vec::<String>::new(), false).map_err(
nix_compat::store_path::build_ca_path(name, ca, Vec::<String>::new(), false).map_err(
|_| {
std::io::Error::new(
std::io::ErrorKind::InvalidData,
@ -399,7 +399,7 @@ impl TvixStoreIO {
&self,
name: &str,
path: &Path,
ca: CAHash,
ca: &CAHash,
root_node: Node,
) -> io::Result<StorePath> {
let (path_info, _, output_path) = self.node_to_path_info(name, path, ca, root_node).await?;

4
tvix/store/src/import.rs
View file

@ -81,7 +81,7 @@ pub fn path_to_name(path: &Path) -> std::io::Result<&str> {
pub fn derive_nar_ca_path_info(
nar_size: u64,
nar_sha256: [u8; 32],
ca: Option<CAHash>,
ca: Option<&CAHash>,
root_node: Node,
) -> PathInfo {
// assemble the [crate::proto::PathInfo] object.
@ -145,7 +145,7 @@ where
let path_info = derive_nar_ca_path_info(
nar_size,
nar_sha256,
Some(CAHash::Nar(NixHash::Sha256(nar_sha256))),
Some(&CAHash::Nar(NixHash::Sha256(nar_sha256))),
root_node,
);