Repository: spark Updated Branches: refs/heads/master 9d006c973 -> 42f3abd52
[SPARK-2306]:BoundedPriorityQueue is private and not registered with Kry... Due to the non registration of BoundedPriorityQueue with kryoserializer, operations which are dependend on BoundedPriorityQueue are giving exceptions.One such instance is using top along with kryo serialization. Fixed the issue by registering BoundedPriorityQueue with kryoserializer. Author: ankit.bhardwaj <ankit.bhard...@guavus.com> Closes #1299 from AnkitBhardwaj12/BoundedPriorityQueueWithKryoIssue and squashes the following commits: a4ae8ed [ankit.bhardwaj] [SPARK-2306]:BoundedPriorityQueue is private and not registered with Kryo Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/42f3abd5 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/42f3abd5 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/42f3abd5 Branch: refs/heads/master Commit: 42f3abd529e84f3b26386abe2bde30666e74b64e Parents: 9d006c9 Author: ankit.bhardwaj <ankit.bhard...@guavus.com> Authored: Fri Jul 4 22:06:10 2014 -0700 Committer: Reynold Xin <r...@apache.org> Committed: Fri Jul 4 22:06:10 2014 -0700 ---------------------------------------------------------------------- .../main/scala/org/apache/spark/serializer/KryoSerializer.scala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/42f3abd5/core/src/main/scala/org/apache/spark/serializer/KryoSerializer.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/serializer/KryoSerializer.scala b/core/src/main/scala/org/apache/spark/serializer/KryoSerializer.scala index 82b62aa..1ce4243 100644 --- a/core/src/main/scala/org/apache/spark/serializer/KryoSerializer.scala +++ b/core/src/main/scala/org/apache/spark/serializer/KryoSerializer.scala @@ -30,6 +30,7 @@ import org.apache.spark.broadcast.HttpBroadcast import org.apache.spark.scheduler.MapStatus import org.apache.spark.storage._ import org.apache.spark.storage.{GetBlock, GotBlock, PutBlock} +import org.apache.spark.util.BoundedPriorityQueue import scala.reflect.ClassTag @@ -183,7 +184,8 @@ private[serializer] object KryoSerializer { classOf[GetBlock], classOf[MapStatus], classOf[BlockManagerId], - classOf[Array[Byte]] + classOf[Array[Byte]], + classOf[BoundedPriorityQueue[_]] ) }
