Changed to using a foreach vs. getorelse

Ilya Ganelin · Ilya Ganelin · commit bfabf8893565 · 2015-03-12T16:02:17.000-07:00
diff --git a/core/src/main/scala/org/apache/spark/shuffle/sort/SortShuffleWriter.scala b/core/src/main/scala/org/apache/spark/shuffle/sort/SortShuffleWriter.scala
@@ -90,10 +90,8 @@ private[spark] class SortShuffleWriter[K, V, C](
       if (sorter != null) {
         val startTime = System.nanoTime()
         sorter.stop()
-        context.taskMetrics().shuffleWriteMetrics.getOrElse({
-          metrics : ShuffleWriteMetrics =>
-            metrics.incShuffleWriteTime(System.nanoTime()-startTime)
-        },Nil)
+        context.taskMetrics.shuffleWriteMetrics.foreach(
+          _.incShuffleWriteTime(System.nanoTime - startTime))
         sorter = null
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -90,10 +90,8 @@ private[spark] class SortShuffleWriter[K, V, C](`
`90`	`90`	`if (sorter != null) {`
`91`	`91`	`val startTime = System.nanoTime()`
`92`	`92`	`sorter.stop()`
`93`		`- context.taskMetrics().shuffleWriteMetrics.getOrElse({`
`94`		`- metrics : ShuffleWriteMetrics =>`
`95`		`- metrics.incShuffleWriteTime(System.nanoTime()-startTime)`
`96`		`- },Nil)`
	`93`	`+ context.taskMetrics.shuffleWriteMetrics.foreach(`
	`94`	`+ _.incShuffleWriteTime(System.nanoTime - startTime))`
`97`	`95`	`sorter = null`
`98`	`96`	`}`
`99`	`97`	`}`