diff options
| author | Tathagata Das <tathagata.das1565@gmail.com> | 2012-07-27 12:01:04 -0700 |
|---|---|---|
| committer | Tathagata Das <tathagata.das1565@gmail.com> | 2012-07-27 12:01:04 -0700 |
| commit | 3e271c3b61daa371a01e3ae287980c5af1045475 (patch) | |
| tree | 2951d8452a9428adc00542bc1bb60145bf81dd63 /core/src | |
| parent | 024905f682b6b683b6cb0ca8e1ea3e277fbd6c9d (diff) | |
| parent | d1eee44a0312e89dea5da803dc3f87e25a024c82 (diff) | |
| download | spark-3e271c3b61daa371a01e3ae287980c5af1045475.tar.gz spark-3e271c3b61daa371a01e3ae287980c5af1045475.tar.bz2 spark-3e271c3b61daa371a01e3ae287980c5af1045475.zip | |
Merge branch 'dev' of github.com:tdas/spark into dev
Diffstat (limited to 'core/src')
| -rw-r--r-- | core/src/main/scala/spark/BoundedMemoryCache.scala | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/core/src/main/scala/spark/BoundedMemoryCache.scala b/core/src/main/scala/spark/BoundedMemoryCache.scala index 5ea5c303bd..6fe0b94297 100644 --- a/core/src/main/scala/spark/BoundedMemoryCache.scala +++ b/core/src/main/scala/spark/BoundedMemoryCache.scala @@ -91,10 +91,14 @@ class BoundedMemoryCache(maxBytes: Long) extends Cache with Logging { protected def reportEntryDropped(datasetId: Any, partition: Int, entry: Entry) { logInfo("Dropping key (%s, %d) of size %d to make space".format(datasetId, partition, entry.size)) // TODO: remove BoundedMemoryCache - datasetId match { - case rddDatasetId: (Int, Int) => - SparkEnv.get.cacheTracker.dropEntry(rddDatasetId._2, partition) - case _ => + + val (keySpaceId, innerDatasetId) = datasetId.asInstanceOf[(Any, Any)] + innerDatasetId match { + case rddId: Int => + SparkEnv.get.cacheTracker.dropEntry(rddId, partition) + case broadcastUUID: java.util.UUID => + // TODO: Maybe something should be done if the broadcasted variable falls out of cache + case _ => } } } |