Remove experimental prefix

pull/2530/head
Craig Tiller 10 years ago
parent f08b067cdb
commit bf6abeef3d
  1. 5
      include/grpc++/channel_arguments.h
  2. 5
      include/grpc++/client_context.h
  3. 2
      src/cpp/client/channel_arguments.cc
  4. 2
      src/cpp/client/client_context.cc
  5. 2
      test/cpp/end2end/end2end_test.cc
  6. 2
      test/cpp/end2end/generic_end2end_test.cc

@ -57,11 +57,10 @@ class ChannelArguments {
// grpc specific channel argument setters // grpc specific channel argument setters
// Set target name override for SSL host name checking. // Set target name override for SSL host name checking.
void SetSslTargetNameOverride(const grpc::string& name); void SetSslTargetNameOverride(const grpc::string& name);
// TODO(yangg) add flow control options // TODO(yangg) add flow control optionsc
// Set the compression algorithm for the channel. // Set the compression algorithm for the channel.
void _Experimental_SetCompressionAlgorithm( void SetCompressionAlgorithm(grpc_compression_algorithm algorithm);
grpc_compression_algorithm algorithm);
// Generic channel argument setters. Only for advanced use cases. // Generic channel argument setters. Only for advanced use cases.
void SetInt(const grpc::string& key, int value); void SetInt(const grpc::string& key, int value);

@ -110,12 +110,11 @@ class ClientContext {
creds_ = creds; creds_ = creds;
} }
grpc_compression_algorithm _experimental_get_compression_algorithm() const { grpc_compression_algorithm get_compression_algorithm() const {
return compression_algorithm_; return compression_algorithm_;
} }
void _experimental_set_compression_algorithm( void set_compression_algorithm(grpc_compression_algorithm algorithm);
grpc_compression_algorithm algorithm);
std::shared_ptr<const AuthContext> auth_context() const; std::shared_ptr<const AuthContext> auth_context() const;

@ -37,7 +37,7 @@
namespace grpc { namespace grpc {
void ChannelArguments::_Experimental_SetCompressionAlgorithm( void ChannelArguments::SetCompressionAlgorithm(
grpc_compression_algorithm algorithm) { grpc_compression_algorithm algorithm) {
SetInt(GRPC_COMPRESSION_ALGORITHM_ARG, algorithm); SetInt(GRPC_COMPRESSION_ALGORITHM_ARG, algorithm);
} }

@ -79,7 +79,7 @@ void ClientContext::set_call(grpc_call* call,
} }
} }
void ClientContext::_experimental_set_compression_algorithm( void ClientContext::set_compression_algorithm(
grpc_compression_algorithm algorithm) { grpc_compression_algorithm algorithm) {
char* algorithm_name = NULL; char* algorithm_name = NULL;
if (!grpc_compression_algorithm_name(algorithm, &algorithm_name)) { if (!grpc_compression_algorithm_name(algorithm, &algorithm_name)) {

@ -273,7 +273,7 @@ static void SendRpc(grpc::cpp::test::util::TestService::Stub* stub,
for (int i = 0; i < num_rpcs; ++i) { for (int i = 0; i < num_rpcs; ++i) {
ClientContext context; ClientContext context;
context._experimental_set_compression_algorithm(GRPC_COMPRESS_GZIP); context.set_compression_algorithm(GRPC_COMPRESS_GZIP);
Status s = stub->Echo(&context, request, &response); Status s = stub->Echo(&context, request, &response);
EXPECT_EQ(response.message(), request.message()); EXPECT_EQ(response.message(), request.message());
EXPECT_TRUE(s.ok()); EXPECT_TRUE(s.ok());

@ -227,7 +227,7 @@ TEST_F(GenericEnd2endTest, SimpleBidiStreaming) {
GenericServerContext srv_ctx; GenericServerContext srv_ctx;
GenericServerAsyncReaderWriter srv_stream(&srv_ctx); GenericServerAsyncReaderWriter srv_stream(&srv_ctx);
cli_ctx._experimental_set_compression_algorithm(GRPC_COMPRESS_GZIP); cli_ctx.set_compression_algorithm(GRPC_COMPRESS_GZIP);
send_request.set_message("Hello"); send_request.set_message("Hello");
std::unique_ptr<GenericClientAsyncReaderWriter> cli_stream = std::unique_ptr<GenericClientAsyncReaderWriter> cli_stream =
generic_stub_->Call(&cli_ctx, kMethodName, &cli_cq_, tag(1)); generic_stub_->Call(&cli_ctx, kMethodName, &cli_cq_, tag(1));

Loading…
Cancel
Save