Skip to content
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

Fix ByteArrayIndexInput with nonzero offset #93205

Merged
merged 3 commits into from
Jan 24, 2023
Merged

Fix ByteArrayIndexInput with nonzero offset #93205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b3a2e5
Fix ByteArrayIndexInput with nonzero offset
DaveCTurner Jan 24, 2023
adcfdbf
Update docs/changelog/93205.yaml
DaveCTurner Jan 24, 2023
e01b706
Spotless
DaveCTurner Jan 24, 2023
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
5 changes: 5 additions & 0 deletions docs/changelog/93205.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 93205
summary: Fix `ByteArrayIndexInput` with nonzero offset
area: Distributed
type: bug
issues: []
6 changes: 3 additions & 3 deletions server/src/main/java/org/elasticsearch/common/lucene/store/ByteArrayIndexInput.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public void readBytes(final byte[] b, final int offset, int len) throws IOExcept
@Override
public short readShort() throws IOException {
try {
return (short) BitUtil.VH_LE_SHORT.get(bytes, pos);
return (short) BitUtil.VH_LE_SHORT.get(bytes, pos + offset);
} finally {
pos += Short.BYTES;
}
Expand All @@ -108,7 +108,7 @@ public short readShort() throws IOException {
@Override
public int readInt() throws IOException {
try {
return (int) BitUtil.VH_LE_INT.get(bytes, pos);
return (int) BitUtil.VH_LE_INT.get(bytes, pos + offset);
} finally {
pos += Integer.BYTES;
}
Expand All @@ -117,7 +117,7 @@ public int readInt() throws IOException {
@Override
public long readLong() throws IOException {
try {
return (long) BitUtil.VH_LE_LONG.get(bytes, pos);
return (long) BitUtil.VH_LE_LONG.get(bytes, pos + offset);
} finally {
pos += Long.BYTES;
}
Expand Down
31 changes: 22 additions & 9 deletions test/framework/src/main/java/org/elasticsearch/common/lucene/store/ESIndexInputTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
import org.junit.BeforeClass;

import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicLong;

Expand Down Expand Up @@ -60,26 +62,37 @@ protected byte[] randomReadAndSlice(IndexInput indexInput, int length) throws IO
int readPos = (int) indexInput.getFilePointer();
byte[] output = new byte[length];
while (readPos < length) {
switch (randomIntBetween(0, 5)) {
case 0:
// Read by one byte at a time
output[readPos++] = indexInput.readByte();
final var readStrategy = randomFrom(2, 6);
switch (readStrategy) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Above looks suspicious. Should it be randomIntBetween(0, 9)?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, fix incoming in https://github.com/elastic/elasticsearch/pull/93208/files#diff-1313cb767b5d3c0840a46464b34a645015f7dffb344967cf380dba0a5f54d833R65

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and #93227 fixes this in 8.6 too

case 0, 1, 2, 3:
if (length - readPos >= Long.BYTES && readStrategy <= 0) {
ByteBuffer.wrap(output, readPos, Long.BYTES).order(ByteOrder.LITTLE_ENDIAN).putLong(indexInput.readLong());
readPos += Long.BYTES;
} else if (length - readPos >= Integer.BYTES && readStrategy <= 1) {
ByteBuffer.wrap(output, readPos, Integer.BYTES).order(ByteOrder.LITTLE_ENDIAN).putInt(indexInput.readInt());
readPos += Integer.BYTES;
} else if (length - readPos >= Short.BYTES && readStrategy <= 2) {
ByteBuffer.wrap(output, readPos, Short.BYTES).order(ByteOrder.LITTLE_ENDIAN).putShort(indexInput.readShort());
readPos += Short.BYTES;
} else {
output[readPos++] = indexInput.readByte();
}
break;
case 1:
case 4:
// Read several bytes into target
int len = randomIntBetween(1, length - readPos);
indexInput.readBytes(output, readPos, len);
readPos += len;
break;
case 2:
case 5:
// Read several bytes into 0-offset target
len = randomIntBetween(1, length - readPos);
byte[] temp = new byte[len];
indexInput.readBytes(temp, 0, len);
System.arraycopy(temp, 0, output, readPos, len);
readPos += len;
break;
case 3:
case 6:
// Read using slice
len = randomIntBetween(1, length - readPos);
final String sliceExtension = randomValueOtherThan(".cfs", ESIndexInputTestCase::randomFileExtension);
Expand All @@ -92,7 +105,7 @@ protected byte[] randomReadAndSlice(IndexInput indexInput, int length) throws IO
indexInput.seek(readPos);
assertEquals(readPos, indexInput.getFilePointer());
break;
case 4:
case 7:
// Seek at a random position and read a single byte,
// then seek back to original position
final int lastReadPos = readPos;
Expand All @@ -106,7 +119,7 @@ protected byte[] randomReadAndSlice(IndexInput indexInput, int length) throws IO
indexInput.seek(readPos);
assertEquals(readPos, indexInput.getFilePointer());
break;
case 5:
case 8:
// Read clone or slice concurrently
final int cloneCount = between(1, 3);
final CountDownLatch startLatch = new CountDownLatch(1 + cloneCount);
Expand Down