gfe-relnote: (n/a) Deprecate --gfe2_reloadable_flag_quic_faster_interval_add_in_sequence_buffer. PiperOrigin-RevId: 249325984 Change-Id: Idc6e2d47856ed04abfca1b43467cafe9acf93e39
diff --git a/quic/core/quic_stream_sequencer_buffer.cc b/quic/core/quic_stream_sequencer_buffer.cc index d42ee20..7f0f2cb 100644 --- a/quic/core/quic_stream_sequencer_buffer.cc +++ b/quic/core/quic_stream_sequencer_buffer.cc
@@ -34,9 +34,7 @@ blocks_count_(CalculateBlockCount(max_capacity_bytes)), total_bytes_read_(0), blocks_(nullptr), - total_bytes_prefetched_(0), - faster_interval_add_in_sequence_buffer_( - GetQuicReloadableFlag(quic_faster_interval_add_in_sequence_buffer)) { + total_bytes_prefetched_(0) { Clear(); } @@ -90,35 +88,15 @@ bytes_received_.IsDisjoint(QuicInterval<QuicStreamOffset>( starting_offset, starting_offset + size))) { // Optimization for the typical case, when all data is newly received. - if (faster_interval_add_in_sequence_buffer_) { - QUIC_RELOADABLE_FLAG_COUNT(quic_faster_interval_add_in_sequence_buffer); - bytes_received_.AddOptimizedForAppend(starting_offset, - starting_offset + size); - if (bytes_received_.Size() >= kMaxNumDataIntervalsAllowed) { - // This frame is going to create more intervals than allowed. Stop - // processing. - *error_details = "Too many data intervals received for this stream."; - return QUIC_TOO_MANY_STREAM_DATA_INTERVALS; - } - } else { - if (!bytes_received_.Empty() && - starting_offset == bytes_received_.rbegin()->max()) { - // Extend the right edge of last interval. - // TODO(fayang): Encapsulate this into a future version of - // QuicIntervalSet if this is more efficient than Add. - const_cast<QuicInterval<QuicStreamOffset>*>( - &(*bytes_received_.rbegin())) - ->SetMax(starting_offset + size); - } else { - bytes_received_.Add(starting_offset, starting_offset + size); - if (bytes_received_.Size() >= kMaxNumDataIntervalsAllowed) { - // This frame is going to create more intervals than allowed. Stop - // processing. - *error_details = "Too many data intervals received for this stream."; - return QUIC_TOO_MANY_STREAM_DATA_INTERVALS; - } - } + bytes_received_.AddOptimizedForAppend(starting_offset, + starting_offset + size); + if (bytes_received_.Size() >= kMaxNumDataIntervalsAllowed) { + // This frame is going to create more intervals than allowed. Stop + // processing. + *error_details = "Too many data intervals received for this stream."; + return QUIC_TOO_MANY_STREAM_DATA_INTERVALS; } + size_t bytes_copy = 0; if (!CopyStreamData(starting_offset, data, &bytes_copy, error_details)) { return QUIC_STREAM_SEQUENCER_INVALID_STATE;
diff --git a/quic/core/quic_stream_sequencer_buffer.h b/quic/core/quic_stream_sequencer_buffer.h index 6f4717d..08a1ab4 100644 --- a/quic/core/quic_stream_sequencer_buffer.h +++ b/quic/core/quic_stream_sequencer_buffer.h
@@ -239,9 +239,6 @@ // Total number of bytes that have been prefetched. QuicStreamOffset total_bytes_prefetched_; - - // Latched value of --quic_faster_interval_add_in_sequence_buffer. - const bool faster_interval_add_in_sequence_buffer_; }; } // namespace quic