misc: enhance support for replayable instances of InputStream
#1197
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
This comment has been minimized.
This comment has been minimized.
lauzadis
changed the title
InputStream
ianbotsf
reviewed
Dec 17, 2024
Comment on lines
116
to
137
| public fun InputStream.asByteStream(contentLength: Long? = null): ByteStream.SourceStream { | ||
| val source = source() | ||
| if (markSupported() && contentLength != null) { | ||
| mark(contentLength.toInt()) | ||
| } | ||
|
|
||
| return object : ByteStream.SourceStream() { | ||
| override val contentLength: Long? = contentLength | ||
| override val isOneShot: Boolean = !markSupported() | ||
| override fun readFrom(): SdkSource = source | ||
| override fun readFrom(): SdkSource { | ||
| if (markSupported() && contentLength != null) { | ||
| reset() | ||
| mark(contentLength.toInt()) | ||
| return object : SdkSource by source() { | ||
| // no-op close | ||
| override fun close() { } | ||
| } | ||
| } | ||
|
|
||
| return source() | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
Question: Is this a behavioral change wrt closing? It seems like before we returned the raw underlying SdkSource before which, if closed, would close the underlying InputStream. Now it looks like that won't happen...why is that necessary?
There was a problem hiding this comment.
Yes it is. Without this change the underlying InputStream is closed after hashing (because we call a .use { } on the SdkSource) and subsequent attempts to read the body (e.g. during transmission) fail with IOException: Stream closed
This comment has been minimized.
This comment has been minimized.
Affected ArtifactsChanged in size
|
0marperez
approved these changes
Dec 17, 2024
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.
Issue #
Description of changes
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.