diff options
| author | Florian Klink <flokli@flokli.de> | 2023-05-25T14·52+0300 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2023-06-12T10·15+0000 |
| commit | 27ff98000b0cdf0ed30eb8837c7d44cd3e79d32f (patch) | |
| tree | 09fcb40135001d35717ce176d8b473f5e634bdcf /tvix/store/src/import.rs | |
| parent | 5139cc45c2ce1736509f3f0ebf68a71c10ace939 (diff) | |
feat(tvix/store): eliminate generics in BlobStore r/6269
To construct various stores at runtime, we need to eliminate associated types from the BlobService trait, and return Box<dyn …> instead of specific types. This also means we can't consume self in the close() method, so everything we write to is put in an Option<>, and during the first close we take from there. Change-Id: Ia523b6ab2f2a5276f51cb5d17e81a5925bce69b6 Reviewed-on: https://cl.tvl.fyi/c/depot/+/8647 Autosubmit: flokli <flokli@flokli.de> Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su>
Diffstat (limited to 'tvix/store/src/import.rs')
| -rw-r--r-- | tvix/store/src/import.rs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tvix/store/src/import.rs b/tvix/store/src/import.rs index 206e5eaba9..a0bd1de5e1 100644 --- a/tvix/store/src/import.rs +++ b/tvix/store/src/import.rs @@ -1,5 +1,6 @@ -use crate::{blobservice::BlobService, directoryservice::DirectoryService}; -use crate::{blobservice::BlobWriter, directoryservice::DirectoryPutter, proto}; +use crate::blobservice::BlobService; +use crate::directoryservice::DirectoryService; +use crate::{directoryservice::DirectoryPutter, proto}; use std::{ collections::HashMap, fmt::Debug, @@ -55,8 +56,8 @@ 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<BS: BlobService, DP: DirectoryPutter>( - blob_service: &BS, +fn process_entry<DP: DirectoryPutter>( + blob_service: &Box<dyn BlobService>, directory_putter: &mut DP, entry: &walkdir::DirEntry, maybe_directory: Option<proto::Directory>, @@ -144,8 +145,8 @@ fn process_entry<BS: BlobService, 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<BS: BlobService, DS: DirectoryService, P: AsRef<Path> + Debug>( - blob_service: &BS, +pub fn ingest_path<DS: DirectoryService, P: AsRef<Path> + Debug>( + blob_service: &Box<dyn BlobService>, directory_service: &DS, p: P, ) -> Result<proto::node::Node, Error> { |