aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorMatei Zaharia <matei@eecs.berkeley.edu>2011-06-27 22:50:59 -0700
committerMatei Zaharia <matei@eecs.berkeley.edu>2011-06-27 22:50:59 -0700
commit5633299ec6d28a8d38e17f3a6001f8411b44ba0c (patch)
treebdd9637d624389428fbecd77fb576134d4fd3df8 /core
parent85cad5d9dd481ae4eef9d1d30849851027c81c9d (diff)
parentb0ecf1ee41f2280a885a8005363e0d0b197e4d3b (diff)
downloadspark-5633299ec6d28a8d38e17f3a6001f8411b44ba0c.tar.gz
spark-5633299ec6d28a8d38e17f3a6001f8411b44ba0c.tar.bz2
spark-5633299ec6d28a8d38e17f3a6001f8411b44ba0c.zip
Merge remote-tracking branch 'origin/master' into scala-2.9
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/spark/DAGScheduler.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/src/main/scala/spark/DAGScheduler.scala b/core/src/main/scala/spark/DAGScheduler.scala
index 99a69203af..ecdce037e9 100644
--- a/core/src/main/scala/spark/DAGScheduler.scala
+++ b/core/src/main/scala/spark/DAGScheduler.scala
@@ -171,7 +171,8 @@ private trait DAGScheduler extends Scheduler with Logging {
if (finalStage.parents.size == 0 && numOutputParts == 1) {
logInfo("Computing the requested partition locally")
val split = finalRdd.splits(outputParts(0))
- return Array(func(null, finalRdd.iterator(split)))
+ val taskContext = new TaskContext(finalStage.id, outputParts(0), 0)
+ return Array(func(taskContext, finalRdd.iterator(split)))
}
def submitStage(stage: Stage) {