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

Jump to bottom

Fix seeking of empty chunkers. #17797

Closed
wants to merge 1 commit into from
Closed

Fix seeking of empty chunkers. #17797

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
6 changes: 3 additions & 3 deletions src/main/java/com/google/devtools/build/lib/remote/Chunker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,14 +159,14 @@ public void reset() throws IOException {
public void seek(long toOffset) throws IOException {
// For compressed stream, we need to reinitialize the stream since the offset refers to the
// uncompressed form.
if (initialized && toOffset >= offset && !compressed) {
if (initialized && size > 0 && toOffset >= offset && !compressed) {
ByteStreams.skipFully(data, toOffset - offset);
offset = toOffset;
} else {
reset();
initialize(toOffset);
}
if (data.finished()) {
if (size > 0 && data.finished()) {
close();
}
}
Expand Down Expand Up @@ -216,7 +216,7 @@ public Chunk next() throws IOException {
maybeInitialize();

if (size == 0) {
data = null;
close();
return emptyChunk;
}

Expand Down
29 changes: 27 additions & 2 deletions src/test/java/com/google/devtools/build/lib/remote/ChunkerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,17 @@ public void nextShouldThrowIfNoMoreData() throws IOException {

@Test
public void emptyData() throws Exception {
byte[] data = new byte[0];
Chunker chunker = Chunker.builder().setInput(data).build();
var inp =
new ByteArrayInputStream(new byte[0]) {
private boolean closed;

@Override
public void close() throws IOException {
closed = true;
super.close();
}
};
Chunker chunker = Chunker.builder().setInput(0, inp).build();

assertThat(chunker.hasNext()).isTrue();

Expand All @@ -96,6 +105,7 @@ public void emptyData() throws Exception {
assertThat(next.getOffset()).isEqualTo(0);

assertThat(chunker.hasNext()).isFalse();
assertThat(inp.closed).isTrue();

assertThrows(NoSuchElementException.class, () -> chunker.next());
}
Expand Down Expand Up @@ -193,6 +203,21 @@ public void seekForwards() throws IOException {
assertThat(chunker.hasNext()).isFalse();
}

@Test
public void seekEmptyData() throws IOException {
var chunker = Chunker.builder().setInput(new byte[0]).build();
for (var i = 0; i < 2; i++) {
chunker.seek(0);
var next = chunker.next();
assertThat(next).isNotNull();
assertThat(next.getData()).isEmpty();
assertThat(next.getOffset()).isEqualTo(0);

assertThat(chunker.hasNext()).isFalse();
assertThrows(NoSuchElementException.class, () -> chunker.next());
}
}

@Test
public void testSingleChunkCompressed() throws IOException {
byte[] data = {72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100, 33};
Expand Down