Skip to content

Commit

Permalink
SPARK-1621 Upgrade Chill to 0.3.6
Browse files Browse the repository at this point in the history
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 <[email protected]>

Closes apache#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
  • Loading branch information
mateiz committed Apr 25, 2014
1 parent dc3b640 commit a24d918
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand All @@ -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)
Expand Down Expand Up @@ -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]]
)
}
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
<parquet.version>1.3.2</parquet.version>
<jblas.version>1.2.3</jblas.version>
<jetty.version>8.1.14.v20131031</jetty.version>
<chill.version>0.3.1</chill.version>
<chill.version>0.3.6</chill.version>
<codahale.metrics.version>3.0.0</codahale.metrics.version>

<PermGen>64m</PermGen>
Expand Down
6 changes: 3 additions & 3 deletions project/SparkBuild.scala
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ object SparkBuild extends Build {
) ++ net.virtualvoid.sbt.graph.Plugin.graphSettings ++ ScalaStyleSettings ++ genjavadocSettings

val akkaVersion = "2.2.3-shaded-protobuf"
val chillVersion = "0.3.1"
val chillVersion = "0.3.6"
val codahaleMetricsVersion = "3.0.0"
val jblasVersion = "1.2.3"
val jettyVersion = "8.1.14.v20131031"
Expand Down Expand Up @@ -412,8 +412,8 @@ object SparkBuild extends Build {
)

def examplesSettings = sharedSettings ++ Seq(
name := "spark-examples",
jarName in assembly <<= version map {
name := "spark-examples",
jarName in assembly <<= version map {
v => "spark-examples-" + v + "-hadoop" + hadoopVersion + ".jar" },
libraryDependencies ++= Seq(
"com.twitter" %% "algebird-core" % "0.1.11",
Expand Down

0 comments on commit a24d918

Please sign in to comment.