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 2014/11/14 22:29:45 UTC
spark git commit: [Spark Core] SPARK-4380 Edit spilling log from MB
to B
Repository: spark
Updated Branches:
refs/heads/master abd581752 -> 0c56a039a
[Spark Core] SPARK-4380 Edit spilling log from MB to B
https://issues.apache.org/jira/browse/SPARK-4380
Author: Hong Shen <ho...@tencent.com>
Closes #3243 from shenh062326/spark_change and squashes the following commits:
4653378 [Hong Shen] Edit spilling log from MB to B
21ee960 [Hong Shen] Edit spilling log from MB to B
e9145e8 [Hong Shen] Edit spilling log from MB to B
da761c2 [Hong Shen] Edit spilling log from MB to B
946351c [Hong Shen] Edit spilling log from MB to B
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/0c56a039
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/0c56a039
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/0c56a039
Branch: refs/heads/master
Commit: 0c56a039a9c5b871422f0fc55ff4394bc077fb34
Parents: abd5817
Author: Hong Shen <ho...@tencent.com>
Authored: Fri Nov 14 13:29:41 2014 -0800
Committer: Andrew Or <an...@databricks.com>
Committed: Fri Nov 14 13:29:41 2014 -0800
----------------------------------------------------------------------
.../main/scala/org/apache/spark/util/collection/Spillable.scala | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/0c56a039/core/src/main/scala/org/apache/spark/util/collection/Spillable.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/util/collection/Spillable.scala b/core/src/main/scala/org/apache/spark/util/collection/Spillable.scala
index d7dccd4..0e4c6d6 100644
--- a/core/src/main/scala/org/apache/spark/util/collection/Spillable.scala
+++ b/core/src/main/scala/org/apache/spark/util/collection/Spillable.scala
@@ -105,7 +105,8 @@ private[spark] trait Spillable[C] {
*/
@inline private def logSpillage(size: Long) {
val threadId = Thread.currentThread().getId
- logInfo("Thread %d spilling in-memory map of %d MB to disk (%d time%s so far)"
- .format(threadId, size / (1024 * 1024), _spillCount, if (_spillCount > 1) "s" else ""))
+ logInfo("Thread %d spilling in-memory map of %s to disk (%d time%s so far)"
+ .format(threadId, org.apache.spark.util.Utils.bytesToString(size),
+ _spillCount, if (_spillCount > 1) "s" else ""))
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org