Skip to content

[SPARK-46732][CONNECT]Make Subquery/Broadcast thread work with Connect's artifact management #44753

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
xieshuaihu wants to merge 1 commit into from
Closed

[SPARK-46732][CONNECT]Make Subquery/Broadcast thread work with Connect's artifact management #44753

Show file tree
Hide file tree
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
16 changes: 16 additions & 0 deletions ...tor/connect/client/jvm/src/test/scala/org/apache/spark/sql/application/ReplE2ESuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,22 @@ class ReplE2ESuite extends RemoteSparkSession with BeforeAndAfterEach {
assertContains("noException: Boolean = true", output)
}

test("broadcast works with REPL generated code") {
val input =
"""
|val add1 = udf((i: Long) => i + 1)
|val tableA = spark.range(2).alias("a")
|val tableB = broadcast(spark.range(2).select(add1(col("id")).alias("id"))).alias("b")
|tableA.join(tableB).
| where(col("a.id")===col("b.id")).
| select(col("a.id").alias("a_id"), col("b.id").alias("b_id")).
| collect().
| mkString("[", ", ", "]")
|""".stripMargin
val output = runCommandsInShell(input)
assertContains("""String = "[[1,1]]"""", output)
}

test("closure cleaner") {
val input =
"""
Expand Down
5 changes: 3 additions & 2 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/SQLExecution.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import java.util.concurrent.atomic.AtomicLong

import scala.util.control.NonFatal

import org.apache.spark.{ErrorMessageFormat, SparkException, SparkThrowable, SparkThrowableHelper}
import org.apache.spark.{ErrorMessageFormat, JobArtifactSet, SparkException, SparkThrowable, SparkThrowableHelper}
import org.apache.spark.SparkContext.{SPARK_JOB_DESCRIPTION, SPARK_JOB_INTERRUPT_ON_CANCEL}
import org.apache.spark.internal.Logging
import org.apache.spark.internal.config.{SPARK_DRIVER_PREFIX, SPARK_EXECUTOR_PREFIX}
Expand Down Expand Up @@ -255,7 +255,8 @@ object SQLExecution extends Logging {
val activeSession = sparkSession
val sc = sparkSession.sparkContext
val localProps = Utils.cloneProperties(sc.getLocalProperties)
exec.submit(() => {
val artifactState = JobArtifactSet.getCurrentJobArtifactState.orNull
exec.submit(() => JobArtifactSet.withActiveJobArtifactState(artifactState) {
val originalSession = SparkSession.getActiveSession
val originalLocalProps = sc.getLocalProperties
SparkSession.setActiveSession(activeSession)
Expand Down