diff options
| author | Xiangrui Meng <meng@databricks.com> | 2014-02-12 16:26:25 -0800 |
|---|---|---|
| committer | Reynold Xin <rxin@apache.org> | 2014-02-12 16:26:25 -0800 |
| commit | 7e29e02791a34c0aebdf1b32a522f388efd6cadc (patch) | |
| tree | fc7f760d63686428481d4bfee12a88a27d859639 | |
| parent | 2bea0709f9a1597f3c0dcc68d7c0536f465b3640 (diff) | |
| download | spark-7e29e02791a34c0aebdf1b32a522f388efd6cadc.tar.gz spark-7e29e02791a34c0aebdf1b32a522f388efd6cadc.tar.bz2 spark-7e29e02791a34c0aebdf1b32a522f388efd6cadc.zip | |
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 <meng@databricks.com>
Closes #591 and squashes the following commits:
2b4f044 [Xiangrui Meng] add @transient to prev in ZippedWithIndexRDD add @transient to seed in PartitionwiseSampledRDD
| -rw-r--r-- | core/src/main/scala/org/apache/spark/rdd/PartitionwiseSampledRDD.scala | 2 | ||||
| -rw-r--r-- | core/src/main/scala/org/apache/spark/rdd/ZippedWithIndexRDD.scala | 2 |
2 files changed, 2 insertions, 2 deletions
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 629f7074c1..a74309d861 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] = { 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 5e08a469ee..38dc114d80 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 |