feat(tvix/store): eliminate generics in BlobStore
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>
This commit is contained in:
parent
5139cc45c2
commit
27ff98000b
15 changed files with 227 additions and 140 deletions
|
|
@ -1,5 +1,4 @@
|
|||
use super::utils::{gen_blob_service, gen_directory_service};
|
||||
use crate::blobservice::BlobService;
|
||||
use crate::directoryservice::DirectoryService;
|
||||
use crate::import::ingest_path;
|
||||
use crate::proto;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
use crate::blobservice::BlobService;
|
||||
use crate::blobservice::BlobWriter;
|
||||
use crate::directoryservice::DirectoryService;
|
||||
use crate::nar::NARRenderer;
|
||||
use crate::proto::DirectoryNode;
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ use crate::{
|
|||
pathinfoservice::{MemoryPathInfoService, PathInfoService},
|
||||
};
|
||||
|
||||
pub fn gen_blob_service() -> impl BlobService + Send + Sync + Clone + 'static {
|
||||
MemoryBlobService::default()
|
||||
pub fn gen_blob_service() -> Box<dyn BlobService> {
|
||||
Box::new(MemoryBlobService::default())
|
||||
}
|
||||
|
||||
pub fn gen_directory_service() -> impl DirectoryService + Send + Sync + Clone + 'static {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue