grpc 1.43.1 → 1.44.0.pre2

data/src/core/ext/filters/http/client/http_client_filter.cc

@@ -39,7 +39,6 @@
 #include "src/core/lib/slice/percent_encoding.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/slice/slice_string_helpers.h"
-#include "src/core/lib/transport/static_metadata.h"
 #include "src/core/lib/transport/status_conversion.h"
 #include "src/core/lib/transport/transport_impl.h"
 
@@ -75,10 +74,6 @@ struct call_data {
   ~call_data() { GRPC_ERROR_UNREF(recv_initial_metadata_error); }
 
   grpc_core::CallCombiner* call_combiner;
-  // State for handling send_initial_metadata ops.
-  grpc_linked_mdelem method;
-  grpc_linked_mdelem scheme;
-  grpc_linked_mdelem content_type;
   // State for handling recv_initial_metadata ops.
   grpc_metadata_batch* recv_initial_metadata;
   grpc_error_handle recv_initial_metadata_error = GRPC_ERROR_NONE;
@@ -102,7 +97,7 @@ struct call_data {
 };
 
 struct channel_data {
-  grpc_mdelem static_scheme;
+  grpc_core::HttpSchemeMetadata::ValueType static_scheme;
   grpc_core::Slice user_agent;
   size_t max_payload_size_for_get;
 };
@@ -110,30 +105,27 @@ struct channel_data {
 
 static grpc_error_handle client_filter_incoming_metadata(
     grpc_metadata_batch* b) {
-  if (b->legacy_index()->named.status != nullptr) {
+  if (auto* status = b->get_pointer(grpc_core::HttpStatusMetadata())) {
     /* If both gRPC status and HTTP status are provided in the response, we
      * should prefer the gRPC status code, as mentioned in
      * https://github.com/grpc/grpc/blob/master/doc/http-grpc-status-mapping.md.
      */
-    if (b->legacy_index()->named.grpc_status != nullptr ||
-        grpc_mdelem_static_value_eq(b->legacy_index()->named.status->md,
-                                    GRPC_MDELEM_STATUS_200)) {
-      b->Remove(GRPC_BATCH_STATUS);
+    const grpc_status_code* grpc_status =
+        b->get_pointer(grpc_core::GrpcStatusMetadata());
+    if (grpc_status != nullptr || *status == 200) {
+      b->Remove(grpc_core::HttpStatusMetadata());
     } else {
-      char* val = grpc_dump_slice(
-          GRPC_MDVALUE(b->legacy_index()->named.status->md), GPR_DUMP_ASCII);
       std::string msg =
-          absl::StrCat("Received http2 header with status: ", val);
+          absl::StrCat("Received http2 header with status: ", *status);
       grpc_error_handle e = grpc_error_set_str(
           grpc_error_set_int(
               grpc_error_set_str(
                   GRPC_ERROR_CREATE_FROM_STATIC_STRING(
                       "Received http2 :status header with non-200 OK status"),
-                  GRPC_ERROR_STR_VALUE, val),
+                  GRPC_ERROR_STR_VALUE, std::to_string(*status)),
               GRPC_ERROR_INT_GRPC_STATUS,
-              grpc_http2_status_to_grpc_status(atoi(val))),
+              grpc_http2_status_to_grpc_status(*status)),
           GRPC_ERROR_STR_GRPC_MESSAGE, msg);
-      gpr_free(val);
       return e;
     }
   }
@@ -144,38 +136,7 @@ static grpc_error_handle client_filter_incoming_metadata(
         grpc_core::PermissivePercentDecodeSlice(std::move(*grpc_message));
   }
 
-  if (b->legacy_index()->named.content_type != nullptr) {
-    if (!grpc_mdelem_static_value_eq(
-            b->legacy_index()->named.content_type->md,
-            GRPC_MDELEM_CONTENT_TYPE_APPLICATION_SLASH_GRPC)) {
-      if (grpc_slice_buf_start_eq(
-              GRPC_MDVALUE(b->legacy_index()->named.content_type->md),
-              EXPECTED_CONTENT_TYPE, EXPECTED_CONTENT_TYPE_LENGTH) &&
-          (GRPC_SLICE_START_PTR(GRPC_MDVALUE(
-               b->legacy_index()
-                   ->named.content_type->md))[EXPECTED_CONTENT_TYPE_LENGTH] ==
-               '+' ||
-           GRPC_SLICE_START_PTR(GRPC_MDVALUE(
-               b->legacy_index()
-                   ->named.content_type->md))[EXPECTED_CONTENT_TYPE_LENGTH] ==
-               ';')) {
-        /* Although the C implementation doesn't (currently) generate them,
-           any custom +-suffix is explicitly valid. */
-        /* TODO(klempner): We should consider preallocating common values such
-           as +proto or +json, or at least stashing them if we see them. */
-        /* TODO(klempner): Should we be surfacing this to application code? */
-      } else {
-        /* TODO(klempner): We're currently allowing this, but we shouldn't
-           see it without a proxy so log for now. */
-        char* val = grpc_dump_slice(
-            GRPC_MDVALUE(b->legacy_index()->named.content_type->md),
-            GPR_DUMP_ASCII);
-        gpr_log(GPR_INFO, "Unexpected content-type '%s'", val);
-        gpr_free(val);
-      }
-    }
-    b->Remove(GRPC_BATCH_CONTENT_TYPE);
-  }
+  b->Remove(grpc_core::ContentTypeMetadata());
 
   return GRPC_ERROR_NONE;
 }
@@ -306,53 +267,41 @@ static char* slice_buffer_to_string(grpc_slice_buffer* slice_buffer) {
 
 // Modifies the path entry in the batch's send_initial_metadata to
 // append the base64-encoded query for a GET request.
-static grpc_error_handle update_path_for_get(
-    grpc_call_element* elem, grpc_transport_stream_op_batch* batch) {
+static void update_path_for_get(grpc_call_element* elem,
+                                grpc_transport_stream_op_batch* batch) {
+  grpc_metadata_batch* b =
+      batch->payload->send_initial_metadata.send_initial_metadata;
   call_data* calld = static_cast<call_data*>(elem->call_data);
-  grpc_slice path_slice =
-      GRPC_MDVALUE(batch->payload->send_initial_metadata.send_initial_metadata
-                       ->legacy_index()
-                       ->named.path->md);
+  const grpc_core::Slice& path_slice =
+      *b->get_pointer(grpc_core::HttpPathMetadata());
   /* sum up individual component's lengths and allocate enough memory to
    * hold combined path+query */
-  size_t estimated_len = GRPC_SLICE_LENGTH(path_slice);
+  size_t estimated_len = path_slice.size();
   estimated_len++; /* for the '?' */
   estimated_len += grpc_base64_estimate_encoded_size(
       batch->payload->send_message.send_message->length(),
       false /* multi_line */);
-  grpc_core::UnmanagedMemorySlice path_with_query_slice(estimated_len);
+  grpc_core::MutableSlice path_with_query_slice =
+      grpc_core::MutableSlice::CreateUninitialized(estimated_len);
   /* memcopy individual pieces into this slice */
-  char* write_ptr =
-      reinterpret_cast<char*> GRPC_SLICE_START_PTR(path_with_query_slice);
-  char* original_path =
-      reinterpret_cast<char*> GRPC_SLICE_START_PTR(path_slice);
-  memcpy(write_ptr, original_path, GRPC_SLICE_LENGTH(path_slice));
-  write_ptr += GRPC_SLICE_LENGTH(path_slice);
+  uint8_t* write_ptr = path_with_query_slice.begin();
+  const uint8_t* original_path = path_slice.data();
+  memcpy(write_ptr, original_path, path_slice.size());
+  write_ptr += path_slice.size();
   *write_ptr++ = '?';
   char* payload_bytes =
       slice_buffer_to_string(calld->send_message_cache->cache_buffer());
-  grpc_base64_encode_core(write_ptr, payload_bytes,
+  grpc_base64_encode_core(reinterpret_cast<char*>(write_ptr), payload_bytes,
                           batch->payload->send_message.send_message->length(),
                           true /* url_safe */, false /* multi_line */);
   gpr_free(payload_bytes);
-  /* remove trailing unused memory and add trailing 0 to terminate string */
-  char* t =
-      reinterpret_cast<char*> GRPC_SLICE_START_PTR(path_with_query_slice) +
-      GRPC_SLICE_LENGTH(path_slice);
+  char* t = reinterpret_cast<char*>(path_with_query_slice.begin()) +
+            path_slice.size();
   /* safe to use strlen since base64_encode will always add '\0' */
-  path_with_query_slice = grpc_slice_sub_no_ref(
-      path_with_query_slice, 0, GRPC_SLICE_LENGTH(path_slice) + strlen(t));
   /* substitute previous path with the new path+query */
-  grpc_mdelem mdelem_path_and_query =
-      grpc_mdelem_from_slices(GRPC_MDSTR_PATH, path_with_query_slice);
-  grpc_metadata_batch* b =
-      batch->payload->send_initial_metadata.send_initial_metadata;
-  return b->Substitute(b->legacy_index()->named.path, mdelem_path_and_query);
-}
-
-static void remove_if_present(grpc_metadata_batch* batch,
-                              grpc_metadata_batch_callouts_index idx) {
-  batch->Remove(idx);
+  b->Set(grpc_core::HttpPathMetadata(),
+         grpc_core::Slice(path_with_query_slice.TakeSubSlice(
+             0, path_slice.size() + strlen(t))));
 }
 
 static void http_client_start_transport_stream_op_batch(
@@ -388,7 +337,8 @@ static void http_client_start_transport_stream_op_batch(
     // cacheable, and the operation contains both initial metadata and send
     // message, and the payload is below the size threshold, and all the data
     // for this request is immediately available.
-    grpc_mdelem method = GRPC_MDELEM_METHOD_POST;
+    grpc_core::HttpMethodMetadata::ValueType method =
+        grpc_core::HttpMethodMetadata::kPost;
     if (batch->send_message &&
         (batch->payload->send_initial_metadata.send_initial_metadata_flags &
          GRPC_INITIAL_METADATA_CACHEABLE_REQUEST) &&
@@ -408,9 +358,8 @@ static void http_client_start_transport_stream_op_batch(
       // If all the data has been read, then we can use GET.
       if (calld->send_message_bytes_read ==
           calld->send_message_caching_stream->length()) {
-        method = GRPC_MDELEM_METHOD_GET;
-        error = update_path_for_get(elem, batch);
-        if (error != GRPC_ERROR_NONE) goto done;
+        method = grpc_core::HttpMethodMetadata::kGet;
+        update_path_for_get(elem, batch);
         batch->send_message = false;
         calld->send_message_caching_stream->Orphan();
       } else {
@@ -425,36 +374,20 @@ static void http_client_start_transport_stream_op_batch(
     } else if (batch->payload->send_initial_metadata
                    .send_initial_metadata_flags &
                GRPC_INITIAL_METADATA_IDEMPOTENT_REQUEST) {
-      method = GRPC_MDELEM_METHOD_PUT;
+      method = grpc_core::HttpMethodMetadata::kPut;
     }
 
-    remove_if_present(
-        batch->payload->send_initial_metadata.send_initial_metadata,
-        GRPC_BATCH_METHOD);
-    remove_if_present(
-        batch->payload->send_initial_metadata.send_initial_metadata,
-        GRPC_BATCH_SCHEME);
-    remove_if_present(
-        batch->payload->send_initial_metadata.send_initial_metadata,
-        GRPC_BATCH_CONTENT_TYPE);
-
     /* Send : prefixed headers, which have to be before any application
        layer headers. */
-    error = grpc_metadata_batch_add_head(
-        batch->payload->send_initial_metadata.send_initial_metadata,
-        &calld->method, method, GRPC_BATCH_METHOD);
-    if (error != GRPC_ERROR_NONE) goto done;
-    error = grpc_metadata_batch_add_head(
-        batch->payload->send_initial_metadata.send_initial_metadata,
-        &calld->scheme, channeld->static_scheme, GRPC_BATCH_SCHEME);
-    if (error != GRPC_ERROR_NONE) goto done;
+    batch->payload->send_initial_metadata.send_initial_metadata->Set(
+        grpc_core::HttpMethodMetadata(), method);
+    batch->payload->send_initial_metadata.send_initial_metadata->Set(
+        grpc_core::HttpSchemeMetadata(), channeld->static_scheme);
     batch->payload->send_initial_metadata.send_initial_metadata->Set(
         grpc_core::TeMetadata(), grpc_core::TeMetadata::kTrailers);
-    error = grpc_metadata_batch_add_tail(
-        batch->payload->send_initial_metadata.send_initial_metadata,
-        &calld->content_type, GRPC_MDELEM_CONTENT_TYPE_APPLICATION_SLASH_GRPC,
-        GRPC_BATCH_CONTENT_TYPE);
-    if (error != GRPC_ERROR_NONE) goto done;
+    batch->payload->send_initial_metadata.send_initial_metadata->Set(
+        grpc_core::ContentTypeMetadata(),
+        grpc_core::ContentTypeMetadata::kApplicationGrpc);
     batch->payload->send_initial_metadata.send_initial_metadata->Set(
         grpc_core::UserAgentMetadata(), channeld->user_agent.Ref());
   }
@@ -483,25 +416,21 @@ static void http_client_destroy_call_elem(
   calld->~call_data();
 }
 
-static grpc_mdelem scheme_from_args(const grpc_channel_args* args) {
-  unsigned i;
-  size_t j;
-  grpc_mdelem valid_schemes[] = {GRPC_MDELEM_SCHEME_HTTP,
-                                 GRPC_MDELEM_SCHEME_HTTPS};
+static grpc_core::HttpSchemeMetadata::ValueType scheme_from_args(
+    const grpc_channel_args* args) {
   if (args != nullptr) {
-    for (i = 0; i < args->num_args; ++i) {
+    for (size_t i = 0; i < args->num_args; ++i) {
       if (args->args[i].type == GRPC_ARG_STRING &&
-          strcmp(args->args[i].key, GRPC_ARG_HTTP2_SCHEME) == 0) {
-        for (j = 0; j < GPR_ARRAY_SIZE(valid_schemes); j++) {
-          if (0 == grpc_slice_str_cmp(GRPC_MDVALUE(valid_schemes[j]),
-                                      args->args[i].value.string)) {
-            return valid_schemes[j];
-          }
-        }
+          0 == strcmp(args->args[i].key, GRPC_ARG_HTTP2_SCHEME)) {
+        grpc_core::HttpSchemeMetadata::ValueType scheme =
+            grpc_core::HttpSchemeMetadata::Parse(
+                args->args[i].value.string,
+                [](absl::string_view, const grpc_core::Slice&) {});
+        if (scheme != grpc_core::HttpSchemeMetadata::kInvalid) return scheme;
       }
     }
   }
-  return GRPC_MDELEM_SCHEME_HTTP;
+  return grpc_core::HttpSchemeMetadata::kHttp;
 }
 
 static size_t max_payload_size_from_args(const grpc_channel_args* args) {

data/src/core/ext/filters/http/client_authority_filter.cc

@@ -36,39 +36,27 @@
 #include "src/core/lib/slice/slice_string_helpers.h"
 #include "src/core/lib/surface/call.h"
 #include "src/core/lib/surface/channel_stack_type.h"
-#include "src/core/lib/transport/static_metadata.h"
 
 namespace {
 
 struct call_data {
-  grpc_linked_mdelem authority_storage;
   grpc_core::CallCombiner* call_combiner;
 };
 
 struct channel_data {
-  grpc_core::ManagedMemorySlice default_authority;
-  grpc_mdelem default_authority_mdelem;
+  grpc_core::Slice default_authority;
 };
 
 void client_authority_start_transport_stream_op_batch(
     grpc_call_element* elem, grpc_transport_stream_op_batch* batch) {
   channel_data* chand = static_cast<channel_data*>(elem->channel_data);
-  call_data* calld = static_cast<call_data*>(elem->call_data);
   // Handle send_initial_metadata.
   // If the initial metadata doesn't already contain :authority, add it.
   if (batch->send_initial_metadata &&
-      batch->payload->send_initial_metadata.send_initial_metadata
-              ->legacy_index()
-              ->named.authority == nullptr) {
-    grpc_error_handle error = grpc_metadata_batch_add_head(
-        batch->payload->send_initial_metadata.send_initial_metadata,
-        &calld->authority_storage,
-        GRPC_MDELEM_REF(chand->default_authority_mdelem), GRPC_BATCH_AUTHORITY);
-    if (error != GRPC_ERROR_NONE) {
-      grpc_transport_stream_op_batch_finish_with_failure(batch, error,
-                                                         calld->call_combiner);
-      return;
-    }
+      batch->payload->send_initial_metadata.send_initial_metadata->get_pointer(
+          grpc_core::HttpAuthorityMetadata()) == nullptr) {
+    batch->payload->send_initial_metadata.send_initial_metadata->Set(
+        grpc_core::HttpAuthorityMetadata(), chand->default_authority.Ref());
   }
   // Pass control down the stack.
   grpc_call_next_op(elem, batch);
@@ -90,7 +78,7 @@ void client_authority_destroy_call_elem(
 /* Constructor for channel_data */
 grpc_error_handle client_authority_init_channel_elem(
     grpc_channel_element* elem, grpc_channel_element_args* args) {
-  channel_data* chand = static_cast<channel_data*>(elem->channel_data);
+  channel_data* chand = new (elem->channel_data) channel_data;
   const grpc_arg* default_authority_arg =
       grpc_channel_args_find(args->channel_args, GRPC_ARG_DEFAULT_AUTHORITY);
   if (default_authority_arg == nullptr) {
@@ -105,18 +93,14 @@ grpc_error_handle client_authority_init_channel_elem(
         "GRPC_ARG_DEFAULT_AUTHORITY channel arg. must be a string");
   }
   chand->default_authority =
-      grpc_core::ManagedMemorySlice(default_authority_str);
-  chand->default_authority_mdelem = grpc_mdelem_create(
-      GRPC_MDSTR_AUTHORITY, chand->default_authority, nullptr);
+      grpc_core::Slice::FromCopiedString(default_authority_str);
   GPR_ASSERT(!args->is_last);
   return GRPC_ERROR_NONE;
 }
 
 /* Destructor for channel data */
 void client_authority_destroy_channel_elem(grpc_channel_element* elem) {
-  channel_data* chand = static_cast<channel_data*>(elem->channel_data);
-  grpc_slice_unref_internal(chand->default_authority);
-  GRPC_MDELEM_UNREF(chand->default_authority_mdelem);
+  static_cast<channel_data*>(elem->channel_data)->~channel_data();
 }
 }  // namespace
 

data/src/core/ext/filters/http/message_compress/message_compress_filter.cc

@@ -31,8 +31,6 @@
 #include <grpc/support/log.h>
 
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/compression/algorithm_metadata.h"
-#include "src/core/lib/compression/compression_args.h"
 #include "src/core/lib/compression/compression_internal.h"
 #include "src/core/lib/compression/message_compress.h"
 #include "src/core/lib/gpr/string.h"
@@ -41,7 +39,6 @@
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/slice/slice_string_helpers.h"
 #include "src/core/lib/surface/call.h"
-#include "src/core/lib/transport/static_metadata.h"
 
 namespace {
 
@@ -49,15 +46,15 @@ class ChannelData {
  public:
   explicit ChannelData(grpc_channel_element_args* args) {
     // Get the enabled and the default algorithms from channel args.
-    enabled_compression_algorithms_bitset_ =
-        grpc_channel_args_compression_algorithm_get_states(args->channel_args);
+    enabled_compression_algorithms_ =
+        grpc_core::CompressionAlgorithmSet::FromChannelArgs(args->channel_args);
     default_compression_algorithm_ =
-        grpc_channel_args_get_channel_default_compression_algorithm(
-            args->channel_args);
+        grpc_core::DefaultCompressionAlgorithmFromChannelArgs(
+            args->channel_args)
+            .value_or(GRPC_COMPRESS_NONE);
     // Make sure the default is enabled.
-    if (size_t(default_compression_algorithm_) >= 32 ||
-        !grpc_core::GetBit(enabled_compression_algorithms_bitset_,
-                           default_compression_algorithm_)) {
+    if (!enabled_compression_algorithms_.IsSet(
+            default_compression_algorithm_)) {
       const char* name;
       if (!grpc_compression_algorithm_name(default_compression_algorithm_,
                                            &name)) {
@@ -68,12 +65,6 @@ class ChannelData {
               name);
       default_compression_algorithm_ = GRPC_COMPRESS_NONE;
     }
-    enabled_message_compression_algorithms_bitset_ =
-        grpc_compression_bitset_to_message_bitset(
-            enabled_compression_algorithms_bitset_);
-    enabled_stream_compression_algorithms_bitset_ =
-        grpc_compression_bitset_to_stream_bitset(
-            enabled_compression_algorithms_bitset_);
     GPR_ASSERT(!args->is_last);
   }
 
@@ -81,27 +72,15 @@ class ChannelData {
     return default_compression_algorithm_;
   }
 
-  uint32_t enabled_compression_algorithms_bitset() const {
-    return enabled_compression_algorithms_bitset_;
-  }
-
-  uint32_t enabled_message_compression_algorithms_bitset() const {
-    return enabled_message_compression_algorithms_bitset_;
-  }
-
-  uint32_t enabled_stream_compression_algorithms_bitset() const {
-    return enabled_stream_compression_algorithms_bitset_;
+  grpc_core::CompressionAlgorithmSet enabled_compression_algorithms() const {
+    return enabled_compression_algorithms_;
   }
 
  private:
   /** The default, channel-level, compression algorithm */
   grpc_compression_algorithm default_compression_algorithm_;
-  /** Bitset of enabled compression algorithms */
-  uint32_t enabled_compression_algorithms_bitset_;
-  /** Bitset of enabled message compression algorithms */
-  uint32_t enabled_message_compression_algorithms_bitset_;
-  /** Bitset of enabled stream compression algorithms */
-  uint32_t enabled_stream_compression_algorithms_bitset_;
+  /** Enabled compression algorithms */
+  grpc_core::CompressionAlgorithmSet enabled_compression_algorithms_;
 };
 
 class CallData {
@@ -111,12 +90,9 @@ class CallData {
     ChannelData* channeld = static_cast<ChannelData*>(elem->channel_data);
     // The call's message compression algorithm is set to channel's default
     // setting. It can be overridden later by initial metadata.
-    if (GPR_LIKELY(
-            grpc_core::GetBit(channeld->enabled_compression_algorithms_bitset(),
-                              channeld->default_compression_algorithm()))) {
-      message_compression_algorithm_ =
-          grpc_compression_algorithm_to_message_compression_algorithm(
-              channeld->default_compression_algorithm());
+    if (GPR_LIKELY(channeld->enabled_compression_algorithms().IsSet(
+            channeld->default_compression_algorithm()))) {
+      compression_algorithm_ = channeld->default_compression_algorithm();
     }
     GRPC_CLOSURE_INIT(&start_send_message_batch_in_call_combiner_,
                       StartSendMessageBatch, elem, grpc_schedule_on_exec_ctx);
@@ -136,8 +112,8 @@ class CallData {
   bool SkipMessageCompression();
   void InitializeState(grpc_call_element* elem);
 
-  grpc_error_handle ProcessSendInitialMetadata(
-      grpc_call_element* elem, grpc_metadata_batch* initial_metadata);
+  void ProcessSendInitialMetadata(grpc_call_element* elem,
+                                  grpc_metadata_batch* initial_metadata);
 
   // Methods for processing a send_message batch
   static void StartSendMessageBatch(void* elem_arg, grpc_error_handle unused);
@@ -152,8 +128,7 @@ class CallData {
   static void SendMessageOnComplete(void* calld_arg, grpc_error_handle error);
 
   grpc_core::CallCombiner* call_combiner_;
-  grpc_message_compression_algorithm message_compression_algorithm_ =
-      GRPC_MESSAGE_COMPRESS_NONE;
+  grpc_compression_algorithm compression_algorithm_ = GRPC_COMPRESS_NONE;
   grpc_error_handle cancel_error_ = GRPC_ERROR_NONE;
   grpc_transport_stream_op_batch* send_message_batch_ = nullptr;
   bool seen_initial_metadata_ = false;
@@ -163,10 +138,6 @@ class CallData {
   /* The fields below are only initialized when we compress the payload.
    * Keep them at the bottom of the struct, so they don't pollute the
    * cache-lines. */
-  grpc_linked_mdelem message_compression_algorithm_storage_;
-  grpc_linked_mdelem stream_compression_algorithm_storage_;
-  grpc_linked_mdelem accept_encoding_storage_;
-  grpc_linked_mdelem accept_stream_encoding_storage_;
   grpc_slice_buffer slices_; /**< Buffers up input slices to be compressed */
   // Allocate space for the replacement stream
   std::aligned_storage<sizeof(grpc_core::SliceBufferByteStream),
@@ -188,44 +159,7 @@ bool CallData::SkipMessageCompression() {
   }
   // If this call doesn't have any message compression algorithm set, skip
   // message compression.
-  return message_compression_algorithm_ == GRPC_MESSAGE_COMPRESS_NONE;
-}
-
-// Determines the compression algorithm from the initial metadata and the
-// channel's default setting.
-grpc_compression_algorithm FindCompressionAlgorithm(
-    grpc_metadata_batch* initial_metadata, ChannelData* channeld) {
-  if (initial_metadata->legacy_index()->named.grpc_internal_encoding_request ==
-      nullptr) {
-    return channeld->default_compression_algorithm();
-  }
-  grpc_compression_algorithm compression_algorithm;
-  // Parse the compression algorithm from the initial metadata.
-  grpc_mdelem md = initial_metadata->legacy_index()
-                       ->named.grpc_internal_encoding_request->md;
-  GPR_ASSERT(grpc_compression_algorithm_parse(GRPC_MDVALUE(md),
-                                              &compression_algorithm));
-  // Remove this metadata since it's an internal one (i.e., it won't be
-  // transmitted out).
-  initial_metadata->Remove(GRPC_BATCH_GRPC_INTERNAL_ENCODING_REQUEST);
-  // Check if that algorithm is enabled. Note that GRPC_COMPRESS_NONE is always
-  // enabled.
-  // TODO(juanlishen): Maybe use channel default or abort() if the algorithm
-  // from the initial metadata is disabled.
-  if (GPR_LIKELY(
-          grpc_core::GetBit(channeld->enabled_compression_algorithms_bitset(),
-                            compression_algorithm))) {
-    return compression_algorithm;
-  }
-  const char* algorithm_name;
-  GPR_ASSERT(
-      grpc_compression_algorithm_name(compression_algorithm, &algorithm_name));
-  gpr_log(GPR_ERROR,
-          "Invalid compression algorithm from initial metadata: '%s' "
-          "(previously disabled). "
-          "Will not compress.",
-          algorithm_name);
-  return GRPC_COMPRESS_NONE;
+  return compression_algorithm_ == GRPC_COMPRESS_NONE;
 }
 
 void CallData::InitializeState(grpc_call_element* elem) {
@@ -238,53 +172,28 @@ void CallData::InitializeState(grpc_call_element* elem) {
                     grpc_schedule_on_exec_ctx);
 }
 
-grpc_error_handle CallData::ProcessSendInitialMetadata(
+void CallData::ProcessSendInitialMetadata(
     grpc_call_element* elem, grpc_metadata_batch* initial_metadata) {
   ChannelData* channeld = static_cast<ChannelData*>(elem->channel_data);
   // Find the compression algorithm.
-  grpc_compression_algorithm compression_algorithm =
-      FindCompressionAlgorithm(initial_metadata, channeld);
-  // Note that at most one of the following algorithms can be set.
-  message_compression_algorithm_ =
-      grpc_compression_algorithm_to_message_compression_algorithm(
-          compression_algorithm);
-  grpc_stream_compression_algorithm stream_compression_algorithm =
-      grpc_compression_algorithm_to_stream_compression_algorithm(
-          compression_algorithm);
-  // Hint compression algorithm.
-  grpc_error_handle error = GRPC_ERROR_NONE;
-  if (message_compression_algorithm_ != GRPC_MESSAGE_COMPRESS_NONE) {
-    InitializeState(elem);
-    error = grpc_metadata_batch_add_tail(
-        initial_metadata, &message_compression_algorithm_storage_,
-        grpc_message_compression_encoding_mdelem(
-            message_compression_algorithm_),
-        GRPC_BATCH_GRPC_ENCODING);
-  } else if (stream_compression_algorithm != GRPC_STREAM_COMPRESS_NONE) {
-    InitializeState(elem);
-    error = grpc_metadata_batch_add_tail(
-        initial_metadata, &stream_compression_algorithm_storage_,
-        grpc_stream_compression_encoding_mdelem(stream_compression_algorithm),
-        GRPC_BATCH_CONTENT_ENCODING);
+  compression_algorithm_ =
+      initial_metadata->Take(grpc_core::GrpcInternalEncodingRequest())
+          .value_or(channeld->default_compression_algorithm());
+  switch (compression_algorithm_) {
+    case GRPC_COMPRESS_NONE:
+      break;
+    case GRPC_COMPRESS_DEFLATE:
+    case GRPC_COMPRESS_GZIP:
+      InitializeState(elem);
+      initial_metadata->Set(grpc_core::GrpcEncodingMetadata(),
+                            compression_algorithm_);
+      break;
+    case GRPC_COMPRESS_ALGORITHMS_COUNT:
+      abort();
   }
-  if (error != GRPC_ERROR_NONE) return error;
   // Convey supported compression algorithms.
-  error = grpc_metadata_batch_add_tail(
-      initial_metadata, &accept_encoding_storage_,
-      GRPC_MDELEM_ACCEPT_ENCODING_FOR_ALGORITHMS(
-          channeld->enabled_message_compression_algorithms_bitset()),
-      GRPC_BATCH_GRPC_ACCEPT_ENCODING);
-  if (error != GRPC_ERROR_NONE) return error;
-  // Do not overwrite accept-encoding header if it already presents (e.g., added
-  // by some proxy).
-  if (!initial_metadata->legacy_index()->named.accept_encoding) {
-    error = grpc_metadata_batch_add_tail(
-        initial_metadata, &accept_stream_encoding_storage_,
-        GRPC_MDELEM_ACCEPT_STREAM_ENCODING_FOR_ALGORITHMS(
-            channeld->enabled_stream_compression_algorithms_bitset()),
-        GRPC_BATCH_ACCEPT_ENCODING);
-  }
-  return error;
+  initial_metadata->Set(grpc_core::GrpcAcceptEncodingMetadata(),
+                        channeld->enabled_compression_algorithms());
 }
 
 void CallData::SendMessageOnComplete(void* calld_arg, grpc_error_handle error) {
@@ -304,15 +213,13 @@ void CallData::SendMessageBatchContinue(grpc_call_element* elem) {
 }
 
 void CallData::FinishSendMessage(grpc_call_element* elem) {
-  GPR_DEBUG_ASSERT(message_compression_algorithm_ !=
-                   GRPC_MESSAGE_COMPRESS_NONE);
+  GPR_DEBUG_ASSERT(compression_algorithm_ != GRPC_COMPRESS_NONE);
   // Compress the data if appropriate.
   grpc_slice_buffer tmp;
   grpc_slice_buffer_init(&tmp);
   uint32_t send_flags =
       send_message_batch_->payload->send_message.send_message->flags();
-  bool did_compress =
-      grpc_msg_compress(message_compression_algorithm_, &slices_, &tmp);
+  bool did_compress = grpc_msg_compress(compression_algorithm_, &slices_, &tmp);
   if (did_compress) {
     if (GRPC_TRACE_FLAG_ENABLED(grpc_compression_trace)) {
       const char* algo_name;
@@ -320,8 +227,8 @@ void CallData::FinishSendMessage(grpc_call_element* elem) {
       const size_t after_size = tmp.length;
       const float savings_ratio = 1.0f - static_cast<float>(after_size) /
                                              static_cast<float>(before_size);
-      GPR_ASSERT(grpc_message_compression_algorithm_name(
-          message_compression_algorithm_, &algo_name));
+      GPR_ASSERT(
+          grpc_compression_algorithm_name(compression_algorithm_, &algo_name));
       gpr_log(GPR_INFO,
               "Compressed[%s] %" PRIuPTR " bytes vs. %" PRIuPTR
               " bytes (%.2f%% savings)",
@@ -332,8 +239,8 @@ void CallData::FinishSendMessage(grpc_call_element* elem) {
   } else {
     if (GRPC_TRACE_FLAG_ENABLED(grpc_compression_trace)) {
       const char* algo_name;
-      GPR_ASSERT(grpc_message_compression_algorithm_name(
-          message_compression_algorithm_, &algo_name));
+      GPR_ASSERT(
+          grpc_compression_algorithm_name(compression_algorithm_, &algo_name));
       gpr_log(GPR_INFO,
               "Algorithm '%s' enabled but decided not to compress. Input size: "
               "%" PRIuPTR,
@@ -465,13 +372,8 @@ void CallData::CompressStartTransportStreamOpBatch(
   // Handle send_initial_metadata.
   if (batch->send_initial_metadata) {
     GPR_ASSERT(!seen_initial_metadata_);
-    grpc_error_handle error = ProcessSendInitialMetadata(
+    ProcessSendInitialMetadata(
         elem, batch->payload->send_initial_metadata.send_initial_metadata);
-    if (error != GRPC_ERROR_NONE) {
-      grpc_transport_stream_op_batch_finish_with_failure(batch, error,
-                                                         call_combiner_);
-      return;
-    }
     seen_initial_metadata_ = true;
     // If we had previously received a batch containing a send_message op,
     // handle it now.  Note that we need to re-enter the call combiner