diff options
Diffstat (limited to 'tvix/glue')
| -rw-r--r-- | tvix/glue/src/builtins/derivation.rs | 8 | ||||
| -rw-r--r-- | tvix/glue/src/builtins/import.rs | 8 | ||||
| -rw-r--r-- | tvix/glue/src/fetchers/mod.rs | 14 | ||||
| -rw-r--r-- | tvix/glue/src/tvix_build.rs | 8 | ||||
| -rw-r--r-- | tvix/glue/src/tvix_store_io.rs | 41 |
5 files changed, 46 insertions, 33 deletions
diff --git a/tvix/glue/src/builtins/derivation.rs b/tvix/glue/src/builtins/derivation.rs index a79545437a67..6a61b0dbaf36 100644 --- a/tvix/glue/src/builtins/derivation.rs +++ b/tvix/glue/src/builtins/derivation.rs @@ -179,7 +179,7 @@ pub(crate) mod derivation_builtins { use nix_compat::nixhash::CAHash; use nix_compat::store_path::{build_ca_path, hash_placeholder}; use sha2::Sha256; - use tvix_castore::{FileNode, Node}; + use tvix_castore::Node; use tvix_eval::generators::Gen; use tvix_eval::{NixContext, NixContextElement, NixString}; use tvix_store::proto::{NarInfo, PathInfo}; @@ -577,7 +577,11 @@ pub(crate) mod derivation_builtins { }) .map_err(DerivationError::InvalidDerivation)?; - let root_node = Node::File(FileNode::new(blob_digest, blob_size, false)); + let root_node = Node::File { + digest: blob_digest, + size: blob_size, + executable: false, + }; // calculate the nar hash let (nar_size, nar_sha256) = state diff --git a/tvix/glue/src/builtins/import.rs b/tvix/glue/src/builtins/import.rs index a09dc5a06b35..3660f575c843 100644 --- a/tvix/glue/src/builtins/import.rs +++ b/tvix/glue/src/builtins/import.rs @@ -3,7 +3,7 @@ use crate::builtins::errors::ImportError; use std::path::Path; use tvix_castore::import::ingest_entries; -use tvix_castore::{FileNode, Node}; +use tvix_castore::Node; use tvix_eval::{ builtin_macros::builtins, generators::{self, GenCo}, @@ -213,7 +213,11 @@ mod import_builtins { .tokio_handle .block_on(async { blob_writer.close().await })?; - let root_node = Node::File(FileNode::new(blob_digest, blob_size, false)); + let root_node = Node::File { + digest: blob_digest, + size: blob_size, + executable: false, + }; let ca_hash = if recursive_ingestion { let (_nar_size, nar_sha256) = state diff --git a/tvix/glue/src/fetchers/mod.rs b/tvix/glue/src/fetchers/mod.rs index 46db5d093009..065d011361a7 100644 --- a/tvix/glue/src/fetchers/mod.rs +++ b/tvix/glue/src/fetchers/mod.rs @@ -10,7 +10,7 @@ use tokio::io::{AsyncBufRead, AsyncRead, AsyncWrite, AsyncWriteExt, BufReader}; use tokio_util::io::{InspectReader, InspectWriter}; use tracing::{instrument, warn, Span}; use tracing_indicatif::span_ext::IndicatifSpanExt; -use tvix_castore::{blobservice::BlobService, directoryservice::DirectoryService, FileNode, Node}; +use tvix_castore::{blobservice::BlobService, directoryservice::DirectoryService, Node}; use tvix_store::{nar::NarCalculationService, pathinfoservice::PathInfoService, proto::PathInfo}; use url::Url; @@ -327,7 +327,11 @@ where // Construct and return the FileNode describing the downloaded contents. Ok(( - Node::File(FileNode::new(blob_writer.close().await?, blob_size, false)), + Node::File { + digest: blob_writer.close().await?, + size: blob_size, + executable: false, + }, CAHash::Flat(actual_hash), blob_size, )) @@ -522,7 +526,11 @@ where // Construct and return the FileNode describing the downloaded contents, // make it executable. - let root_node = Node::File(FileNode::new(blob_digest, file_size, true)); + let root_node = Node::File { + digest: blob_digest, + size: file_size, + executable: true, + }; Ok((root_node, CAHash::Nar(actual_hash), file_size)) } diff --git a/tvix/glue/src/tvix_build.rs b/tvix/glue/src/tvix_build.rs index 77fa5d92a197..b466ff458f6e 100644 --- a/tvix/glue/src/tvix_build.rs +++ b/tvix/glue/src/tvix_build.rs @@ -200,7 +200,7 @@ mod test { BuildRequest, }; use tvix_castore::fixtures::DUMMY_DIGEST; - use tvix_castore::{DirectoryNode, Node}; + use tvix_castore::Node; use crate::tvix_build::NIX_ENVIRONMENT_VARS; @@ -209,8 +209,10 @@ mod test { lazy_static! { static ref INPUT_NODE_FOO_NAME: Bytes = "mp57d33657rf34lzvlbpfa1gjfv5gmpg-bar".into(); - static ref INPUT_NODE_FOO: Node = - Node::Directory(DirectoryNode::new(DUMMY_DIGEST.clone(), 42,)); + static ref INPUT_NODE_FOO: Node = Node::Directory { + digest: DUMMY_DIGEST.clone(), + size: 42 + }; } #[test] diff --git a/tvix/glue/src/tvix_store_io.rs b/tvix/glue/src/tvix_store_io.rs index 4185c9554810..234a5ef38f43 100644 --- a/tvix/glue/src/tvix_store_io.rs +++ b/tvix/glue/src/tvix_store_io.rs @@ -475,20 +475,16 @@ impl EvalIO for TvixStoreIO { { // depending on the node type, treat open differently match node { - Node::Directory(_) => { + Node::Directory { .. } => { // This would normally be a io::ErrorKind::IsADirectory (still unstable) Err(io::Error::new( io::ErrorKind::Unsupported, format!("tried to open directory at {:?}", path), )) } - Node::File(file_node) => { + Node::File { digest, .. } => { self.tokio_handle.block_on(async { - let resp = self - .blob_service - .as_ref() - .open_read(file_node.digest()) - .await?; + let resp = self.blob_service.as_ref().open_read(&digest).await?; match resp { Some(blob_reader) => { // The VM Response needs a sync [std::io::Reader]. @@ -497,18 +493,18 @@ impl EvalIO for TvixStoreIO { } None => { error!( - blob.digest = %file_node.digest(), + blob.digest = %digest, "blob not found", ); Err(io::Error::new( io::ErrorKind::NotFound, - format!("blob {} not found", &file_node.digest()), + format!("blob {} not found", &digest), )) } } }) } - Node::Symlink(_symlink_node) => Err(io::Error::new( + Node::Symlink { .. } => Err(io::Error::new( io::ErrorKind::Unsupported, "open for symlinks is unsupported", ))?, @@ -534,9 +530,9 @@ impl EvalIO for TvixStoreIO { .block_on(async { self.store_path_to_node(&store_path, &sub_path).await })? { match node { - Node::Directory(_) => Ok(FileType::Directory), - Node::File(_) => Ok(FileType::Regular), - Node::Symlink(_) => Ok(FileType::Symlink), + Node::Directory { .. } => Ok(FileType::Directory), + Node::File { .. } => Ok(FileType::Regular), + Node::Symlink { .. } => Ok(FileType::Symlink), } } else { self.std_io.file_type(path) @@ -556,20 +552,19 @@ impl EvalIO for TvixStoreIO { .block_on(async { self.store_path_to_node(&store_path, &sub_path).await })? { match node { - Node::Directory(directory_node) => { + Node::Directory { digest, .. } => { // fetch the Directory itself. - let digest = directory_node.digest().clone(); - - if let Some(directory) = self.tokio_handle.block_on(async { - self.directory_service.as_ref().get(&digest).await + if let Some(directory) = self.tokio_handle.block_on({ + let digest = digest.clone(); + async move { self.directory_service.as_ref().get(&digest).await } })? { let mut children: Vec<(bytes::Bytes, FileType)> = Vec::new(); // TODO: into_nodes() to avoid cloning for (name, node) in directory.nodes() { children.push(match node { - Node::Directory(_) => (name.clone(), FileType::Directory), - Node::File(_) => (name.clone(), FileType::Regular), - Node::Symlink(_) => (name.clone(), FileType::Symlink), + Node::Directory { .. } => (name.clone(), FileType::Directory), + Node::File { .. } => (name.clone(), FileType::Regular), + Node::Symlink { .. } => (name.clone(), FileType::Symlink), }) } Ok(children) @@ -586,14 +581,14 @@ impl EvalIO for TvixStoreIO { ))? } } - Node::File(_file_node) => { + Node::File { .. } => { // This would normally be a io::ErrorKind::NotADirectory (still unstable) Err(io::Error::new( io::ErrorKind::Unsupported, "tried to readdir path {:?}, which is a file", ))? } - Node::Symlink(_symlink_node) => Err(io::Error::new( + Node::Symlink { .. } => Err(io::Error::new( io::ErrorKind::Unsupported, "read_dir for symlinks is unsupported", ))?, |