diff options
| author | Matei Zaharia <matei.zaharia@gmail.com> | 2013-08-08 14:02:02 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei.zaharia@gmail.com> | 2013-08-08 14:02:02 -0700 |
| commit | 63b6e02beda8d9042696cbf2cbfc640b77f9b851 (patch) | |
| tree | d4b5d50cb5dcd385b96c9c39d92087b210bf10c4 | |
| parent | 9955e5a4b7821e9c8eb3627757504603d7763a92 (diff) | |
| parent | d1e1c1b24d8dd8284952a08dbda138dc9e233a9a (diff) | |
| download | spark-63b6e02beda8d9042696cbf2cbfc640b77f9b851.tar.gz spark-63b6e02beda8d9042696cbf2cbfc640b77f9b851.tar.bz2 spark-63b6e02beda8d9042696cbf2cbfc640b77f9b851.zip | |
Merge pull request #797 from mateiz/chill-0.3.1
Update to Chill 0.3.1
| -rw-r--r-- | core/pom.xml | 4 | ||||
| -rw-r--r-- | core/src/test/scala/spark/KryoSerializerSuite.scala | 14 | ||||
| -rw-r--r-- | pom.xml | 4 | ||||
| -rw-r--r-- | project/SparkBuild.scala | 4 |
4 files changed, 19 insertions, 7 deletions
diff --git a/core/pom.xml b/core/pom.xml index ba0071f582..485aa29f83 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -63,12 +63,12 @@ <dependency> <groupId>com.twitter</groupId> <artifactId>chill_2.9.3</artifactId> - <version>0.3.0</version> + <version>0.3.1</version> </dependency> <dependency> <groupId>com.twitter</groupId> <artifactId>chill-java</artifactId> - <version>0.3.0</version> + <version>0.3.1</version> </dependency> <dependency> <groupId>com.typesafe.akka</groupId> diff --git a/core/src/test/scala/spark/KryoSerializerSuite.scala b/core/src/test/scala/spark/KryoSerializerSuite.scala index 01390027c8..7568a0bf65 100644 --- a/core/src/test/scala/spark/KryoSerializerSuite.scala +++ b/core/src/test/scala/spark/KryoSerializerSuite.scala @@ -139,6 +139,18 @@ class KryoSerializerSuite extends FunSuite with SharedSparkContext { assert (control === result.toSeq) } + test("kryo with parallelize for specialized tuples") { + assert (sc.parallelize( Array((1, 11), (2, 22), (3, 33)) ).count === 3) + } + + test("kryo with parallelize for primitive arrays") { + assert (sc.parallelize( Array(1, 2, 3) ).count === 3) + } + + test("kryo with collect for specialized tuples") { + assert (sc.parallelize( Array((1, 11), (2, 22), (3, 33)) ).collect().head === (1, 11)) + } + test("kryo with reduce") { val control = 1 :: 2 :: Nil val result = sc.parallelize(control, 2).map(new ClassWithoutNoArgConstructor(_)) @@ -193,4 +205,4 @@ object KryoTest { k.register(classOf[java.util.HashMap[_, _]]) } } -}
\ No newline at end of file +} @@ -201,12 +201,12 @@ <dependency> <groupId>com.twitter</groupId> <artifactId>chill_2.9.3</artifactId> - <version>0.3.0</version> + <version>0.3.1</version> </dependency> <dependency> <groupId>com.twitter</groupId> <artifactId>chill-java</artifactId> - <version>0.3.0</version> + <version>0.3.1</version> </dependency> <dependency> <groupId>com.typesafe.akka</groupId> diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index c822f49e78..236f424dff 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -183,8 +183,8 @@ object SparkBuild extends Build { "org.apache.derby" % "derby" % "10.4.2.0" % "test", "com.codahale.metrics" % "metrics-core" % "3.0.0", "com.codahale.metrics" % "metrics-jvm" % "3.0.0", - "com.twitter" % "chill_2.9.3" % "0.3.0", - "com.twitter" % "chill-java" % "0.3.0" + "com.twitter" % "chill_2.9.3" % "0.3.1", + "com.twitter" % "chill-java" % "0.3.1" ) ++ ( if (HADOOP_MAJOR_VERSION == "2") { if (HADOOP_YARN) { |