fix(tvix): Avoid buffering file into memory in builtins.hashFile
Right now `builtins.hashFile` always reads the entire file into memory before hashing, which is not ideal for large files. This replaces `read_to_string` with `open_file` which allows calculating the hash of the file without buffering it entirely into memory. Other callers can continue to buffer into memory if they choose, but they still use the `open_file` VM request and then call `read_to_string` or `read_to_end` on the `std::io::Reader`. Fixes b/380 Change-Id: Ifa1c8324bcee8f751604b0b449feab875c632fda Reviewed-on: https://cl.tvl.fyi/c/depot/+/11236 Reviewed-by: flokli <flokli@flokli.de> Tested-by: BuildkiteCI
This commit is contained in:
parent
17849c5c00
commit
63116d8c21
9 changed files with 80 additions and 74 deletions
|
|
@ -16,6 +16,7 @@
|
|||
//! how store paths are opened and so on.
|
||||
|
||||
use std::{
|
||||
fs::File,
|
||||
io,
|
||||
path::{Path, PathBuf},
|
||||
};
|
||||
|
|
@ -48,13 +49,8 @@ pub trait EvalIO {
|
|||
/// * `builtins.pathExists :: path -> bool`
|
||||
fn path_exists(&self, path: &Path) -> io::Result<bool>;
|
||||
|
||||
/// Read the file at the specified path to a `Vec<u8>`.
|
||||
///
|
||||
/// This is used for the following language evaluation cases:
|
||||
///
|
||||
/// * `builtins.readFile :: path -> string`
|
||||
/// * `builtins.import :: path -> any`
|
||||
fn read_to_end(&self, path: &Path) -> io::Result<Vec<u8>>;
|
||||
/// Open the file at the specified path to a `io::Read`.
|
||||
fn open(&self, path: &Path) -> io::Result<Box<dyn io::Read>>;
|
||||
|
||||
/// Read the directory at the specified path and return the names
|
||||
/// of its entries associated with their [`FileType`].
|
||||
|
|
@ -99,8 +95,8 @@ impl EvalIO for StdIO {
|
|||
path.try_exists()
|
||||
}
|
||||
|
||||
fn read_to_end(&self, path: &Path) -> io::Result<Vec<u8>> {
|
||||
std::fs::read(path)
|
||||
fn open(&self, path: &Path) -> io::Result<Box<dyn io::Read>> {
|
||||
Ok(Box::new(File::open(path)?))
|
||||
}
|
||||
|
||||
fn read_dir(&self, path: &Path) -> io::Result<Vec<(bytes::Bytes, FileType)>> {
|
||||
|
|
@ -145,7 +141,7 @@ impl EvalIO for DummyIO {
|
|||
))
|
||||
}
|
||||
|
||||
fn read_to_end(&self, _: &Path) -> io::Result<Vec<u8>> {
|
||||
fn open(&self, _: &Path) -> io::Result<Box<dyn io::Read>> {
|
||||
Err(io::Error::new(
|
||||
io::ErrorKind::Unsupported,
|
||||
"I/O methods are not implemented in DummyIO",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue