about summary refs log tree commit diff
path: root/tvix/castore
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2024-04-13T16·22+0300
committerclbot <clbot@tvl.fyi>2024-04-15T14·06+0000
commitb70744fda627594cd42f8b6ae2d0dd1d7d037d61 (patch)
treee836230cb90aa6dd723d41aff2d9ee7dab66308e /tvix/castore
parentbcc00fba8f65c767f831ab05f15278d23ea4b322 (diff)
refactor(tvix/*/import): rename direntry_stream, entries_per_depths r/7925
Align these names and comments with the two users, to make it more
obvious we're doing the same thing here, just use a different method to
come up with entries_per_depths.

Change-Id: I42058e397588b6b57a6299e87183bef27588b228
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11415
Tested-by: BuildkiteCI
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: Connor Brewster <cbrewster@hey.com>
Diffstat (limited to 'tvix/castore')
-rw-r--r--tvix/castore/src/import.rs9
1 files changed, 5 insertions, 4 deletions
diff --git a/tvix/castore/src/import.rs b/tvix/castore/src/import.rs
index 2e1d4c2af33a..acae8299cc27 100644
--- a/tvix/castore/src/import.rs
+++ b/tvix/castore/src/import.rs
@@ -143,11 +143,12 @@ where
     BS: AsRef<dyn BlobService> + Clone,
     DS: AsRef<dyn DirectoryService>,
 {
-    let entries = walk_path_for_ingestion(path)?;
-    let entries_stream = leveled_entries_to_stream(entries);
-    pin_mut!(entries_stream);
+    // produce the leveled-key vector of DirEntry.
+    let entries_per_depths = walk_path_for_ingestion(path)?;
+    let direntry_stream = leveled_entries_to_stream(entries_per_depths);
+    pin_mut!(direntry_stream);
 
-    ingest_entries(blob_service, directory_service, entries_stream).await
+    ingest_entries(blob_service, directory_service, direntry_stream).await
 }
 
 /// The Merkle invariant checker is an internal structure to perform bookkeeping of all directory