ui

Author: ulysses-you

externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/SparkSQLEngine.scala

@@ -22,9 +22,8 @@ import java.util.concurrent.CountDownLatch
 
 import scala.util.control.NonFatal
 
-import org.apache.spark.SparkConf
+import org.apache.spark.{ui, SparkConf}
 import org.apache.spark.kyuubi.SparkSQLEngineListener
-import org.apache.spark.kyuubi.ui.EngineTab
 import org.apache.spark.sql.SparkSession
 
 import org.apache.kyuubi.{KyuubiException, Logging}
@@ -134,7 +133,7 @@ object SparkSQLEngine extends Logging {
       }
       try {
         engine.start()
-        EngineTab(engine)
+        ui.EngineTab(engine)
         val event = EngineEvent(engine)
         info(event)
         EventLoggingService.onEvent(event)

externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/spark/kyuubi/ui/EnginePage.scala renamed to externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/spark/ui/EnginePage.scala

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.spark.kyuubi.ui
+package org.apache.spark.ui
 
 import java.net.URLEncoder
 import java.nio.charset.StandardCharsets.UTF_8
@@ -26,13 +26,11 @@ import scala.collection.JavaConverters.mapAsScalaMapConverter
 import scala.xml.{Node, Unparsed}
 
 import org.apache.commons.text.StringEscapeUtils
-import org.apache.spark.kyuubi.ui.TableSourceUtil._
-import org.apache.spark.ui.{PagedDataSource, PagedTable, UIUtils, WebUIPage}
+import org.apache.spark.ui.TableSourceUtil._
 import org.apache.spark.ui.UIUtils._
 
 import org.apache.kyuubi.Utils
-import org.apache.kyuubi.engine.spark.events.SessionEvent
-import org.apache.kyuubi.engine.spark.events.SparkStatementEvent
+import org.apache.kyuubi.engine.spark.events.{SessionEvent, SparkStatementEvent}
 
 case class EnginePage(parent: EngineTab) extends WebUIPage("") {
   private val store = parent.engine.store
@@ -386,7 +384,7 @@ private class SessionStatsTableDataSource(
       case "User" => Ordering.by(_.username)
       case "Client IP" => Ordering.by(_.ip)
       case "Session ID" => Ordering.by(_.sessionId)
-      case "Start Time" => Ordering by (_.startTime)
+      case "Start Time" => Ordering.by(_.startTime)
       case "Finish Time" => Ordering.by(_.endTime)
       case "Duration" => Ordering.by(_.duration)
       case "Total Statements" => Ordering.by(_.totalOperations)
@@ -420,7 +418,7 @@ private class StatementStatsTableDataSource(
     val ordering: Ordering[SparkStatementEvent] = sortColumn match {
       case "User" => Ordering.by(_.username)
       case "Statement ID" => Ordering.by(_.statementId)
-      case "Create Time" => Ordering by (_.createTime)
+      case "Create Time" => Ordering.by(_.createTime)
       case "Finish Time" => Ordering.by(_.endTime)
       case "Duration" => Ordering.by(_.duration)
       case "Statement" => Ordering.by(_.statement)

externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/spark/kyuubi/ui/EngineSessionPage.scala renamed to externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/spark/ui/EngineSessionPage.scala

@@ -15,15 +15,14 @@
  * limitations under the License.
  */
 
-package org.apache.spark.kyuubi.ui
+package org.apache.spark.ui
 
 import java.util.Date
 import javax.servlet.http.HttpServletRequest
 
 import scala.xml.Node
 
 import org.apache.spark.internal.Logging
-import org.apache.spark.ui._
 import org.apache.spark.ui.UIUtils._
 import org.apache.spark.util.Utils
 

externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/spark/kyuubi/ui/EngineTab.scala renamed to externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/spark/ui/EngineTab.scala

@@ -15,11 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.spark.kyuubi.ui
+package org.apache.spark.ui
 
 import javax.servlet.http.HttpServletRequest
 
-import org.apache.spark.ui.SparkUITab
 import scala.util.control.NonFatal
 
 import org.apache.kyuubi.{Logging, Utils}

externals/kyuubi-spark-sql-engine/src/test/scala/org/apache/spark/kyuubi/ui/EngineTabSuite.scala renamed to externals/kyuubi-spark-sql-engine/src/test/scala/org/apache/spark/ui/EngineTabSuite.scala

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.spark.kyuubi.ui
+package org.apache.spark.ui
 
 import org.apache.http.client.methods.HttpGet
 import org.apache.http.impl.client.HttpClients