Skip to content

[SPARK-44519][CONNECT] SparkConnectServerUtils generated incorrect parameters for jars #42121

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

Closed
beliefer wants to merge 1 commit into from
Closed

[SPARK-44519][CONNECT] SparkConnectServerUtils generated incorrect parameters for jars #42121

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
48 changes: 24 additions & 24 deletions ...ient/jvm/src/test/scala/org/apache/spark/sql/connect/client/util/RemoteSparkSession.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,19 +93,30 @@ object SparkConnectServerUtils {
* configs, we add them here
*/
private def testConfigs: Seq[String] = {
// To find InMemoryTableCatalog for V2 writer tests
val catalystTestJar =
tryFindJar("sql/catalyst", "spark-catalyst", "spark-catalyst", test = true)
.map(clientTestJar => Seq("--jars", clientTestJar.getCanonicalPath))
.getOrElse(Seq.empty)

// For UDF maven E2E tests, the server needs the client code to find the UDFs defined in tests.
val connectClientTestJar = tryFindJar(
"connector/connect/client/jvm",
// SBT passes the client & test jars to the server process automatically.
// So we skip building or finding this jar for SBT.
"sbt-tests-do-not-need-this-jar",
"spark-connect-client-jvm",
test = true)
.map(clientTestJar => Seq(clientTestJar.getCanonicalPath))
.getOrElse(Seq.empty)

val allJars = catalystTestJar ++ connectClientTestJar
val jarsConfigs = Seq("--jars", allJars.mkString(","))

// Use InMemoryTableCatalog for V2 writer tests
val writerV2Configs = {
val catalystTestJar = findJar( // To find InMemoryTableCatalog for V2 writer tests
"sql/catalyst",
"spark-catalyst",
"spark-catalyst",
test = true).getCanonicalPath
Seq(
"--jars",
catalystTestJar,
"--conf",
"spark.sql.catalog.testcat=org.apache.spark.sql.connector.catalog.InMemoryTableCatalog")
}
val writerV2Configs = Seq(
"--conf",
"spark.sql.catalog.testcat=org.apache.spark.sql.connector.catalog.InMemoryTableCatalog")

// Run tests using hive
val hiveTestConfigs = {
Expand All @@ -128,18 +139,7 @@ object SparkConnectServerUtils {
Seq("--conf", s"spark.sql.catalogImplementation=$catalogImplementation")
}

// For UDF maven E2E tests, the server needs the client code to find the UDFs defined in tests.
val udfTestConfigs = tryFindJar(
"connector/connect/client/jvm",
// SBT passes the client & test jars to the server process automatically.
// So we skip building or finding this jar for SBT.
"sbt-tests-do-not-need-this-jar",
"spark-connect-client-jvm",
test = true)
.map(clientTestJar => Seq("--jars", clientTestJar.getCanonicalPath))
.getOrElse(Seq.empty)

writerV2Configs ++ hiveTestConfigs ++ udfTestConfigs
jarsConfigs ++ writerV2Configs ++ hiveTestConfigs
}

def start(): Unit = {
Expand Down