From 7762a02c70ba2d24f7b4b280fbbe225430afaaac Mon Sep 17 00:00:00 2001
From: Fei Wang <fwang12@ebay.com>
Date: Fri, 1 Jul 2022 11:13:18 +0800
Subject: [PATCH] Revert "[KYUUBI #2976] Expose session name into kyuubi engine
 tab"

This reverts commit 8eb06a68e1eb6c3e8c51eb56907cfa0b3ce1e326.
---
 .../org/apache/kyuubi/engine/spark/events/SessionEvent.scala   | 2 --
 .../src/main/scala/org/apache/spark/ui/EnginePage.scala        | 3 ---
 2 files changed, 5 deletions(-)

diff --git a/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/events/SessionEvent.scala b/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/events/SessionEvent.scala
index 6f4ee78d600..8d87b1cd940 100644
--- a/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/events/SessionEvent.scala
+++ b/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/events/SessionEvent.scala
@@ -39,7 +39,6 @@ import org.apache.kyuubi.events.KyuubiEvent
  */
 case class SessionEvent(
     @KVIndexParam sessionId: String,
-    name: String,
     engineId: String,
     username: String,
     ip: String,
@@ -68,7 +67,6 @@ object SessionEvent {
   def apply(session: SparkSessionImpl): SessionEvent = {
     new SessionEvent(
       session.handle.identifier.toString,
-      session.name.getOrElse(""),
       KyuubiSparkUtil.engineId,
       session.user,
       session.ipAddress,
diff --git a/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/spark/ui/EnginePage.scala b/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/spark/ui/EnginePage.scala
index 94316c91b86..7ff3453cdf7 100644
--- a/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/spark/ui/EnginePage.scala
+++ b/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/spark/ui/EnginePage.scala
@@ -250,7 +250,6 @@ case class EnginePage(parent: EngineTab) extends WebUIPage("") {
           ("Client IP", true, None),
           ("Server IP", true, None),
           ("Session ID", true, None),
-          ("Session Name", true, None),
           ("Start Time", true, None),
           ("Finish Time", true, None),
           ("Duration", true, None),
@@ -276,7 +275,6 @@ case class EnginePage(parent: EngineTab) extends WebUIPage("") {
         <td> {session.ip} </td>
         <td> {session.serverIp} </td>
         <td> <a href={sessionLink}> {session.sessionId} </a> </td>
-        <td> {session.name} </td>
         <td> {formatDate(session.startTime)} </td>
         <td> {if (session.endTime > 0) formatDate(session.endTime)} </td>
         <td> {formatDurationVerbose(session.duration)} </td>
@@ -430,7 +428,6 @@ private class SessionStatsTableDataSource(
       case "Client IP" => Ordering.by(_.ip)
       case "Server IP" => Ordering.by(_.serverIp)
       case "Session ID" => Ordering.by(_.sessionId)
-      case "Session Name" => Ordering.by(_.name)
       case "Start Time" => Ordering.by(_.startTime)
       case "Finish Time" => Ordering.by(_.endTime)
       case "Duration" => Ordering.by(_.duration)