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

refactor(tvix/store/pathinfosvc): drop ByWhat, use digest directly

Browse source 
We currently only support querying by the output hash digest.
This makes the interface a bit simpler.

Change-Id: I80b285373f1923e85cb0e404c4b15d51a7f259ef
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8570
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
This commit is contained in:
Florian Klink 2023-05-14 18:10:23 +03:00 • committed by flokli
parent 71c29d0f4c
commit e815b680c0
5 changed files with 46 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,36 +1,22 @@
use super::PathInfoService;
use crate::{proto, Error};
use std::{
collections::HashMap,
sync::{Arc, RwLock},
};
use crate::{proto, Error};
use nix_compat::store_path::DIGEST_SIZE;
use super::PathInfoService;
#[derive(Default)]
pub struct MemoryPathInfoService {
db: Arc<RwLock<HashMap<Vec<u8>, proto::PathInfo>>>,
db: Arc<RwLock<HashMap<[u8; 20], proto::PathInfo>>>,
}
impl PathInfoService for MemoryPathInfoService {
fn get(
&self,
by_what: proto::get_path_info_request::ByWhat,
) -> Result<Option<proto::PathInfo>, Error> {
match by_what {
proto::get_path_info_request::ByWhat::ByOutputHash(digest) => {
if digest.len() != DIGEST_SIZE {
return Err(Error::InvalidRequest("invalid digest length".to_string()));
}
fn get(&self, digest: [u8; 20]) -> Result<Option<proto::PathInfo>, Error> {
let db = self.db.read().unwrap();
let db = self.db.read().unwrap();
match db.get(&digest) {
None => Ok(None),
Some(path_info) => Ok(Some(path_info.clone())),
}
}
match db.get(&digest) {
None => Ok(None),
Some(path_info) => Ok(Some(path_info.clone())),
}
}
@ -46,7 +32,7 @@ impl PathInfoService for MemoryPathInfoService {
// This overwrites existing PathInfo objects.
Ok(nix_path) => {
let mut db = self.db.write().unwrap();
db.insert(nix_path.digest.to_vec(), path_info.clone());
db.insert(nix_path.digest, path_info.clone());
Ok(path_info)
}