Split the HPackEncoder partial class (#31210)

Tratcher · web-flow · commit 94cd7b9c069f · 2021-03-25T12:36:17.000+13:00
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http2/HPackHeaderWriter.cs b/src/Servers/Kestrel/Core/src/Internal/Http2/HPackHeaderWriter.cs
@@ -12,7 +12,7 @@ internal static class HPackHeaderWriter
         /// <summary>
         /// Begin encoding headers in the first HEADERS frame.
         /// </summary>
-        public static bool BeginEncodeHeaders(int statusCode, HPackEncoder hpackEncoder, Http2HeadersEnumerator headersEnumerator, Span<byte> buffer, out int length)
+        public static bool BeginEncodeHeaders(int statusCode, DynamicHPackEncoder hpackEncoder, Http2HeadersEnumerator headersEnumerator, Span<byte> buffer, out int length)
         {
             length = 0;
 
@@ -43,7 +43,7 @@ public static bool BeginEncodeHeaders(int statusCode, HPackEncoder hpackEncoder,
         /// <summary>
         /// Begin encoding headers in the first HEADERS frame.
         /// </summary>
-        public static bool BeginEncodeHeaders(HPackEncoder hpackEncoder, Http2HeadersEnumerator headersEnumerator, Span<byte> buffer, out int length)
+        public static bool BeginEncodeHeaders(DynamicHPackEncoder hpackEncoder, Http2HeadersEnumerator headersEnumerator, Span<byte> buffer, out int length)
         {
             length = 0;
 
@@ -66,12 +66,12 @@ public static bool BeginEncodeHeaders(HPackEncoder hpackEncoder, Http2HeadersEnu
         /// <summary>
         /// Continue encoding headers in the next HEADERS frame. The enumerator should already have a current value.
         /// </summary>
-        public static bool ContinueEncodeHeaders(HPackEncoder hpackEncoder, Http2HeadersEnumerator headersEnumerator, Span<byte> buffer, out int length)
+        public static bool ContinueEncodeHeaders(DynamicHPackEncoder hpackEncoder, Http2HeadersEnumerator headersEnumerator, Span<byte> buffer, out int length)
         {
             return EncodeHeadersCore(hpackEncoder, headersEnumerator, buffer, throwIfNoneEncoded: true, out length);
         }
 
-        private static bool EncodeStatusHeader(int statusCode, HPackEncoder hpackEncoder, Span<byte> buffer, out int length)
+        private static bool EncodeStatusHeader(int statusCode, DynamicHPackEncoder hpackEncoder, Span<byte> buffer, out int length)
         {
             switch (statusCode)
             {
@@ -91,7 +91,7 @@ private static bool EncodeStatusHeader(int statusCode, HPackEncoder hpackEncoder
             }
         }
 
-        private static bool EncodeHeadersCore(HPackEncoder hpackEncoder, Http2HeadersEnumerator headersEnumerator, Span<byte> buffer, bool throwIfNoneEncoded, out int length)
+        private static bool EncodeHeadersCore(DynamicHPackEncoder hpackEncoder, Http2HeadersEnumerator headersEnumerator, Span<byte> buffer, bool throwIfNoneEncoded, out int length)
         {
             var currentLength = 0;
             do
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2FrameWriter.cs b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2FrameWriter.cs
@@ -38,7 +38,7 @@ internal class Http2FrameWriter
         private readonly ITimeoutControl _timeoutControl;
         private readonly MinDataRate? _minResponseDataRate;
         private readonly TimingPipeFlusher _flusher;
-        private readonly HPackEncoder _hpackEncoder;
+        private readonly DynamicHPackEncoder _hpackEncoder;
 
         private uint _maxFrameSize = Http2PeerSettings.MinAllowedMaxFrameSize;
         private byte[] _headerEncodingBuffer;
@@ -71,7 +71,7 @@ public Http2FrameWriter(
             _outgoingFrame = new Http2Frame();
             _headerEncodingBuffer = new byte[_maxFrameSize];
 
-            _hpackEncoder = new HPackEncoder(serviceContext.ServerOptions.AllowResponseHeaderCompression);
+            _hpackEncoder = new DynamicHPackEncoder(serviceContext.ServerOptions.AllowResponseHeaderCompression);
         }
 
         public void UpdateMaxHeaderTableSize(uint maxHeaderTableSize)
diff --git a/src/Servers/Kestrel/Core/test/Http2HPackEncoderTests.cs b/src/Servers/Kestrel/Core/test/Http2HPackEncoderTests.cs
@@ -26,7 +26,7 @@ public void BeginEncodeHeaders_Status302_NewIndexValue()
             var enumerator = new Http2HeadersEnumerator();
             enumerator.Initialize(headers);
 
-            var hpackEncoder = new HPackEncoder();
+            var hpackEncoder = new DynamicHPackEncoder();
             Assert.True(HPackHeaderWriter.BeginEncodeHeaders(302, hpackEncoder, enumerator, buffer, out var length));
 
             var result = buffer.Slice(0, length).ToArray();
@@ -49,7 +49,7 @@ public void BeginEncodeHeaders_CacheControlPrivate_NewIndexValue()
             var enumerator = new Http2HeadersEnumerator();
             enumerator.Initialize(headers);
 
-            var hpackEncoder = new HPackEncoder();
+            var hpackEncoder = new DynamicHPackEncoder();
             Assert.True(HPackHeaderWriter.BeginEncodeHeaders(302, hpackEncoder, enumerator, buffer, out var length));
 
             var result = buffer.Slice(5, length - 5).ToArray();
@@ -75,7 +75,7 @@ public void BeginEncodeHeaders_MaxHeaderTableSizeExceeded_EvictionsToFit()
 
             var enumerator = new Http2HeadersEnumerator();
 
-            var hpackEncoder = new HPackEncoder(maxHeaderTableSize: 256);
+            var hpackEncoder = new DynamicHPackEncoder(maxHeaderTableSize: 256);
 
             // First response
             enumerator.Initialize(headers);
@@ -201,7 +201,7 @@ public void BeginEncodeHeaders_ExcludedHeaders_NotAddedToTable(string headerName
             var enumerator = new Http2HeadersEnumerator();
             enumerator.Initialize(headers);
 
-            var hpackEncoder = new HPackEncoder(maxHeaderTableSize: Http2PeerSettings.DefaultHeaderTableSize);
+            var hpackEncoder = new DynamicHPackEncoder(maxHeaderTableSize: Http2PeerSettings.DefaultHeaderTableSize);
             Assert.True(HPackHeaderWriter.BeginEncodeHeaders(hpackEncoder, enumerator, buffer, out _));
 
             if (neverIndex)
@@ -227,7 +227,7 @@ public void BeginEncodeHeaders_HeaderExceedHeaderTableSize_NoIndexAndNoHeaderEnt
             var enumerator = new Http2HeadersEnumerator();
             enumerator.Initialize(headers);
 
-            var hpackEncoder = new HPackEncoder();
+            var hpackEncoder = new DynamicHPackEncoder();
             Assert.True(HPackHeaderWriter.BeginEncodeHeaders(200, hpackEncoder, enumerator, buffer, out var length));
 
             Assert.Empty(GetHeaderEntries(hpackEncoder));
@@ -312,7 +312,7 @@ public void BeginEncodeHeaders_HeaderExceedHeaderTableSize_NoIndexAndNoHeaderEnt
         [MemberData(nameof(SinglePayloadData))]
         public void EncodesHeadersInSinglePayloadWhenSpaceAvailable(KeyValuePair<string, string>[] headers, byte[] expectedPayload, int? statusCode)
         {
-            HPackEncoder hpackEncoder = new HPackEncoder();
+            var hpackEncoder = new DynamicHPackEncoder();
 
             var payload = new byte[1024];
             var length = 0;
@@ -376,7 +376,7 @@ public void EncodesHeadersInMultiplePayloadsWhenSpaceNotAvailable(bool exactSize
                 0x07, 0x4b, 0x65, 0x73, 0x74, 0x72, 0x65, 0x6c
             };
 
-            var hpackEncoder = new HPackEncoder();
+            var hpackEncoder = new DynamicHPackEncoder();
 
             Span<byte> payload = new byte[1024];
             var offset = 0;
@@ -415,7 +415,7 @@ public void BeginEncodeHeaders_MaxHeaderTableSizeUpdated_SizeUpdateInHeaders()
         {
             Span<byte> buffer = new byte[1024 * 16];
 
-            var hpackEncoder = new HPackEncoder();
+            var hpackEncoder = new DynamicHPackEncoder();
             hpackEncoder.UpdateMaxHeaderTableSize(100);
 
             var enumerator = new Http2HeadersEnumerator();
@@ -452,7 +452,7 @@ private static Http2HeadersEnumerator GetHeadersEnumerator(IEnumerable<KeyValueP
             return enumerator;
         }
 
-        private EncoderHeaderEntry GetHeaderEntry(HPackEncoder encoder, int index)
+        private EncoderHeaderEntry GetHeaderEntry(DynamicHPackEncoder encoder, int index)
         {
             var entry = encoder.Head;
             while (index-- >= 0)
@@ -462,7 +462,7 @@ private EncoderHeaderEntry GetHeaderEntry(HPackEncoder encoder, int index)
             return entry;
         }
 
-        private List<EncoderHeaderEntry> GetHeaderEntries(HPackEncoder encoder)
+        private List<EncoderHeaderEntry> GetHeaderEntries(DynamicHPackEncoder encoder)
         {
             var headers = new List<EncoderHeaderEntry>();
 
diff --git a/src/Servers/Kestrel/perf/Microbenchmarks/HPackHeaderWriterBenchmark.cs b/src/Servers/Kestrel/perf/Microbenchmarks/HPackHeaderWriterBenchmark.cs
@@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks
     public class HPackHeaderWriterBenchmark
     {
         private Http2HeadersEnumerator _http2HeadersEnumerator;
-        private HPackEncoder _hpackEncoder;
+        private DynamicHPackEncoder _hpackEncoder;
         private HttpResponseHeaders _knownResponseHeaders;
         private HttpResponseHeaders _unknownResponseHeaders;
         private byte[] _buffer;
@@ -25,7 +25,7 @@ public class HPackHeaderWriterBenchmark
         public void GlobalSetup()
         {
             _http2HeadersEnumerator = new Http2HeadersEnumerator();
-            _hpackEncoder = new HPackEncoder();
+            _hpackEncoder = new DynamicHPackEncoder();
             _buffer = new byte[1024 * 1024];
 
             _knownResponseHeaders = new HttpResponseHeaders
diff --git a/src/Servers/Kestrel/perf/Microbenchmarks/Http2ConnectionBenchmarkBase.cs b/src/Servers/Kestrel/perf/Microbenchmarks/Http2ConnectionBenchmarkBase.cs
@@ -30,7 +30,7 @@ public abstract class Http2ConnectionBenchmarkBase
         private MemoryPool<byte> _memoryPool;
         private HttpRequestHeaders _httpRequestHeaders;
         private Http2Connection _connection;
-        private HPackEncoder _hpackEncoder;
+        private DynamicHPackEncoder _hpackEncoder;
         private Http2HeadersEnumerator _requestHeadersEnumerator;
         private int _currentStreamId;
         private byte[] _headersBuffer;
@@ -56,7 +56,7 @@ public virtual void GlobalSetup()
             _httpRequestHeaders.HeaderAuthority = new StringValues("localhost:80");
 
             _headersBuffer = new byte[1024 * 16];
-            _hpackEncoder = new HPackEncoder();
+            _hpackEncoder = new DynamicHPackEncoder();
 
             var serviceContext = TestContextFactory.CreateServiceContext(
                 serverOptions: new KestrelServerOptions(),
diff --git a/src/Servers/Kestrel/shared/test/PipeWriterHttp2FrameExtensions.cs b/src/Servers/Kestrel/shared/test/PipeWriterHttp2FrameExtensions.cs
@@ -25,7 +25,7 @@ public static void WriteSettings(this PipeWriter writer, Http2PeerSettings clien
             writer.Write(payload);
         }
 
-        public static void WriteStartStream(this PipeWriter writer, int streamId, HPackEncoder hpackEncoder, Http2HeadersEnumerator headers, byte[] headerEncodingBuffer, bool endStream, Http2Frame frame = null)
+        public static void WriteStartStream(this PipeWriter writer, int streamId, DynamicHPackEncoder hpackEncoder, Http2HeadersEnumerator headers, byte[] headerEncodingBuffer, bool endStream, Http2Frame frame = null)
         {
             frame ??= new Http2Frame();
             frame.PrepareHeaders(Http2HeadersFrameFlags.NONE, streamId);
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TestBase.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TestBase.cs
@@ -123,7 +123,7 @@ protected static IEnumerable<KeyValuePair<string, string>> ReadRateRequestHeader
 
         internal readonly Http2PeerSettings _clientSettings = new Http2PeerSettings();
         internal readonly HPackDecoder _hpackDecoder;
-        internal readonly HPackEncoder _hpackEncoder;
+        internal readonly DynamicHPackEncoder _hpackEncoder;
         private readonly byte[] _headerEncodingBuffer = new byte[Http2PeerSettings.MinAllowedMaxFrameSize];
 
         internal readonly TimeoutControl _timeoutControl;
@@ -168,7 +168,7 @@ protected static IEnumerable<KeyValuePair<string, string>> ReadRateRequestHeader
         public Http2TestBase()
         {
             _hpackDecoder = new HPackDecoder((int)_clientSettings.HeaderTableSize, MaxRequestHeaderFieldSize);
-            _hpackEncoder = new HPackEncoder();
+            _hpackEncoder = new DynamicHPackEncoder();
 
             _timeoutControl = new TimeoutControl(_mockTimeoutHandler.Object);
             _mockTimeoutControl = new Mock<MockTimeoutControlBase>(_timeoutControl) { CallBase = true };
diff --git a/src/Shared/Hpack/DynamicHPackEncoder.cs b/src/Shared/Hpack/DynamicHPackEncoder.cs
@@ -7,7 +7,7 @@
 
 namespace System.Net.Http.HPack
 {
-    internal partial class HPackEncoder
+    internal class DynamicHPackEncoder
     {
         public const int DefaultHeaderTableSize = 4096;
 
@@ -22,7 +22,7 @@ internal partial class HPackEncoder
         private bool _pendingTableSizeUpdate;
         private EncoderHeaderEntry? _removed;
 
-        public HPackEncoder(bool allowDynamicCompression = true, uint maxHeaderTableSize = DefaultHeaderTableSize)
+        public DynamicHPackEncoder(bool allowDynamicCompression = true, uint maxHeaderTableSize = DefaultHeaderTableSize)
         {
             _allowDynamicCompression = allowDynamicCompression;
             _maxHeaderTableSize = maxHeaderTableSize;
@@ -54,7 +54,7 @@ public bool EnsureDynamicTableSizeUpdate(Span<byte> buffer, out int length)
             // Check if there is a table size update that should be encoded
             if (_pendingTableSizeUpdate)
             {
-                bool success = EncodeDynamicTableSizeUpdate((int)_maxHeaderTableSize, buffer, out length);
+                bool success = HPackEncoder.EncodeDynamicTableSizeUpdate((int)_maxHeaderTableSize, buffer, out length);
                 _pendingTableSizeUpdate = false;
                 return success;
             }
@@ -73,16 +73,16 @@ public bool EncodeHeader(Span<byte> buffer, int staticTableIndex, HeaderEncoding
                 int index = ResolveDynamicTableIndex(staticTableIndex, name);
 
                 return index == -1
-                    ? EncodeLiteralHeaderFieldNeverIndexingNewName(name, value, buffer, out bytesWritten)
-                    : EncodeLiteralHeaderFieldNeverIndexing(index, value, buffer, out bytesWritten);
+                    ? HPackEncoder.EncodeLiteralHeaderFieldNeverIndexingNewName(name, value, buffer, out bytesWritten)
+                    : HPackEncoder.EncodeLiteralHeaderFieldNeverIndexing(index, value, buffer, out bytesWritten);
             }
 
             // No dynamic table. Only use the static table.
             if (!_allowDynamicCompression || _maxHeaderTableSize == 0 || encodingHint == HeaderEncodingHint.IgnoreIndex)
             {
                 return staticTableIndex == -1
-                    ? EncodeLiteralHeaderFieldWithoutIndexingNewName(name, value, buffer, out bytesWritten)
-                    : EncodeLiteralHeaderFieldWithoutIndexing(staticTableIndex, value, buffer, out bytesWritten);
+                    ? HPackEncoder.EncodeLiteralHeaderFieldWithoutIndexingNewName(name, value, buffer, out bytesWritten)
+                    : HPackEncoder.EncodeLiteralHeaderFieldWithoutIndexing(staticTableIndex, value, buffer, out bytesWritten);
             }
 
             // Header is greater than the maximum table size.
@@ -92,8 +92,8 @@ public bool EncodeHeader(Span<byte> buffer, int staticTableIndex, HeaderEncoding
                 int index = ResolveDynamicTableIndex(staticTableIndex, name);
 
                 return index == -1
-                    ? EncodeLiteralHeaderFieldWithoutIndexingNewName(name, value, buffer, out bytesWritten)
-                    : EncodeLiteralHeaderFieldWithoutIndexing(index, value, buffer, out bytesWritten);
+                    ? HPackEncoder.EncodeLiteralHeaderFieldWithoutIndexingNewName(name, value, buffer, out bytesWritten)
+                    : HPackEncoder.EncodeLiteralHeaderFieldWithoutIndexing(index, value, buffer, out bytesWritten);
             }
 
             return EncodeDynamicHeader(buffer, staticTableIndex, name, value, out bytesWritten);
@@ -117,7 +117,7 @@ private bool EncodeDynamicHeader(Span<byte> buffer, int staticTableIndex, string
             {
                 // Already exists in dynamic table. Write index.
                 int index = CalculateDynamicTableIndex(headerField.Index);
-                return EncodeIndexedHeaderField(index, buffer, out bytesWritten);
+                return HPackEncoder.EncodeIndexedHeaderField(index, buffer, out bytesWritten);
             }
             else
             {
@@ -126,8 +126,8 @@ private bool EncodeDynamicHeader(Span<byte> buffer, int staticTableIndex, string
 
                 int index = ResolveDynamicTableIndex(staticTableIndex, name);
                 bool success = index == -1
-                    ? EncodeLiteralHeaderFieldIndexingNewName(name, value, buffer, out bytesWritten)
-                    : EncodeLiteralHeaderFieldIndexing(index, value, buffer, out bytesWritten);
+                    ? HPackEncoder.EncodeLiteralHeaderFieldIndexingNewName(name, value, buffer, out bytesWritten)
+                    : HPackEncoder.EncodeLiteralHeaderFieldIndexing(index, value, buffer, out bytesWritten);
 
                 if (success)
                 {

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ internal static class HPackHeaderWriter`
`12`	`12`	`/// <summary>`
`13`	`13`	`/// Begin encoding headers in the first HEADERS frame.`
`14`	`14`	`/// </summary>`
`15`		`- public static bool BeginEncodeHeaders(int statusCode, HPackEncoder hpackEncoder, Http2HeadersEnumerator headersEnumerator, Span<byte> buffer, out int length)`
	`15`	`+ public static bool BeginEncodeHeaders(int statusCode, DynamicHPackEncoder hpackEncoder, Http2HeadersEnumerator headersEnumerator, Span<byte> buffer, out int length)`
`16`	`16`	`{`
`17`	`17`	`length = 0;`
`18`	`18`
`@@ -43,7 +43,7 @@ public static bool BeginEncodeHeaders(int statusCode, HPackEncoder hpackEncoder,`
`43`	`43`	`/// <summary>`
`44`	`44`	`/// Begin encoding headers in the first HEADERS frame.`
`45`	`45`	`/// </summary>`
`46`		`- public static bool BeginEncodeHeaders(HPackEncoder hpackEncoder, Http2HeadersEnumerator headersEnumerator, Span<byte> buffer, out int length)`
	`46`	`+ public static bool BeginEncodeHeaders(DynamicHPackEncoder hpackEncoder, Http2HeadersEnumerator headersEnumerator, Span<byte> buffer, out int length)`
`47`	`47`	`{`
`48`	`48`	`length = 0;`
`49`	`49`
`@@ -66,12 +66,12 @@ public static bool BeginEncodeHeaders(HPackEncoder hpackEncoder, Http2HeadersEnu`
`66`	`66`	`/// <summary>`
`67`	`67`	`/// Continue encoding headers in the next HEADERS frame. The enumerator should already have a current value.`
`68`	`68`	`/// </summary>`
`69`		`- public static bool ContinueEncodeHeaders(HPackEncoder hpackEncoder, Http2HeadersEnumerator headersEnumerator, Span<byte> buffer, out int length)`
	`69`	`+ public static bool ContinueEncodeHeaders(DynamicHPackEncoder hpackEncoder, Http2HeadersEnumerator headersEnumerator, Span<byte> buffer, out int length)`
`70`	`70`	`{`
`71`	`71`	`return EncodeHeadersCore(hpackEncoder, headersEnumerator, buffer, throwIfNoneEncoded: true, out length);`
`72`	`72`	`}`
`73`	`73`
`74`		`- private static bool EncodeStatusHeader(int statusCode, HPackEncoder hpackEncoder, Span<byte> buffer, out int length)`
	`74`	`+ private static bool EncodeStatusHeader(int statusCode, DynamicHPackEncoder hpackEncoder, Span<byte> buffer, out int length)`
`75`	`75`	`{`
`76`	`76`	`switch (statusCode)`
`77`	`77`	`{`
`@@ -91,7 +91,7 @@ private static bool EncodeStatusHeader(int statusCode, HPackEncoder hpackEncoder`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`
`94`		`- private static bool EncodeHeadersCore(HPackEncoder hpackEncoder, Http2HeadersEnumerator headersEnumerator, Span<byte> buffer, bool throwIfNoneEncoded, out int length)`
	`94`	`+ private static bool EncodeHeadersCore(DynamicHPackEncoder hpackEncoder, Http2HeadersEnumerator headersEnumerator, Span<byte> buffer, bool throwIfNoneEncoded, out int length)`
`95`	`95`	`{`
`96`	`96`	`var currentLength = 0;`
`97`	`97`	`do`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public static void WriteSettings(this PipeWriter writer, Http2PeerSettings clien`
`25`	`25`	`writer.Write(payload);`
`26`	`26`	`}`
`27`	`27`
`28`		`- public static void WriteStartStream(this PipeWriter writer, int streamId, HPackEncoder hpackEncoder, Http2HeadersEnumerator headers, byte[] headerEncodingBuffer, bool endStream, Http2Frame frame = null)`
	`28`	`+ public static void WriteStartStream(this PipeWriter writer, int streamId, DynamicHPackEncoder hpackEncoder, Http2HeadersEnumerator headers, byte[] headerEncodingBuffer, bool endStream, Http2Frame frame = null)`
`29`	`29`	`{`
`30`	`30`	`frame ??= new Http2Frame();`
`31`	`31`	`frame.PrepareHeaders(Http2HeadersFrameFlags.NONE, streamId);`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`namespace System.Net.Http.HPack`
`9`	`9`	`{`
`10`		`- internal partial class HPackEncoder`
	`10`	`+ internal class DynamicHPackEncoder`
`11`	`11`	`{`
`12`	`12`	`public const int DefaultHeaderTableSize = 4096;`
`13`	`13`
`@@ -22,7 +22,7 @@ internal partial class HPackEncoder`
`22`	`22`	`private bool _pendingTableSizeUpdate;`
`23`	`23`	`private EncoderHeaderEntry? _removed;`
`24`	`24`
`25`		`- public HPackEncoder(bool allowDynamicCompression = true, uint maxHeaderTableSize = DefaultHeaderTableSize)`
	`25`	`+ public DynamicHPackEncoder(bool allowDynamicCompression = true, uint maxHeaderTableSize = DefaultHeaderTableSize)`
`26`	`26`	`{`
`27`	`27`	`_allowDynamicCompression = allowDynamicCompression;`
`28`	`28`	`_maxHeaderTableSize = maxHeaderTableSize;`
`@@ -54,7 +54,7 @@ public bool EnsureDynamicTableSizeUpdate(Span<byte> buffer, out int length)`
`54`	`54`	`// Check if there is a table size update that should be encoded`
`55`	`55`	`if (_pendingTableSizeUpdate)`
`56`	`56`	`{`
`57`		`- bool success = EncodeDynamicTableSizeUpdate((int)_maxHeaderTableSize, buffer, out length);`
	`57`	`+ bool success = HPackEncoder.EncodeDynamicTableSizeUpdate((int)_maxHeaderTableSize, buffer, out length);`
`58`	`58`	`_pendingTableSizeUpdate = false;`
`59`	`59`	`return success;`
`60`	`60`	`}`
`@@ -73,16 +73,16 @@ public bool EncodeHeader(Span<byte> buffer, int staticTableIndex, HeaderEncoding`
`73`	`73`	`int index = ResolveDynamicTableIndex(staticTableIndex, name);`
`74`	`74`
`75`	`75`	`return index == -1`
`76`		`- ? EncodeLiteralHeaderFieldNeverIndexingNewName(name, value, buffer, out bytesWritten)`
`77`		`- : EncodeLiteralHeaderFieldNeverIndexing(index, value, buffer, out bytesWritten);`
	`76`	`+ ? HPackEncoder.EncodeLiteralHeaderFieldNeverIndexingNewName(name, value, buffer, out bytesWritten)`
	`77`	`+ : HPackEncoder.EncodeLiteralHeaderFieldNeverIndexing(index, value, buffer, out bytesWritten);`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`// No dynamic table. Only use the static table.`
`81`	`81`	`if (!_allowDynamicCompression \|\| _maxHeaderTableSize == 0 \|\| encodingHint == HeaderEncodingHint.IgnoreIndex)`
`82`	`82`	`{`
`83`	`83`	`return staticTableIndex == -1`
`84`		`- ? EncodeLiteralHeaderFieldWithoutIndexingNewName(name, value, buffer, out bytesWritten)`
`85`		`- : EncodeLiteralHeaderFieldWithoutIndexing(staticTableIndex, value, buffer, out bytesWritten);`
	`84`	`+ ? HPackEncoder.EncodeLiteralHeaderFieldWithoutIndexingNewName(name, value, buffer, out bytesWritten)`
	`85`	`+ : HPackEncoder.EncodeLiteralHeaderFieldWithoutIndexing(staticTableIndex, value, buffer, out bytesWritten);`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`// Header is greater than the maximum table size.`
`@@ -92,8 +92,8 @@ public bool EncodeHeader(Span<byte> buffer, int staticTableIndex, HeaderEncoding`
`92`	`92`	`int index = ResolveDynamicTableIndex(staticTableIndex, name);`
`93`	`93`
`94`	`94`	`return index == -1`
`95`		`- ? EncodeLiteralHeaderFieldWithoutIndexingNewName(name, value, buffer, out bytesWritten)`
`96`		`- : EncodeLiteralHeaderFieldWithoutIndexing(index, value, buffer, out bytesWritten);`
	`95`	`+ ? HPackEncoder.EncodeLiteralHeaderFieldWithoutIndexingNewName(name, value, buffer, out bytesWritten)`
	`96`	`+ : HPackEncoder.EncodeLiteralHeaderFieldWithoutIndexing(index, value, buffer, out bytesWritten);`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`return EncodeDynamicHeader(buffer, staticTableIndex, name, value, out bytesWritten);`
`@@ -117,7 +117,7 @@ private bool EncodeDynamicHeader(Span<byte> buffer, int staticTableIndex, string`
`117`	`117`	`{`
`118`	`118`	`// Already exists in dynamic table. Write index.`
`119`	`119`	`int index = CalculateDynamicTableIndex(headerField.Index);`
`120`		`- return EncodeIndexedHeaderField(index, buffer, out bytesWritten);`
	`120`	`+ return HPackEncoder.EncodeIndexedHeaderField(index, buffer, out bytesWritten);`
`121`	`121`	`}`
`122`	`122`	`else`
`123`	`123`	`{`
`@@ -126,8 +126,8 @@ private bool EncodeDynamicHeader(Span<byte> buffer, int staticTableIndex, string`
`126`	`126`
`127`	`127`	`int index = ResolveDynamicTableIndex(staticTableIndex, name);`
`128`	`128`	`bool success = index == -1`
`129`		`- ? EncodeLiteralHeaderFieldIndexingNewName(name, value, buffer, out bytesWritten)`
`130`		`- : EncodeLiteralHeaderFieldIndexing(index, value, buffer, out bytesWritten);`
	`129`	`+ ? HPackEncoder.EncodeLiteralHeaderFieldIndexingNewName(name, value, buffer, out bytesWritten)`
	`130`	`+ : HPackEncoder.EncodeLiteralHeaderFieldIndexing(index, value, buffer, out bytesWritten);`
`131`	`131`
`132`	`132`	`if (success)`
`133`	`133`	`{`