Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SPARK-25299] Fix semantic merge conflict that broke the build. #546

Merged
merged 1 commit into from
May 9, 2019
Merged

[SPARK-25299] Fix semantic merge conflict that broke the build. #546

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions core/src/test/scala/org/apache/spark/shuffle/ShuffleDriverComponentsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ import java.util
import com.google.common.collect.ImmutableMap

import org.apache.spark.{LocalSparkContext, SparkConf, SparkContext, SparkEnv, SparkFunSuite}
import org.apache.spark.api.shuffle.{ShuffleDataIO, ShuffleDriverComponents, ShuffleExecutorComponents, ShuffleWriteSupport}
import org.apache.spark.api.shuffle.{ShuffleDataIO, ShuffleDriverComponents, ShuffleExecutorComponents, ShuffleReadSupport, ShuffleWriteSupport}
import org.apache.spark.internal.config.SHUFFLE_IO_PLUGIN_CLASS
import org.apache.spark.shuffle.io.DefaultShuffleReadSupport
import org.apache.spark.shuffle.sort.io.DefaultShuffleWriteSupport

class ShuffleDriverComponentsSuite extends SparkFunSuite with LocalSparkContext {
Expand Down Expand Up @@ -66,6 +67,13 @@ class TestShuffleExecutorComponents(sparkConf: SparkConf) extends ShuffleExecuto
override def writes(): ShuffleWriteSupport = {
val blockManager = SparkEnv.get.blockManager
val blockResolver = new IndexShuffleBlockResolver(sparkConf, blockManager)
new DefaultShuffleWriteSupport(sparkConf, blockResolver)
new DefaultShuffleWriteSupport(sparkConf, blockResolver, blockManager.shuffleServerId)
}

override def reads(): ShuffleReadSupport = {
val blockManager = SparkEnv.get.blockManager
val mapOutputTracker = SparkEnv.get.mapOutputTracker
val serializerManager = SparkEnv.get.serializerManager
new DefaultShuffleReadSupport(blockManager, mapOutputTracker, serializerManager, sparkConf)
}
}