Fold GenericStub from grpc_impl to grpc

pull/18434/head
Karthik Ravi Shankar 6 years ago
parent 0eca1b1031
commit 526bf39f89
  1. 1
      BUILD
  2. 3
      CMakeLists.txt
  3. 3
      Makefile
  4. 1
      build.yaml
  5. 1
      gRPC-C++.podspec
  6. 73
      include/grpcpp/generic/generic_stub.h
  7. 103
      include/grpcpp/generic/generic_stub_impl.h
  8. 76
      src/cpp/client/generic_stub.cc
  9. 1
      tools/doxygen/Doxyfile.c++
  10. 1
      tools/doxygen/Doxyfile.c++.internal
  11. 2
      tools/run_tests/generated/sources_and_headers.json

@ -223,6 +223,7 @@ GRPCXX_PUBLIC_HDRS = [
"include/grpcpp/ext/health_check_service_server_builder_option.h", "include/grpcpp/ext/health_check_service_server_builder_option.h",
"include/grpcpp/generic/async_generic_service.h", "include/grpcpp/generic/async_generic_service.h",
"include/grpcpp/generic/generic_stub.h", "include/grpcpp/generic/generic_stub.h",
"include/grpcpp/generic/generic_stub_impl.h",
"include/grpcpp/grpcpp.h", "include/grpcpp/grpcpp.h",
"include/grpcpp/health_check_service_interface.h", "include/grpcpp/health_check_service_interface.h",
"include/grpcpp/impl/call.h", "include/grpcpp/impl/call.h",

@ -3003,6 +3003,7 @@ foreach(_hdr
include/grpcpp/ext/health_check_service_server_builder_option.h include/grpcpp/ext/health_check_service_server_builder_option.h
include/grpcpp/generic/async_generic_service.h include/grpcpp/generic/async_generic_service.h
include/grpcpp/generic/generic_stub.h include/grpcpp/generic/generic_stub.h
include/grpcpp/generic/generic_stub_impl.h
include/grpcpp/grpcpp.h include/grpcpp/grpcpp.h
include/grpcpp/health_check_service_interface.h include/grpcpp/health_check_service_interface.h
include/grpcpp/impl/call.h include/grpcpp/impl/call.h
@ -3593,6 +3594,7 @@ foreach(_hdr
include/grpcpp/ext/health_check_service_server_builder_option.h include/grpcpp/ext/health_check_service_server_builder_option.h
include/grpcpp/generic/async_generic_service.h include/grpcpp/generic/async_generic_service.h
include/grpcpp/generic/generic_stub.h include/grpcpp/generic/generic_stub.h
include/grpcpp/generic/generic_stub_impl.h
include/grpcpp/grpcpp.h include/grpcpp/grpcpp.h
include/grpcpp/health_check_service_interface.h include/grpcpp/health_check_service_interface.h
include/grpcpp/impl/call.h include/grpcpp/impl/call.h
@ -4552,6 +4554,7 @@ foreach(_hdr
include/grpcpp/ext/health_check_service_server_builder_option.h include/grpcpp/ext/health_check_service_server_builder_option.h
include/grpcpp/generic/async_generic_service.h include/grpcpp/generic/async_generic_service.h
include/grpcpp/generic/generic_stub.h include/grpcpp/generic/generic_stub.h
include/grpcpp/generic/generic_stub_impl.h
include/grpcpp/grpcpp.h include/grpcpp/grpcpp.h
include/grpcpp/health_check_service_interface.h include/grpcpp/health_check_service_interface.h
include/grpcpp/impl/call.h include/grpcpp/impl/call.h

@ -5428,6 +5428,7 @@ PUBLIC_HEADERS_CXX += \
include/grpcpp/ext/health_check_service_server_builder_option.h \ include/grpcpp/ext/health_check_service_server_builder_option.h \
include/grpcpp/generic/async_generic_service.h \ include/grpcpp/generic/async_generic_service.h \
include/grpcpp/generic/generic_stub.h \ include/grpcpp/generic/generic_stub.h \
include/grpcpp/generic/generic_stub_impl.h \
include/grpcpp/grpcpp.h \ include/grpcpp/grpcpp.h \
include/grpcpp/health_check_service_interface.h \ include/grpcpp/health_check_service_interface.h \
include/grpcpp/impl/call.h \ include/grpcpp/impl/call.h \
@ -6027,6 +6028,7 @@ PUBLIC_HEADERS_CXX += \
include/grpcpp/ext/health_check_service_server_builder_option.h \ include/grpcpp/ext/health_check_service_server_builder_option.h \
include/grpcpp/generic/async_generic_service.h \ include/grpcpp/generic/async_generic_service.h \
include/grpcpp/generic/generic_stub.h \ include/grpcpp/generic/generic_stub.h \
include/grpcpp/generic/generic_stub_impl.h \
include/grpcpp/grpcpp.h \ include/grpcpp/grpcpp.h \
include/grpcpp/health_check_service_interface.h \ include/grpcpp/health_check_service_interface.h \
include/grpcpp/impl/call.h \ include/grpcpp/impl/call.h \
@ -6939,6 +6941,7 @@ PUBLIC_HEADERS_CXX += \
include/grpcpp/ext/health_check_service_server_builder_option.h \ include/grpcpp/ext/health_check_service_server_builder_option.h \
include/grpcpp/generic/async_generic_service.h \ include/grpcpp/generic/async_generic_service.h \
include/grpcpp/generic/generic_stub.h \ include/grpcpp/generic/generic_stub.h \
include/grpcpp/generic/generic_stub_impl.h \
include/grpcpp/grpcpp.h \ include/grpcpp/grpcpp.h \
include/grpcpp/health_check_service_interface.h \ include/grpcpp/health_check_service_interface.h \
include/grpcpp/impl/call.h \ include/grpcpp/impl/call.h \

@ -1348,6 +1348,7 @@ filegroups:
- include/grpcpp/ext/health_check_service_server_builder_option.h - include/grpcpp/ext/health_check_service_server_builder_option.h
- include/grpcpp/generic/async_generic_service.h - include/grpcpp/generic/async_generic_service.h
- include/grpcpp/generic/generic_stub.h - include/grpcpp/generic/generic_stub.h
- include/grpcpp/generic/generic_stub_impl.h
- include/grpcpp/grpcpp.h - include/grpcpp/grpcpp.h
- include/grpcpp/health_check_service_interface.h - include/grpcpp/health_check_service_interface.h
- include/grpcpp/impl/call.h - include/grpcpp/impl/call.h

@ -89,6 +89,7 @@ Pod::Spec.new do |s|
'include/grpcpp/ext/health_check_service_server_builder_option.h', 'include/grpcpp/ext/health_check_service_server_builder_option.h',
'include/grpcpp/generic/async_generic_service.h', 'include/grpcpp/generic/async_generic_service.h',
'include/grpcpp/generic/generic_stub.h', 'include/grpcpp/generic/generic_stub.h',
'include/grpcpp/generic/generic_stub_impl.h',
'include/grpcpp/grpcpp.h', 'include/grpcpp/grpcpp.h',
'include/grpcpp/health_check_service_interface.h', 'include/grpcpp/health_check_service_interface.h',
'include/grpcpp/impl/call.h', 'include/grpcpp/impl/call.h',

@ -19,80 +19,11 @@
#ifndef GRPCPP_GENERIC_GENERIC_STUB_H #ifndef GRPCPP_GENERIC_GENERIC_STUB_H
#define GRPCPP_GENERIC_GENERIC_STUB_H #define GRPCPP_GENERIC_GENERIC_STUB_H
#include <functional> #include <grpcpp/generic/generic_stub_impl.h>
#include <grpcpp/support/async_stream.h>
#include <grpcpp/support/async_unary_call.h>
#include <grpcpp/support/byte_buffer.h>
#include <grpcpp/support/client_callback.h>
#include <grpcpp/support/status.h>
namespace grpc { namespace grpc {
class CompletionQueue; typedef ::grpc_impl::GenericStub GenericStub;
typedef ClientAsyncReaderWriter<ByteBuffer, ByteBuffer>
GenericClientAsyncReaderWriter;
typedef ClientAsyncResponseReader<ByteBuffer> GenericClientAsyncResponseReader;
/// Generic stubs provide a type-unsafe interface to call gRPC methods
/// by name.
class GenericStub final {
public:
explicit GenericStub(std::shared_ptr<ChannelInterface> channel)
: channel_(channel) {}
/// Setup a call to a named method \a method using \a context, but don't
/// start it. Let it be started explicitly with StartCall and a tag.
/// The return value only indicates whether or not registration of the call
/// succeeded (i.e. the call won't proceed if the return value is nullptr).
std::unique_ptr<GenericClientAsyncReaderWriter> PrepareCall(
ClientContext* context, const grpc::string& method, CompletionQueue* cq);
/// Setup a unary call to a named method \a method using \a context, and don't
/// start it. Let it be started explicitly with StartCall.
/// The return value only indicates whether or not registration of the call
/// succeeded (i.e. the call won't proceed if the return value is nullptr).
std::unique_ptr<GenericClientAsyncResponseReader> PrepareUnaryCall(
ClientContext* context, const grpc::string& method,
const ByteBuffer& request, CompletionQueue* cq);
/// DEPRECATED for multi-threaded use
/// Begin a call to a named method \a method using \a context.
/// A tag \a tag will be delivered to \a cq when the call has been started
/// (i.e, initial metadata has been sent).
/// The return value only indicates whether or not registration of the call
/// succeeded (i.e. the call won't proceed if the return value is nullptr).
std::unique_ptr<GenericClientAsyncReaderWriter> Call(
ClientContext* context, const grpc::string& method, CompletionQueue* cq,
void* tag);
/// NOTE: class experimental_type is not part of the public API of this class
/// TODO(vjpai): Move these contents to the public API of GenericStub when
/// they are no longer experimental
class experimental_type {
public:
explicit experimental_type(GenericStub* stub) : stub_(stub) {}
void UnaryCall(ClientContext* context, const grpc::string& method,
const ByteBuffer* request, ByteBuffer* response,
std::function<void(Status)> on_completion);
void PrepareBidiStreamingCall(
ClientContext* context, const grpc::string& method,
experimental::ClientBidiReactor<ByteBuffer, ByteBuffer>* reactor);
private:
GenericStub* stub_;
};
/// NOTE: The function experimental() is not stable public API. It is a view
/// to the experimental components of this class. It may be changed or removed
/// at any time.
experimental_type experimental() { return experimental_type(this); }
private:
std::shared_ptr<ChannelInterface> channel_;
};
} // namespace grpc } // namespace grpc

@ -0,0 +1,103 @@
/*
*
* Copyright 2015 gRPC authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
#ifndef GRPCPP_GENERIC_GENERIC_STUB_IMPL_H
#define GRPCPP_GENERIC_GENERIC_STUB_IMPL_H
#include <functional>
#include <grpcpp/support/async_stream.h>
#include <grpcpp/support/async_unary_call.h>
#include <grpcpp/support/byte_buffer.h>
#include <grpcpp/support/client_callback.h>
#include <grpcpp/support/status.h>
namespace grpc {
class CompletionQueue;
typedef ClientAsyncReaderWriter<ByteBuffer, ByteBuffer>
GenericClientAsyncReaderWriter;
typedef ClientAsyncResponseReader<ByteBuffer> GenericClientAsyncResponseReader;
} // namespace grpc
namespace grpc_impl {
/// Generic stubs provide a type-unsafe interface to call gRPC methods
/// by name.
class GenericStub final {
public:
explicit GenericStub(std::shared_ptr<grpc::ChannelInterface> channel)
: channel_(channel) {}
/// Setup a call to a named method \a method using \a context, but don't
/// start it. Let it be started explicitly with StartCall and a tag.
/// The return value only indicates whether or not registration of the call
/// succeeded (i.e. the call won't proceed if the return value is nullptr).
std::unique_ptr<grpc::GenericClientAsyncReaderWriter> PrepareCall(
grpc::ClientContext* context, const grpc::string& method,
grpc::CompletionQueue* cq);
/// Setup a unary call to a named method \a method using \a context, and don't
/// start it. Let it be started explicitly with StartCall.
/// The return value only indicates whether or not registration of the call
/// succeeded (i.e. the call won't proceed if the return value is nullptr).
std::unique_ptr<grpc::GenericClientAsyncResponseReader> PrepareUnaryCall(
grpc::ClientContext* context, const grpc::string& method,
const grpc::ByteBuffer& request, grpc::CompletionQueue* cq);
/// DEPRECATED for multi-threaded use
/// Begin a call to a named method \a method using \a context.
/// A tag \a tag will be delivered to \a cq when the call has been started
/// (i.e, initial metadata has been sent).
/// The return value only indicates whether or not registration of the call
/// succeeded (i.e. the call won't proceed if the return value is nullptr).
std::unique_ptr<grpc::GenericClientAsyncReaderWriter> Call(
grpc::ClientContext* context, const grpc::string& method,
grpc::CompletionQueue* cq, void* tag);
/// NOTE: class experimental_type is not part of the public API of this class
/// TODO(vjpai): Move these contents to the public API of GenericStub when
/// they are no longer experimental
class experimental_type {
public:
explicit experimental_type(GenericStub* stub) : stub_(stub) {}
void UnaryCall(grpc::ClientContext* context, const grpc::string& method,
const grpc::ByteBuffer* request, grpc::ByteBuffer* response,
std::function<void(grpc::Status)> on_completion);
void PrepareBidiStreamingCall(
grpc::ClientContext* context, const grpc::string& method,
grpc::experimental::ClientBidiReactor<grpc::ByteBuffer,
grpc::ByteBuffer>* reactor);
private:
GenericStub* stub_;
};
/// NOTE: The function experimental() is not stable public API. It is a view
/// to the experimental components of this class. It may be changed or removed
/// at any time.
experimental_type experimental() { return experimental_type(this); }
private:
std::shared_ptr<grpc::ChannelInterface> channel_;
};
} // namespace grpc_impl
#endif // GRPCPP_GENERIC_GENERIC_STUB_IMPL_H

@ -22,63 +22,75 @@
#include <grpcpp/impl/rpc_method.h> #include <grpcpp/impl/rpc_method.h>
#include <grpcpp/support/client_callback.h> #include <grpcpp/support/client_callback.h>
namespace grpc { namespace grpc_impl {
namespace { namespace {
std::unique_ptr<GenericClientAsyncReaderWriter> CallInternal( std::unique_ptr<grpc::GenericClientAsyncReaderWriter> CallInternal(
ChannelInterface* channel, ClientContext* context, grpc::ChannelInterface* channel, grpc::ClientContext* context,
const grpc::string& method, CompletionQueue* cq, bool start, void* tag) { const grpc::string& method, grpc::CompletionQueue* cq, bool start,
return std::unique_ptr<GenericClientAsyncReaderWriter>( void* tag) {
internal::ClientAsyncReaderWriterFactory<ByteBuffer, ByteBuffer>::Create( return std::unique_ptr<grpc::GenericClientAsyncReaderWriter>(
channel, cq, grpc::internal::ClientAsyncReaderWriterFactory<grpc::ByteBuffer,
internal::RpcMethod(method.c_str(), grpc::ByteBuffer>::
internal::RpcMethod::BIDI_STREAMING), Create(channel, cq,
grpc::internal::RpcMethod(
method.c_str(), grpc::internal::RpcMethod::BIDI_STREAMING),
context, start, tag)); context, start, tag));
} }
} // namespace } // namespace
// begin a call to a named method // begin a call to a named method
std::unique_ptr<GenericClientAsyncReaderWriter> GenericStub::Call( std::unique_ptr<grpc::GenericClientAsyncReaderWriter> GenericStub::Call(
ClientContext* context, const grpc::string& method, CompletionQueue* cq, grpc::ClientContext* context, const grpc::string& method,
void* tag) { grpc::CompletionQueue* cq, void* tag) {
return CallInternal(channel_.get(), context, method, cq, true, tag); return CallInternal(channel_.get(), context, method, cq, true, tag);
} }
// setup a call to a named method // setup a call to a named method
std::unique_ptr<GenericClientAsyncReaderWriter> GenericStub::PrepareCall( std::unique_ptr<grpc::GenericClientAsyncReaderWriter> GenericStub::PrepareCall(
ClientContext* context, const grpc::string& method, CompletionQueue* cq) { grpc::ClientContext* context, const grpc::string& method,
grpc::CompletionQueue* cq) {
return CallInternal(channel_.get(), context, method, cq, false, nullptr); return CallInternal(channel_.get(), context, method, cq, false, nullptr);
} }
// setup a unary call to a named method // setup a unary call to a named method
std::unique_ptr<GenericClientAsyncResponseReader> GenericStub::PrepareUnaryCall( std::unique_ptr<grpc::GenericClientAsyncResponseReader>
ClientContext* context, const grpc::string& method, GenericStub::PrepareUnaryCall(grpc::ClientContext* context,
const ByteBuffer& request, CompletionQueue* cq) { const grpc::string& method,
return std::unique_ptr<GenericClientAsyncResponseReader>( const grpc::ByteBuffer& request,
internal::ClientAsyncResponseReaderFactory<ByteBuffer>::Create( grpc::CompletionQueue* cq) {
channel_.get(), cq, return std::unique_ptr<grpc::GenericClientAsyncResponseReader>(
internal::RpcMethod(method.c_str(), internal::RpcMethod::NORMAL_RPC), grpc::internal::ClientAsyncResponseReaderFactory<
grpc::ByteBuffer>::Create(channel_.get(), cq,
grpc::internal::RpcMethod(
method.c_str(),
grpc::internal::RpcMethod::NORMAL_RPC),
context, request, false)); context, request, false));
} }
void GenericStub::experimental_type::UnaryCall( void GenericStub::experimental_type::UnaryCall(
ClientContext* context, const grpc::string& method, grpc::ClientContext* context, const grpc::string& method,
const ByteBuffer* request, ByteBuffer* response, const grpc::ByteBuffer* request, grpc::ByteBuffer* response,
std::function<void(Status)> on_completion) { std::function<void(grpc::Status)> on_completion) {
internal::CallbackUnaryCall( grpc::internal::CallbackUnaryCall(
stub_->channel_.get(), stub_->channel_.get(),
internal::RpcMethod(method.c_str(), internal::RpcMethod::NORMAL_RPC), grpc::internal::RpcMethod(method.c_str(),
grpc::internal::RpcMethod::NORMAL_RPC),
context, request, response, std::move(on_completion)); context, request, response, std::move(on_completion));
} }
void GenericStub::experimental_type::PrepareBidiStreamingCall( void GenericStub::experimental_type::PrepareBidiStreamingCall(
ClientContext* context, const grpc::string& method, grpc::ClientContext* context, const grpc::string& method,
experimental::ClientBidiReactor<ByteBuffer, ByteBuffer>* reactor) { grpc::experimental::ClientBidiReactor<grpc::ByteBuffer, grpc::ByteBuffer>*
internal::ClientCallbackReaderWriterFactory<ByteBuffer, ByteBuffer>::Create( reactor) {
stub_->channel_.get(), grpc::internal::ClientCallbackReaderWriterFactory<
internal::RpcMethod(method.c_str(), internal::RpcMethod::BIDI_STREAMING), grpc::ByteBuffer,
grpc::ByteBuffer>::Create(stub_->channel_.get(),
grpc::internal::RpcMethod(
method.c_str(),
grpc::internal::RpcMethod::BIDI_STREAMING),
context, reactor); context, reactor);
} }
} // namespace grpc } // namespace grpc_impl

@ -934,6 +934,7 @@ include/grpcpp/create_channel_posix.h \
include/grpcpp/ext/health_check_service_server_builder_option.h \ include/grpcpp/ext/health_check_service_server_builder_option.h \
include/grpcpp/generic/async_generic_service.h \ include/grpcpp/generic/async_generic_service.h \
include/grpcpp/generic/generic_stub.h \ include/grpcpp/generic/generic_stub.h \
include/grpcpp/generic/generic_stub_impl.h \
include/grpcpp/grpcpp.h \ include/grpcpp/grpcpp.h \
include/grpcpp/health_check_service_interface.h \ include/grpcpp/health_check_service_interface.h \
include/grpcpp/impl/call.h \ include/grpcpp/impl/call.h \

@ -935,6 +935,7 @@ include/grpcpp/create_channel_posix.h \
include/grpcpp/ext/health_check_service_server_builder_option.h \ include/grpcpp/ext/health_check_service_server_builder_option.h \
include/grpcpp/generic/async_generic_service.h \ include/grpcpp/generic/async_generic_service.h \
include/grpcpp/generic/generic_stub.h \ include/grpcpp/generic/generic_stub.h \
include/grpcpp/generic/generic_stub_impl.h \
include/grpcpp/grpcpp.h \ include/grpcpp/grpcpp.h \
include/grpcpp/health_check_service_interface.h \ include/grpcpp/health_check_service_interface.h \
include/grpcpp/impl/call.h \ include/grpcpp/impl/call.h \

@ -11418,6 +11418,7 @@
"include/grpcpp/ext/health_check_service_server_builder_option.h", "include/grpcpp/ext/health_check_service_server_builder_option.h",
"include/grpcpp/generic/async_generic_service.h", "include/grpcpp/generic/async_generic_service.h",
"include/grpcpp/generic/generic_stub.h", "include/grpcpp/generic/generic_stub.h",
"include/grpcpp/generic/generic_stub_impl.h",
"include/grpcpp/grpcpp.h", "include/grpcpp/grpcpp.h",
"include/grpcpp/health_check_service_interface.h", "include/grpcpp/health_check_service_interface.h",
"include/grpcpp/impl/call.h", "include/grpcpp/impl/call.h",
@ -11527,6 +11528,7 @@
"include/grpcpp/ext/health_check_service_server_builder_option.h", "include/grpcpp/ext/health_check_service_server_builder_option.h",
"include/grpcpp/generic/async_generic_service.h", "include/grpcpp/generic/async_generic_service.h",
"include/grpcpp/generic/generic_stub.h", "include/grpcpp/generic/generic_stub.h",
"include/grpcpp/generic/generic_stub_impl.h",
"include/grpcpp/grpcpp.h", "include/grpcpp/grpcpp.h",
"include/grpcpp/health_check_service_interface.h", "include/grpcpp/health_check_service_interface.h",
"include/grpcpp/impl/call.h", "include/grpcpp/impl/call.h",

Loading…
Cancel
Save