From 7725eb53ad67730e92a3839a6c10925c668e5586 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 9 Jun 2023 12:26:34 +0300
Subject: refactor(tvix/store): use Box<dyn DirectoryService>

Once we support configuring services at runtime, we don't know what
DirectoryService we're using at compile time.

This also means, we can't explicitly use the is_closed method from
GRPCPutter, without making it part of the DirectoryPutter itself.

Change-Id: Icd2a1ec4fc5649a6cd15c9cc7db4c2b473630431
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8727
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
---
 tvix/store/src/import.rs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'tvix/store/src/import.rs')

diff --git a/tvix/store/src/import.rs b/tvix/store/src/import.rs
index a0bd1de5e1..d07ddfc41e 100644
--- a/tvix/store/src/import.rs
+++ b/tvix/store/src/import.rs
@@ -56,9 +56,9 @@ impl From<super::Error> for Error {
 //
 // It assumes the caller adds returned nodes to the directories it assembles.
 #[instrument(skip_all, fields(entry.file_type=?&entry.file_type(),entry.path=?entry.path()))]
-fn process_entry<DP: DirectoryPutter>(
+fn process_entry(
     blob_service: &Box<dyn BlobService>,
-    directory_putter: &mut DP,
+    directory_putter: &mut Box<dyn DirectoryPutter>,
     entry: &walkdir::DirEntry,
     maybe_directory: Option<proto::Directory>,
 ) -> Result<proto::node::Node, Error> {
@@ -145,9 +145,9 @@ fn process_entry<DP: DirectoryPutter>(
 /// possibly register it somewhere (and potentially rename it based on some
 /// naming scheme.
 #[instrument(skip(blob_service, directory_service), fields(path=?p))]
-pub fn ingest_path<DS: DirectoryService, P: AsRef<Path> + Debug>(
+pub fn ingest_path<P: AsRef<Path> + Debug>(
     blob_service: &Box<dyn BlobService>,
-    directory_service: &DS,
+    directory_service: &Box<dyn DirectoryService>,
     p: P,
 ) -> Result<proto::node::Node, Error> {
     // Probe if the path points to a symlink. If it does, we process it manually,
@@ -174,6 +174,7 @@ pub fn ingest_path<DS: DirectoryService, P: AsRef<Path> + Debug>(
 
     let mut directories: HashMap<PathBuf, proto::Directory> = HashMap::default();
 
+    // TODO: pass this one instead?
     let mut directory_putter = directory_service.put_multiple_start();
 
     for entry in WalkDir::new(p)
-- 
cgit 1.4.1