Skip to content

[SPARK-30225][core] Correct read() behavior past EOF in NioBufferedFileInputStream #27084

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

Closed
vanzin wants to merge 1 commit into from
Closed

[SPARK-30225][core] Correct read() behavior past EOF in NioBufferedFileInputStream #27084

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
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/spark/io/NioBufferedFileInputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ private boolean refill() throws IOException {
while (nRead == 0) {
Copy link
Member

@HyukjinKwon HyukjinKwon Jan 3, 2020

Choose a reason for hiding this comment

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

nit: the comment says it checks the weather :-).

nRead = fileChannel.read(byteBuffer);
}
byteBuffer.flip();
if (nRead < 0) {
return false;
}
byteBuffer.flip();
}
return true;
}
Expand Down
17 changes: 16 additions & 1 deletion core/src/test/java/org/apache/spark/io/GenericFileInputStreamSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,12 @@ public void setUp() throws IOException {
}

@After
public void tearDown() {
public void tearDown() throws IOException {
inputFile.delete();

for (InputStream is : inputStreams) {
is.close();
}
}

@Test
Expand Down Expand Up @@ -141,4 +145,15 @@ public void testBytesSkippedAfterEOF() throws IOException {
assertEquals(-1, inputStream.read());
}
}

@Test
public void testReadPastEOF() throws IOException {
InputStream is = inputStreams[0];
byte[] buf = new byte[1024];
int read;
while ((read = is.read(buf, 0, buf.length)) != -1);

int readAfterEOF = is.read(buf, 0, buf.length);
assertEquals(-1, readAfterEOF);
}
}