aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorLiang-Chi Hsieh <viirya@gmail.com>2014-09-03 17:04:53 -0700
committerAndrew Or <andrewor14@gmail.com>2014-09-03 17:04:53 -0700
commit996b7434ee0d0c7c26987eb9cf050c139fdd2db2 (patch)
tree9a7d3a4f33a22c64e82b03b2228f62dbaab8252d /core
parent2784822e4c63083a647cc2d6c7089065ef3b947d (diff)
downloadspark-996b7434ee0d0c7c26987eb9cf050c139fdd2db2.tar.gz
spark-996b7434ee0d0c7c26987eb9cf050c139fdd2db2.tar.bz2
spark-996b7434ee0d0c7c26987eb9cf050c139fdd2db2.zip
[SPARK-3345] Do correct parameters for ShuffleFileGroup
In the method `newFileGroup` of class `FileShuffleBlockManager`, the parameters for creating new `ShuffleFileGroup` object is in wrong order. Because in current codes, the parameters `shuffleId` and `fileId` are not used. So it doesn't cause problem now. However it should be corrected for readability and avoid future problem. Author: Liang-Chi Hsieh <viirya@gmail.com> Closes #2235 from viirya/correct_shufflefilegroup_params and squashes the following commits: fe72567 [Liang-Chi Hsieh] Do correct parameters for ShuffleFileGroup.
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/org/apache/spark/shuffle/FileShuffleBlockManager.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/main/scala/org/apache/spark/shuffle/FileShuffleBlockManager.scala b/core/src/main/scala/org/apache/spark/shuffle/FileShuffleBlockManager.scala
index 76e3932a9b..96facccd52 100644
--- a/core/src/main/scala/org/apache/spark/shuffle/FileShuffleBlockManager.scala
+++ b/core/src/main/scala/org/apache/spark/shuffle/FileShuffleBlockManager.scala
@@ -155,7 +155,7 @@ class FileShuffleBlockManager(conf: SparkConf)
val filename = physicalFileName(shuffleId, bucketId, fileId)
blockManager.diskBlockManager.getFile(filename)
}
- val fileGroup = new ShuffleFileGroup(fileId, shuffleId, files)
+ val fileGroup = new ShuffleFileGroup(shuffleId, fileId, files)
shuffleState.allFileGroups.add(fileGroup)
fileGroup
}