Fix reading empty files from S3 and GCS #22473
Merged
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
When reading an empty file from S3 as a stream, using the AWS SDK v2, it incorrectly keeps reading the MD5 checksum included at the end of the response. This has been reported upstream as aws/aws-sdk-java-v2#3538
nineinchnick
requested review from
electrum,
wendigo,
anusudarsan and
findinpath
|
@findepi can you run the workflow with secrets? |
|
I love the important part 🫡 |
|
Testing here: #22474 |
wendigo
reviewed
Jun 21, 2024
lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3InputStream.java
Show resolved
Hide resolved
wendigo
approved these changes
Jun 21, 2024
findinpath
reviewed
Jun 21, 2024
| @@ -196,6 +196,10 @@ private void seekStream() | |||
| rangeRequest = request.toBuilder().range(range).build(); | |||
| } | |||
| in = client.getObject(rangeRequest); | |||
| // a workaround for https://github.com/aws/aws-sdk-java-v2/issues/3538 | |||
There was a problem hiding this comment.
Is this a follow-up of #22469 ?
There was a problem hiding this comment.
Yes, see the PR description
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.
Description
When reading an empty file from S3 as a stream, using the AWS SDK v2, it
incorrectly keeps reading the MD5 checksum included at the end of the
response. This has been reported upstream as
aws/aws-sdk-java-v2#3538
For GCS, skip the boundary check for empty files.
Important
This is a follow-up to #22469 that was not tested with all secrets. Run a workflow with all secrets before merging.
Additional context and related issues
Release notes
(x) This is not user-visible or is docs only, and no release notes are required.
( ) Release notes are required. Please propose a release note for me.
( ) Release notes are required, with the following suggested text: