spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject git commit: SPARK-1621 Upgrade Chill to 0.3.6
Date Fri, 25 Apr 2014 18:12:55 GMT
Repository: spark
Updated Branches:
  refs/heads/master dc3b640a0 -> a24d918c7


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


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/a24d918c
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/a24d918c
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/a24d918c

Branch: refs/heads/master
Commit: a24d918c71f6ac4adbe3ae363ef69f4658118938
Parents: dc3b640
Author: Matei Zaharia <matei@databricks.com>
Authored: Fri Apr 25 11:12:41 2014 -0700
Committer: Matei Zaharia <matei@databricks.com>
Committed: Fri Apr 25 11:12:41 2014 -0700

----------------------------------------------------------------------
 .../org/apache/spark/serializer/KryoSerializer.scala    | 12 +++++-------
 pom.xml                                                 |  2 +-
 project/SparkBuild.scala                                |  6 +++---
 3 files changed, 9 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/a24d918c/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 d1e8c3e..c4daec7 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]]
   )
 }

http://git-wip-us.apache.org/repos/asf/spark/blob/a24d918c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e292775..e911799 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>

http://git-wip-us.apache.org/repos/asf/spark/blob/a24d918c/project/SparkBuild.scala
----------------------------------------------------------------------
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 9cbc188..48f234c 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -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"
@@ -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",


Mime
View raw message