Skip to content

[8.x] Specialize skip for InputStreamIndexInput (#118436) #118477

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
elasticsearchmachine merged 1 commit into from
Dec 11, 2024
Merged

[8.x] Specialize skip for InputStreamIndexInput (#118436) #118477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions server/src/main/java/org/elasticsearch/common/lucene/store/InputStreamIndexInput.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,15 @@ public synchronized void reset() throws IOException {
indexInput.seek(markPointer);
counter = markCounter;
}

@Override
public long skip(long n) throws IOException {
long skipBytes = Math.min(n, Math.min(indexInput.length() - indexInput.getFilePointer(), limit - counter));
if (skipBytes <= 0) {
return 0;
}
indexInput.skipBytes(skipBytes);
counter += skipBytes;
return skipBytes;
}
}
37 changes: 36 additions & 1 deletion server/src/test/java/org/elasticsearch/common/lucene/store/InputStreamIndexInputTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ public void testReadMultiFourBytesLimit() throws IOException {
assertThat(is.read(read), equalTo(-1));
}

public void testMarkRest() throws Exception {
public void testMarkReset() throws Exception {
Directory dir = new ByteBuffersDirectory();
IndexOutput output = dir.createOutput("test", IOContext.DEFAULT);
for (int i = 0; i < 3; i++) {
Expand All @@ -243,6 +243,41 @@ public void testMarkRest() throws Exception {
assertThat(is.read(), equalTo(2));
}

public void testSkipBytes() throws Exception {
Directory dir = new ByteBuffersDirectory();
IndexOutput output = dir.createOutput("test", IOContext.DEFAULT);
int bytes = randomIntBetween(10, 100);
for (int i = 0; i < bytes; i++) {
output.writeByte((byte) i);
}
output.close();

int limit = randomIntBetween(0, bytes * 2);
int initialReadBytes = randomIntBetween(0, limit);
int skipBytes = randomIntBetween(0, limit);
int seekExpected = Math.min(Math.min(initialReadBytes + skipBytes, limit), bytes);
int skipBytesExpected = Math.max(seekExpected - initialReadBytes, 0);
logger.debug(
"bytes: {}, limit: {}, initialReadBytes: {}, skipBytes: {}, seekExpected: {}, skipBytesExpected: {}",
bytes,
limit,
initialReadBytes,
skipBytes,
seekExpected,
skipBytesExpected
);

IndexInput input = dir.openInput("test", IOContext.DEFAULT);
InputStreamIndexInput is = new InputStreamIndexInput(input, limit);
is.readNBytes(initialReadBytes);
assertThat(is.skip(skipBytes), equalTo((long) skipBytesExpected));

int remainingBytes = Math.min(bytes, limit) - seekExpected;
for (int i = seekExpected; i < seekExpected + remainingBytes; i++) {
assertThat(is.read(), equalTo(i));
}
}

public void testReadZeroShouldReturnZero() throws IOException {
try (Directory dir = new ByteBuffersDirectory()) {
try (IndexOutput output = dir.createOutput("test", IOContext.DEFAULT)) {
Expand Down