Skip to content

[SPARK-24107][CORE] ChunkedByteBuffer.writeFully method has not reset the limit value #21175

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
jinhai-cloud wants to merge 11 commits into from
Closed

[SPARK-24107][CORE] ChunkedByteBuffer.writeFully method has not reset the limit value #21175

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fae1814
restore bytes limit value
Apr 26, 2018
623f26d
add ChunkedByteBufferSuite unit test
Apr 27, 2018
5ba6867
Merge branch 'master' into bugfix-ChunkedByteBuffer
Apr 27, 2018
c585131
ChunkedByteBufferSuite improve unit test
Apr 27, 2018
a2a82f1
change assert size
Apr 27, 2018
217ec9d
add SPARK-24107:
Apr 27, 2018
2bc19a3
change ByteArrayWritableChannel's size
Apr 27, 2018
c9a6816
add configure bufferWriteChunkSize
Apr 27, 2018
fa99a19
sc.conf.set spark.buffer.write.chunkSize
Apr 27, 2018
fb527c8
add try finally
Apr 27, 2018
e78ef39
fixed the style
May 2, 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
2 changes: 2 additions & 0 deletions 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 @@ -63,10 +63,12 @@ private[spark] class ChunkedByteBuffer(var chunks: Array[ByteBuffer]) {
*/
def writeFully(channel: WritableByteChannel): Unit = {
for (bytes <- getChunks()) {
val limit = bytes.limit()

@maropu maropu Apr 27, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

How about renaming limit to curChunkLimit?

while (bytes.remaining() > 0) {

@maropu maropu Apr 27, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This is not related to this pr though, while (bytes.hasRemaining) {?

val ioSize = Math.min(bytes.remaining(), bufferWriteChunkSize)
bytes.limit(bytes.position() + ioSize)
channel.write(bytes)
bytes.limit(limit)
}
}
}
Expand Down
6 changes: 6 additions & 0 deletions 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 @@ -56,6 +56,12 @@ class ChunkedByteBufferSuite extends SparkFunSuite {
assert(chunkedByteBuffer.getChunks().head.position() === 0)
}

test("writeFully() does not affect original buffer's position") {

@Ngone51 Ngone51 Apr 27, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Hi @Manbuyun .You should add a new unit test to support your own change. For example, "writeFully() can write buffer which is larger than bufferWriteChunkSize correctly. " And update the test code.

@jinhai-cloud jinhai-cloud Apr 27, 2018

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Done. Thanks

val chunkedByteBuffer = new ChunkedByteBuffer(Array(ByteBuffer.allocate(80*1024*1024)))

@Ngone51 Ngone51 Apr 27, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

nit: space beside *.

@jinhai-cloud jinhai-cloud Apr 27, 2018

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Done. Thanks

chunkedByteBuffer.writeFully(new ByteArrayWritableChannel(chunkedByteBuffer.size.toInt))
assert(chunkedByteBuffer.getChunks().head.position() === 0)

@Ngone51 Ngone51 Apr 27, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This assert is unnecessary for this PR change. Please replace it with assert channel's length here.

}

test("toArray()") {
val empty = ByteBuffer.wrap(Array.empty[Byte])
val bytes = ByteBuffer.wrap(Array.tabulate(8)(_.toByte))
Expand Down