about summary refs log tree commit diff
path: root/tvix/store/src
diff options
context:
space:
mode:
authorYureka <tvl@yuka.dev>2024-09-27T19·32+0200
committerclbot <clbot@tvl.fyi>2024-10-01T13·40+0000
commitb82cacb449c71684aab533cb1f27ddfd48bf78da (patch)
treefebc5cf7e8d49a1ff02dd5900b500082b46b1fd4 /tvix/store/src
parentd277bd9fbf17d579b9c51c12a4126f67a9e9db6c (diff)
feat(castore/fs): optional refscanner for ingest r/8741
Change-Id: Ieca06de4c2e2680d89fe05a380079fafa5454837
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12529
Autosubmit: yuka <yuka@yuka.dev>
Tested-by: BuildkiteCI
Reviewed-by: flokli <flokli@flokli.de>
Diffstat (limited to 'tvix/store/src')
-rw-r--r--tvix/store/src/bin/tvix-store.rs3
-rw-r--r--tvix/store/src/import.rs7
2 files changed, 6 insertions, 4 deletions
diff --git a/tvix/store/src/bin/tvix-store.rs b/tvix/store/src/bin/tvix-store.rs
index 6da239a8fee3..b77a46dace7c 100644
--- a/tvix/store/src/bin/tvix-store.rs
+++ b/tvix/store/src/bin/tvix-store.rs
@@ -339,10 +339,11 @@ async fn run_cli(cli: Cli) -> Result<(), Box<dyn std::error::Error + Send + Sync
                     async move {
                         // Ingest the given path.
 
-                        ingest_path(
+                        ingest_path::<_, _, _, &[u8]>(
                             blob_service,
                             directory_service,
                             PathBuf::from(elem.path.to_absolute_path()),
+                            None,
                         )
                         .await
                         .map(|root_node| (elem, root_node))
diff --git a/tvix/store/src/import.rs b/tvix/store/src/import.rs
index 1719669a4285..2c2b205016a1 100644
--- a/tvix/store/src/import.rs
+++ b/tvix/store/src/import.rs
@@ -123,9 +123,10 @@ where
     PS: AsRef<dyn PathInfoService>,
     NS: NarCalculationService,
 {
-    let root_node = ingest_path(blob_service, directory_service, path.as_ref())
-        .await
-        .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))?;
+    let root_node =
+        ingest_path::<_, _, _, &[u8]>(blob_service, directory_service, path.as_ref(), None)
+            .await
+            .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))?;
 
     // Ask for the NAR size and sha256
     let (nar_size, nar_sha256) = nar_calculation_service.calculate_nar(&root_node).await?;