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

refactor(tvix/store/pathinfosvc): use Arc<dyn …>

Browse source 
This removes the use of generics, like previously done with Blob and
Directory services.

Change-Id: I7cc8bd1439b026c88e80c11e38aafc63c74e5e84
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8751
Tested-by: BuildkiteCI
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: tazjin <tazjin@tvl.su>
This commit is contained in:
Florian Klink 2023-06-12 16:04:56 +03:00 • committed by flokli
parent 64a4f6185c
commit b5e37869e6
8 changed files with 34 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tvix/store/src/bin/tvix-store.rs
View file

@ -13,6 +13,7 @@ use tvix_store::directoryservice::DirectoryService;
use tvix_store::directoryservice::GRPCDirectoryService;
use tvix_store::directoryservice::SledDirectoryService;
use tvix_store::pathinfoservice::GRPCPathInfoService;
use tvix_store::pathinfoservice::PathInfoService;
use tvix_store::pathinfoservice::SledPathInfoService;
use tvix_store::proto::blob_service_client::BlobServiceClient;
use tvix_store::proto::blob_service_server::BlobServiceServer;
@ -104,11 +105,11 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
Arc::new(SledBlobService::new("blobs.sled".into())?);
let directory_service: Arc<dyn DirectoryService> =
Arc::new(SledDirectoryService::new("directories.sled".into())?);
let path_info_service = SledPathInfoService::new(
let path_info_service: Arc<dyn PathInfoService> = Arc::new(SledPathInfoService::new(
"pathinfo.sled".into(),
blob_service.clone(),
directory_service.clone(),
)?;
)?);
let listen_address = listen_address
.unwrap_or_else(|| "[::]:8000".to_string())
@ -156,7 +157,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
let io = Arc::new(TvixStoreIO::new(
Arc::new(blob_service),
Arc::new(directory_service),
path_info_service,
Arc::new(path_info_service),
));
let tasks = paths
@ -193,7 +194,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
let f = FUSE::new(
Arc::new(blob_service),
Arc::new(directory_service),
path_info_service,
Arc::new(path_info_service),
);
fuser::mount2(f, &dest, &[])
})