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

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

@ -8,15 +8,18 @@ use std::{
sync::{Arc, RwLock},
};
pub struct MemoryPathInfoService<DS: DirectoryService> {
pub struct MemoryPathInfoService {
db: Arc<RwLock<HashMap<[u8; 20], proto::PathInfo>>>,
blob_service: Box<dyn BlobService>,
directory_service: DS,
directory_service: Box<dyn DirectoryService>,
}
impl<DS: DirectoryService> MemoryPathInfoService<DS> {
pub fn new(blob_service: Box<dyn BlobService>, directory_service: DS) -> Self {
impl MemoryPathInfoService {
pub fn new(
blob_service: Box<dyn BlobService>,
directory_service: Box<dyn DirectoryService>,
) -> Self {
Self {
db: Default::default(),
blob_service,
@ -25,7 +28,7 @@ impl<DS: DirectoryService> MemoryPathInfoService<DS> {
}
}
impl<DS: DirectoryService + Clone> PathInfoService for MemoryPathInfoService<DS> {
impl PathInfoService for MemoryPathInfoService {
fn get(&self, digest: [u8; 20]) -> Result<Option<proto::PathInfo>, Error> {
let db = self.db.read().unwrap();
@ -55,11 +58,7 @@ impl<DS: DirectoryService + Clone> PathInfoService for MemoryPathInfoService<DS>
}
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()))
calculate_size_and_sha256(root_node, &self.blob_service, &self.directory_service)
.map_err(|e| Error::StorageError(e.to_string()))
}
}

20
tvix/store/src/pathinfoservice/sled.rs
View file

@ -11,18 +11,18 @@ use tracing::warn;
///
/// The PathInfo messages are stored as encoded protos, and keyed by their output hash,
/// as that's currently the only request type available.
pub struct SledPathInfoService<DS: DirectoryService> {
pub struct SledPathInfoService {
db: sled::Db,
blob_service: Box<dyn BlobService>,
directory_service: DS,
directory_service: Box<dyn DirectoryService>,
}
impl<DS: DirectoryService> SledPathInfoService<DS> {
impl SledPathInfoService {
pub fn new(
p: PathBuf,
blob_service: Box<dyn BlobService>,
directory_service: DS,
directory_service: Box<dyn DirectoryService>,
) -> Result<Self, sled::Error> {
let config = sled::Config::default().use_compression(true).path(p);
let db = config.open()?;
@ -36,7 +36,7 @@ impl<DS: DirectoryService> SledPathInfoService<DS> {
pub fn new_temporary(
blob_service: Box<dyn BlobService>,
directory_service: DS,
directory_service: Box<dyn DirectoryService>,
) -> Result<Self, sled::Error> {
let config = sled::Config::default().temporary(true);
let db = config.open()?;
@ -49,7 +49,7 @@ impl<DS: DirectoryService> SledPathInfoService<DS> {
}
}
impl<DS: DirectoryService + Clone> PathInfoService for SledPathInfoService<DS> {
impl PathInfoService for SledPathInfoService {
fn get(&self, digest: [u8; 20]) -> Result<Option<proto::PathInfo>, Error> {
match self.db.get(digest) {
Ok(None) => Ok(None),
@ -95,11 +95,7 @@ impl<DS: DirectoryService + Clone> PathInfoService for SledPathInfoService<DS> {
}
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()))
calculate_size_and_sha256(root_node, &self.blob_service, &self.directory_service)
.map_err(|e| Error::StorageError(e.to_string()))
}
}