Skip to content

[SPARK-12084][Core]Fix codes that uses ByteBuffer.array incorrectly #10083

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
zsxwing wants to merge 4 commits into from
Closed

[SPARK-12084][Core]Fix codes that uses ByteBuffer.array incorrectly #10083

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
93b68de
Fix codes that uses ByteBuffer.array incorrectly
zsxwing Dec 1, 2015
bfb3360
Fix KryoSerializer
zsxwing Dec 2, 2015
a5d965c
Fix GenericAvroSerializer and address comments
zsxwing Dec 2, 2015
81d1812
Fix the bug that BatchedWriteAheadLog.deaggregate doesn't restore the…
zsxwing Dec 2, 2015
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
Prev Previous commit
Next Next commit
Fix KryoSerializer
  • Loading branch information
@zsxwing
zsxwing committed Dec 2, 2015
commit bfb336048f4383702315f2de352437c75218cb92
6 changes: 3 additions & 3 deletions core/src/main/scala/org/apache/spark/serializer/KryoSerializer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import org.roaringbitmap.RoaringBitmap
import org.apache.spark._
import org.apache.spark.api.python.PythonBroadcast
import org.apache.spark.broadcast.HttpBroadcast
import org.apache.spark.network.util.{ByteUnit, JavaUtils}
import org.apache.spark.network.util.ByteUnit
import org.apache.spark.scheduler.{CompressedMapStatus, HighlyCompressedMapStatus}
import org.apache.spark.storage._
import org.apache.spark.util.collection.CompactBuffer
Expand Down Expand Up @@ -307,7 +307,7 @@ private[spark] class KryoSerializerInstance(ks: KryoSerializer) extends Serializ
override def deserialize[T: ClassTag](bytes: ByteBuffer): T = {
val kryo = borrowKryo()
try {
input.setBuffer(JavaUtils.bufferToArray(bytes))
input.setBuffer(bytes.array(), bytes.arrayOffset() + bytes.position(), bytes.remaining())
Copy link
Contributor

@vanzin vanzin Dec 2, 2015

Choose a reason for hiding this comment

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

Not necessary for this change, but at some point it might be worth it to change this to use Kryo's ByteBufferInput.

Copy link
Member Author

@zsxwing zsxwing Dec 2, 2015

Choose a reason for hiding this comment

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

Kryo will use the array as an internal buffer. Why it's not necessary?

Copy link
Contributor

@vanzin vanzin Dec 2, 2015

Choose a reason for hiding this comment

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

I'm saying that the change I proposed is not necessary, not that your change is not necessary.

Copy link
Member Author

@zsxwing zsxwing Dec 2, 2015

Choose a reason for hiding this comment

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

I'm saying that the change I proposed is not necessary, not that your change is not necessary.

Got it. Sorry for my misunderstanding.

kryo.readClassAndObject(input).asInstanceOf[T]
} finally {
releaseKryo(kryo)
Expand All @@ -319,7 +319,7 @@ private[spark] class KryoSerializerInstance(ks: KryoSerializer) extends Serializ
val oldClassLoader = kryo.getClassLoader
try {
kryo.setClassLoader(loader)
input.setBuffer(JavaUtils.bufferToArray(bytes))
input.setBuffer(bytes.array(), bytes.arrayOffset() + bytes.position(), bytes.remaining())
kryo.readClassAndObject(input).asInstanceOf[T]
} finally {
kryo.setClassLoader(oldClassLoader)
Expand Down