Skip to content

[8.x] No-op reset in SlicedInputStream (#118437) #118478

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

Merged
merged 2 commits into from
Dec 12, 2024
Merged

[8.x] No-op reset in SlicedInputStream (#118437) #118478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab6c4de
No-op reset in SlicedInputStream (#118437)
kingherc Dec 11, 2024
56de013
Merge branch '8.x' into backport/8.x/pr-118437
kingherc Dec 12, 2024
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
4 changes: 4 additions & 0 deletions server/src/main/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,10 @@ public void reset() throws IOException {
if (markedSlice < 0 || markedSliceOffset < 0) {
throw new IOException("Mark has not been set");
}
if (initialized && nextSlice == markedSlice + 1 && currentSliceOffset == markedSliceOffset) {
// Reset at the marked offset should return immediately without re-opening the slice
return;
}

nextSlice = markedSlice;
initialized = true;
Expand Down
7 changes: 5 additions & 2 deletions server/src/test/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStreamTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,10 @@ protected InputStream openSlice(int slice) throws IOException {

// Mark
input.mark(randomNonNegativeInt());
int slicesOpenedAtMark = streamsOpened.size();

// Read or skip up to another random point
final int moreBytes = randomIntBetween(0, bytes.length - mark);
int moreBytes = randomIntBetween(0, bytes.length - mark);
if (moreBytes > 0) {
if (randomBoolean()) {
final var moreBytesRead = new byte[moreBytes];
Expand All @@ -171,11 +172,13 @@ protected InputStream openSlice(int slice) throws IOException {

// Randomly read to EOF
if (randomBoolean()) {
input.readAllBytes();
moreBytes += input.readAllBytes().length;
}

// Reset
input.reset();
int slicesOpenedAfterReset = streamsOpened.size();
assert moreBytes > 0 || mark == 0 || slicesOpenedAfterReset == slicesOpenedAtMark : "Reset at mark should not re-open slices";

// Read all remaining bytes, which should be the bytes from mark up to the end
final int remainingBytes = bytes.length - mark;
Expand Down