aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--core/pom.xml4
-rw-r--r--core/src/main/scala/spark/deploy/JsonProtocol.scala108
-rw-r--r--core/src/main/scala/spark/deploy/master/ui/ApplicationPage.scala5
-rw-r--r--core/src/main/scala/spark/deploy/master/ui/IndexPage.scala5
-rw-r--r--core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala5
-rw-r--r--core/src/main/scala/spark/ui/JettyUtils.scala7
-rw-r--r--pom.xml5
-rw-r--r--project/SparkBuild.scala1
8 files changed, 64 insertions, 76 deletions
diff --git a/core/pom.xml b/core/pom.xml
index dfadd22d42..73426a9ec5 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -91,10 +91,6 @@
<artifactId>scala-library</artifactId>
</dependency>
<dependency>
- <groupId>net.liftweb</groupId>
- <artifactId>lift-json_2.9.2</artifactId>
- </dependency>
- <dependency>
<groupId>it.unimi.dsi</groupId>
<artifactId>fastutil</artifactId>
</dependency>
diff --git a/core/src/main/scala/spark/deploy/JsonProtocol.scala b/core/src/main/scala/spark/deploy/JsonProtocol.scala
index bd1db7c294..6b71b953dd 100644
--- a/core/src/main/scala/spark/deploy/JsonProtocol.scala
+++ b/core/src/main/scala/spark/deploy/JsonProtocol.scala
@@ -17,7 +17,7 @@
package spark.deploy
-import net.liftweb.json.JsonDSL._
+import scala.util.parsing.json.{JSONArray, JSONObject, JSONType}
import spark.deploy.DeployMessages.{MasterStateResponse, WorkerStateResponse}
import spark.deploy.master.{ApplicationInfo, WorkerInfo}
@@ -25,61 +25,63 @@ import spark.deploy.worker.ExecutorRunner
private[spark] object JsonProtocol {
- def writeWorkerInfo(obj: WorkerInfo) = {
- ("id" -> obj.id) ~
- ("host" -> obj.host) ~
- ("port" -> obj.port) ~
- ("webuiaddress" -> obj.webUiAddress) ~
- ("cores" -> obj.cores) ~
- ("coresused" -> obj.coresUsed) ~
- ("memory" -> obj.memory) ~
- ("memoryused" -> obj.memoryUsed)
- }
- def writeApplicationInfo(obj: ApplicationInfo) = {
- ("starttime" -> obj.startTime) ~
- ("id" -> obj.id) ~
- ("name" -> obj.desc.name) ~
- ("cores" -> obj.desc.maxCores) ~
- ("user" -> obj.desc.user) ~
- ("memoryperslave" -> obj.desc.memoryPerSlave) ~
- ("submitdate" -> obj.submitDate.toString)
- }
+ def writeWorkerInfo(obj: WorkerInfo): JSONType = JSONObject(Map(
+ "id" -> obj.id,
+ "host" -> obj.host,
+ "port" -> obj.port,
+ "webuiaddress" -> obj.webUiAddress,
+ "cores" -> obj.cores,
+ "coresused" -> obj.coresUsed,
+ "memory" -> obj.memory,
+ "memoryused" -> obj.memoryUsed,
+ "state" -> obj.state.toString
+ ))
- def writeApplicationDescription(obj: ApplicationDescription) = {
- ("name" -> obj.name) ~
- ("cores" -> obj.maxCores) ~
- ("memoryperslave" -> obj.memoryPerSlave) ~
- ("user" -> obj.user)
- }
+ def writeApplicationInfo(obj: ApplicationInfo): JSONType = JSONObject(Map(
+ "starttime" -> obj.startTime,
+ "id" -> obj.id,
+ "name" -> obj.desc.name,
+ "cores" -> obj.desc.maxCores,
+ "user" -> obj.desc.user,
+ "memoryperslave" -> obj.desc.memoryPerSlave,
+ "submitdate" -> obj.submitDate.toString
+ ))
- def writeExecutorRunner(obj: ExecutorRunner) = {
- ("id" -> obj.execId) ~
- ("memory" -> obj.memory) ~
- ("appid" -> obj.appId) ~
- ("appdesc" -> writeApplicationDescription(obj.appDesc))
- }
+ def writeApplicationDescription(obj: ApplicationDescription): JSONType = JSONObject(Map(
+ "name" -> obj.name,
+ "cores" -> obj.maxCores,
+ "memoryperslave" -> obj.memoryPerSlave,
+ "user" -> obj.user
+ ))
- def writeMasterState(obj: MasterStateResponse) = {
- ("url" -> ("spark://" + obj.uri)) ~
- ("workers" -> obj.workers.toList.map(writeWorkerInfo)) ~
- ("cores" -> obj.workers.map(_.cores).sum) ~
- ("coresused" -> obj.workers.map(_.coresUsed).sum) ~
- ("memory" -> obj.workers.map(_.memory).sum) ~
- ("memoryused" -> obj.workers.map(_.memoryUsed).sum) ~
- ("activeapps" -> obj.activeApps.toList.map(writeApplicationInfo)) ~
- ("completedapps" -> obj.completedApps.toList.map(writeApplicationInfo))
- }
+ def writeExecutorRunner(obj: ExecutorRunner): JSONType = JSONObject(Map(
+ "id" -> obj.execId,
+ "memory" -> obj.memory,
+ "appid" -> obj.appId,
+ "appdesc" -> writeApplicationDescription(obj.appDesc)
+ ))
- def writeWorkerState(obj: WorkerStateResponse) = {
- ("id" -> obj.workerId) ~
- ("masterurl" -> obj.masterUrl) ~
- ("masterwebuiurl" -> obj.masterWebUiUrl) ~
- ("cores" -> obj.cores) ~
- ("coresused" -> obj.coresUsed) ~
- ("memory" -> obj.memory) ~
- ("memoryused" -> obj.memoryUsed) ~
- ("executors" -> obj.executors.toList.map(writeExecutorRunner)) ~
- ("finishedexecutors" -> obj.finishedExecutors.toList.map(writeExecutorRunner))
- }
+ def writeMasterState(obj: MasterStateResponse): JSONType = JSONObject(Map(
+ "url" -> ("spark://" + obj.uri),
+ "workers" -> obj.workers.toList.map(writeWorkerInfo),
+ "cores" -> obj.workers.map(_.cores).sum,
+ "coresused" -> obj.workers.map(_.coresUsed).sum,
+ "memory" -> obj.workers.map(_.memory).sum,
+ "memoryused" -> obj.workers.map(_.memoryUsed).sum,
+ "activeapps" -> JSONArray(obj.activeApps.toList.map(writeApplicationInfo)),
+ "completedapps" -> JSONArray(obj.completedApps.toList.map(writeApplicationInfo))
+ ))
+
+ def writeWorkerState(obj: WorkerStateResponse): JSONType = JSONObject(Map(
+ "id" -> obj.workerId,
+ "masterurl" -> obj.masterUrl,
+ "masterwebuiurl" -> obj.masterWebUiUrl,
+ "cores" -> obj.cores,
+ "coresused" -> obj.coresUsed,
+ "memory" -> obj.memory,
+ "memoryused" -> obj.memoryUsed,
+ "executors" -> JSONArray(obj.executors.toList.map(writeExecutorRunner)),
+ "finishedexecutors" -> JSONArray(obj.finishedExecutors.toList.map(writeExecutorRunner))
+ ))
}
diff --git a/core/src/main/scala/spark/deploy/master/ui/ApplicationPage.scala b/core/src/main/scala/spark/deploy/master/ui/ApplicationPage.scala
index 405a1ec3a6..494a9b914d 100644
--- a/core/src/main/scala/spark/deploy/master/ui/ApplicationPage.scala
+++ b/core/src/main/scala/spark/deploy/master/ui/ApplicationPage.scala
@@ -17,6 +17,7 @@
package spark.deploy.master.ui
+import scala.util.parsing.json.JSONType
import scala.xml.Node
import akka.dispatch.Await
@@ -25,8 +26,6 @@ import akka.util.duration._
import javax.servlet.http.HttpServletRequest
-import net.liftweb.json.JsonAST.JValue
-
import spark.deploy.DeployMessages.{MasterStateResponse, RequestMasterState}
import spark.deploy.JsonProtocol
import spark.deploy.master.ExecutorInfo
@@ -37,7 +36,7 @@ private[spark] class ApplicationPage(parent: MasterWebUI) {
implicit val timeout = parent.timeout
/** Executor details for a particular application */
- def renderJson(request: HttpServletRequest): JValue = {
+ def renderJson(request: HttpServletRequest): JSONType = {
val appId = request.getParameter("appId")
val stateFuture = (master ? RequestMasterState)(timeout).mapTo[MasterStateResponse]
val state = Await.result(stateFuture, 30 seconds)
diff --git a/core/src/main/scala/spark/deploy/master/ui/IndexPage.scala b/core/src/main/scala/spark/deploy/master/ui/IndexPage.scala
index 2000211b98..28e421e3bc 100644
--- a/core/src/main/scala/spark/deploy/master/ui/IndexPage.scala
+++ b/core/src/main/scala/spark/deploy/master/ui/IndexPage.scala
@@ -19,14 +19,13 @@ package spark.deploy.master.ui
import javax.servlet.http.HttpServletRequest
+import scala.util.parsing.json.JSONType
import scala.xml.Node
import akka.dispatch.Await
import akka.pattern.ask
import akka.util.duration._
-import net.liftweb.json.JsonAST.JValue
-
import spark.Utils
import spark.deploy.DeployWebUI
import spark.deploy.DeployMessages.{MasterStateResponse, RequestMasterState}
@@ -38,7 +37,7 @@ private[spark] class IndexPage(parent: MasterWebUI) {
val master = parent.masterActorRef
implicit val timeout = parent.timeout
- def renderJson(request: HttpServletRequest): JValue = {
+ def renderJson(request: HttpServletRequest): JSONType = {
val stateFuture = (master ? RequestMasterState)(timeout).mapTo[MasterStateResponse]
val state = Await.result(stateFuture, 30 seconds)
JsonProtocol.writeMasterState(state)
diff --git a/core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala b/core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala
index b67059068b..02993d58a0 100644
--- a/core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala
+++ b/core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala
@@ -19,14 +19,13 @@ package spark.deploy.worker.ui
import javax.servlet.http.HttpServletRequest
+import scala.util.parsing.json.JSONType
import scala.xml.Node
import akka.dispatch.Await
import akka.pattern.ask
import akka.util.duration._
-import net.liftweb.json.JsonAST.JValue
-
import spark.Utils
import spark.deploy.JsonProtocol
import spark.deploy.DeployMessages.{RequestWorkerState, WorkerStateResponse}
@@ -39,7 +38,7 @@ private[spark] class IndexPage(parent: WorkerWebUI) {
val worker = parent.worker
val timeout = parent.timeout
- def renderJson(request: HttpServletRequest): JValue = {
+ def renderJson(request: HttpServletRequest): JSONType = {
val stateFuture = (workerActor ? RequestWorkerState)(timeout).mapTo[WorkerStateResponse]
val workerState = Await.result(stateFuture, 30 seconds)
JsonProtocol.writeWorkerState(workerState)
diff --git a/core/src/main/scala/spark/ui/JettyUtils.scala b/core/src/main/scala/spark/ui/JettyUtils.scala
index f66fe39905..ba58f35729 100644
--- a/core/src/main/scala/spark/ui/JettyUtils.scala
+++ b/core/src/main/scala/spark/ui/JettyUtils.scala
@@ -21,10 +21,9 @@ import javax.servlet.http.{HttpServletResponse, HttpServletRequest}
import scala.annotation.tailrec
import scala.util.{Try, Success, Failure}
+import scala.util.parsing.json.JSONType
import scala.xml.Node
-import net.liftweb.json.{JValue, pretty, render}
-
import org.eclipse.jetty.server.{Server, Request, Handler}
import org.eclipse.jetty.server.handler.{ResourceHandler, HandlerList, ContextHandler, AbstractHandler}
import org.eclipse.jetty.util.thread.QueuedThreadPool
@@ -39,8 +38,8 @@ private[spark] object JettyUtils extends Logging {
type Responder[T] = HttpServletRequest => T
// Conversions from various types of Responder's to jetty Handlers
- implicit def jsonResponderToHandler(responder: Responder[JValue]): Handler =
- createHandler(responder, "text/json", (in: JValue) => pretty(render(in)))
+ implicit def jsonResponderToHandler(responder: Responder[JSONType]): Handler =
+ createHandler(responder, "text/json", (in: JSONType) => in.toString)
implicit def htmlResponderToHandler(responder: Responder[Seq[Node]]): Handler =
createHandler(responder, "text/html", (in: Seq[Node]) => "<!DOCTYPE html>" + in.toString)
diff --git a/pom.xml b/pom.xml
index 7e6d38df9f..1811c62b55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -255,11 +255,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>net.liftweb</groupId>
- <artifactId>lift-json_2.9.2</artifactId>
- <version>2.5</version>
- </dependency>
- <dependency>
<groupId>com.codahale.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>3.0.0</version>
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index f6519c8287..852f40d3fd 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -180,7 +180,6 @@ object SparkBuild extends Build {
"com.typesafe.akka" % "akka-slf4j" % "2.0.5" excludeAll(excludeNetty),
"it.unimi.dsi" % "fastutil" % "6.4.4",
"colt" % "colt" % "1.2.0",
- "net.liftweb" % "lift-json_2.9.2" % "2.5",
"org.apache.mesos" % "mesos" % "0.12.1",
"io.netty" % "netty-all" % "4.0.0.Beta2",
"org.apache.derby" % "derby" % "10.4.2.0" % "test",
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-21 09:24:58 +0000