This is an automated email from the ASF dual-hosted git repository.
maxgekk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new ddcfe6b10980 [SPARK-46596][CORE][TESTS] Correct package name of
`SslTestUtils`
ddcfe6b10980 is described below
commit ddcfe6b10980e25017190d4d9f41b39c56b29d02
Author: yangjie01 <yangji...@baidu.com>
AuthorDate: Thu Jan 4 21:50:19 2024 +0300
[SPARK-46596][CORE][TESTS] Correct package name of `SslTestUtils`
### What changes were proposed in this pull request?
The package name for `SslTestUtils` is defined as `org.apache.spark`, but
it is in the `org/apache/spark/util/` directory. This pr corrects its package
name to ensure consistency.
### Why are the changes needed?
Correct package name of `SslTestUtils`
### Does this PR introduce _any_ user-facing change?
No
### How was this patch tested?
Pass GitHub Actions
### Was this patch authored or co-authored using generative AI tooling?
No
Closes #44596 from LuciferYang/SslTestUtils-package-name.
Lead-authored-by: yangjie01 <yangji...@baidu.com>
Co-authored-by: YangJie <yangji...@baidu.com>
Signed-off-by: Max Gekk <max.g...@gmail.com>
---
.../test/scala/org/apache/spark/SslExternalShuffleServiceSuite.scala | 1 +
core/src/test/scala/org/apache/spark/SslShuffleNettySuite.scala | 2 ++
.../org/apache/spark/executor/CoarseGrainedExecutorBackendSuite.scala | 2 +-
.../apache/spark/network/netty/NettyBlockTransferSecuritySuite.scala | 4 ++--
core/src/test/scala/org/apache/spark/rpc/netty/NettyRpcEnvSuite.scala | 2 +-
.../test/scala/org/apache/spark/shuffle/ShuffleBlockPusherSuite.scala | 2 +-
.../apache/spark/shuffle/sort/IndexShuffleBlockResolverSuite.scala | 4 ++--
.../org/apache/spark/storage/SslBlockManagerReplicationSuite.scala | 3 ++-
core/src/test/scala/org/apache/spark/util/SslTestUtils.scala | 3 ++-
9 files changed, 14 insertions(+), 9 deletions(-)
diff --git
a/core/src/test/scala/org/apache/spark/SslExternalShuffleServiceSuite.scala
b/core/src/test/scala/org/apache/spark/SslExternalShuffleServiceSuite.scala
index 3ce1f11a7acd..119ad6b0530a 100644
--- a/core/src/test/scala/org/apache/spark/SslExternalShuffleServiceSuite.scala
+++ b/core/src/test/scala/org/apache/spark/SslExternalShuffleServiceSuite.scala
@@ -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.
diff --git a/core/src/test/scala/org/apache/spark/SslShuffleNettySuite.scala
b/core/src/test/scala/org/apache/spark/SslShuffleNettySuite.scala
index 7eaff7d37a81..ca4f0e8f7527 100644
--- a/core/src/test/scala/org/apache/spark/SslShuffleNettySuite.scala
+++ b/core/src/test/scala/org/apache/spark/SslShuffleNettySuite.scala
@@ -17,6 +17,8 @@
package org.apache.spark
+import org.apache.spark.util.SslTestUtils
+
class SslShuffleNettySuite extends ShuffleNettySuite {
override def beforeAll(): Unit = {
diff --git
a/core/src/test/scala/org/apache/spark/executor/CoarseGrainedExecutorBackendSuite.scala
b/core/src/test/scala/org/apache/spark/executor/CoarseGrainedExecutorBackendSuite.scala
index a8c9550c6b76..7bd84c810c42 100644
---
a/core/src/test/scala/org/apache/spark/executor/CoarseGrainedExecutorBackendSuite.scala
+++
b/core/src/test/scala/org/apache/spark/executor/CoarseGrainedExecutorBackendSuite.scala
@@ -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 {
diff --git
a/core/src/test/scala/org/apache/spark/network/netty/NettyBlockTransferSecuritySuite.scala
b/core/src/test/scala/org/apache/spark/network/netty/NettyBlockTransferSecuritySuite.scala
index 5c234ef95500..124c089b4710 100644
---
a/core/src/test/scala/org/apache/spark/network/netty/NettyBlockTransferSecuritySuite.scala
+++
b/core/src/test/scala/org/apache/spark/network/netty/NettyBlockTransferSecuritySuite.scala
@@ -32,7 +32,7 @@ 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}
@@ -40,7 +40,7 @@ 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 {
diff --git
a/core/src/test/scala/org/apache/spark/rpc/netty/NettyRpcEnvSuite.scala
b/core/src/test/scala/org/apache/spark/rpc/netty/NettyRpcEnvSuite.scala
index dcd40b6afd56..dce105d5e364 100644
--- a/core/src/test/scala/org/apache/spark/rpc/netty/NettyRpcEnvSuite.scala
+++ b/core/src/test/scala/org/apache/spark/rpc/netty/NettyRpcEnvSuite.scala
@@ -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 {
diff --git
a/core/src/test/scala/org/apache/spark/shuffle/ShuffleBlockPusherSuite.scala
b/core/src/test/scala/org/apache/spark/shuffle/ShuffleBlockPusherSuite.scala
index 99f113ec16ac..340c93518f58 100644
--- a/core/src/test/scala/org/apache/spark/shuffle/ShuffleBlockPusherSuite.scala
+++ b/core/src/test/scala/org/apache/spark/shuffle/ShuffleBlockPusherSuite.scala
@@ -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 {
diff --git
a/core/src/test/scala/org/apache/spark/shuffle/sort/IndexShuffleBlockResolverSuite.scala
b/core/src/test/scala/org/apache/spark/shuffle/sort/IndexShuffleBlockResolverSuite.scala
index a9ca9135f38a..d374b54c8cb9 100644
---
a/core/src/test/scala/org/apache/spark/shuffle/sort/IndexShuffleBlockResolverSuite.scala
+++
b/core/src/test/scala/org/apache/spark/shuffle/sort/IndexShuffleBlockResolverSuite.scala
@@ -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 {
diff --git
a/core/src/test/scala/org/apache/spark/storage/SslBlockManagerReplicationSuite.scala
b/core/src/test/scala/org/apache/spark/storage/SslBlockManagerReplicationSuite.scala
index 760f31de0597..0cdfb3665a93 100644
---
a/core/src/test/scala/org/apache/spark/storage/SslBlockManagerReplicationSuite.scala
+++
b/core/src/test/scala/org/apache/spark/storage/SslBlockManagerReplicationSuite.scala
@@ -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 = {
diff --git a/core/src/test/scala/org/apache/spark/util/SslTestUtils.scala
b/core/src/test/scala/org/apache/spark/util/SslTestUtils.scala
index dd71a68f6250..152f6ec149f4 100644
--- a/core/src/test/scala/org/apache/spark/util/SslTestUtils.scala
+++ b/core/src/test/scala/org/apache/spark/util/SslTestUtils.scala
@@ -15,8 +15,9 @@
* limitations under the License.
*/
-package org.apache.spark
+package org.apache.spark.util
+import org.apache.spark.SparkConf
import org.apache.spark.network.ssl.SslSampleConfigs
object SslTestUtils {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
