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

refactor(tvix/castore): relax trait bounds for DS

Browse source 
Make this an `AsRef<dyn DirectoryService>`.

This helps dropping some Clone requirements.

Unfortunately, we can't thread this through to TvixStoreIO just yet.

Change-Id: I3f07eb28d6c793d3313fe21506ada84d5a8aa3ac
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10533
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Reviewed-by: raitobezarius <tvl@lahfa.xyz>
This commit is contained in:
Florian Klink 2024-01-04 19:18:06 +02:00 • committed by clbot
parent 3297843bf1
commit f20969de9b
3 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tvix/castore/src/import.rs
View file

@ -149,7 +149,7 @@ where
/// It's up to the caller to possibly register it somewhere (and potentially /// It's up to the caller to possibly register it somewhere (and potentially
/// rename it based on some naming scheme) /// rename it based on some naming scheme)
#[instrument(skip(blob_service, directory_service), fields(path=?p), err)] #[instrument(skip(blob_service, directory_service), fields(path=?p), err)]
pub async fn ingest_path<BS, DS, P>( pub async fn ingest_path<'a, BS, DS, P>(
blob_service: BS, blob_service: BS,
directory_service: DS, directory_service: DS,
p: P, p: P,
@ -157,7 +157,7 @@ pub async fn ingest_path<BS, DS, P>(
where where
P: AsRef<Path> + Debug, P: AsRef<Path> + Debug,
BS: Deref<Target = dyn BlobService> + Clone, BS: Deref<Target = dyn BlobService> + Clone,
DS: Deref<Target = dyn DirectoryService>, DS: Deref<Target = &'a dyn DirectoryService>,
{ {
let mut directories: HashMap<PathBuf, Directory> = HashMap::default(); let mut directories: HashMap<PathBuf, Directory> = HashMap::default();

7
tvix/castore/src/tests/import.rs
View file

@ -4,6 +4,7 @@ use crate::fixtures::*;
use crate::import::ingest_path; use crate::import::ingest_path;
use crate::proto; use crate::proto;
use crate::utils::{gen_blob_service, gen_directory_service}; use crate::utils::{gen_blob_service, gen_directory_service};
use std::ops::Deref;
use std::sync::Arc; use std::sync::Arc;
use tempfile::TempDir; use tempfile::TempDir;
@ -27,7 +28,7 @@ async fn symlink() {
let root_node = ingest_path( let root_node = ingest_path(
blob_service, blob_service,
directory_service, &directory_service.deref(),
tmpdir.path().join("doesntmatter"), tmpdir.path().join("doesntmatter"),
) )
.await .await
@ -53,7 +54,7 @@ async fn single_file() {
let root_node = ingest_path( let root_node = ingest_path(
blob_service.clone(), blob_service.clone(),
directory_service, &directory_service.deref(),
tmpdir.path().join("root"), tmpdir.path().join("root"),
) )
.await .await
@ -92,7 +93,7 @@ async fn complicated() {
let root_node = ingest_path( let root_node = ingest_path(
blob_service.clone(), blob_service.clone(),
directory_service.clone(), &directory_service.deref(),
tmpdir.path(), tmpdir.path(),
) )
.await .await

5
tvix/store/src/utils.rs
View file

@ -54,7 +54,7 @@ pub async fn import_path<BS, DS, PS, P>(
where where
P: AsRef<Path> + std::fmt::Debug, P: AsRef<Path> + std::fmt::Debug,
BS: Deref<Target = dyn BlobService> + Clone, BS: Deref<Target = dyn BlobService> + Clone,
DS: Deref<Target = dyn DirectoryService> + Clone, DS: Deref<Target = dyn DirectoryService>,
PS: Deref<Target = dyn PathInfoService>, PS: Deref<Target = dyn PathInfoService>,
{ {
// calculate the name // calculate the name
@ -71,7 +71,8 @@ where
})?; })?;
// Ingest the path into blob and directory service. // Ingest the path into blob and directory service.
let root_node = tvix_castore::import::ingest_path(blob_service, directory_service, &path) let root_node =
tvix_castore::import::ingest_path(blob_service, &directory_service.deref(), &path)
.await .await
.expect("failed to ingest path"); .expect("failed to ingest path");