Skip to content

Use exact-size header arrays for output cache entries #70195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
davidfowl wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −12
Open

Use exact-size header arrays for output cache entries #70195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions src/Middleware/OutputCaching/src/OutputCacheEntry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,23 +87,15 @@ internal OutputCacheEntry CopyHeadersFrom(IHeaderDictionary headers)
var index = 0;
if (count != 0)
{
var arr = ArrayPool<(string, StringValues)>.Shared.Rent(count);
var arr = new (string, StringValues)[count];
foreach (var header in headers)
{
if (OutputCacheEntryFormatter.ShouldStoreHeader(header.Key))
{
arr[index++] = (header.Key, header.Value);
}
}
if (index == 0) // only ignored headers
{
ArrayPool<(string, StringValues)>.Shared.Return(arr);
Headers = default;
}
else
{
Headers = new(arr, 0, index);
}
Headers = index == 0 ? default : new(arr, 0, index);
}
}
return this;
Expand Down
4 changes: 2 additions & 2 deletions src/Middleware/OutputCaching/src/OutputCacheEntryFormatter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ private static bool CanParseRevision(SerializationRevision revision, out bool us
// Values count: 7-bit encoded int
if (headersCount > 0)
{
var headerArr = ArrayPool<(string Name, StringValues Values)>.Shared.Rent(headersCount);
var headerArr = new (string Name, StringValues Values)[headersCount];

for (var i = 0; i < headersCount; i++)
{
Expand Down Expand Up @@ -296,7 +296,7 @@ private static bool CanParseRevision(SerializationRevision revision, out bool us
}
headerArr[i] = (key, value);
}
result.SetHeaders(new ReadOnlyMemory<(string Name, StringValues Values)>(headerArr, 0, headersCount));
result.SetHeaders(headerArr);
}

if (revision == SerializationRevision.V1_Original)
Expand Down
Loading