Skip to content

feat(storage): make GrpcRustClient available as a transport option #6000

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joshuatants wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(storage): make GrpcRustClient available as a transport option #6000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions src/storage/src/storage/bidi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,18 @@ mod worker;

use crate::google::storage::v2::{BidiReadObjectRequest, BidiReadObjectResponse};
use crate::request_options::RequestOptions;
use gaxi::grpc::tonic::{Extensions, Response as TonicResponse, Result as TonicResult, Streaming};
use gaxi::grpc::tonic::{Extensions, Response as TonicResponse, Result as TonicResult};
use tokio::sync::mpsc::Receiver;

#[cfg(google_cloud_unstable_grpc_rust)]
pub(crate) type GrpcClient = gaxi::grpc::GrpcRustClient;
#[cfg(google_cloud_unstable_grpc_rust)]
pub(crate) type GrpcStream = gaxi::grpc::GrpcRustStreaming<BidiReadObjectResponse>;

#[cfg(not(google_cloud_unstable_grpc_rust))]
pub(crate) type GrpcClient = gaxi::grpc::Client;
pub(crate) type GrpcStream = Streaming<BidiReadObjectResponse>;
#[cfg(not(google_cloud_unstable_grpc_rust))]
pub(crate) type GrpcStream = gaxi::grpc::tonic::Streaming<BidiReadObjectResponse>;

pub use super::open_object::OpenObject;

Expand All @@ -45,7 +52,7 @@ pub trait TonicStreaming: std::fmt::Debug + Send + 'static {
}

/// Implement [TonicStreaming] for the one `Streaming<T>` we use.
impl TonicStreaming for Streaming<BidiReadObjectResponse> {
impl TonicStreaming for GrpcStream {
async fn next_message(&mut self) -> TonicResult<Option<BidiReadObjectResponse>> {
self.message().await
}
Expand Down
18 changes: 14 additions & 4 deletions src/storage/src/storage/bidi_write.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,20 @@ pub(crate) mod stub;

use crate::google::storage::v2::{BidiWriteObjectRequest, BidiWriteObjectResponse};
use crate::request_options::RequestOptions;
use gaxi::grpc::tonic::{Extensions, Response as TonicResponse, Result as TonicResult, Streaming};
use gaxi::grpc::tonic::{Extensions, Response as TonicResponse, Result as TonicResult};
use std::future::Future;
use tokio::sync::mpsc::Receiver;

#[cfg(google_cloud_unstable_grpc_rust)]
pub(crate) type GrpcClient = gaxi::grpc::GrpcRustClient;
#[cfg(google_cloud_unstable_grpc_rust)]
pub(crate) type GrpcStream = gaxi::grpc::GrpcRustStreaming<BidiWriteObjectResponse>;

#[cfg(not(google_cloud_unstable_grpc_rust))]
pub(crate) type GrpcClient = gaxi::grpc::Client;
#[cfg(not(google_cloud_unstable_grpc_rust))]
pub(crate) type GrpcStream = gaxi::grpc::tonic::Streaming<BidiWriteObjectResponse>;

/// A trait to mock `Streaming<T>` in the unit tests.
///
/// This is not a public trait, we only need this for our own testing.
Expand All @@ -35,7 +45,7 @@ pub(crate) trait TonicStreaming: std::fmt::Debug + Send + 'static {
}

/// Implement [TonicStreaming] for the one `Streaming<T>`` we use.
impl TonicStreaming for Streaming<BidiWriteObjectResponse> {
impl TonicStreaming for GrpcStream {
async fn next_message(&mut self) -> TonicResult<Option<BidiWriteObjectResponse>> {
self.message().await
}
Expand All @@ -58,8 +68,8 @@ pub(crate) trait Client: std::fmt::Debug + Send + 'static {
) -> impl Future<Output = crate::Result<TonicResult<TonicResponse<Self::Stream>>>> + Send;
}

impl Client for gaxi::grpc::Client {
type Stream = Streaming<BidiWriteObjectResponse>;
impl Client for GrpcClient {
type Stream = GrpcStream;
async fn start(
&self,
extensions: Extensions,
Expand Down
Loading