Updated Branches: refs/heads/master 2bea0709f -> 7e29e0279
Merge pull request #591 from mengxr/transient-new. SPARK-1076: [Fix #578] add @transient to some vals I'll try to be more careful next time. Author: Xiangrui Meng <m...@databricks.com> Closes #591 and squashes the following commits: 2b4f044 [Xiangrui Meng] add @transient to prev in ZippedWithIndexRDD add @transient to seed in PartitionwiseSampledRDD Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/7e29e027 Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/7e29e027 Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/7e29e027 Branch: refs/heads/master Commit: 7e29e02791a34c0aebdf1b32a522f388efd6cadc Parents: 2bea070 Author: Xiangrui Meng <m...@databricks.com> Authored: Wed Feb 12 16:26:25 2014 -0800 Committer: Reynold Xin <r...@apache.org> Committed: Wed Feb 12 16:26:25 2014 -0800 ---------------------------------------------------------------------- .../main/scala/org/apache/spark/rdd/PartitionwiseSampledRDD.scala | 2 +- core/src/main/scala/org/apache/spark/rdd/ZippedWithIndexRDD.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/7e29e027/core/src/main/scala/org/apache/spark/rdd/PartitionwiseSampledRDD.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/rdd/PartitionwiseSampledRDD.scala b/core/src/main/scala/org/apache/spark/rdd/PartitionwiseSampledRDD.scala index 629f707..a74309d 100644 --- a/core/src/main/scala/org/apache/spark/rdd/PartitionwiseSampledRDD.scala +++ b/core/src/main/scala/org/apache/spark/rdd/PartitionwiseSampledRDD.scala @@ -45,7 +45,7 @@ class PartitionwiseSampledRDDPartition(val prev: Partition, val seed: Long) class PartitionwiseSampledRDD[T: ClassTag, U: ClassTag]( prev: RDD[T], sampler: RandomSampler[T, U], - seed: Long = System.nanoTime) + @transient seed: Long = System.nanoTime) extends RDD[U](prev) { override def getPartitions: Array[Partition] = { http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/7e29e027/core/src/main/scala/org/apache/spark/rdd/ZippedWithIndexRDD.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/rdd/ZippedWithIndexRDD.scala b/core/src/main/scala/org/apache/spark/rdd/ZippedWithIndexRDD.scala index 5e08a46..38dc114 100644 --- a/core/src/main/scala/org/apache/spark/rdd/ZippedWithIndexRDD.scala +++ b/core/src/main/scala/org/apache/spark/rdd/ZippedWithIndexRDD.scala @@ -37,7 +37,7 @@ class ZippedWithIndexRDDPartition(val prev: Partition, val startIndex: Long) * @tparam T parent RDD item type */ private[spark] -class ZippedWithIndexRDD[T: ClassTag](prev: RDD[T]) extends RDD[(T, Long)](prev) { +class ZippedWithIndexRDD[T: ClassTag](@transient prev: RDD[T]) extends RDD[(T, Long)](prev) { override def getPartitions: Array[Partition] = { val n = prev.partitions.size
