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-45133][CONNECT] Make Spark Connect queries be FINISHED when last result task is finished #42889

Closed
wants to merge 2 commits into from
+10 −5
Closed

[SPARK-45133][CONNECT] Make Spark Connect queries be FINISHED when last result task is finished #42889

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e4fb04
fix
juliuszsompolski Sep 12, 2023
f12ab2f
typos
juliuszsompolski Sep 12, 2023
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
15 changes: 10 additions & 5 deletions ...ver/src/main/scala/org/apache/spark/sql/connect/execution/SparkConnectPlanExecution.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ private[execution] class SparkConnectPlanExecution(executeHolder: ExecuteHolder)
errorOnDuplicatedFieldNames = false)

var numSent = 0
var totalNumRows: Long = 0
def sendBatch(bytes: Array[Byte], count: Long): Unit = {
val response = proto.ExecutePlanResponse.newBuilder().setSessionId(sessionId)
val batch = proto.ExecutePlanResponse.ArrowBatch
Expand All @@ -121,15 +120,14 @@ private[execution] class SparkConnectPlanExecution(executeHolder: ExecuteHolder)
response.setArrowBatch(batch)
responseObserver.onNext(response.build())
numSent += 1
totalNumRows += count
}

dataframe.queryExecution.executedPlan match {
case LocalTableScanExec(_, rows) =>
executePlan.eventsManager.postFinished(Some(rows.length))
converter(rows.iterator).foreach { case (bytes, count) =>
sendBatch(bytes, count)
}
executePlan.eventsManager.postFinished(Some(totalNumRows))
case _ =>
SQLExecution.withNewExecutionId(dataframe.queryExecution, Some("collectArrow")) {
val rows = dataframe.queryExecution.executedPlan.execute()
Expand All @@ -142,6 +140,8 @@ private[execution] class SparkConnectPlanExecution(executeHolder: ExecuteHolder)

val signal = new Object
val partitions = new Array[Array[Batch]](numPartitions)
var numFinishedPartitions = 0
var totalNumRows: Long = 0
var error: Option[Throwable] = None

// This callback is executed by the DAGScheduler thread.
Expand All @@ -150,6 +150,12 @@ private[execution] class SparkConnectPlanExecution(executeHolder: ExecuteHolder)
val resultHandler = (partitionId: Int, partition: Array[Batch]) => {
signal.synchronized {
partitions(partitionId) = partition
totalNumRows += partition.map(_._2).sum
numFinishedPartitions += 1
if (numFinishedPartitions == numPartitions) {
// Execution is finished, when all partitions returned results.
executePlan.eventsManager.postFinished(Some(totalNumRows))
}
signal.notify()
}
()
Expand Down Expand Up @@ -201,9 +207,8 @@ private[execution] class SparkConnectPlanExecution(executeHolder: ExecuteHolder)
currentPartitionId += 1
}
ThreadUtils.awaitReady(future, Duration.Inf)
executePlan.eventsManager.postFinished(Some(totalNumRows))
} else {
executePlan.eventsManager.postFinished(Some(totalNumRows))
executePlan.eventsManager.postFinished(Some(0))
}
}
}
Expand Down