Skip to content

Fix logical-end seeks in InStream #2707

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

Draft
mkuchenbecker wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −2
Draft

Fix logical-end seeks in InStream #2707

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
8 changes: 6 additions & 2 deletions java/core/src/java/org/apache/orc/impl/InStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,9 +233,13 @@ public void seek(long desired) throws IOException {
} else {
for (DiskRangeList curRange = bytes; curRange != null;
curRange = curRange.next) {
// Accept this stream's logical end when later ranges belong to other streams.
boolean isLogicalEnd =
desired == length && positionFile == curRange.getEnd();
if (curRange.getOffset() <= positionFile &&
(curRange.next == null ? positionFile <= curRange.getEnd() :
positionFile < curRange.getEnd())) {
(isLogicalEnd ||
(curRange.next == null ? positionFile <= curRange.getEnd() :
positionFile < curRange.getEnd()))) {
position = desired;
setCurrent(curRange, true);
return;
Expand Down
13 changes: 13 additions & 0 deletions java/core/src/test/org/apache/orc/impl/TestInStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -790,6 +790,19 @@ public long getNext() {
}
}

@Test
public void testSeekToLogicalEndWithLaterDiskRange() throws IOException {
BufferChunk streamRange = new BufferChunk(ByteBuffer.allocate(10), 100);
streamRange.insertAfter(new BufferChunk(ByteBuffer.allocate(10), 120));
try (InStream.UncompressedStream stream =
new InStream.UncompressedStream("test", streamRange, 100, 10)) {
stream.seek(10);
assertSame(streamRange, stream.currentRange);
assertEquals(0, stream.available());
assertEquals(-1, stream.read());
}
}

private static byte[] input(int... data) {
byte[] result = new byte[data.length];
for(int i = 0; i < data.length; ++i) {
Expand Down