grpc 1.47.0-x86_64-linux → 1.48.0.pre1-x86_64-linux

data/third_party/abseil-cpp/absl/types/optional.h

@@ -282,15 +282,16 @@ class optional : private optional_internal::optional_data<T>,
   optional& operator=(optional&& src) = default;
 
   // Value assignment operators
-  template <
-      typename U = T,
-      typename = typename std::enable_if<absl::conjunction<
-          absl::negation<
-              std::is_same<optional<T>, typename std::decay<U>::type>>,
-          absl::negation<
-              absl::conjunction<std::is_scalar<T>,
-                                std::is_same<T, typename std::decay<U>::type>>>,
-          std::is_constructible<T, U>, std::is_assignable<T&, U>>::value>::type>
+  template <typename U = T,
+            int&...,  // Workaround an internal compiler error in GCC 5 to 10.
+            typename = typename std::enable_if<absl::conjunction<
+                absl::negation<
+                    std::is_same<optional<T>, typename std::decay<U>::type> >,
+                absl::negation<absl::conjunction<
+                    std::is_scalar<T>,
+                    std::is_same<T, typename std::decay<U>::type> > >,
+                std::is_constructible<T, U>,
+                std::is_assignable<T&, U> >::value>::type>
   optional& operator=(U&& v) {
     this->assign(std::forward<U>(v));
     return *this;
@@ -298,13 +299,14 @@ class optional : private optional_internal::optional_data<T>,
 
   template <
       typename U,
+      int&...,  // Workaround an internal compiler error in GCC 5 to 10.
       typename = typename std::enable_if<absl::conjunction<
-          absl::negation<std::is_same<T, U>>,
+          absl::negation<std::is_same<T, U> >,
           std::is_constructible<T, const U&>, std::is_assignable<T&, const U&>,
           absl::negation<
               optional_internal::
                   is_constructible_convertible_assignable_from_optional<
-                      T, U>>>::value>::type>
+                      T, U> > >::value>::type>
   optional& operator=(const optional<U>& rhs) {
     if (rhs) {
       this->assign(*rhs);
@@ -315,13 +317,14 @@ class optional : private optional_internal::optional_data<T>,
   }
 
   template <typename U,
+            int&...,  // Workaround an internal compiler error in GCC 5 to 10.
             typename = typename std::enable_if<absl::conjunction<
-                absl::negation<std::is_same<T, U>>, std::is_constructible<T, U>,
-                std::is_assignable<T&, U>,
+                absl::negation<std::is_same<T, U> >,
+                std::is_constructible<T, U>, std::is_assignable<T&, U>,
                 absl::negation<
                     optional_internal::
                         is_constructible_convertible_assignable_from_optional<
-                            T, U>>>::value>::type>
+                            T, U> > >::value>::type>
   optional& operator=(optional<U>&& rhs) {
     if (rhs) {
       this->assign(std::move(*rhs));

data/third_party/abseil-cpp/absl/types/span.h

@@ -664,7 +664,8 @@ constexpr Span<T> MakeSpan(T* ptr, size_t size) noexcept {
 
 template <int&... ExplicitArgumentBarrier, typename T>
 Span<T> MakeSpan(T* begin, T* end) noexcept {
-  return ABSL_HARDENING_ASSERT(begin <= end), Span<T>(begin, end - begin);
+  return ABSL_HARDENING_ASSERT(begin <= end),
+         Span<T>(begin, static_cast<size_t>(end - begin));
 }
 
 template <int&... ExplicitArgumentBarrier, typename C>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc
 version: !ruby/object:Gem::Version
-  version: 1.47.0
+  version: 1.48.0.pre1
 platform: x86_64-linux
 authors:
 - gRPC Authors
 autorequire:
 bindir: src/ruby/bin
 cert_chain: []
-date: 2022-06-21 00:00:00.000000000 Z
+date: 2022-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -596,6 +596,10 @@ files:
 - src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.h
 - src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c
 - src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h
+- src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.c
+- src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h
+- src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.c
+- src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h
 - src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.c
 - src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.h
 - src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.c
@@ -1049,6 +1053,8 @@ files:
 - src/core/ext/xds/xds_http_filters.h
 - src/core/ext/xds/xds_http_rbac_filter.cc
 - src/core/ext/xds/xds_http_rbac_filter.h
+- src/core/ext/xds/xds_lb_policy_registry.cc
+- src/core/ext/xds/xds_lb_policy_registry.h
 - src/core/ext/xds/xds_listener.cc
 - src/core/ext/xds/xds_listener.h
 - src/core/ext/xds/xds_resource_type.cc
@@ -1072,6 +1078,7 @@ files:
 - src/core/lib/channel/channel_args.h
 - src/core/lib/channel/channel_args_preconditioning.cc
 - src/core/lib/channel/channel_args_preconditioning.h
+- src/core/lib/channel/channel_fwd.h
 - src/core/lib/channel/channel_stack.cc
 - src/core/lib/channel/channel_stack.h
 - src/core/lib/channel/channel_stack_builder.cc
@@ -1110,9 +1117,20 @@ files:
 - src/core/lib/event_engine/event_engine.cc
 - src/core/lib/event_engine/event_engine_factory.h
 - src/core/lib/event_engine/handle_containers.h
-- src/core/lib/event_engine/iomgr_engine.cc
-- src/core/lib/event_engine/iomgr_engine.h
+- src/core/lib/event_engine/iomgr_engine/iomgr_engine.cc
+- src/core/lib/event_engine/iomgr_engine/iomgr_engine.h
+- src/core/lib/event_engine/iomgr_engine/thread_pool.cc
+- src/core/lib/event_engine/iomgr_engine/thread_pool.h
+- src/core/lib/event_engine/iomgr_engine/time_averaged_stats.cc
+- src/core/lib/event_engine/iomgr_engine/time_averaged_stats.h
+- src/core/lib/event_engine/iomgr_engine/timer.cc
+- src/core/lib/event_engine/iomgr_engine/timer.h
+- src/core/lib/event_engine/iomgr_engine/timer_heap.cc
+- src/core/lib/event_engine/iomgr_engine/timer_heap.h
+- src/core/lib/event_engine/iomgr_engine/timer_manager.cc
+- src/core/lib/event_engine/iomgr_engine/timer_manager.h
 - src/core/lib/event_engine/memory_allocator.cc
+- src/core/lib/event_engine/promise.h
 - src/core/lib/event_engine/resolved_address.cc
 - src/core/lib/event_engine/slice.cc
 - src/core/lib/event_engine/slice_buffer.cc
@@ -1492,8 +1510,8 @@ files:
 - src/core/lib/security/security_connector/insecure/insecure_security_connector.h
 - src/core/lib/security/security_connector/load_system_roots.h
 - src/core/lib/security/security_connector/load_system_roots_fallback.cc
-- src/core/lib/security/security_connector/load_system_roots_linux.cc
-- src/core/lib/security/security_connector/load_system_roots_linux.h
+- src/core/lib/security/security_connector/load_system_roots_supported.cc
+- src/core/lib/security/security_connector/load_system_roots_supported.h
 - src/core/lib/security/security_connector/local/local_security_connector.cc
 - src/core/lib/security/security_connector/local/local_security_connector.h
 - src/core/lib/security/security_connector/security_connector.cc
@@ -1537,8 +1555,6 @@ files:
 - src/core/lib/slice/slice_refcount.cc
 - src/core/lib/slice/slice_refcount.h
 - src/core/lib/slice/slice_refcount_base.h
-- src/core/lib/slice/slice_split.cc
-- src/core/lib/slice/slice_split.h
 - src/core/lib/slice/slice_string_helpers.cc
 - src/core/lib/slice/slice_string_helpers.h
 - src/core/lib/surface/api_trace.cc
@@ -1577,8 +1593,6 @@ files:
 - src/core/lib/surface/version.cc
 - src/core/lib/transport/bdp_estimator.cc
 - src/core/lib/transport/bdp_estimator.h
-- src/core/lib/transport/byte_stream.cc
-- src/core/lib/transport/byte_stream.h
 - src/core/lib/transport/connectivity_state.cc
 - src/core/lib/transport/connectivity_state.h
 - src/core/lib/transport/error_utils.cc
@@ -1605,6 +1619,7 @@ files:
 - src/core/lib/transport/timeout_encoding.h
 - src/core/lib/transport/transport.cc
 - src/core/lib/transport/transport.h
+- src/core/lib/transport/transport_fwd.h
 - src/core/lib/transport/transport_impl.h
 - src/core/lib/transport/transport_op_string.cc
 - src/core/lib/uri/uri_parser.cc
@@ -1673,6 +1688,8 @@ files:
 - src/ruby/bin/math_services_pb.rb
 - src/ruby/bin/noproto_client.rb
 - src/ruby/bin/noproto_server.rb
+- src/ruby/ext/grpc/ext-export-truffleruby.clang
+- src/ruby/ext/grpc/ext-export-truffleruby.gcc
 - src/ruby/ext/grpc/ext-export.clang
 - src/ruby/ext/grpc/ext-export.gcc
 - src/ruby/ext/grpc/extconf.rb
@@ -1815,6 +1832,7 @@ files:
 - third_party/abseil-cpp/absl/base/internal/low_level_alloc.h
 - third_party/abseil-cpp/absl/base/internal/low_level_scheduling.h
 - third_party/abseil-cpp/absl/base/internal/per_thread_tls.h
+- third_party/abseil-cpp/absl/base/internal/prefetch.h
 - third_party/abseil-cpp/absl/base/internal/raw_logging.cc
 - third_party/abseil-cpp/absl/base/internal/raw_logging.h
 - third_party/abseil-cpp/absl/base/internal/scheduling_mode.h
@@ -1826,6 +1844,8 @@ files:
 - third_party/abseil-cpp/absl/base/internal/spinlock_wait.cc
 - third_party/abseil-cpp/absl/base/internal/spinlock_wait.h
 - third_party/abseil-cpp/absl/base/internal/spinlock_win32.inc
+- third_party/abseil-cpp/absl/base/internal/strerror.cc
+- third_party/abseil-cpp/absl/base/internal/strerror.h
 - third_party/abseil-cpp/absl/base/internal/sysinfo.cc
 - third_party/abseil-cpp/absl/base/internal/sysinfo.h
 - third_party/abseil-cpp/absl/base/internal/thread_annotations.h
@@ -1845,8 +1865,6 @@ files:
 - third_party/abseil-cpp/absl/base/policy_checks.h
 - third_party/abseil-cpp/absl/base/port.h
 - third_party/abseil-cpp/absl/base/thread_annotations.h
-- third_party/abseil-cpp/absl/cleanup/cleanup.h
-- third_party/abseil-cpp/absl/cleanup/internal/cleanup.h
 - third_party/abseil-cpp/absl/container/fixed_array.h
 - third_party/abseil-cpp/absl/container/flat_hash_map.h
 - third_party/abseil-cpp/absl/container/flat_hash_set.h
@@ -1860,7 +1878,6 @@ files:
 - third_party/abseil-cpp/absl/container/internal/hashtablez_sampler.cc
 - third_party/abseil-cpp/absl/container/internal/hashtablez_sampler.h
 - third_party/abseil-cpp/absl/container/internal/hashtablez_sampler_force_weak_definition.cc
-- third_party/abseil-cpp/absl/container/internal/have_sse.h
 - third_party/abseil-cpp/absl/container/internal/inlined_vector.h
 - third_party/abseil-cpp/absl/container/internal/layout.h
 - third_party/abseil-cpp/absl/container/internal/raw_hash_map.h
@@ -1976,6 +1993,10 @@ files:
 - third_party/abseil-cpp/absl/strings/charconv.h
 - third_party/abseil-cpp/absl/strings/cord.cc
 - third_party/abseil-cpp/absl/strings/cord.h
+- third_party/abseil-cpp/absl/strings/cord_analysis.cc
+- third_party/abseil-cpp/absl/strings/cord_analysis.h
+- third_party/abseil-cpp/absl/strings/cord_buffer.cc
+- third_party/abseil-cpp/absl/strings/cord_buffer.h
 - third_party/abseil-cpp/absl/strings/escaping.cc
 - third_party/abseil-cpp/absl/strings/escaping.h
 - third_party/abseil-cpp/absl/strings/internal/char_map.h
@@ -1983,6 +2004,7 @@ files:
 - third_party/abseil-cpp/absl/strings/internal/charconv_bigint.h
 - third_party/abseil-cpp/absl/strings/internal/charconv_parse.cc
 - third_party/abseil-cpp/absl/strings/internal/charconv_parse.h
+- third_party/abseil-cpp/absl/strings/internal/cord_data_edge.h
 - third_party/abseil-cpp/absl/strings/internal/cord_internal.cc
 - third_party/abseil-cpp/absl/strings/internal/cord_internal.h
 - third_party/abseil-cpp/absl/strings/internal/cord_rep_btree.cc
@@ -1993,6 +2015,8 @@ files:
 - third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_reader.h
 - third_party/abseil-cpp/absl/strings/internal/cord_rep_consume.cc
 - third_party/abseil-cpp/absl/strings/internal/cord_rep_consume.h
+- third_party/abseil-cpp/absl/strings/internal/cord_rep_crc.cc
+- third_party/abseil-cpp/absl/strings/internal/cord_rep_crc.h
 - third_party/abseil-cpp/absl/strings/internal/cord_rep_flat.h
 - third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.cc
 - third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.h
@@ -2801,9 +2825,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 3.2.dev
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.4
 signing_key:

data/src/core/lib/slice/slice_split.cc

@@ -1,103 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <grpc/support/port_platform.h>
-
-#include "src/core/lib/slice/slice_split.h"
-
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
-
-#include <grpc/slice_buffer.h>
-#include <grpc/support/log.h>
-
-/** Finds the initial (\a begin) and final (\a end) offsets of the next
- * substring from \a str + \a read_offset until the next \a sep or the end of \a
- * str.
- *
- * Returns 1 and updates \a begin and \a end. Returns 0 otherwise. */
-static int slice_find_separator_offset(const grpc_slice str, const char* sep,
-                                       const size_t read_offset, size_t* begin,
-                                       size_t* end) {
-  size_t i;
-  const uint8_t* str_ptr = GRPC_SLICE_START_PTR(str) + read_offset;
-  const size_t str_len = GRPC_SLICE_LENGTH(str) - read_offset;
-  const size_t sep_len = strlen(sep);
-  if (str_len < sep_len) {
-    return 0;
-  }
-
-  for (i = 0; i <= str_len - sep_len; i++) {
-    if (memcmp(str_ptr + i, sep, sep_len) == 0) {
-      *begin = read_offset;
-      *end = read_offset + i;
-      return 1;
-    }
-  }
-  return 0;
-}
-
-static void skip_leading_trailing_spaces(const uint8_t* str_buffer,
-                                         size_t* begin, size_t* end) {
-  while (*begin < *end && str_buffer[*begin] == ' ') {
-    (*begin)++;
-  }
-  while (*begin < *end && str_buffer[*end - 1] == ' ') {
-    (*end)--;
-  }
-}
-
-static void grpc_slice_split_inner(grpc_slice str, const char* sep,
-                                   grpc_slice_buffer* dst, bool no_space) {
-  const size_t sep_len = strlen(sep);
-  size_t begin, end;
-  const uint8_t* str_buffer = GRPC_SLICE_START_PTR(str);
-  size_t sep_pos;
-
-  GPR_ASSERT(sep_len > 0);
-
-  if (slice_find_separator_offset(str, sep, 0, &begin, &end) != 0) {
-    do {
-      sep_pos = end;
-      if (no_space) {
-        skip_leading_trailing_spaces(str_buffer, &begin, &end);
-      }
-      grpc_slice_buffer_add_indexed(dst, grpc_slice_sub(str, begin, end));
-    } while (slice_find_separator_offset(str, sep, sep_pos + sep_len, &begin,
-                                         &end) != 0);
-    begin = sep_pos + sep_len;
-    end = GRPC_SLICE_LENGTH(str);
-    if (no_space) {
-      skip_leading_trailing_spaces(str_buffer, &begin, &end);
-    }
-    grpc_slice_buffer_add_indexed(dst, grpc_slice_sub(str, begin, end));
-  } else { /* no sep found, add whole input */
-    begin = 0;
-    end = GRPC_SLICE_LENGTH(str);
-    if (no_space) {
-      skip_leading_trailing_spaces(str_buffer, &begin, &end);
-    }
-    grpc_slice_buffer_add_indexed(dst, grpc_slice_sub(str, begin, end));
-  }
-}
-
-void grpc_slice_split(grpc_slice str, const char* sep, grpc_slice_buffer* dst) {
-  grpc_slice_split_inner(str, sep, dst, false);
-}
-
-void grpc_slice_split_without_space(grpc_slice str, const char* sep,
-                                    grpc_slice_buffer* dst) {
-  grpc_slice_split_inner(str, sep, dst, true);
-}

data/src/core/lib/slice/slice_split.h

@@ -1,36 +0,0 @@
-/*
- *
- * Copyright 2015 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#ifndef GRPC_CORE_LIB_SLICE_SLICE_SPLIT_H
-#define GRPC_CORE_LIB_SLICE_SLICE_SPLIT_H
-
-#include <grpc/support/port_platform.h>
-
-#include <grpc/slice.h>
-
-/** Split \a str by the separator \a sep. Results are stored in \a dst, which
- * should be a properly initialized instance. */
-void grpc_slice_split(grpc_slice str, const char* sep, grpc_slice_buffer* dst);
-
-/** Split \a str by the separator \a sep and remove the leading and trailing
- * spaces of each resulting token. Results are stored in \a dst, which should be
- * a properly initialized instance. */
-void grpc_slice_split_without_space(grpc_slice str, const char* sep,
-                                    grpc_slice_buffer* dst);
-
-#endif /* GRPC_CORE_LIB_SLICE_SLICE_SPLIT_H */

data/src/core/lib/transport/byte_stream.cc

@@ -1,165 +0,0 @@
-/*
- *
- * Copyright 2015 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <grpc/support/port_platform.h>
-
-#include "src/core/lib/transport/byte_stream.h"
-
-#include <memory>
-#include <utility>
-
-#include <grpc/slice_buffer.h>
-#include <grpc/support/log.h>
-
-#include "src/core/lib/slice/slice_internal.h"
-#include "src/core/lib/slice/slice_refcount.h"
-
-namespace grpc_core {
-
-//
-// SliceBufferByteStream
-//
-
-SliceBufferByteStream::SliceBufferByteStream(grpc_slice_buffer* slice_buffer,
-                                             uint32_t flags)
-    : ByteStream(static_cast<uint32_t>(slice_buffer->length), flags) {
-  GPR_ASSERT(slice_buffer->length <= UINT32_MAX);
-  grpc_slice_buffer_init(&backing_buffer_);
-  grpc_slice_buffer_swap(slice_buffer, &backing_buffer_);
-  if (backing_buffer_.count == 0) {
-    grpc_slice_buffer_add_indexed(&backing_buffer_, grpc_empty_slice());
-    GPR_ASSERT(backing_buffer_.count > 0);
-  }
-}
-
-SliceBufferByteStream::~SliceBufferByteStream() {}
-
-void SliceBufferByteStream::Orphan() {
-  grpc_slice_buffer_destroy_internal(&backing_buffer_);
-  GRPC_ERROR_UNREF(shutdown_error_);
-  shutdown_error_ = GRPC_ERROR_NONE;
-  // Note: We do not actually delete the object here, since
-  // SliceBufferByteStream is usually allocated as part of a larger
-  // object and has an OrphanablePtr of itself passed down through the
-  // filter stack.
-}
-
-bool SliceBufferByteStream::Next(size_t /*max_size_hint*/,
-                                 grpc_closure* /*on_complete*/) {
-  GPR_DEBUG_ASSERT(backing_buffer_.count > 0);
-  return true;
-}
-
-grpc_error_handle SliceBufferByteStream::Pull(grpc_slice* slice) {
-  if (GPR_UNLIKELY(shutdown_error_ != GRPC_ERROR_NONE)) {
-    return GRPC_ERROR_REF(shutdown_error_);
-  }
-  *slice = grpc_slice_buffer_take_first(&backing_buffer_);
-  return GRPC_ERROR_NONE;
-}
-
-void SliceBufferByteStream::Shutdown(grpc_error_handle error) {
-  GRPC_ERROR_UNREF(shutdown_error_);
-  shutdown_error_ = error;
-}
-
-//
-// ByteStreamCache
-//
-
-ByteStreamCache::ByteStreamCache(OrphanablePtr<ByteStream> underlying_stream)
-    : underlying_stream_(std::move(underlying_stream)),
-      length_(underlying_stream_->length()),
-      flags_(underlying_stream_->flags()) {
-  grpc_slice_buffer_init(&cache_buffer_);
-}
-
-ByteStreamCache::~ByteStreamCache() { Destroy(); }
-
-void ByteStreamCache::Destroy() {
-  underlying_stream_.reset();
-  if (cache_buffer_.length > 0) {
-    grpc_slice_buffer_destroy_internal(&cache_buffer_);
-  }
-}
-
-//
-// ByteStreamCache::CachingByteStream
-//
-
-ByteStreamCache::CachingByteStream::CachingByteStream(ByteStreamCache* cache)
-    : ByteStream(cache->length_, cache->flags_), cache_(cache) {}
-
-ByteStreamCache::CachingByteStream::~CachingByteStream() {}
-
-void ByteStreamCache::CachingByteStream::Orphan() {
-  GRPC_ERROR_UNREF(shutdown_error_);
-  shutdown_error_ = GRPC_ERROR_NONE;
-  // Note: We do not actually delete the object here, since
-  // CachingByteStream is usually allocated as part of a larger
-  // object and has an OrphanablePtr of itself passed down through the
-  // filter stack.
-}
-
-bool ByteStreamCache::CachingByteStream::Next(size_t max_size_hint,
-                                              grpc_closure* on_complete) {
-  if (shutdown_error_ != GRPC_ERROR_NONE) return true;
-  if (cursor_ < cache_->cache_buffer_.count) return true;
-  GPR_ASSERT(cache_->underlying_stream_ != nullptr);
-  return cache_->underlying_stream_->Next(max_size_hint, on_complete);
-}
-
-grpc_error_handle ByteStreamCache::CachingByteStream::Pull(grpc_slice* slice) {
-  if (shutdown_error_ != GRPC_ERROR_NONE) {
-    return GRPC_ERROR_REF(shutdown_error_);
-  }
-  if (cursor_ < cache_->cache_buffer_.count) {
-    *slice = grpc_slice_ref_internal(cache_->cache_buffer_.slices[cursor_]);
-    ++cursor_;
-    offset_ += GRPC_SLICE_LENGTH(*slice);
-    return GRPC_ERROR_NONE;
-  }
-  GPR_ASSERT(cache_->underlying_stream_ != nullptr);
-  grpc_error_handle error = cache_->underlying_stream_->Pull(slice);
-  if (error == GRPC_ERROR_NONE) {
-    grpc_slice_buffer_add(&cache_->cache_buffer_,
-                          grpc_slice_ref_internal(*slice));
-    ++cursor_;
-    offset_ += GRPC_SLICE_LENGTH(*slice);
-    // Orphan the underlying stream if it's been drained.
-    if (offset_ == cache_->underlying_stream_->length()) {
-      cache_->underlying_stream_.reset();
-    }
-  }
-  return error;
-}
-
-void ByteStreamCache::CachingByteStream::Shutdown(grpc_error_handle error) {
-  GRPC_ERROR_UNREF(shutdown_error_);
-  shutdown_error_ = GRPC_ERROR_REF(error);
-  if (cache_->underlying_stream_ != nullptr) {
-    cache_->underlying_stream_->Shutdown(error);
-  }
-}
-
-void ByteStreamCache::CachingByteStream::Reset() {
-  cursor_ = 0;
-  offset_ = 0;
-}
-
-}  // namespace grpc_core