From 3d8aafb1c73048bfa6b6dee6cc52b81c5d23e4ca Mon Sep 17 00:00:00 2001
From: Ryan Lahfa <tvl@lahfa.xyz>
Date: Wed, 17 Jan 2024 08:06:30 +0100
Subject: feat(tvix/store): enable `name` customization in the store

Sometimes, Nix lets someone customize the `name` in the store for a
path, this is the case for `builtins.path` which takes a `name`
argument, we leave it to the caller to choose the name, which can be the
basename by default of the path.

Change-Id: Icdbf71d1d8f2dca5716b99d20aac885aab905b80
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10653
Tested-by: BuildkiteCI
Autosubmit: raitobezarius <tvl@lahfa.xyz>
Reviewed-by: flokli <flokli@flokli.de>
---
 tvix/glue/src/tvix_store_io.rs   |  1 +
 tvix/store/src/bin/tvix-store.rs | 23 +++++++++++++----------
 tvix/store/src/import.rs         | 10 +++++-----
 3 files changed, 19 insertions(+), 15 deletions(-)

(limited to 'tvix')

diff --git a/tvix/glue/src/tvix_store_io.rs b/tvix/glue/src/tvix_store_io.rs
index 45bcf0df3ae8..1277a1d97792 100644
--- a/tvix/glue/src/tvix_store_io.rs
+++ b/tvix/glue/src/tvix_store_io.rs
@@ -276,6 +276,7 @@ impl EvalIO for TvixStoreIO {
         let output_path = self.tokio_handle.block_on(async {
             tvix_store::import::import_path_as_nar_ca(
                 path,
+                tvix_store::import::path_to_name(path)?,
                 &self.blob_service,
                 &self.directory_service,
                 &self.path_info_service,
diff --git a/tvix/store/src/bin/tvix-store.rs b/tvix/store/src/bin/tvix-store.rs
index 9b07117d71ff..ecee8d78f3b7 100644
--- a/tvix/store/src/bin/tvix-store.rs
+++ b/tvix/store/src/bin/tvix-store.rs
@@ -305,16 +305,19 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
                         let path_info_service = path_info_service.clone();
 
                         async move {
-                            let resp = tvix_store::import::import_path_as_nar_ca(
-                                path,
-                                blob_service,
-                                directory_service,
-                                path_info_service,
-                            )
-                            .await;
-                            if let Ok(output_path) = resp {
-                                // If the import was successful, print the path to stdout.
-                                println!("{}", output_path.to_absolute_path());
+                            if let Ok(name) = tvix_store::import::path_to_name(&path) {
+                                let resp = tvix_store::import::import_path_as_nar_ca(
+                                    &path,
+                                    name,
+                                    blob_service,
+                                    directory_service,
+                                    path_info_service,
+                                )
+                                .await;
+                                if let Ok(output_path) = resp {
+                                    // If the import was successful, print the path to stdout.
+                                    println!("{}", output_path.to_absolute_path());
+                                }
                             }
                         }
                     })
diff --git a/tvix/store/src/import.rs b/tvix/store/src/import.rs
index 84c73e15544c..588a0108931e 100644
--- a/tvix/store/src/import.rs
+++ b/tvix/store/src/import.rs
@@ -13,7 +13,7 @@ use crate::{
     proto::{nar_info, NarInfo, PathInfo},
 };
 
-fn log_node(node: &Node, path: &Path) {
+pub fn log_node(node: &Node, path: &Path) {
     match node {
         Node::Directory(directory_node) => {
             debug!(
@@ -86,9 +86,10 @@ pub fn derive_nar_ca_path_info(nar_size: u64, nar_sha256: [u8; 32], root_node: N
 
 /// Ingest the given path [`path`] and register the resulting output path in the
 /// [`PathInfoService`] as a recursive fixed output NAR.
-#[instrument(skip_all, fields(path=?path), err)]
+#[instrument(skip_all, fields(store_name=name, path=?path), err)]
 pub async fn import_path_as_nar_ca<BS, DS, PS, P>(
     path: P,
+    name: &str,
     blob_service: BS,
     directory_service: DS,
     path_info_service: PS,
@@ -106,9 +107,8 @@ where
     let (nar_size, nar_sha256) = path_info_service.as_ref().calculate_nar(&root_node).await?;
 
     // Calculate the output path. This might still fail, as some names are illegal.
-    // FUTUREWORK: take `name` as a parameter here and enforce the validity of the name
-    // at the type level.
-    let name = path_to_name(path.as_ref())?;
+    // FUTUREWORK: express the `name` at the type level to be valid and move the conversion
+    // at the caller level.
     let output_path = store_path::build_nar_based_store_path(&nar_sha256, name).map_err(|_| {
         std::io::Error::new(
             std::io::ErrorKind::InvalidData,
-- 
cgit 1.4.1