diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2010-10-03 13:28:06 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2010-10-03 13:28:06 -0700 |
| commit | a826294c3ad9038b6c7d6c6a338e908264489c45 (patch) | |
| tree | 5139d1dde1e538414e7cb51622dd4b4d32a5606a /src | |
| parent | aef9e5b98c0ebd23fb9a85830ba0ea993f826f82 (diff) | |
| parent | 34eccedbf5781b8723abdc1e6fd3d98e14056999 (diff) | |
| download | spark-a826294c3ad9038b6c7d6c6a338e908264489c45.tar.gz spark-a826294c3ad9038b6c7d6c6a338e908264489c45.tar.bz2 spark-a826294c3ad9038b6c7d6c6a338e908264489c45.zip | |
Merge branch 'master' into matei-scheduling
Diffstat (limited to 'src')
| -rw-r--r-- | src/scala/spark/HdfsFile.scala | 1 | ||||
| -rw-r--r-- | src/scala/spark/RDD.scala | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/scala/spark/HdfsFile.scala b/src/scala/spark/HdfsFile.scala index 595386fceb..886272a8ed 100644 --- a/src/scala/spark/HdfsFile.scala +++ b/src/scala/spark/HdfsFile.scala @@ -14,6 +14,7 @@ import org.apache.hadoop.mapred.Reporter @serializable class HdfsSplit(@transient s: InputSplit) extends Split { val inputSplit = new SerializableWritable[InputSplit](s) + override def toString = inputSplit.toString } class HdfsTextFile(sc: SparkContext, path: String) diff --git a/src/scala/spark/RDD.scala b/src/scala/spark/RDD.scala index 4d0c8c6711..181f7e8b03 100644 --- a/src/scala/spark/RDD.scala +++ b/src/scala/spark/RDD.scala @@ -198,6 +198,7 @@ extends RDD[T](prev.sparkContext) with Logging { override def iterator(split: Split): Iterator[T] = { val key = id + "::" + split.toString + logInfo("CachedRDD split key is " + key) val cache = CachedRDD.cache val loading = CachedRDD.loading val cachedVal = cache.get(key) |