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-46596][CORE][TESTS] Correct package name of SslTestUtils #44596

Closed
wants to merge 2 commits into from
Closed

[SPARK-46596][CORE][TESTS] Correct package name of SslTestUtils #44596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bae93df
init
LuciferYang Jan 3, 2024
1f2304f
Merge branch 'apache:master' into SslTestUtils-package-name
LuciferYang Jan 4, 2024
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
1 change: 1 addition & 0 deletions core/src/test/scala/org/apache/spark/SslExternalShuffleServiceSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import org.apache.spark.internal.config
import org.apache.spark.network.TransportContext
import org.apache.spark.network.netty.SparkTransportConf
import org.apache.spark.network.shuffle.ExternalBlockHandler
import org.apache.spark.util.SslTestUtils

/**
* This suite creates an external shuffle server and routes all shuffle fetches through it.
Expand Down
2 changes: 2 additions & 0 deletions core/src/test/scala/org/apache/spark/SslShuffleNettySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

package org.apache.spark

import org.apache.spark.util.SslTestUtils

class SslShuffleNettySuite extends ShuffleNettySuite {

override def beforeAll(): Unit = {
Expand Down
2 changes: 1 addition & 1 deletion core/src/test/scala/org/apache/spark/executor/CoarseGrainedExecutorBackendSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ import org.apache.spark.rpc.RpcEnv
import org.apache.spark.scheduler.{SparkListener, SparkListenerExecutorAdded, SparkListenerExecutorRemoved, TaskDescription}
import org.apache.spark.scheduler.cluster.CoarseGrainedClusterMessages.{KillTask, LaunchTask}
import org.apache.spark.serializer.JavaSerializer
import org.apache.spark.util.{SerializableBuffer, ThreadUtils, Utils}
import org.apache.spark.util.{SerializableBuffer, SslTestUtils, ThreadUtils, Utils}

class CoarseGrainedExecutorBackendSuite extends SparkFunSuite
with LocalSparkContext with MockitoSugar {
Expand Down
4 changes: 2 additions & 2 deletions core/src/test/scala/org/apache/spark/network/netty/NettyBlockTransferSecuritySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ import org.scalatest.matchers.must.Matchers
import org.scalatest.matchers.should.Matchers._
import org.scalatestplus.mockito.MockitoSugar

import org.apache.spark.{SecurityManager, SparkConf, SparkFunSuite, SslTestUtils}
import org.apache.spark.{SecurityManager, SparkConf, SparkFunSuite}
import org.apache.spark.internal.config._
import org.apache.spark.internal.config.Network
import org.apache.spark.network.{BlockDataManager, BlockTransferService}
import org.apache.spark.network.buffer.{ManagedBuffer, NioManagedBuffer}
import org.apache.spark.network.shuffle.BlockFetchingListener
import org.apache.spark.serializer.{JavaSerializer, SerializerManager}
import org.apache.spark.storage.{BlockId, ShuffleBlockId}
import org.apache.spark.util.ThreadUtils
import org.apache.spark.util.{SslTestUtils, ThreadUtils}

class NettyBlockTransferSecuritySuite extends SparkFunSuite with MockitoSugar with Matchers {

Expand Down
2 changes: 1 addition & 1 deletion core/src/test/scala/org/apache/spark/rpc/netty/NettyRpcEnvSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import org.scalatestplus.mockito.MockitoSugar
import org.apache.spark._
import org.apache.spark.network.client.TransportClient
import org.apache.spark.rpc._
import org.apache.spark.util.ThreadUtils
import org.apache.spark.util.{SslTestUtils, ThreadUtils}

class NettyRpcEnvSuite extends RpcEnvSuite with MockitoSugar with TimeLimits {

Expand Down
2 changes: 1 addition & 1 deletion core/src/test/scala/org/apache/spark/shuffle/ShuffleBlockPusherSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import org.apache.spark.network.util.TransportConf
import org.apache.spark.serializer.JavaSerializer
import org.apache.spark.shuffle.ShuffleBlockPusher.PushRequest
import org.apache.spark.storage._
import org.apache.spark.util.ThreadUtils
import org.apache.spark.util.{SslTestUtils, ThreadUtils}

class ShuffleBlockPusherSuite extends SparkFunSuite {

Expand Down
4 changes: 2 additions & 2 deletions core/src/test/scala/org/apache/spark/shuffle/sort/IndexShuffleBlockResolverSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ import org.mockito.Mockito._
import org.mockito.invocation.InvocationOnMock
import org.roaringbitmap.RoaringBitmap

import org.apache.spark.{SparkConf, SparkFunSuite, SslTestUtils}
import org.apache.spark.{SparkConf, SparkFunSuite}
import org.apache.spark.internal.config
import org.apache.spark.shuffle.{IndexShuffleBlockResolver, ShuffleBlockInfo}
import org.apache.spark.storage._
import org.apache.spark.util.Utils
import org.apache.spark.util.{SslTestUtils, Utils}

class IndexShuffleBlockResolverSuite extends SparkFunSuite {

Expand Down
3 changes: 2 additions & 1 deletion core/src/test/scala/org/apache/spark/storage/SslBlockManagerReplicationSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@

package org.apache.spark.storage

import org.apache.spark.{SparkConf, SslTestUtils}
import org.apache.spark.SparkConf
import org.apache.spark.util.SslTestUtils

class SslBlockManagerReplicationSuite extends BlockManagerReplicationSuite {
override def createConf(): SparkConf = {
Expand Down
3 changes: 2 additions & 1 deletion core/src/test/scala/org/apache/spark/util/SslTestUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@
* limitations under the License.
*/

package org.apache.spark
package org.apache.spark.util
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @dongjoon-hyun FYI

Moving this file to the core/src/test/scala/org/apache/spark/ directory is a solution that involves fewer changes. If you prefer to move the file instead of fixing the package name, please let me know.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like an incorrect package name - keeping it in util makes more sense.
Thanks for fixing this @LuciferYang !


import org.apache.spark.SparkConf
import org.apache.spark.network.ssl.SslSampleConfigs

object SslTestUtils {
Expand Down