From 432222f098bfceb033e63e9a63687e35574457f9 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 19 Jul 2023 18:52:50 +0300 Subject: feat(tvix/store/proto): use Bytes instead of Vec 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 Tested-by: BuildkiteCI Reviewed-by: tazjin Autosubmit: flokli --- tvix/eval/Cargo.toml | 1 + tvix/eval/src/builtins/impure.rs | 6 ++++-- tvix/eval/src/io.rs | 8 ++++---- tvix/eval/src/vm/generators.rs | 4 ++-- 4 files changed, 11 insertions(+), 8 deletions(-) (limited to 'tvix/eval') diff --git a/tvix/eval/Cargo.toml b/tvix/eval/Cargo.toml index 99c4fc1a1106..cd5af7709c71 100644 --- a/tvix/eval/Cargo.toml +++ b/tvix/eval/Cargo.toml @@ -10,6 +10,7 @@ name = "tvix_eval" [dependencies] builtin-macros = { path = "./builtin-macros", package = "tvix-eval-builtin-macros" } +bytes = "1.4.0" codemap = "0.1.3" codemap-diagnostic = "0.1.1" dirs = "4.0.0" diff --git a/tvix/eval/src/builtins/impure.rs b/tvix/eval/src/builtins/impure.rs index e01c642e0a4f..26d1ba494575 100644 --- a/tvix/eval/src/builtins/impure.rs +++ b/tvix/eval/src/builtins/impure.rs @@ -38,8 +38,10 @@ mod impure_builtins { let dir = generators::request_read_dir(&co, path).await; let res = dir.into_iter().map(|(name, ftype)| { ( - // TODO: propagate Vec into NixString. - NixString::from(String::from_utf8(name).expect("parsing file name as string")), + // TODO: propagate Vec or bytes::Bytes into NixString. + NixString::from( + String::from_utf8(name.to_vec()).expect("parsing file name as string"), + ), Value::String( match ftype { FileType::Directory => "directory", diff --git a/tvix/eval/src/io.rs b/tvix/eval/src/io.rs index de3da9ebe8ec..1baa24439e4a 100644 --- a/tvix/eval/src/io.rs +++ b/tvix/eval/src/io.rs @@ -42,7 +42,7 @@ pub trait EvalIO { /// Read the directory at the specified path and return the names /// of its entries associated with their [`FileType`]. - fn read_dir(&self, path: &Path) -> Result, FileType)>, io::Error>; + fn read_dir(&self, path: &Path) -> Result, io::Error>; /// Import the given path. What this means depends on the /// implementation, for example for a `std::io`-based @@ -76,7 +76,7 @@ impl EvalIO for StdIO { std::fs::read_to_string(&path) } - fn read_dir(&self, path: &Path) -> Result, FileType)>, io::Error> { + fn read_dir(&self, path: &Path) -> Result, io::Error> { let mut result = vec![]; for entry in path.read_dir()? { @@ -93,7 +93,7 @@ impl EvalIO for StdIO { FileType::Unknown }; - result.push((entry.file_name().into_vec(), val)) + result.push((entry.file_name().into_vec().into(), val)) } Ok(result) @@ -125,7 +125,7 @@ impl EvalIO for DummyIO { )) } - fn read_dir(&self, _: &Path) -> Result, FileType)>, io::Error> { + fn read_dir(&self, _: &Path) -> Result, io::Error> { Err(io::Error::new( io::ErrorKind::Unsupported, "I/O methods are not implemented in DummyIO", diff --git a/tvix/eval/src/vm/generators.rs b/tvix/eval/src/vm/generators.rs index 3437136bde63..a195dac24f53 100644 --- a/tvix/eval/src/vm/generators.rs +++ b/tvix/eval/src/vm/generators.rs @@ -186,7 +186,7 @@ pub enum VMResponse { Path(PathBuf), /// VM response with the contents of a directory. - Directory(Vec<(Vec, FileType)>), + Directory(Vec<(bytes::Bytes, FileType)>), /// VM response with a span to use at the current point. Span(LightSpan), @@ -735,7 +735,7 @@ pub(crate) async fn request_path_exists(co: &GenCo, path: PathBuf) -> Value { } } -pub(crate) async fn request_read_dir(co: &GenCo, path: PathBuf) -> Vec<(Vec, FileType)> { +pub(crate) async fn request_read_dir(co: &GenCo, path: PathBuf) -> Vec<(bytes::Bytes, FileType)> { match co.yield_(VMRequest::ReadDir(path)).await { VMResponse::Directory(dir) => dir, msg => panic!( -- cgit 1.4.1