mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix/*store): remove some grpc_client let bindings

Browse source 
We had to have these all while the traits where sync, and there was a
lot of spawning and moving.

Most of this can now be removed in favor of some inline `.clone()`.

Change-Id: Id5466c32a403100bc3347866b3172e06a792e311
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9705
Tested-by: BuildkiteCI
Reviewed-by: Connor Brewster <cbrewster@hey.com>
This commit is contained in:
Florian Klink 2023-10-12 15:42:01 +02:00 • committed by flokli
parent 0b18be3b57
commit 199e5e0339
3 changed files with 25 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

7
tvix/castore/src/blobservice/grpc.rs
View file

@ -112,12 +112,11 @@ impl BlobService for GRPCBlobService {
&self,
digest: &B3Digest,
) -> Result<Option<Box<dyn BlobReader>>, crate::Error> {
// Get a new handle to the gRPC client, and copy the digest.
let mut grpc_client = self.grpc_client.clone();
// Get a stream of [proto::BlobChunk], or return an error if the blob
// doesn't exist.
let resp = grpc_client
let resp = self
.grpc_client
.clone()
.read(proto::ReadBlobRequest {
digest: digest.clone().into(),
})

8
tvix/castore/src/directoryservice/grpc.rs
View file

@ -139,9 +139,11 @@ impl DirectoryService for GRPCDirectoryService {
}
async fn put(&self, directory: crate::proto::Directory) -> Result<B3Digest, crate::Error> {
let mut grpc_client = self.grpc_client.clone();
let resp = grpc_client.put(tokio_stream::iter(vec![directory])).await;
let resp = self
.grpc_client
.clone()
.put(tokio_stream::once(directory))
.await;
match resp {
Ok(put_directory_resp) => Ok(put_directory_resp