Skip to content

HADOOP-18530. ChecksumFileSystem::readVectored might return byte buffers not positioned at 0 #5168

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 3 commits into from
Nov 29, 2022
Merged

HADOOP-18530. ChecksumFileSystem::readVectored might return byte buffers not positioned at 0 #5168

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
d629b77
HADOOP-18530
Nov 28, 2022
3d95bb1
HADOOP-18530 Fixed the test
Nov 28, 2022
bb52ba4
Added comments
Nov 29, 2022
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
7 changes: 7 additions & 0 deletions ...op-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/VectoredReadUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,9 +307,16 @@ public static ByteBuffer sliceTo(ByteBuffer readData, long readOffset,
FileRange request) {
int offsetChange = (int) (request.getOffset() - readOffset);
int requestLength = request.getLength();
// Create a new buffer that is backed by the original contents
// The buffer will have position 0 and the same limit as the original one
readData = readData.slice();
// Change the offset and the limit of the buffer as the reader wants to see
// only relevant data
readData.position(offsetChange);
readData.limit(offsetChange + requestLength);
// Create a new buffer after the limit change so that only that portion of the data is
// returned to the reader.
readData = readData.slice();
return readData;
}

Expand Down
6 changes: 6 additions & 0 deletions ...ommon-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestVectoredReadUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ public void testSliceTo() {
.describedAs("Slicing on the same offset shouldn't " +
"create a new buffer")
.isEqualTo(slice);
Assertions.assertThat(slice.position())
.describedAs("Slicing should return buffers starting from position 0")
.isEqualTo(0);

// try slicing a range
final int offset = 100;
Expand All @@ -77,6 +80,9 @@ public void testSliceTo() {
.describedAs("Slicing should use the same underlying " +
"data")
.isEqualTo(slice.array());
Assertions.assertThat(slice.position())
.describedAs("Slicing should return buffers starting from position 0")
.isEqualTo(0);
// test the contents of the slice
intBuffer = slice.asIntBuffer();
for(int i=0; i < sliceLength / Integer.BYTES; ++i) {
Expand Down