Skip to content

Commit 21909b8

Browse files
committed
Revert "[SPARK-12060][CORE] Avoid memory copy in JavaSerializerInstance.serialize"
This reverts commit 9b99b2b.
1 parent 81db8d0 commit 21909b8

File tree

2 files changed

+4
-34
lines changed

2 files changed

+4
-34
lines changed

core/src/main/scala/org/apache/spark/serializer/JavaSerializer.scala

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ import scala.reflect.ClassTag
2424

2525
import org.apache.spark.SparkConf
2626
import org.apache.spark.annotation.DeveloperApi
27-
import org.apache.spark.util.{ByteBufferInputStream, ByteBufferOutputStream, Utils}
27+
import org.apache.spark.util.ByteBufferInputStream
28+
import org.apache.spark.util.Utils
2829

2930
private[spark] class JavaSerializationStream(
3031
out: OutputStream, counterReset: Int, extraDebugInfo: Boolean)
@@ -95,11 +96,11 @@ private[spark] class JavaSerializerInstance(
9596
extends SerializerInstance {
9697

9798
override def serialize[T: ClassTag](t: T): ByteBuffer = {
98-
val bos = new ByteBufferOutputStream()
99+
val bos = new ByteArrayOutputStream()
99100
val out = serializeStream(bos)
100101
out.writeObject(t)
101102
out.close()
102-
bos.toByteBuffer
103+
ByteBuffer.wrap(bos.toByteArray)
103104
}
104105

105106
override def deserialize[T: ClassTag](bytes: ByteBuffer): T = {

core/src/main/scala/org/apache/spark/util/ByteBufferOutputStream.scala

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)