Skip to content

Commit d4564ae

Browse files
committed
Added SparkConf to the ctor argument of IndexShuffleBlockManager.
1 parent 6ed369e commit d4564ae

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

core/src/main/scala/org/apache/spark/shuffle/IndexShuffleBlockManager.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import java.nio.ByteBuffer
2222

2323
import com.google.common.io.ByteStreams
2424

25-
import org.apache.spark.SparkEnv
25+
import org.apache.spark.{SparkConf, SparkEnv}
2626
import org.apache.spark.network.buffer.{FileSegmentManagedBuffer, ManagedBuffer}
2727
import org.apache.spark.network.netty.SparkTransportConf
2828
import org.apache.spark.storage._
@@ -39,11 +39,11 @@ import org.apache.spark.storage._
3939
// Note: Changes to the format in this file should be kept in sync with
4040
// org.apache.spark.network.shuffle.StandaloneShuffleBlockManager#getSortBasedShuffleBlockData().
4141
private[spark]
42-
class IndexShuffleBlockManager extends ShuffleBlockManager {
42+
class IndexShuffleBlockManager(conf: SparkConf) extends ShuffleBlockManager {
4343

4444
private lazy val blockManager = SparkEnv.get.blockManager
4545

46-
private val transportConf = SparkTransportConf.fromSparkConf(SparkEnv.get.conf)
46+
private val transportConf = SparkTransportConf.fromSparkConf(conf)
4747

4848
/**
4949
* Mapping to a single shuffleBlockId with reduce ID 0.

core/src/main/scala/org/apache/spark/shuffle/sort/SortShuffleManager.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import org.apache.spark.shuffle.hash.HashShuffleReader
2525

2626
private[spark] class SortShuffleManager(conf: SparkConf) extends ShuffleManager {
2727

28-
private val indexShuffleBlockManager = new IndexShuffleBlockManager()
28+
private val indexShuffleBlockManager = new IndexShuffleBlockManager(conf)
2929
private val shuffleMapNumber = new ConcurrentHashMap[Int, Int]()
3030

3131
/**

0 commit comments

Comments
 (0)