vicennial commented on code in PR #44670:
URL: https://github.com/apache/spark/pull/44670#discussion_r1448781837
##########
connector/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectReattachExecuteHandler.scala:
##########
@@ -29,25 +29,26 @@ class SparkConnectReattachExecuteHandler(
extends Logging {
def handle(v: proto.ReattachExecuteRequest): Unit = {
- val executeHolder = SparkConnectService.executionManager
- .getExecuteHolder(ExecuteKey(v.getUserContext.getUserId, v.getSessionId,
v.getOperationId))
- .getOrElse {
- if (SparkConnectService.executionManager
- .getAbandonedTombstone(
- ExecuteKey(v.getUserContext.getUserId, v.getSessionId,
v.getOperationId))
- .isDefined) {
- logDebug(s"Reattach operation abandoned: ${v.getOperationId}")
- throw new SparkSQLException(
- errorClass = "INVALID_HANDLE.OPERATION_ABANDONED",
- messageParameters = Map("handle" -> v.getOperationId))
+ val sessionHolder = SparkConnectService.sessionManager
+ .getIsolatedSession(SessionKey(v.getUserContext.getUserId,
v.getSessionId))
- } else {
- logDebug(s"Reattach operation not found: ${v.getOperationId}")
- throw new SparkSQLException(
- errorClass = "INVALID_HANDLE.OPERATION_NOT_FOUND",
- messageParameters = Map("handle" -> v.getOperationId))
- }
+ val executeHolder =
sessionHolder.executeHolder(v.getOperationId).getOrElse {
+ if (SparkConnectService.executionManager
+ .getAbandonedTombstone(
+ ExecuteKey(v.getUserContext.getUserId, v.getSessionId,
v.getOperationId))
+ .isDefined) {
+ logDebug(s"Reattach operation abandoned: ${v.getOperationId}")
+ throw new SparkSQLException(
+ errorClass = "INVALID_HANDLE.OPERATION_ABANDONED",
+ messageParameters = Map("handle" -> v.getOperationId))
+
Review Comment:
This is an existing empty line, its showing up due to whitespace changes.
Will remove it anyway 👍
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
