From 44ae8699313603d582e71960cfa662ee35b3bf13 Mon Sep 17 00:00:00 2001 From: yangjie01 Date: Tue, 4 Jul 2023 17:19:57 +0800 Subject: [PATCH] fix test --- .../{TestHelloV2.jar => TestHelloV2_2.12.jar} | Bin core/src/test/resources/TestHelloV2_2.13.jar | Bin 0 -> 4118 bytes .../{TestHelloV3.jar => TestHelloV3_2.12.jar} | Bin core/src/test/resources/TestHelloV3_2.13.jar | Bin 0 -> 3827 bytes .../executor/ClassLoaderIsolationSuite.scala | 14 ++++++++++++-- 5 files changed, 12 insertions(+), 2 deletions(-) rename core/src/test/resources/{TestHelloV2.jar => TestHelloV2_2.12.jar} (100%) create mode 100644 core/src/test/resources/TestHelloV2_2.13.jar rename core/src/test/resources/{TestHelloV3.jar => TestHelloV3_2.12.jar} (100%) create mode 100644 core/src/test/resources/TestHelloV3_2.13.jar diff --git a/core/src/test/resources/TestHelloV2.jar b/core/src/test/resources/TestHelloV2_2.12.jar similarity index 100% rename from core/src/test/resources/TestHelloV2.jar rename to core/src/test/resources/TestHelloV2_2.12.jar diff --git a/core/src/test/resources/TestHelloV2_2.13.jar b/core/src/test/resources/TestHelloV2_2.13.jar new file mode 100644 index 0000000000000000000000000000000000000000..6dee8fcd9c95702fb7909c909c6faf22fe93766d GIT binary patch literal 4118 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 Sh;t>xxx8Ln4i-p!_4Pme8xa%$ literal 0 HcmV?d00001 diff --git a/core/src/test/resources/TestHelloV3.jar b/core/src/test/resources/TestHelloV3_2.12.jar similarity index 100% rename from core/src/test/resources/TestHelloV3.jar rename to core/src/test/resources/TestHelloV3_2.12.jar diff --git a/core/src/test/resources/TestHelloV3_2.13.jar b/core/src/test/resources/TestHelloV3_2.13.jar new file mode 100644 index 0000000000000000000000000000000000000000..0c292e7d81ad741dbc11177224b9c30519b7a362 GIT binary patch literal 3827 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 literal 0 HcmV?d00001 diff --git a/core/src/test/scala/org/apache/spark/executor/ClassLoaderIsolationSuite.scala b/core/src/test/scala/org/apache/spark/executor/ClassLoaderIsolationSuite.scala index 33c1baccd7298..72ee0e96fd014 100644 --- a/core/src/test/scala/org/apache/spark/executor/ClassLoaderIsolationSuite.scala +++ b/core/src/test/scala/org/apache/spark/executor/ClassLoaderIsolationSuite.scala @@ -17,21 +17,31 @@ package org.apache.spark.executor +import scala.util.Properties + import org.apache.spark.{JobArtifactSet, LocalSparkContext, SparkConf, SparkContext, SparkFunSuite} import org.apache.spark.util.Utils class ClassLoaderIsolationSuite extends SparkFunSuite with LocalSparkContext { + + private val scalaVersion = Properties.versionNumberString + .split("\\.") + .take(2) + .mkString(".") + val jar1 = Thread.currentThread().getContextClassLoader.getResource("TestUDTF.jar").toString // package com.example // object Hello { def test(): Int = 2 } // case class Hello(x: Int, y: Int) - val jar2 = Thread.currentThread().getContextClassLoader.getResource("TestHelloV2.jar").toString + val jar2 = Thread.currentThread().getContextClassLoader + .getResource(s"TestHelloV2_$scalaVersion.jar").toString // package com.example // object Hello { def test(): Int = 3 } // case class Hello(x: String) - val jar3 = Thread.currentThread().getContextClassLoader.getResource("TestHelloV3.jar").toString + val jar3 = Thread.currentThread().getContextClassLoader + .getResource(s"TestHelloV3_$scalaVersion.jar").toString test("Executor classloader isolation with JobArtifactSet") { sc = new SparkContext(new SparkConf().setAppName("test").setMaster("local"))