Skip to content

Recover S3 stream after skip failure #29419

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.

Sign up for GitHub

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

Open
electrum wants to merge 2 commits into
base: master
Choose a base branch
from
+11 −19
Open

Recover S3 stream after skip failure #29419

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e6ffb7
Recover S3 stream after skip failure
electrum May 11, 2026
b9e1530
Remove empty S3 read workaround
electrum May 11, 2026
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
30 changes: 11 additions & 19 deletions lib/trino-filesystem-s3/src/main/java/io/trino/filesystem/s3/S3InputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,17 @@ private void seekStream(boolean forceStreamReset)
long skip = nextReadPosition - streamPosition;
if (skip <= max(getAvailable(), MAX_SKIP_BYTES)) {
// already buffered or seek is small enough
if (doSkip(skip) == skip) {
streamPosition = nextReadPosition;
return;
try {
if (in.skip(skip) == skip) {
streamPosition = nextReadPosition;
return;
}
}
Comment thread
electrum marked this conversation as resolved.
Comment thread
electrum marked this conversation as resolved.
catch (IOException _) {
// reopen the stream below at the requested position
}
catch (AbortedException e) {
Comment thread
electrum marked this conversation as resolved.
throw new InterruptedIOException();
}
}
}
Expand All @@ -221,11 +229,6 @@ private void seekStream(boolean forceStreamReset)
rangeRequest = request.toBuilder().range(range).build();
}
in = client.getObject(rangeRequest);
// a workaround for https://github.com/aws/aws-sdk-java-v2/issues/3538
if (in.response().contentLength() != null && in.response().contentLength() == 0) {
in.close();
in = new ResponseInputStream<>(in.response(), nullInputStream());
}
streamPosition = nextReadPosition;
}
catch (NoSuchKeyException e) {
Expand Down Expand Up @@ -274,17 +277,6 @@ private int getAvailable()
}
}

private long doSkip(long n)
throws IOException
{
try {
return in.skip(n);
}
catch (AbortedException e) {
throw new InterruptedIOException();
}
}

private int doRead()
throws IOException
{
Expand Down