feat(tvix/store/pathinfosvc): add calculate_nar method
Putting this in the PathInfoService trait makes much more sense, we can have direct control over where/how to cache the results in the implementation. This now requires each PathInfoService to hold pointers to BlobService and DirectoryService. Change-Id: I4faae780d43eae4beeb57bd5e190e6d1a5d3314e Reviewed-on: https://cl.tvl.fyi/c/depot/+/8724 Tested-by: BuildkiteCI Autosubmit: flokli <flokli@flokli.de> Reviewed-by: tazjin <tazjin@tvl.su>
This commit is contained in:
parent
8d05c0ceaa
commit
6f85dbfc06
12 changed files with 147 additions and 67 deletions
|
|
@ -1,16 +1,31 @@
|
|||
use super::PathInfoService;
|
||||
use crate::{proto, Error};
|
||||
use crate::{
|
||||
blobservice::BlobService, directoryservice::DirectoryService, nar::calculate_size_and_sha256,
|
||||
proto, Error,
|
||||
};
|
||||
use std::{
|
||||
collections::HashMap,
|
||||
sync::{Arc, RwLock},
|
||||
};
|
||||
|
||||
#[derive(Default)]
|
||||
pub struct MemoryPathInfoService {
|
||||
pub struct MemoryPathInfoService<DS: DirectoryService> {
|
||||
db: Arc<RwLock<HashMap<[u8; 20], proto::PathInfo>>>,
|
||||
|
||||
blob_service: Box<dyn BlobService>,
|
||||
directory_service: DS,
|
||||
}
|
||||
|
||||
impl PathInfoService for MemoryPathInfoService {
|
||||
impl<DS: DirectoryService> MemoryPathInfoService<DS> {
|
||||
pub fn new(blob_service: Box<dyn BlobService>, directory_service: DS) -> Self {
|
||||
Self {
|
||||
db: Default::default(),
|
||||
blob_service,
|
||||
directory_service,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl<DS: DirectoryService + Clone> PathInfoService for MemoryPathInfoService<DS> {
|
||||
fn get(&self, digest: [u8; 20]) -> Result<Option<proto::PathInfo>, Error> {
|
||||
let db = self.db.read().unwrap();
|
||||
|
||||
|
|
@ -38,4 +53,13 @@ impl PathInfoService for MemoryPathInfoService {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn calculate_nar(&self, root_node: &proto::node::Node) -> Result<(u64, [u8; 32]), Error> {
|
||||
calculate_size_and_sha256(
|
||||
root_node,
|
||||
&self.blob_service,
|
||||
self.directory_service.clone(),
|
||||
)
|
||||
.map_err(|e| Error::StorageError(e.to_string()))
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue