about summary refs log tree commit diff
path: root/tvix/store/src/nar
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2023-06-09T07·28+0300
committerclbot <clbot@tvl.fyi>2023-06-12T10·15+0000
commit6f85dbfc06c4fa96deb968cfeb7e98ba36e95043 (patch)
tree9dd303d69ae3de19bfe2244d8547c639e4e95995 /tvix/store/src/nar
parent8d05c0ceaa9bddb7fdaab436730f093eb16374a2 (diff)
feat(tvix/store/pathinfosvc): add calculate_nar method r/6271
Putting this in the PathInfoService trait makes much more sense, we can
have direct control over where/how to cache the results in the
implementation.

This now requires each PathInfoService to hold pointers to BlobService
and DirectoryService.

Change-Id: I4faae780d43eae4beeb57bd5e190e6d1a5d3314e
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8724
Tested-by: BuildkiteCI
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: tazjin <tazjin@tvl.su>
Diffstat (limited to 'tvix/store/src/nar')
-rw-r--r--tvix/store/src/nar/mod.rs2
-rw-r--r--tvix/store/src/nar/renderer.rs4
2 files changed, 3 insertions, 3 deletions
diff --git a/tvix/store/src/nar/mod.rs b/tvix/store/src/nar/mod.rs
index c73e610f4ecb..13e4f7bd93f6 100644
--- a/tvix/store/src/nar/mod.rs
+++ b/tvix/store/src/nar/mod.rs
@@ -4,7 +4,7 @@ use thiserror::Error;
 
 mod renderer;
 pub use renderer::calculate_size_and_sha256;
-pub use renderer::writer_nar;
+pub use renderer::write_nar;
 
 /// Errors that can encounter while rendering NARs.
 #[derive(Debug, Error)]
diff --git a/tvix/store/src/nar/renderer.rs b/tvix/store/src/nar/renderer.rs
index 6ea76e1429be..80bf9bc6d816 100644
--- a/tvix/store/src/nar/renderer.rs
+++ b/tvix/store/src/nar/renderer.rs
@@ -21,7 +21,7 @@ pub fn calculate_size_and_sha256<DS: DirectoryService + Clone>(
     let h = Sha256::new();
     let mut cw = CountWrite::from(h);
 
-    writer_nar(&mut cw, root_node, blob_service, directory_service)?;
+    write_nar(&mut cw, root_node, blob_service, directory_service)?;
 
     Ok((cw.count(), cw.into_inner().finalize().into()))
 }
@@ -30,7 +30,7 @@ pub fn calculate_size_and_sha256<DS: DirectoryService + Clone>(
 /// and uses the passed blob_service and directory_service to
 /// perform the necessary lookups as it traverses the structure.
 /// The contents in NAR serialization are writen to the passed [std::io::Write].
-pub fn writer_nar<W: std::io::Write, DS: DirectoryService + Clone>(
+pub fn write_nar<W: std::io::Write, DS: DirectoryService + Clone>(
     w: &mut W,
     proto_root_node: &proto::node::Node,
     blob_service: &Box<dyn BlobService>,