aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatei Zaharia <matei.zaharia@gmail.com>2013-07-31 15:52:36 -0700
committerMatei Zaharia <matei.zaharia@gmail.com>2013-07-31 15:52:36 -0700
commit39c75f3033eb0b6d3de3517f681bb932efad0caa (patch)
tree268cb67232946103744207c7cdf10db088f730d0
parentb2b86c25752438688aa9d1481b3f2b4a3231a7c5 (diff)
parent9a815de4bfaf959fe1399d6550e561a0ec9f28c2 (diff)
downloadspark-39c75f3033eb0b6d3de3517f681bb932efad0caa.tar.gz
spark-39c75f3033eb0b6d3de3517f681bb932efad0caa.tar.bz2
spark-39c75f3033eb0b6d3de3517f681bb932efad0caa.zip
Merge pull request #757 from BlackNiuza/result_task_generation
Bug fix: SPARK-837
-rw-r--r--core/src/main/scala/spark/scheduler/ResultTask.scala2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/src/main/scala/spark/scheduler/ResultTask.scala b/core/src/main/scala/spark/scheduler/ResultTask.scala
index 361b1e6b91..1ced6f9524 100644
--- a/core/src/main/scala/spark/scheduler/ResultTask.scala
+++ b/core/src/main/scala/spark/scheduler/ResultTask.scala
@@ -118,6 +118,7 @@ private[spark] class ResultTask[T, U](
out.write(bytes)
out.writeInt(partition)
out.writeInt(outputId)
+ out.writeLong(generation)
out.writeObject(split)
}
}
@@ -132,6 +133,7 @@ private[spark] class ResultTask[T, U](
func = func_.asInstanceOf[(TaskContext, Iterator[T]) => U]
partition = in.readInt()
val outputId = in.readInt()
+ generation = in.readLong()
split = in.readObject().asInstanceOf[Partition]
}
}