diff options
| author |  Vijay Pai <vpai@google.com> | 2018-02-04 23:39:07 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-02-04 23:39:07 -0800 |
| commit | 73a50abd1d675acba4bdbde3af8ca0077654de79 (patch) | |
| tree | b07d622ea96677909829d23f25ad5df33cca0994 | |
| parent | d934602beb34d41d3c02a507db71adb31dda7893 (diff) | |
| parent | a21ab2ba29bd5f84c861476871cf811131449ec8 (diff) | |
Merge pull request #14286 from dgquintas/fix_compresion_alg_accessors
Fix compression algorithm accessors
| -rw-r--r-- | include/grpc++/impl/codegen/client_context.h | 4 | ||||
| -rw-r--r-- | include/grpc++/impl/codegen/server_context.h | 5 | ||||
| -rw-r--r-- | src/cpp/client/client_context.cc | 1 | ||||
| -rw-r--r-- | src/cpp/server/server_context.cc | 1 |
4 files changed, 9 insertions, 2 deletions
diff --git a/include/grpc++/impl/codegen/client_context.h b/include/grpc++/impl/codegen/client_context.h index 61d97ce818..ff6b107452 100644 --- a/include/grpc++/impl/codegen/client_context.h +++ b/include/grpc++/impl/codegen/client_context.h @@ -289,7 +289,9 @@ class ClientContext { creds_ = creds; } - /// Return the compression algorithm to be used by the client call. + /// Return the compression algorithm the client call will request be used. + /// Note that the gRPC runtime may decide to ignore this request, for example, + /// due to resource constraints. grpc_compression_algorithm compression_algorithm() const { return compression_algorithm_; } diff --git a/include/grpc++/impl/codegen/server_context.h b/include/grpc++/impl/codegen/server_context.h index a2d6967bf8..c36975860e 100644 --- a/include/grpc++/impl/codegen/server_context.h +++ b/include/grpc++/impl/codegen/server_context.h @@ -185,7 +185,10 @@ class ServerContext { /// \a set_compression_level. bool compression_level_set() const { return compression_level_set_; } - /// Return the compression algorithm to be used by the server call. + /// Return the compression algorithm the server call will request be used. + /// Note that the gRPC runtime may decide to ignore this request, for example, + /// due to resource constraints, or if the server is aware the client doesn't + /// support the requested algorithm. grpc_compression_algorithm compression_algorithm() const { return compression_algorithm_; } diff --git a/src/cpp/client/client_context.cc b/src/cpp/client/client_context.cc index dafa8081e9..5c90838440 100644 --- a/src/cpp/client/client_context.cc +++ b/src/cpp/client/client_context.cc @@ -96,6 +96,7 @@ void ClientContext::set_call(grpc_call* call, void ClientContext::set_compression_algorithm( grpc_compression_algorithm algorithm) { + compression_algorithm_ = algorithm; const char* algorithm_name = nullptr; if (!grpc_compression_algorithm_name(algorithm, &algorithm_name)) { gpr_log(GPR_ERROR, "Name for compression algorithm '%d' unknown.", diff --git a/src/cpp/server/server_context.cc b/src/cpp/server/server_context.cc index f0cbbdb86d..878be1c4b6 100644 --- a/src/cpp/server/server_context.cc +++ b/src/cpp/server/server_context.cc @@ -190,6 +190,7 @@ bool ServerContext::IsCancelled() const { void ServerContext::set_compression_algorithm( grpc_compression_algorithm algorithm) { + compression_algorithm_ = algorithm; const char* algorithm_name = nullptr; if (!grpc_compression_algorithm_name(algorithm, &algorithm_name)) { gpr_log(GPR_ERROR, "Name for compression algorithm '%d' unknown.", |