spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [3/3] git commit: Merge pull request #115 from aarondav/shuffle-fix
Date Mon, 28 Oct 2013 02:11:28 GMT
Merge pull request #115 from aarondav/shuffle-fix

Eliminate extra memory usage when shuffle file consolidation is disabled

Otherwise, we see SPARK-946 even when shuffle file consolidation is disabled.
Fixing SPARK-946 is still forthcoming.


Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/d4df4749
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/d4df4749
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/d4df4749

Branch: refs/heads/master
Commit: d4df4749a8738628aa79802c4fb2805d02f47bb8
Parents: e018f2d 4261e83
Author: Reynold Xin <rxin@apache.org>
Authored: Sun Oct 27 22:11:21 2013 -0400
Committer: Reynold Xin <rxin@apache.org>
Committed: Sun Oct 27 22:11:21 2013 -0400

----------------------------------------------------------------------
 .../scala/org/apache/spark/storage/BlockManager.scala  |  4 +++-
 .../org/apache/spark/storage/ShuffleBlockManager.scala | 13 +++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------



Mime
View raw message