You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2014/10/22 09:51:40 UTC
git commit: use isRunningLocally rather than runningLocally
Repository: spark
Updated Branches:
refs/heads/master bae4ca3bb -> f05e09b4c
use isRunningLocally rather than runningLocally
runningLocally is deprecated now
Author: CrazyJvm <cr...@gmail.com>
Closes #2879 from CrazyJvm/runningLocally and squashes the following commits:
bec0b3e [CrazyJvm] use isRunningLocally rather than runningLocally
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/f05e09b4
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/f05e09b4
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/f05e09b4
Branch: refs/heads/master
Commit: f05e09b4c95d799bdda3c3ff7fb76a4cd656415d
Parents: bae4ca3
Author: CrazyJvm <cr...@gmail.com>
Authored: Wed Oct 22 00:51:33 2014 -0700
Committer: Reynold Xin <rx...@databricks.com>
Committed: Wed Oct 22 00:51:33 2014 -0700
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/CacheManager.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/f05e09b4/core/src/main/scala/org/apache/spark/CacheManager.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/CacheManager.scala b/core/src/main/scala/org/apache/spark/CacheManager.scala
index d89bb50..80da62c 100644
--- a/core/src/main/scala/org/apache/spark/CacheManager.scala
+++ b/core/src/main/scala/org/apache/spark/CacheManager.scala
@@ -61,7 +61,7 @@ private[spark] class CacheManager(blockManager: BlockManager) extends Logging {
val computedValues = rdd.computeOrReadCheckpoint(partition, context)
// If the task is running locally, do not persist the result
- if (context.runningLocally) {
+ if (context.isRunningLocally) {
return computedValues
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org