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

refactor(tvix/castore/blobsvc/grpc/wrapper): don't require Arc<_>

Browse source 
Change-Id: I9655f5588c7dc98427de6af47d74b4ab7ce22071
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10516
Tested-by: BuildkiteCI
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: raitobezarius <tvl@lahfa.xyz>
This commit is contained in:
Florian Klink 2024-01-01 03:23:23 +02:00 • committed by clbot
parent 96aa220dcf
commit 1b62f82b10
4 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

18
tvix/castore/src/proto/grpc_blobservice_wrapper.rs
View file

@ -6,22 +6,19 @@ use std::{
io,
ops::{Deref, DerefMut},
pin::Pin,
sync::Arc,
};
use tokio_stream::StreamExt;
use tokio_util::io::ReaderStream;
use tonic::{async_trait, Request, Response, Status, Streaming};
use tracing::{instrument, warn};
pub struct GRPCBlobServiceWrapper {
blob_service: Arc<dyn BlobService>,
pub struct GRPCBlobServiceWrapper<T> {
blob_service: T,
}
impl From<Arc<dyn BlobService>> for GRPCBlobServiceWrapper {
fn from(value: Arc<dyn BlobService>) -> Self {
Self {
blob_service: value,
}
impl<T> GRPCBlobServiceWrapper<T> {
pub fn new(blob_service: T) -> Self {
Self { blob_service }
}
}
@ -84,7 +81,10 @@ unsafe impl<const N: usize> bytes::BufMut for BytesMutWithDefaultCapacity<N> {
}
#[async_trait]
impl super::blob_service_server::BlobService for GRPCBlobServiceWrapper {
impl<T> super::blob_service_server::BlobService for GRPCBlobServiceWrapper<T>
where
T: Deref<Target = dyn BlobService> + Send + Sync + 'static,
{
// https://github.com/tokio-rs/tokio/issues/2723#issuecomment-1534723933
type ReadStream =
Pin<Box<dyn futures::Stream<Item = Result<super::BlobChunk, Status>> + Send + 'static>>;