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

refactor(tvix/store/pathinfoservice): make more generic

Browse source 
We don't need Arcs in most of the cases, we're fine with some container.

Change-Id: Ic4f8acb5b9d93e2b0923bb607463fb91e9d0e4fe
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10606
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Reviewed-by: raitobezarius <tvl@lahfa.xyz>
This commit is contained in:
Florian Klink 2024-01-12 12:18:43 +02:00 • committed by clbot
parent 7d51193f7d
commit b59df53774
6 changed files with 51 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

29
tvix/store/src/pathinfoservice/memory.rs
View file

@ -11,18 +11,15 @@ use tvix_castore::proto as castorepb;
use tvix_castore::Error;
use tvix_castore::{blobservice::BlobService, directoryservice::DirectoryService};
pub struct MemoryPathInfoService {
pub struct MemoryPathInfoService<BS, DS> {
db: Arc<RwLock<HashMap<[u8; 20], PathInfo>>>,
blob_service: Arc<dyn BlobService>,
directory_service: Arc<dyn DirectoryService>,
blob_service: BS,
directory_service: DS,
}
impl MemoryPathInfoService {
pub fn new(
blob_service: Arc<dyn BlobService>,
directory_service: Arc<dyn DirectoryService>,
) -> Self {
impl<BS, DS> MemoryPathInfoService<BS, DS> {
pub fn new(blob_service: BS, directory_service: DS) -> Self {
Self {
db: Default::default(),
blob_service,
@ -32,7 +29,11 @@ impl MemoryPathInfoService {
}
#[async_trait]
impl PathInfoService for MemoryPathInfoService {
impl<BS, DS> PathInfoService for MemoryPathInfoService<BS, DS>
where
BS: AsRef<dyn BlobService> + Send + Sync,
DS: AsRef<dyn DirectoryService> + Send + Sync,
{
async fn get(&self, digest: [u8; 20]) -> Result<Option<PathInfo>, Error> {
let db = self.db.read().unwrap();
@ -65,13 +66,9 @@ impl PathInfoService for MemoryPathInfoService {
&self,
root_node: &castorepb::node::Node,
) -> Result<(u64, [u8; 32]), Error> {
calculate_size_and_sha256(
root_node,
self.blob_service.clone(),
self.directory_service.clone(),
)
.await
.map_err(|e| Error::StorageError(e.to_string()))
calculate_size_and_sha256(root_node, &self.blob_service, &self.directory_service)
.await
.map_err(|e| Error::StorageError(e.to_string()))
}
fn list(&self) -> Pin<Box<dyn Stream<Item = Result<PathInfo, Error>> + Send>> {