Do not add chunk data for empty ByteBuffer #5320
Merged
Conversation
This file contains hidden or 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
zoewangg
reviewed
Jun 21, 2024
services/s3/pom.xml
Outdated
| @@ -224,5 +224,17 @@ | |||
| <artifactId>jimfs</artifactId> | |||
| <scope>test</scope> | |||
| </dependency> | |||
| <dependency> | |||
There was a problem hiding this comment.
We should probably avoid circular dependency in the SDK. It'll likely cause more dependency issues in the future. (Side note, I didn't know you could use exclusions trick to work around the issue)
There was a problem hiding this comment.
removed integ test, one-off testing and unit test should be sufficient
| @@ -197,9 +197,11 @@ public void onNext(ByteBuffer byteBuffer) { | |||
| checksumBytes = checksum.getChecksumBytes(); | |||
| ByteBuffer allocatedBuffer = getFinalChecksumAppendedChunk(byteBuffer); | |||
| wrapped.onNext(allocatedBuffer); | |||
| } else { | |||
| } else if (byteBuffer.remaining() > 0) { | |||
|
zoewangg
approved these changes
Jun 21, 2024
akidambisrinivasan
pushed a commit
to akidambisrinivasan/aws-sdk-java-v2
that referenced
this pull request
Jun 28, 2024
* Do not add chunk data for empty ByteBuffer * Do not add chunk data for empty ByteBuffer * Add unit test * Add changelog * Remove integ test
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.
Motivation and Context
When doing S3
PutObjectwith flexible checksums withS3AsyncClient, theChecksumCalculatingAsyncRequestBodyadds chunk headers and trailers to each chunk. We should skip this if there is a non-final empty chunk of length 0, as it causes an error to be thrownModifications
In
onNext(), return theByteBufferas is, if it is empty and non-final chunkTesting
added unit tests, performed one-off integ tests
Screenshots (if appropriate)
Types of changes
Checklist
mvn installsucceedsscripts/new-changescript and following the instructions. Commit the new file created by the script in.changes/next-releasewith your changes.License