Skip to content

Commit 840bcce

Browse files
ctillerctiller
authored
Revert "HPACK Table --> C++ (grpc#26851)" (grpc#26995)
This reverts commit 83bcb0c.
1 parent aa6af14 commit 840bcce

File tree

20 files changed

+1580
-1052
lines changed

20 files changed

+1580
-1052
lines changed

‎BUILD‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2634,7 +2634,6 @@ grpc_cc_library(
26342634
"grpc_http_filters",
26352635
"grpc_trace",
26362636
"grpc_transport_chttp2_alpn",
2637-
"match",
26382637
"popularity_count",
26392638
],
26402639
)

‎CMakeLists.txt‎

Lines changed: 4 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build_autogenerated.yaml‎

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gRPC-C++.podspec‎

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gRPC-Core.podspec‎

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎grpc.gemspec‎

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎grpc.gyp‎

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.xml‎

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/core/ext/transport/chttp2/transport/hpack_encoder.cc‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@ static void GPR_ATTRIBUTE_NOINLINE hpack_enc_log(grpc_mdelem elem) {
586586
}
587587

588588
static uint32_t dynidx(grpc_chttp2_hpack_compressor* c, uint32_t elem_index) {
589-
return 1 + grpc_core::HPackTable::kLastStaticEntry + c->tail_remote_index +
589+
return 1 + GRPC_CHTTP2_LAST_STATIC_ENTRY + c->tail_remote_index +
590590
c->table_elems - elem_index;
591591
}
592592

@@ -833,7 +833,7 @@ void grpc_chttp2_encode_header(grpc_chttp2_hpack_compressor* c,
833833
if (is_static &&
834834
(static_index =
835835
reinterpret_cast<grpc_core::StaticMetadata*>(GRPC_MDELEM_DATA(md))
836-
->StaticIndex()) < grpc_core::HPackTable::kLastStaticEntry) {
836+
->StaticIndex()) < GRPC_CHTTP2_LAST_STATIC_ENTRY) {
837837
emit_indexed(c, static_cast<uint32_t>(static_index + 1), &st);
838838
} else {
839839
hpack_enc(c, md, &st);
@@ -847,8 +847,7 @@ void grpc_chttp2_encode_header(grpc_chttp2_hpack_compressor* c,
847847
if (is_static &&
848848
(static_index = reinterpret_cast<grpc_core::StaticMetadata*>(
849849
GRPC_MDELEM_DATA(l->md))
850-
->StaticIndex()) <
851-
grpc_core::HPackTable::kLastStaticEntry) {
850+
->StaticIndex()) < GRPC_CHTTP2_LAST_STATIC_ENTRY) {
852851
emit_indexed(c, static_cast<uint32_t>(static_index + 1), &st);
853852
} else {
854853
hpack_enc(c, l->md, &st);

0 commit comments

Comments
 (0)