You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by an...@apache.org on 2015/02/13 01:18:31 UTC
spark git commit: Revert "[SPARK-5762] Fix shuffle write time for
sort-based shuffle"
Repository: spark
Updated Branches:
refs/heads/branch-1.2 d24971a62 -> 0ba065f0a
Revert "[SPARK-5762] Fix shuffle write time for sort-based shuffle"
This reverts commit 9c5454d06e56917521a15697c36f76a33a94dd1e.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/0ba065f0
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/0ba065f0
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/0ba065f0
Branch: refs/heads/branch-1.2
Commit: 0ba065f0ad9ccac2305cc5bd926cf6e4333b3358
Parents: d24971a
Author: Andrew Or <an...@databricks.com>
Authored: Thu Feb 12 16:18:27 2015 -0800
Committer: Andrew Or <an...@databricks.com>
Committed: Thu Feb 12 16:18:27 2015 -0800
----------------------------------------------------------------------
.../scala/org/apache/spark/util/collection/ExternalSorter.scala | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/0ba065f0/core/src/main/scala/org/apache/spark/util/collection/ExternalSorter.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/util/collection/ExternalSorter.scala b/core/src/main/scala/org/apache/spark/util/collection/ExternalSorter.scala
index 3916fca..15bda1c 100644
--- a/core/src/main/scala/org/apache/spark/util/collection/ExternalSorter.scala
+++ b/core/src/main/scala/org/apache/spark/util/collection/ExternalSorter.scala
@@ -723,7 +723,6 @@ private[spark] class ExternalSorter[K, V, C](
partitionWriters.foreach(_.commitAndClose())
var out: FileOutputStream = null
var in: FileInputStream = null
- val writeStartTime = System.nanoTime
try {
out = new FileOutputStream(outputFile, true)
for (i <- 0 until numPartitions) {
@@ -740,8 +739,6 @@ private[spark] class ExternalSorter[K, V, C](
if (in != null) {
in.close()
}
- context.taskMetrics.shuffleWriteMetrics.foreach(
- _.incShuffleWriteTime(System.nanoTime - writeStartTime))
}
} else {
// Either we're not bypassing merge-sort or we have only in-memory data; get an iterator by
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org