Fix C++ builds

include/grpc++/impl/codegen/call.h

@@ -212,14 +212,12 @@ class CallOpSendInitialMetadata {
  public:
   CallOpSendInitialMetadata() : send_(false) {
     maybe_compression_level_.is_set = false;
-    maybe_stream_compression_level_.is_set = false;
   }
 
   void SendInitialMetadata(
       const std::multimap<grpc::string, grpc::string>& metadata,
       uint32_t flags) {
     maybe_compression_level_.is_set = false;
-    maybe_stream_compression_level_.is_set = false;
     send_ = true;
     flags_ = flags;
     initial_metadata_ =
@@ -231,11 +229,6 @@ class CallOpSendInitialMetadata {
     maybe_compression_level_.level = level;
   }
 
-  void set_stream_compression_level(grpc_stream_compression_level level) {
-    maybe_stream_compression_level_.is_set = true;
-    maybe_stream_compression_level_.level = level;
-  }
-
  protected:
   void AddOp(grpc_op* ops, size_t* nops) {
     if (!send_) return;
@@ -251,12 +244,6 @@ class CallOpSendInitialMetadata {
       op->data.send_initial_metadata.maybe_compression_level.level =
           maybe_compression_level_.level;
     }
-    op->data.send_initial_metadata.maybe_stream_compression_level.is_set =
-        maybe_stream_compression_level_.is_set;
-    if (maybe_stream_compression_level_.is_set) {
-      op->data.send_initial_metadata.maybe_stream_compression_level.level =
-          maybe_stream_compression_level_.level;
-    }
   }
   void FinishOp(bool* status) {
     if (!send_) return;
@@ -272,10 +259,6 @@ class CallOpSendInitialMetadata {
     bool is_set;
     grpc_compression_level level;
   } maybe_compression_level_;
-  struct {
-    bool is_set;
-    grpc_stream_compression_level level;
-  } maybe_stream_compression_level_;
 };
 
 class CallOpSendMessage {

test/cpp/end2end/end2end_test.cc

@@ -345,7 +345,7 @@ static void SendRpc(grpc::testing::EchoTestService::Stub* stub, int num_rpcs,
       char bytes[8] = {'\0', '\1', '\2', '\3', '\4', '\5', '\6', (char)i};
       context.AddMetadata("custom-bin", grpc::string(bytes, 8));
     }
-    context.set_compression_algorithm(GRPC_COMPRESS_GZIP);
+    context.set_compression_algorithm(GRPC_COMPRESS_MESSAGE_GZIP);
     Status s = stub->Echo(&context, request, &response);
     EXPECT_EQ(response.message(), request.message());
     EXPECT_TRUE(s.ok());

test/cpp/end2end/filter_end2end_test.cc

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

test/cpp/end2end/generic_end2end_test.cc

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

test/cpp/end2end/server_builder_plugin_test.cc

@@ -251,7 +251,7 @@ TEST_P(ServerBuilderPluginTest, PluginWithServiceTest) {
   EchoResponse response;
   request.set_message("Hello hello hello hello");
   ClientContext context;
-  context.set_compression_algorithm(GRPC_COMPRESS_GZIP);
+  context.set_compression_algorithm(GRPC_COMPRESS_MESSAGE_GZIP);
   Status s = stub_->Echo(&context, request, &response);
   EXPECT_EQ(response.message(), request.message());
   EXPECT_TRUE(s.ok());

test/cpp/interop/interop_client.cc

@@ -184,7 +184,7 @@ bool InteropClient::PerformLargeUnary(SimpleRequest* request,
   request->mutable_payload()->set_body(payload.c_str(), kLargeRequestSize);
   if (request->has_expect_compressed()) {
     if (request->expect_compressed().value()) {
-      context.set_compression_algorithm(GRPC_COMPRESS_GZIP);
+      context.set_compression_algorithm(GRPC_COMPRESS_MESSAGE_GZIP);
     } else {
       context.set_compression_algorithm(GRPC_COMPRESS_NONE);
     }
@@ -492,7 +492,7 @@ bool InteropClient::DoClientCompressedStreaming() {
   StreamingInputCallRequest request;
   StreamingInputCallResponse response;
 
-  context.set_compression_algorithm(GRPC_COMPRESS_GZIP);
+  context.set_compression_algorithm(GRPC_COMPRESS_MESSAGE_GZIP);
   std::unique_ptr<ClientWriter<StreamingInputCallRequest>> stream(
       serviceStub_.Get()->StreamingInputCall(&context, &response));
 

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_HIGH);
+        context->set_compression_level(GRPC_COMPRESS_LEVEL_MESSAGE_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_HIGH);
+        context->set_compression_level(GRPC_COMPRESS_LEVEL_MESSAGE_HIGH);
         const bool compression_requested =
             request->response_parameters(i).compressed().value();
         gpr_log(GPR_DEBUG, "Request for compression (%s) present for %s",