Skip to content
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.

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

Optimize Request.SetHeader #19797

Merged
merged 9 commits into from
Mar 25, 2021
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
13 changes: 13 additions & 0 deletions sdk/core/Azure.Core.TestFramework/src/MockRequest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,19 @@ public override RequestContent Content
}
}

protected override void SetHeader(string name, string value)
{
if (!_headers.TryGetValue(name, out List<string> values))
{
_headers[name] = _ = new List<string>() { value };
}
else
{
values.Clear();
values.Add(value);
}
}

protected override void AddHeader(string name, string value)
{
if (!_headers.TryGetValue(name, out List<string> values))
Expand Down
12 changes: 12 additions & 0 deletions sdk/core/Azure.Core/src/Pipeline/HttpClientTransport.cs
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,18 @@ public override string ClientRequestId
}
}

protected internal override void SetHeader(string name, string value)
{
if (name.Equals(HttpHeader.Names.Authorization) && AuthenticationHeaderValue.TryParse(value, out var authHeader))
christothes marked this conversation as resolved.
Show resolved Hide resolved
{
_requestMessage.Headers.Authorization = authHeader;
}
else
{
base.SetHeader(name, value);
}
}

protected internal override void AddHeader(string name, string value)
{
if (_requestMessage.Headers.TryAddWithoutValidation(name, value))
Expand Down
27 changes: 20 additions & 7 deletions sdk/core/Azure.Core/src/Pipeline/HttpWebRequestTransport.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ internal class HttpWebRequestTransport : HttpPipelineTransport
/// <summary>
/// Creates a new instance of <see cref="HttpWebRequestTransport"/>
/// </summary>
public HttpWebRequestTransport(): this (_ => { })
public HttpWebRequestTransport() : this(_ => { })
{
}

Expand Down Expand Up @@ -58,7 +58,7 @@ private async ValueTask ProcessInternal(HttpMessage message, bool async)

ServicePointHelpers.SetLimits(request.ServicePoint);

using var registration = message.CancellationToken.Register(state => ((HttpWebRequest) state).Abort(), request);
using var registration = message.CancellationToken.Register(state => ((HttpWebRequest)state).Abort(), request);
try
{
if (message.Request.Content != null)
Expand Down Expand Up @@ -90,7 +90,7 @@ private async ValueTask ProcessInternal(HttpMessage message, bool async)
webResponse = exception.Response;
}

message.Response = new HttpWebResponseImplementation(message.Request.ClientRequestId, (HttpWebResponse) webResponse);
message.Response = new HttpWebResponseImplementation(message.Request.ClientRequestId, (HttpWebResponse)webResponse);
}
// ObjectDisposedException might be thrown if the request is aborted during the content upload via SSL
catch (ObjectDisposedException) when (message.CancellationToken.IsCancellationRequested)
Expand Down Expand Up @@ -239,7 +239,7 @@ public override Request CreateRequest()
return new HttpWebRequestImplementation();
}

private sealed class HttpWebResponseImplementation: Response
private sealed class HttpWebResponseImplementation : Response
{
private readonly HttpWebResponse _webResponse;
private Stream? _contentStream;
Expand All @@ -253,7 +253,7 @@ public HttpWebResponseImplementation(string clientRequestId, HttpWebResponse web
ClientRequestId = clientRequestId;
}

public override int Status => (int) _webResponse.StatusCode;
public override int Status => (int)_webResponse.StatusCode;

public override string ReasonPhrase => _webResponse.StatusDescription;

Expand Down Expand Up @@ -302,7 +302,7 @@ protected internal override IEnumerable<HttpHeader> EnumerateHeaders()
}
}

private sealed class HttpWebRequestImplementation: Request
private sealed class HttpWebRequestImplementation : Request
{
public HttpWebRequestImplementation()
{
Expand All @@ -312,6 +312,19 @@ public HttpWebRequestImplementation()
private string? _clientRequestId;
private readonly Dictionary<string, List<string>> _headers = new Dictionary<string, List<string>>(StringComparer.OrdinalIgnoreCase);

protected internal override void SetHeader(string name, string value)
{
if (!_headers.TryGetValue(name, out List<string> values))
christothes marked this conversation as resolved.
Show resolved Hide resolved
{
_headers[name] = values = new List<string>() { value };
}
else
{
values.Clear();
values.Add(value);
}
}

protected internal override void AddHeader(string name, string value)
{
if (!_headers.TryGetValue(name, out List<string> values))
Expand Down Expand Up @@ -376,4 +389,4 @@ public override void Dispose()
}
}
#endif
}
}
18 changes: 18 additions & 0 deletions sdk/core/Azure.Core/src/Shared/Multipart/MemoryRequest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,24 @@ public override RequestContent Content
#if HAS_INTERNALS_VISIBLE_CORE
internal
#endif

protected override void SetHeader(string name, string value)
{
if (!_headers.TryGetValue(name, out List<string> values))
{
_headers[name] = _ = new List<string>() { value };
}
else
{
values.Clear();
values.Add(value);
}
}

#if HAS_INTERNALS_VISIBLE_CORE
internal
#endif

protected override void AddHeader(string name, string value)
{
if (!_headers.TryGetValue(name, out List<string> values))
Expand Down