This is an automated email from the ASF dual-hosted git repository.
ueshin pushed a commit to branch branch-3.5
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-3.5 by this push:
new fdc0cee17908 [SPARK-47921][CONNECT] Fix ExecuteJobTag creation in
ExecuteHolder
fdc0cee17908 is described below
commit fdc0cee179087c31eff9aa1471870ee8a6228b1d
Author: allisonwang-db <allison.w...@databricks.com>
AuthorDate: Wed Apr 24 18:22:29 2024 -0700
[SPARK-47921][CONNECT] Fix ExecuteJobTag creation in ExecuteHolder
### What changes were proposed in this pull request?
This PR fixes a bug in the ExecuteJobTag creation in ExecuteHolder. The
sessionId and userId are reversed.
https://github.com/apache/spark/blob/8aa8ad6be7b3eeceafa2ad1e9211fb8133bb675c/connector/connect/server/src/main/scala/org/apache/spark/sql/connect/service/ExecuteHolder.scala#L296-L299
### Why are the changes needed?
To fix a bug
### Does this PR introduce _any_ user-facing change?
No
### How was this patch tested?
Existing test
### Was this patch authored or co-authored using generative AI tooling?
No
Closes #46140 from allisonwang-db/spark-47921-execute-job-tag.
Authored-by: allisonwang-db <allison.w...@databricks.com>
Signed-off-by: Takuya UESHIN <ues...@databricks.com>
(cherry picked from commit 5a1559a7ef03641db223a8b0862e3dd53032ead0)
Signed-off-by: Takuya UESHIN <ues...@databricks.com>
---
.../scala/org/apache/spark/sql/connect/service/ExecuteHolder.scala | 2 +-
.../spark/sql/connect/ui/SparkConnectServerListenerSuite.scala | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/connector/connect/server/src/main/scala/org/apache/spark/sql/connect/service/ExecuteHolder.scala
b/connector/connect/server/src/main/scala/org/apache/spark/sql/connect/service/ExecuteHolder.scala
index 5cf63c2195ab..0e4f344da901 100644
---
a/connector/connect/server/src/main/scala/org/apache/spark/sql/connect/service/ExecuteHolder.scala
+++
b/connector/connect/server/src/main/scala/org/apache/spark/sql/connect/service/ExecuteHolder.scala
@@ -285,7 +285,7 @@ private[connect] class ExecuteHolder(
object ExecuteJobTag {
private val prefix = "SparkConnect_OperationTag"
- def apply(sessionId: String, userId: String, operationId: String): String = {
+ def apply(userId: String, sessionId: String, operationId: String): String = {
s"${prefix}_" +
s"User_${userId}_" +
s"Session_${sessionId}_" +
diff --git
a/connector/connect/server/src/test/scala/org/apache/spark/sql/connect/ui/SparkConnectServerListenerSuite.scala
b/connector/connect/server/src/test/scala/org/apache/spark/sql/connect/ui/SparkConnectServerListenerSuite.scala
index 3b75c37b2aa0..c9c110dd1e62 100644
---
a/connector/connect/server/src/test/scala/org/apache/spark/sql/connect/ui/SparkConnectServerListenerSuite.scala
+++
b/connector/connect/server/src/test/scala/org/apache/spark/sql/connect/ui/SparkConnectServerListenerSuite.scala
@@ -37,7 +37,7 @@ class SparkConnectServerListenerSuite
private var kvstore: ElementTrackingStore = _
- private val jobTag = ExecuteJobTag("sessionId", "userId", "operationId")
+ private val jobTag = ExecuteJobTag("userId", "sessionId", "operationId")
after {
if (kvstore != null) {
@@ -174,7 +174,7 @@ class SparkConnectServerListenerSuite
SparkListenerJobStart(0, System.currentTimeMillis(), Nil,
createProperties))
listener.onOtherEvent(
SparkListenerConnectSessionClosed("sessionId", "userId",
System.currentTimeMillis()))
- val exec = statusStore.getExecution(ExecuteJobTag("sessionId", "userId",
"operationId"))
+ val exec = statusStore.getExecution(ExecuteJobTag("userId", "sessionId",
"operationId"))
assert(exec.isDefined)
assert(exec.get.jobId === Seq("0"))
assert(exec.get.sqlExecId === Set("0"))
@@ -190,7 +190,7 @@ class SparkConnectServerListenerSuite
listener.onOtherEvent(SparkListenerConnectSessionClosed(unknownSession,
"userId", 0))
listener.onOtherEvent(
SparkListenerConnectOperationStarted(
- ExecuteJobTag("sessionId", "userId", "operationId"),
+ ExecuteJobTag("userId", "sessionId", "operationId"),
"operationId",
System.currentTimeMillis(),
unknownSession,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
