grpc 1.43.1 → 1.44.0.pre2

data/src/core/ext/transport/chttp2/transport/hpack_encoder.h

@@ -21,14 +21,13 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <cstdint>
+
 #include <grpc/slice.h>
 #include <grpc/slice_buffer.h>
 
 #include "src/core/ext/transport/chttp2/transport/frame.h"
-#include "src/core/ext/transport/chttp2/transport/hpack_encoder_index.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_encoder_table.h"
-#include "src/core/ext/transport/chttp2/transport/popularity_count.h"
-#include "src/core/lib/transport/metadata.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/transport/transport.h"
 
@@ -36,48 +35,9 @@ extern grpc_core::TraceFlag grpc_http_trace;
 
 namespace grpc_core {
 
-// Wrapper to take an array of mdelems and make them encodable
-class MetadataArray {
- public:
-  MetadataArray(grpc_mdelem** elems, size_t count)
-      : elems_(elems), count_(count) {}
-
-  template <typename Encoder>
-  void Encode(Encoder* encoder) const {
-    for (size_t i = 0; i < count_; i++) {
-      encoder->Encode(*elems_[i]);
-    }
-  }
-
- private:
-  grpc_mdelem** elems_;
-  size_t count_;
-};
-
-namespace metadata_detail {
-template <typename A, typename B>
-class ConcatMetadata {
- public:
-  ConcatMetadata(const A& a, const B& b) : a_(a), b_(b) {}
-
-  template <typename Encoder>
-  void Encode(Encoder* encoder) const {
-    a_.Encode(encoder);
-    b_.Encode(encoder);
-  }
-
- private:
-  const A& a_;
-  const B& b_;
-};
-}  // namespace metadata_detail
-
-template <typename A, typename B>
-metadata_detail::ConcatMetadata<A, B> ConcatMetadata(const A& a, const B& b) {
-  return metadata_detail::ConcatMetadata<A, B>(a, b);
-}
-
 class HPackCompressor {
+  class SliceIndex;
+
  public:
   HPackCompressor() = default;
   ~HPackCompressor() = default;
@@ -116,30 +76,41 @@ class HPackCompressor {
     Framer(const Framer&) = delete;
     Framer& operator=(const Framer&) = delete;
 
-    void Encode(grpc_mdelem md);
+    void Encode(const Slice& key, const Slice& value);
+    void Encode(HttpPathMetadata, const Slice& value);
+    void Encode(HttpAuthorityMetadata, const Slice& value);
+    void Encode(HttpStatusMetadata, uint32_t status);
     void Encode(GrpcTimeoutMetadata, grpc_millis deadline);
     void Encode(TeMetadata, TeMetadata::ValueType value);
+    void Encode(ContentTypeMetadata, ContentTypeMetadata::ValueType value);
+    void Encode(HttpSchemeMetadata, HttpSchemeMetadata::ValueType value);
+    void Encode(HttpMethodMetadata, HttpMethodMetadata::ValueType method);
     void Encode(UserAgentMetadata, const Slice& slice);
+    void Encode(GrpcStatusMetadata, grpc_status_code status);
+    void Encode(GrpcEncodingMetadata, grpc_compression_algorithm value);
+    void Encode(GrpcAcceptEncodingMetadata, CompressionAlgorithmSet value);
+    void Encode(GrpcTagsBinMetadata, const Slice& slice);
+    void Encode(GrpcTraceBinMetadata, const Slice& slice);
     void Encode(GrpcMessageMetadata, const Slice& slice) {
       if (slice.empty()) return;
       EmitLitHdrWithNonBinaryStringKeyNotIdx(
-          StaticSlice::FromStaticString("grpc-message").c_slice(),
-          slice.c_slice());
+          Slice::FromStaticString("grpc-message"), slice.Ref());
     }
     template <typename Which>
-    void Encode(Which, const Slice& slice) {
+    void Encode(Which, const typename Which::ValueType& value) {
+      const Slice& slice = MetadataValueAsSlice<Which>(value);
       if (absl::EndsWith(Which::key(), "-bin")) {
         EmitLitHdrWithBinaryStringKeyNotIdx(
-            StaticSlice::FromStaticString(Which::key()).c_slice(),
-            slice.c_slice());
+            Slice::FromStaticString(Which::key()), slice.Ref());
       } else {
         EmitLitHdrWithNonBinaryStringKeyNotIdx(
-            StaticSlice::FromStaticString(Which::key()).c_slice(),
-            slice.c_slice());
+            Slice::FromStaticString(Which::key()), slice.Ref());
       }
     }
 
    private:
+    friend class SliceIndex;
+
     struct FramePrefix {
       // index (in output_) of the header for the frame
       size_t header_idx;
@@ -154,26 +125,24 @@ class HPackCompressor {
 
     void AdvertiseTableSizeChange();
     void EmitIndexed(uint32_t index);
-    void EncodeDynamic(grpc_mdelem elem);
-    static GPR_ATTRIBUTE_NOINLINE void Log(grpc_mdelem elem);
-
-    void EmitLitHdrIncIdx(uint32_t key_index, grpc_mdelem elem);
-    void EmitLitHdrNotIdx(uint32_t key_index, grpc_mdelem elem);
-    void EmitLitHdrWithStringKeyIncIdx(grpc_mdelem elem);
-    void EmitLitHdrWithNonBinaryStringKeyIncIdx(const grpc_slice& key_slice,
-                                                const grpc_slice& value_slice);
-    void EmitLitHdrWithBinaryStringKeyNotIdx(const grpc_slice& key_slice,
-                                             const grpc_slice& value_slice);
-    void EmitLitHdrWithNonBinaryStringKeyNotIdx(const grpc_slice& key_slice,
-                                                const grpc_slice& value_slice);
-    void EmitLitHdrWithStringKeyNotIdx(grpc_mdelem elem);
-
-    void EncodeAlwaysIndexed(uint32_t* index, const grpc_slice& key,
-                             const grpc_slice& value,
-                             uint32_t transport_length);
+    void EmitLitHdrWithNonBinaryStringKeyIncIdx(Slice key_slice,
+                                                Slice value_slice);
+    void EmitLitHdrWithBinaryStringKeyIncIdx(Slice key_slice,
+                                             Slice value_slice);
+    void EmitLitHdrWithBinaryStringKeyNotIdx(Slice key_slice,
+                                             Slice value_slice);
+    void EmitLitHdrWithBinaryStringKeyNotIdx(uint32_t key_index,
+                                             Slice value_slice);
+    void EmitLitHdrWithNonBinaryStringKeyNotIdx(Slice key_slice,
+                                                Slice value_slice);
+
+    void EncodeAlwaysIndexed(uint32_t* index, absl::string_view key,
+                             Slice value, uint32_t transport_length);
+    void EncodeIndexedKeyWithBinaryValue(uint32_t* index, absl::string_view key,
+                                         Slice value);
 
     size_t CurrentFrameSize() const;
-    void Add(grpc_slice slice);
+    void Add(Slice slice);
     uint8_t* AddTiny(size_t len);
 
     // maximum size of a frame
@@ -183,10 +152,6 @@ class HPackCompressor {
     const bool is_end_of_stream_;
     // output stream id
     const uint32_t stream_id_;
-#ifndef NDEBUG
-    // have we seen a regular (non-colon-prefixed) header yet?
-    bool seen_regular_header_ = false;
-#endif
     grpc_slice_buffer* const output_;
     grpc_transport_one_way_stats* const stats_;
     HPackCompressor* const compressor_;
@@ -195,14 +160,7 @@ class HPackCompressor {
 
  private:
   static constexpr size_t kNumFilterValues = 64;
-
-  void AddKeyWithIndex(grpc_slice_refcount* key_ref, uint32_t new_index,
-                       uint32_t key_hash);
-  void AddElemWithIndex(grpc_mdelem elem, uint32_t new_index,
-                        uint32_t elem_hash, uint32_t key_hash);
-  void AddElem(grpc_mdelem elem, size_t elem_size, uint32_t elem_hash,
-               uint32_t key_hash);
-  void AddKey(grpc_mdelem elem, size_t elem_size, uint32_t key_hash);
+  static constexpr uint32_t kNumCachedGrpcStatusValues = 16;
 
   // maximum number of bytes we'll use for the decode table (to guard against
   // peers ooming us by setting decode table size high)
@@ -212,96 +170,48 @@ class HPackCompressor {
   bool advertise_table_size_change_ = false;
   HPackEncoderTable table_;
 
-  // filter tables for elems: this tables provides an approximate
-  // popularity count for particular hashes, and are used to determine whether
-  // a new literal should be added to the compression table or not.
-  // They track a single integer that counts how often a particular value has
-  // been seen. When that count reaches max (255), all values are halved.
-  PopularityCount<kNumFilterValues> filter_elems_;
-
-  class KeyElem {
+  class SliceIndex {
    public:
-    class Stored {
-     public:
-      Stored() : elem_(GRPC_MDNULL) {}
-      explicit Stored(grpc_mdelem elem) : elem_(GRPC_MDELEM_REF(elem)) {}
-      Stored(const Stored& other) : elem_(GRPC_MDELEM_REF(other.elem_)) {}
-      Stored& operator=(Stored other) {
-        std::swap(elem_, other.elem_);
-        return *this;
-      }
-      ~Stored() { GRPC_MDELEM_UNREF(elem_); }
-
-      const grpc_mdelem& elem() const { return elem_; }
-
-      bool operator==(const Stored& other) const noexcept {
-        return elem_.payload == other.elem_.payload;
-      }
-
-     private:
-      grpc_mdelem elem_;
-    };
-
-    KeyElem(grpc_mdelem elem, uint32_t hash) : elem_(elem), hash_(hash) {}
-    KeyElem(const KeyElem&);
-    KeyElem& operator=(const KeyElem&);
-
-    uint32_t hash() const {
-      // TODO(ctiller): unify this with what's in the cc file when we move this
-      // code to c++
-      return hash_ >> 6;
-    }
-
-    Stored stored() const { return Stored(elem_); }
-
-    bool operator==(const Stored& stored) const noexcept {
-      return elem_.payload == stored.elem().payload;
-    }
+    void EmitTo(absl::string_view key, const Slice& value, Framer* framer);
 
    private:
-    grpc_mdelem elem_;
-    uint32_t hash_;
+    struct ValueIndex {
+      ValueIndex(Slice value, uint32_t index)
+          : value(std::move(value)), index(index) {}
+      Slice value;
+      uint32_t index;
+    };
+    std::vector<ValueIndex> values_;
   };
 
-  class KeySliceRef {
-   public:
-    using Stored = RefCountedPtr<grpc_slice_refcount>;
-
-    KeySliceRef(grpc_slice_refcount* ref, uint32_t hash)
-        : ref_(ref), hash_(hash) {}
-    KeySliceRef(const KeySliceRef&) = delete;
-    KeySliceRef& operator=(const KeySliceRef&) = delete;
-
-    uint32_t hash() const {
-      // TODO(ctiller): unify this with what's in the cc file when we move this
-      // code to c++
-      return hash_ >> 6;
-    }
-
-    Stored stored() const {
-      ref_->Ref();
-      return Stored(ref_);
-    }
-
-    bool operator==(const Stored& stored) const noexcept {
-      return ref_ == stored.get();
-    }
-
-   private:
-    grpc_slice_refcount* ref_;
-    uint32_t hash_;
+  struct PreviousTimeout {
+    Timeout timeout;
+    uint32_t index;
   };
 
-  // entry tables for keys & elems: these tables track values that have been
-  // seen and *may* be in the decompressor table
-  HPackEncoderIndex<KeyElem, kNumFilterValues> elem_index_;
-  HPackEncoderIndex<KeySliceRef, kNumFilterValues> key_index_;
   // Index into table_ for the te:trailers metadata element
   uint32_t te_index_ = 0;
+  // Index into table_ for the content-type metadata element
+  uint32_t content_type_index_ = 0;
   // Index into table_ for the user-agent metadata element
   uint32_t user_agent_index_ = 0;
+  // Cached grpc-status values
+  uint32_t cached_grpc_status_[kNumCachedGrpcStatusValues] = {};
+  // Cached grpc-encoding values
+  uint32_t cached_grpc_encoding_[GRPC_COMPRESS_ALGORITHMS_COUNT] = {};
+  // Cached grpc-accept-encoding value
+  uint32_t grpc_accept_encoding_index_ = 0;
+  // The grpc-accept-encoding string referred to by grpc_accept_encoding_index_
+  CompressionAlgorithmSet grpc_accept_encoding_;
+  // Index of something that was sent with grpc-tags-bin
+  uint32_t grpc_tags_bin_index_ = 0;
+  // Index of something that was sent with grpc-trace-bin
+  uint32_t grpc_trace_bin_index_ = 0;
   // The user-agent string referred to by user_agent_index_
   Slice user_agent_;
+  SliceIndex path_index_;
+  SliceIndex authority_index_;
+  std::vector<PreviousTimeout> previous_timeouts_;
 };
 
 }  // namespace grpc_core

data/src/core/ext/transport/chttp2/transport/hpack_encoder_table.cc

@@ -22,7 +22,7 @@ namespace grpc_core {
 
 uint32_t HPackEncoderTable::AllocateIndex(size_t element_size) {
   uint32_t new_index = tail_remote_index_ + table_elems_ + 1;
-  GPR_DEBUG_ASSERT(element_size < 65536);
+  GPR_DEBUG_ASSERT(element_size <= MaxEntrySize());
 
   if (element_size > max_table_size_) {
     while (table_size_ > 0) {

data/src/core/ext/transport/chttp2/transport/hpack_encoder_table.h

@@ -29,6 +29,8 @@ class HPackEncoderTable {
  public:
   HPackEncoderTable() : elem_size_(hpack_constants::kInitialTableEntries) {}
 
+  static constexpr size_t MaxEntrySize() { return 65535; }
+
   // Reserve space in table for the new element, evict entries if needed.
   // Return the new index of the element. Return 0 to indicate not adding to
   // table.

data/src/core/ext/transport/chttp2/transport/hpack_parser.cc

@@ -1076,11 +1076,7 @@ class HPackParser::Parser {
       return HandleMetadataSizeLimitExceeded(md);
     }
 
-    grpc_error_handle err = metadata_buffer_->Set(md);
-    if (GPR_UNLIKELY(err != GRPC_ERROR_NONE)) {
-      input_->SetError(err);
-      return false;
-    }
+    metadata_buffer_->Set(md);
     return true;
   }
 
@@ -1129,8 +1125,11 @@ class HPackParser::Parser {
     auto value_slice = value->Take<TakeValueType>();
     const auto transport_size = key_string.size() + value_slice.size() +
                                 hpack_constants::kEntryOverhead;
-    return grpc_metadata_batch::Parse(key->string_view(),
-                                      std::move(value_slice), transport_size);
+    return grpc_metadata_batch::Parse(
+        key->string_view(), std::move(value_slice), transport_size,
+        [key_string](absl::string_view error, const Slice& value) {
+          ReportMetadataParseError(key_string, error, value.as_string_view());
+        });
   }
 
   // Parse an index encoded key and a string encoded value
@@ -1143,7 +1142,11 @@ class HPackParser::Parser {
     }
     auto value = ParseValueString(elem->is_binary_header());
     if (GPR_UNLIKELY(!value.has_value())) return {};
-    return elem->WithNewValue(value->Take<TakeValueType>());
+    return elem->WithNewValue(value->Take<TakeValueType>(),
+                              [=](absl::string_view error, const Slice& value) {
+                                ReportMetadataParseError(
+                                    elem->key(), error, value.as_string_view());
+                              });
   }
 
   // Parse a varint index encoded key and a string encoded value
@@ -1230,6 +1233,14 @@ class HPackParser::Parser {
         false);
   }
 
+  static void ReportMetadataParseError(absl::string_view key,
+                                       absl::string_view error,
+                                       absl::string_view value) {
+    gpr_log(
+        GPR_ERROR, "Error parsing metadata: %s",
+        absl::StrCat("error=", error, " key=", key, " value=", value).c_str());
+  }
+
   Input* const input_;
   grpc_metadata_batch* const metadata_buffer_;
   HPackTable* const table_;
@@ -1356,25 +1367,6 @@ static void force_client_rst_stream(void* sp, grpc_error_handle /*error*/) {
   GRPC_CHTTP2_STREAM_UNREF(s, "final_rst");
 }
 
-static void parse_stream_compression_md(grpc_chttp2_transport* /*t*/,
-                                        grpc_chttp2_stream* s,
-                                        grpc_metadata_batch* initial_metadata) {
-  if (initial_metadata->legacy_index()->named.content_encoding == nullptr ||
-      grpc_stream_compression_method_parse(
-          GRPC_MDVALUE(
-              initial_metadata->legacy_index()->named.content_encoding->md),
-          false, &s->stream_decompression_method) == 0) {
-    s->stream_decompression_method =
-        GRPC_STREAM_COMPRESSION_IDENTITY_DECOMPRESS;
-  }
-
-  if (s->stream_decompression_method !=
-      GRPC_STREAM_COMPRESSION_IDENTITY_DECOMPRESS) {
-    s->stream_decompression_ctx = nullptr;
-    grpc_slice_buffer_init(&s->decompressed_data_buffer);
-  }
-}
-
 grpc_error_handle grpc_chttp2_header_parser_parse(void* hpack_parser,
                                                   grpc_chttp2_transport* t,
                                                   grpc_chttp2_stream* s,
@@ -1398,11 +1390,6 @@ grpc_error_handle grpc_chttp2_header_parser_parse(void* hpack_parser,
           return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
               "Too many trailer frames");
         }
-        /* Process stream compression md element if it exists */
-        if (s->header_frames_received ==
-            0) { /* Only acts on initial metadata */
-          parse_stream_compression_md(t, s, &s->initial_metadata_buffer);
-        }
         s->published_metadata[s->header_frames_received] =
             GRPC_METADATA_PUBLISHED_FROM_WIRE;
         maybe_complete_funcs[s->header_frames_received](t, s);

data/src/core/ext/transport/chttp2/transport/hpack_parser.h

@@ -25,7 +25,6 @@
 
 #include "src/core/ext/transport/chttp2/transport/frame.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_parser_table.h"
-#include "src/core/lib/transport/metadata.h"
 #include "src/core/lib/transport/metadata_batch.h"
 
 namespace grpc_core {

data/src/core/ext/transport/chttp2/transport/hpack_parser_table.cc

@@ -28,11 +28,11 @@
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 
+#include "src/core/ext/transport/chttp2/transport/hpack_constants.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/gpr/murmur_hash.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/surface/validate_metadata.h"
-#include "src/core/lib/transport/static_metadata.h"
 
 extern grpc_core::TraceFlag grpc_http_trace;
 
@@ -143,4 +143,97 @@ grpc_error_handle HPackTable::Add(Memento md) {
   return GRPC_ERROR_NONE;
 }
 
+namespace {
+struct StaticTableEntry {
+  const char* key;
+  const char* value;
+};
+
+const StaticTableEntry kStaticTable[hpack_constants::kLastStaticEntry] = {
+    {":authority", ""},
+    {":method", "GET"},
+    {":method", "POST"},
+    {":path", "/"},
+    {":path", "/index.html"},
+    {":scheme", "http"},
+    {":scheme", "https"},
+    {":status", "200"},
+    {":status", "204"},
+    {":status", "206"},
+    {":status", "304"},
+    {":status", "400"},
+    {":status", "404"},
+    {":status", "500"},
+    {"accept-charset", ""},
+    {"accept-encoding", "gzip, deflate"},
+    {"accept-language", ""},
+    {"accept-ranges", ""},
+    {"accept", ""},
+    {"access-control-allow-origin", ""},
+    {"age", ""},
+    {"allow", ""},
+    {"authorization", ""},
+    {"cache-control", ""},
+    {"content-disposition", ""},
+    {"content-encoding", ""},
+    {"content-language", ""},
+    {"content-length", ""},
+    {"content-location", ""},
+    {"content-range", ""},
+    {"content-type", ""},
+    {"cookie", ""},
+    {"date", ""},
+    {"etag", ""},
+    {"expect", ""},
+    {"expires", ""},
+    {"from", ""},
+    {"host", ""},
+    {"if-match", ""},
+    {"if-modified-since", ""},
+    {"if-none-match", ""},
+    {"if-range", ""},
+    {"if-unmodified-since", ""},
+    {"last-modified", ""},
+    {"link", ""},
+    {"location", ""},
+    {"max-forwards", ""},
+    {"proxy-authenticate", ""},
+    {"proxy-authorization", ""},
+    {"range", ""},
+    {"referer", ""},
+    {"refresh", ""},
+    {"retry-after", ""},
+    {"server", ""},
+    {"set-cookie", ""},
+    {"strict-transport-security", ""},
+    {"transfer-encoding", ""},
+    {"user-agent", ""},
+    {"vary", ""},
+    {"via", ""},
+    {"www-authenticate", ""},
+};
+
+GPR_ATTRIBUTE_NOINLINE HPackTable::Memento MakeMemento(size_t i) {
+  auto sm = kStaticTable[i];
+  return grpc_metadata_batch::Parse(
+      sm.key, Slice::FromStaticString(sm.value),
+      strlen(sm.key) + strlen(sm.value) + hpack_constants::kEntryOverhead,
+      [](absl::string_view, const Slice&) {
+        abort();  // not expecting to see this
+      });
+}
+
+}  // namespace
+
+const HPackTable::StaticMementos& HPackTable::GetStaticMementos() {
+  static const StaticMementos static_mementos;
+  return static_mementos;
+}
+
+HPackTable::StaticMementos::StaticMementos() {
+  for (uint32_t i = 0; i < hpack_constants::kLastStaticEntry; i++) {
+    memento[i] = MakeMemento(i);
+  }
+}
+
 }  // namespace grpc_core

data/src/core/ext/transport/chttp2/transport/hpack_parser_table.h

@@ -26,9 +26,7 @@
 #include "src/core/ext/transport/chttp2/transport/hpack_constants.h"
 #include "src/core/lib/gprpp/memory.h"
 #include "src/core/lib/iomgr/error.h"
-#include "src/core/lib/transport/metadata.h"
 #include "src/core/lib/transport/metadata_batch.h"
-#include "src/core/lib/transport/static_metadata.h"
 
 namespace grpc_core {
 
@@ -69,17 +67,10 @@ class HPackTable {
 
  private:
   struct StaticMementos {
-    StaticMementos() {
-      for (uint32_t i = 0; i < hpack_constants::kLastStaticEntry; i++) {
-        memento[i] = Memento(g_static_mdelem_manifested[i]);
-      }
-    }
+    StaticMementos();
     Memento memento[hpack_constants::kLastStaticEntry];
   };
-  static const StaticMementos& GetStaticMementos() {
-    static const StaticMementos static_mementos;
-    return static_mementos;
-  }
+  static const StaticMementos& GetStaticMementos() GPR_ATTRIBUTE_NOINLINE;
 
   enum { kInlineEntries = hpack_constants::kInitialTableEntries };
   using EntriesVec = absl::InlinedVector<Memento, kInlineEntries>;
@@ -121,17 +112,4 @@ class HPackTable {
 
 }  // namespace grpc_core
 
-/* Returns the static hpack table index that corresponds to /a elem. Returns 0
-  if /a elem is not statically stored or if it is not in the static hpack
-  table */
-inline uintptr_t grpc_chttp2_get_static_hpack_table_index(grpc_mdelem md) {
-  uintptr_t index =
-      reinterpret_cast<grpc_core::StaticMetadata*>(GRPC_MDELEM_DATA(md)) -
-      grpc_core::g_static_mdelem_table;
-  if (index < grpc_core::hpack_constants::kLastStaticEntry) {
-    return index + 1;  // Hpack static metadata element indices start at 1
-  }
-  return 0;
-}
-
 #endif /* GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_PARSER_TABLE_H */

data/src/core/ext/transport/chttp2/transport/internal.h

@@ -36,7 +36,6 @@
 #include "src/core/ext/transport/chttp2/transport/hpack_parser.h"
 #include "src/core/ext/transport/chttp2/transport/stream_map.h"
 #include "src/core/lib/channel/channelz.h"
-#include "src/core/lib/compression/stream_compression.h"
 #include "src/core/lib/gprpp/manual_constructor.h"
 #include "src/core/lib/iomgr/combiner.h"
 #include "src/core/lib/iomgr/endpoint.h"
@@ -254,8 +253,6 @@ class Chttp2IncomingByteStream : public ByteStream {
   static void NextLocked(void* arg, grpc_error_handle error_ignored);
   static void OrphanLocked(void* arg, grpc_error_handle error_ignored);
 
-  void MaybeCreateStreamDecompressionCtx();
-
   grpc_chttp2_transport* transport_;  // Immutable.
   grpc_chttp2_stream* stream_;        // Immutable.
 
@@ -523,8 +520,6 @@ struct grpc_chttp2_stream {
     explicit Reffer(grpc_chttp2_stream* s);
   } reffer;
 
-  grpc_core::MemoryAllocator::Reservation stream_reservation;
-
   grpc_closure destroy_stream;
   grpc_closure* destroy_stream_arg;
 
@@ -644,38 +639,10 @@ struct grpc_chttp2_stream {
   grpc_chttp2_write_cb* finish_after_write = nullptr;
   size_t sending_bytes = 0;
 
-  /* Stream compression method to be used. */
-  grpc_stream_compression_method stream_compression_method =
-      GRPC_STREAM_COMPRESSION_IDENTITY_COMPRESS;
-  /* Stream decompression method to be used. */
-  grpc_stream_compression_method stream_decompression_method =
-      GRPC_STREAM_COMPRESSION_IDENTITY_DECOMPRESS;
-
-  /** Whether bytes stored in unprocessed_incoming_byte_stream is decompressed
-   */
-  bool unprocessed_incoming_frames_decompressed = false;
   /** Whether the bytes needs to be traced using Fathom */
   bool traced = false;
-  /** gRPC header bytes that are already decompressed */
-  size_t decompressed_header_bytes = 0;
   /** Byte counter for number of bytes written */
   size_t byte_counter = 0;
-
-  /** Amount of uncompressed bytes sent out when compressed_data_buffer is
-   * emptied */
-  size_t uncompressed_data_size;
-  /** Stream compression compress context */
-  grpc_stream_compression_context* stream_compression_ctx;
-  /** Buffer storing data that is compressed but not sent */
-  grpc_slice_buffer compressed_data_buffer;
-
-  /** Stream compression decompress context */
-  grpc_stream_compression_context* stream_decompression_ctx;
-  /** Temporary buffer storing decompressed data.
-   * Initialized, used, and destroyed only when stream uses (non-identity)
-   * compression.
-   */
-  grpc_slice_buffer decompressed_data_buffer;
 };
 
 /** Transport writing call flow:

data/src/core/ext/transport/chttp2/transport/parsing.cc

@@ -31,7 +31,6 @@
 #include "src/core/lib/slice/slice_string_helpers.h"
 #include "src/core/lib/slice/slice_utils.h"
 #include "src/core/lib/transport/http2_errors.h"
-#include "src/core/lib/transport/static_metadata.h"
 #include "src/core/lib/transport/status_conversion.h"
 #include "src/core/lib/transport/timeout_encoding.h"
 
@@ -306,11 +305,6 @@ static grpc_error_handle skip_parser(void* /*parser*/,
   return GRPC_ERROR_NONE;
 }
 
-grpc_error_handle skip_header(grpc_mdelem md) {
-  GRPC_MDELEM_UNREF(md);
-  return GRPC_ERROR_NONE;
-}
-
 static HPackParser::Boundary hpack_boundary_type(grpc_chttp2_transport* t,
                                                  bool is_eoh) {
   if (is_eoh) {