Skip to content

[KYUUBI #1429][TASK-1] Move ui package from org.apache.spark to org.apache.spark.ui #1430

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

Closed
wants to merge 2 commits into from
Closed

[KYUUBI #1429][TASK-1] Move ui package from org.apache.spark to org.apache.spark.ui #1430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f875cda
ui
ulysses-you Nov 22, 2021
8b40c60
nit
ulysses-you Nov 22, 2021
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
5 changes: 2 additions & 3 deletions ...yuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/SparkSQLEngine.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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)
Expand Down
12 changes: 5 additions & 7 deletions ...g/apache/spark/kyuubi/ui/EnginePage.scala → ...cala/org/apache/spark/ui/EnginePage.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -401,7 +399,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)
Expand Down Expand Up @@ -435,7 +433,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(_.completeTime)
case "Duration" => Ordering.by(_.duration)
case "Statement" => Ordering.by(_.statement)
Expand Down
3 changes: 1 addition & 2 deletions ...e/spark/kyuubi/ui/EngineSessionPage.scala → ...g/apache/spark/ui/EngineSessionPage.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 1 addition & 3 deletions ...rg/apache/spark/kyuubi/ui/EngineTab.scala → ...scala/org/apache/spark/ui/EngineTab.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,12 @@
* limitations under the License.
*/

package org.apache.spark.kyuubi.ui
package org.apache.spark.ui

import javax.servlet.http.HttpServletRequest

import scala.util.control.NonFatal

import org.apache.spark.ui.SparkUITab

import org.apache.kyuubi.{Logging, Utils}
import org.apache.kyuubi.config.KyuubiConf
import org.apache.kyuubi.engine.spark.SparkSQLEngine
Expand Down
2 changes: 1 addition & 1 deletion ...ache/spark/kyuubi/ui/EngineTabSuite.scala → .../org/apache/spark/ui/EngineTabSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down