Pārlūkot izejas kodu

[spark] Clean up imports, use the right SparkProcessSession

Erick Tryzelaar 11 gadi atpakaļ
vecāks
revīzija
4d70af915b

+ 2 - 4
apps/spark/java/livy-server/src/main/scala/com/cloudera/hue/livy/server/Main.scala

@@ -4,14 +4,12 @@ import javax.servlet.ServletContext
 
 import _root_.akka.util.Timeout
 import com.cloudera.hue.livy.WebServer
-import com.cloudera.hue.livy.server.sessions.Session
 import org.json4s.{DefaultFormats, Formats}
+import org.scalatra._
 import org.scalatra.json.JacksonJsonSupport
 import org.scalatra.servlet.ScalatraListener
-import org.scalatra._
 
-import scala.concurrent.duration.Duration
-import scala.concurrent.{Await, Future, ExecutionContext, ExecutionContextExecutor}
+import scala.concurrent.{ExecutionContext, ExecutionContextExecutor}
 
 object Main {
   def main(args: Array[String]): Unit = {

+ 2 - 5
apps/spark/java/livy-server/src/main/scala/com/cloudera/hue/livy/server/SessionFactory.scala

@@ -1,9 +1,6 @@
 package com.cloudera.hue.livy.server
 
 import java.util.UUID
-import java.util.concurrent.Executors
-
-import com.cloudera.hue.livy.server.sessions.{Session, SparkSession}
 
 import scala.concurrent.{ExecutionContext, Future, future}
 
@@ -13,12 +10,12 @@ trait SessionFactory {
 
 class ProcessSessionFactory extends SessionFactory {
 
-  implicit def executor: ExecutionContext = ExecutionContext.global //ExecutionContext.fromExecutor(Executors.newFixedThreadPool(5))
+  implicit def executor: ExecutionContext = ExecutionContext.global
 
   override def createSparkSession: Future[Session] = {
     future {
       val id = UUID.randomUUID().toString
-      new SparkSession(id)
+      new SparkProcessSession(id)
     }
   }
 }

+ 0 - 2
apps/spark/java/livy-server/src/main/scala/com/cloudera/hue/livy/server/SessionManager.scala

@@ -1,7 +1,5 @@
 package com.cloudera.hue.livy.server
 
-import com.cloudera.hue.livy.server.sessions.Session
-
 import scala.collection.concurrent.TrieMap
 import scala.concurrent.{ExecutionContext, ExecutionContextExecutor, Future}