maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix/store): use Box<dyn DirectoryService>

Browse source 
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
This commit is contained in:
Florian Klink 2023-06-09 12:26:34 +03:00 • committed by clbot
parent 6f85dbfc06
commit 7725eb53ad
18 changed files with 144 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

20
tvix/store/src/directoryservice/memory.rs
View file

@ -4,7 +4,7 @@ use std::sync::{Arc, RwLock};
use tracing::{instrument, warn};
use super::utils::SimplePutter;
use super::{DirectoryService, DirectoryTraverser};
use super::{DirectoryPutter, DirectoryService, DirectoryTraverser};
#[derive(Clone, Default)]
pub struct MemoryDirectoryService {
@ -12,8 +12,6 @@ pub struct MemoryDirectoryService {
}
impl DirectoryService for MemoryDirectoryService {
type DirectoriesIterator = DirectoryTraverser<Self>;
#[instrument(skip(self, digest), fields(directory.digest = %digest))]
fn get(&self, digest: &B3Digest) -> Result<Option<proto::Directory>, Error> {
let db = self.db.read()?;
@ -68,17 +66,21 @@ impl DirectoryService for MemoryDirectoryService {
}
#[instrument(skip_all, fields(directory.digest = %root_directory_digest))]
fn get_recursive(&self, root_directory_digest: &B3Digest) -> Self::DirectoriesIterator {
DirectoryTraverser::with(self.clone(), root_directory_digest)
fn get_recursive(
&self,
root_directory_digest: &B3Digest,
) -> Box<dyn Iterator<Item = Result<proto::Directory, Error>> + Send> {
Box::new(DirectoryTraverser::with(
self.clone(),
root_directory_digest,
))
}
type DirectoryPutter = SimplePutter<Self>;
#[instrument(skip_all)]
fn put_multiple_start(&self) -> Self::DirectoryPutter
fn put_multiple_start(&self) -> Box<(dyn DirectoryPutter + 'static)>
where
Self: Clone,
{
SimplePutter::new(self.clone())
Box::new(SimplePutter::new(self.clone()))
}
}