aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorMatei Zaharia <matei@databricks.com>2014-04-25 11:12:41 -0700
committerMatei Zaharia <matei@databricks.com>2014-04-25 11:12:41 -0700
commita24d918c71f6ac4adbe3ae363ef69f4658118938 (patch)
treeedfdceb390784baaf8ef9277fef66676e082b418 /core
parentdc3b640a0ab3501b678b591be3e99fbcf3badbec (diff)
downloadspark-a24d918c71f6ac4adbe3ae363ef69f4658118938.tar.gz
spark-a24d918c71f6ac4adbe3ae363ef69f4658118938.tar.bz2
spark-a24d918c71f6ac4adbe3ae363ef69f4658118938.zip
SPARK-1621 Upgrade Chill to 0.3.6
It registers more Scala classes, including things like Ranges that we had to register manually before. See https://github.com/twitter/chill/releases for Chill's change log. Author: Matei Zaharia <matei@databricks.com> Closes #543 from mateiz/chill-0.3.6 and squashes the following commits: a1dc5e0 [Matei Zaharia] Upgrade Chill to 0.3.6 and remove our special registration of Ranges
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/org/apache/spark/serializer/KryoSerializer.scala12
1 files changed, 5 insertions, 7 deletions
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 d1e8c3ef63..c4daec7875 100644
--- a/core/src/main/scala/org/apache/spark/serializer/KryoSerializer.scala
+++ b/core/src/main/scala/org/apache/spark/serializer/KryoSerializer.scala
@@ -58,7 +58,9 @@ class KryoSerializer(conf: SparkConf)
// Do this before we invoke the user registrator so the user registrator can override this.
kryo.setReferences(referenceTracking)
- for (cls <- KryoSerializer.toRegister) kryo.register(cls)
+ for (cls <- KryoSerializer.toRegister) {
+ kryo.register(cls)
+ }
// Allow sending SerializableWritable
kryo.register(classOf[SerializableWritable[_]], new KryoJavaSerializer())
@@ -77,7 +79,7 @@ class KryoSerializer(conf: SparkConf)
}
// Register Chill's classes; we do this after our ranges and the user's own classes to let
- // our code override the generic serialziers in Chill for things like Seq
+ // our code override the generic serializers in Chill for things like Seq
new AllScalaRegistrar().apply(kryo)
kryo.setClassLoader(classLoader)
@@ -176,10 +178,6 @@ private[serializer] object KryoSerializer {
classOf[GetBlock],
classOf[MapStatus],
classOf[BlockManagerId],
- classOf[Array[Byte]],
- (1 to 10).getClass,
- (1 until 10).getClass,
- (1L to 10L).getClass,
- (1L until 10L).getClass
+ classOf[Array[Byte]]
)
}