Skip to content

Some minor cleanup after SPARK-4550. #5916

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
wants to merge 1 commit into from
Closed

Some minor cleanup after SPARK-4550. #5916

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
9 changes: 2 additions & 7 deletions core/src/main/scala/org/apache/spark/storage/BlockObjectWriter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ private[spark] abstract class BlockObjectWriter(val blockId: BlockId) extends Ou
def write(key: Any, value: Any)

/**
* Notify the writer that a record worth of bytes has been written with writeBytes.
* Notify the writer that a record worth of bytes has been written with OutputStream#write.
*/
def recordWritten()

Expand Down Expand Up @@ -215,12 +215,7 @@ private[spark] class DiskBlockObjectWriter(

objOut.writeKey(key)
objOut.writeValue(value)
numRecordsWritten += 1
writeMetrics.incShuffleRecordsWritten(1)

if (numRecordsWritten % 32 == 0) {
updateBytesWritten()
}
recordWritten()
}

override def write(b: Int): Unit = throw new UnsupportedOperationException()
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/scala/org/apache/spark/util/collection/PartitionedSerializedPairBuffer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@ private[spark] class PartitionedSerializedPairBuffer[K, V](
if (keyStart < 0) {
throw new Exception(s"Can't grow buffer beyond ${1 << 31} bytes")
}
kvSerializationStream.writeObject[Any](key)
kvSerializationStream.writeKey[Any](key)
kvSerializationStream.flush()
val valueStart = kvBuffer.size
kvSerializationStream.writeObject[Any](value)
kvSerializationStream.writeValue[Any](value)
kvSerializationStream.flush()
val valueEnd = kvBuffer.size

Expand Down