ClientModel Prototype: Change approach to response.Content, with buffering in transport instead of policy #13
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
annelo-msft
commented
Feb 1, 2024
| @@ -8,8 +8,11 @@ namespace System.ClientModel.Primitives; | |||
|
|
|||
| public partial class HttpClientPipelineTransport | |||
| { | |||
| private class HttpPipelineResponse : PipelineResponse | |||
| private class HttpClientPipelineResponse : PipelineResponse | |||
annelo-msft
commented
Feb 1, 2024
| { | ||
| _httpResponse = httpResponse ?? throw new ArgumentNullException(nameof(httpResponse)); | ||
| _httpResponseContent = _httpResponse.Content; | ||
|
|
||
| // Don't let anyone dispose the content, which is used by headers. | ||
| _httpResponse.Content = null; |
There was a problem hiding this comment.
Add this into the constructor
annelo-msft
commented
Feb 1, 2024
| @@ -62,8 +58,9 @@ protected virtual void Dispose(bool disposing) | |||
| { | |||
| if (disposing && !_disposed) | |||
| { | |||
| var httpResponse = _httpResponse; | |||
| httpResponse?.Dispose(); | |||
| // The transport is responsible for disposing the HttpResponseMessage. | |||
There was a problem hiding this comment.
Move where this happens?
annelo-msft
commented
Feb 1, 2024
| { | ||
| message.Response.ContentStream = contentStream; | ||
| } | ||
| responseMessage.Dispose(); |
There was a problem hiding this comment.
Dispose this in the transport instead of in the response
annelo-msft
commented
Feb 1, 2024
| } | ||
|
|
||
| if (!message.BufferResponse) |
There was a problem hiding this comment.
Move this logic into Response so transport just makes a simple call to response.TryBufferContent(message.BufferContent)
annelo-msft
commented
Feb 1, 2024
| @@ -11,23 +11,23 @@ namespace System.ClientModel.Primitives; | |||
|
|
|||
| internal class HttpClientResponseHeaders : PipelineResponseHeaders | |||
| { | |||
| private readonly HttpResponseMessage _httpResponse; | |||
| private readonly HttpHeaders _httpHeaders; | |||
There was a problem hiding this comment.
Don't store the whole response message, just the part we need
annelo-msft
commented
Feb 1, 2024
| @@ -146,35 +146,4 @@ private static string JoinHeaderValues(IEnumerable<string> values) | |||
| } | |||
| #endif | |||
| #endregion | |||
|
|
|||
| private static IEnumerable<KeyValuePair<string, IEnumerable<string>>> GetHeadersListValues(HttpHeaders headers, HttpContent? content) | |||
There was a problem hiding this comment.
Remove this code, which is never used
annelo-msft
commented
Feb 1, 2024
| @@ -73,7 +76,7 @@ public virtual BinaryData Content | |||
|
|
|||
| protected virtual void SetIsErrorCore(bool isError) => _isError = isError; | |||
|
|
|||
| internal TimeSpan NetworkTimeout { get; set; } = ClientPipeline.DefaultNetworkTimeout; | |||
There was a problem hiding this comment.
Can we remove this initialization?
annelo-msft
commented
Feb 1, 2024
| { | ||
| // No need to buffer content. | ||
| return; | ||
| } | ||
|
|
||
| MemoryStream bufferStream = new(); | ||
|
|
||
| // TODO: Come back and optimize this - for now, just a POC. |
There was a problem hiding this comment.
We will want to optimize the implementation
annelo-msft
commented
Feb 1, 2024
| /// <remarks> | ||
| /// Throws <see cref="InvalidOperationException"/> when <see cref="PipelineResponse.ContentStream"/> is not a <see cref="MemoryStream"/>. | ||
| /// </remarks> | ||
| public new virtual BinaryData Content => base.Content; |
There was a problem hiding this comment.
Remove this as we no longer need it.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Investigation into Azure#41080