Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

spark
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

d4df4749

Commit d4df4749 authored 11 years ago by Reynold Xin

Downloads
- Plain Diff

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.

parents e018f2d0 4261e834

No related branches found

No related tags found

No related merge requests found

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

core/src/main/scala/org/apache/spark/storage/BlockManager.scala 3 additions, 1 deletion

...rc/main/scala/org/apache/spark/storage/BlockManager.scala
core/src/main/scala/org/apache/spark/storage/ShuffleBlockManager.scala 9 additions, 4 deletions

.../scala/org/apache/spark/storage/ShuffleBlockManager.scala

with 12 additions and 5 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment