diff options
| author | Florian Klink <flokli@flokli.de> | 2023-07-19T15·52+0300 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2023-07-22T09·03+0000 |
| commit | 432222f098bfceb033e63e9a63687e35574457f9 (patch) | |
| tree | 43a5e38cf79827dd63aa2adbd841da6aa62cf1de /tvix/store/src/store_io.rs | |
| parent | 7971d7d9ff42ed00f6f70121f372dd744f45915b (diff) | |
feat(tvix/store/proto): use Bytes instead of Vec<u8> r/6439
Makes use of https://github.com/tokio-rs/prost/pull/341, which makes our bytes field cheaper to clone. It's a bit annoying to configure due to https://github.com/hyperium/tonic/issues/908, but the workaround does get the job done. Change-Id: I25714600b041bb5432d3adf5859b151e72b12778 Reviewed-on: https://cl.tvl.fyi/c/depot/+/8975 Reviewed-by: raitobezarius <tvl@lahfa.xyz> Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su> Autosubmit: flokli <flokli@flokli.de>
Diffstat (limited to 'tvix/store/src/store_io.rs')
| -rw-r--r-- | tvix/store/src/store_io.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tvix/store/src/store_io.rs b/tvix/store/src/store_io.rs index 19a809b6a1a7..1030bbdd337f 100644 --- a/tvix/store/src/store_io.rs +++ b/tvix/store/src/store_io.rs @@ -129,7 +129,7 @@ impl TvixStoreIO { // assemble a new root_node with a name that is derived from the nar hash. let renamed_root_node = { - let name = output_path.to_string().into_bytes(); + let name = output_path.to_string().into_bytes().into(); match root_node { crate::proto::node::Node::Directory(n) => { @@ -153,7 +153,7 @@ impl TvixStoreIO { references: vec![], narinfo: Some(crate::proto::NarInfo { nar_size, - nar_sha256: nar_sha256.to_vec(), + nar_sha256: nar_sha256.to_vec().into(), signatures: vec![], reference_names: vec![], // TODO: narinfo for talosctl.src contains `CA: fixed:r:sha256:1x13j5hy75221bf6kz7cpgld9vgic6bqx07w5xjs4pxnksj6lxb6` @@ -264,7 +264,7 @@ impl EvalIO for TvixStoreIO { } #[instrument(skip(self), ret, err)] - fn read_dir(&self, path: &Path) -> Result<Vec<(Vec<u8>, FileType)>, io::Error> { + fn read_dir(&self, path: &Path) -> Result<Vec<(bytes::Bytes, FileType)>, io::Error> { if let Ok((store_path, sub_path)) = StorePath::from_absolute_path_full(&path.to_string_lossy()) { @@ -283,7 +283,7 @@ impl EvalIO for TvixStoreIO { })?; if let Some(directory) = self.directory_service.get(&digest)? { - let mut children: Vec<(Vec<u8>, FileType)> = Vec::new(); + let mut children: Vec<(bytes::Bytes, FileType)> = Vec::new(); for node in directory.nodes() { children.push(match node { crate::proto::node::Node::Directory(e) => { |