Skip to content

[SPARK-26068][Core]ChunkedByteBufferInputStream should handle empty chunks correctly #23040

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
LinhongLiu wants to merge 3 commits into from
Closed

[SPARK-26068][Core]ChunkedByteBufferInputStream should handle empty chunks correctly #23040

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
6136d36
ChunkedByteBufferInputStream should handle empty chunks correctly
Nov 14, 2018
fa7af44
Code clean
LinhongLiu Nov 15, 2018
3c6d349
fix review
LinhongLiu Nov 19, 2018
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
3 changes: 2 additions & 1 deletion core/src/main/scala/org/apache/spark/util/io/ChunkedByteBuffer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,8 @@ private[spark] class ChunkedByteBufferInputStream(
dispose: Boolean)
extends InputStream {

private[this] var chunks = chunkedByteBuffer.getChunks().iterator
// Filter out empty chunks since `read()` assumes all chunks are non-empty.
private[this] var chunks = chunkedByteBuffer.getChunks().filter(_.hasRemaining).iterator
Copy link
Contributor

@cloud-fan cloud-fan Nov 17, 2018

Choose a reason for hiding this comment

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

can you add a comment above, saying that we do this filter because read assumes chunks has no empty chunk?

private[this] var currentChunk: ByteBuffer = {
if (chunks.hasNext) {
chunks.next()
Expand Down
2 changes: 1 addition & 1 deletion core/src/test/scala/org/apache/spark/io/ChunkedByteBufferSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class ChunkedByteBufferSuite extends SparkFunSuite with SharedSparkContext {
val empty = ByteBuffer.wrap(Array.empty[Byte])
val bytes1 = ByteBuffer.wrap(Array.tabulate(256)(_.toByte))
val bytes2 = ByteBuffer.wrap(Array.tabulate(128)(_.toByte))
val chunkedByteBuffer = new ChunkedByteBuffer(Array(empty, bytes1, bytes2))
val chunkedByteBuffer = new ChunkedByteBuffer(Array(empty, bytes1, empty, bytes2))
assert(chunkedByteBuffer.size === bytes1.limit() + bytes2.limit())

val inputStream = chunkedByteBuffer.toInputStream(dispose = false)
Expand Down