diff options
| author |  Muxi Yan <mxyan@google.com> | 2017-12-11 15:53:22 -0800 |
|---|---|---|
| committer | Muxi Yan <mxyan@google.com> | 2017-12-11 15:53:22 -0800 |
| commit | c870ce5476c86fc2fb090524b258ad9c9b987f00 (patch) | |
| tree | d1c710b221220a788a3e8c15f1cbfdd9be1b157f | |
| parent | 99024d64367b62c98f03dda5c800c7418bcbf123 (diff) | |
More message compression level clean-up
| -rw-r--r-- | src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi | 9 | ||||
| -rw-r--r-- | src/python/grpcio/grpc/_cython/_cygrpc/records.pyx.pxi | 6 | ||||
| -rw-r--r-- | test/cpp/interop/interop_server.cc | 4 |
3 files changed, 8 insertions, 11 deletions
diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi index 9c4c5f2215..2c78fbca68 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi @@ -545,12 +545,9 @@ cdef extern from "grpc/compression.h": ctypedef enum grpc_compression_level: GRPC_COMPRESS_LEVEL_NONE - GRPC_COMPRESS_LEVEL_MESSAGE_LOW - GRPC_COMPRESS_LEVEL_MESSAGE_MED - GRPC_COMPRESS_LEVEL_MESSAGE_HIGH - GRPC_COMPRESS_LEVEL_STREAM_LOW - GRPC_COMPRESS_LEVEL_STREAM_MED - GRPC_COMPRESS_LEVEL_STREAM_HIGH + GRPC_COMPRESS_LEVEL_LOW + GRPC_COMPRESS_LEVEL_MED + GRPC_COMPRESS_LEVEL_HIGH GRPC_COMPRESS_LEVEL_COUNT ctypedef struct grpc_compression_options: diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/records.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/records.pyx.pxi index f9b5f502e4..e92953b45f 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/records.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/records.pyx.pxi @@ -118,9 +118,9 @@ class CompressionAlgorithm: class CompressionLevel: none = GRPC_COMPRESS_LEVEL_NONE - low = GRPC_COMPRESS_LEVEL_MESSAGE_LOW - medium = GRPC_COMPRESS_LEVEL_MESSAGE_MED - high = GRPC_COMPRESS_LEVEL_MESSAGE_HIGH + low = GRPC_COMPRESS_LEVEL_LOW + medium = GRPC_COMPRESS_LEVEL_MED + high = GRPC_COMPRESS_LEVEL_HIGH cdef class Timespec: diff --git a/test/cpp/interop/interop_server.cc b/test/cpp/interop/interop_server.cc index dc50ffc5b0..30bd8bfef8 100644 --- a/test/cpp/interop/interop_server.cc +++ b/test/cpp/interop/interop_server.cc @@ -163,7 +163,7 @@ class TestServiceImpl : public TestService::Service { compression_requested ? "enabled" : "disabled", __func__); if (compression_requested) { // Any level would do, let's go for HIGH because we are overachievers. - context->set_compression_level(GRPC_COMPRESS_LEVEL_MESSAGE_HIGH); + context->set_compression_level(GRPC_COMPRESS_LEVEL_HIGH); } else { context->set_compression_level(GRPC_COMPRESS_LEVEL_NONE); } @@ -204,7 +204,7 @@ class TestServiceImpl : public TestService::Service { WriteOptions wopts; if (request->response_parameters(i).has_compressed()) { // Compress by default. Disabled on a per-message basis. - context->set_compression_level(GRPC_COMPRESS_LEVEL_MESSAGE_HIGH); + context->set_compression_level(GRPC_COMPRESS_LEVEL_HIGH); const bool compression_requested = request->response_parameters(i).compressed().value(); gpr_log(GPR_DEBUG, "Request for compression (%s) present for %s", |