Browse Source

[livy] Shuffle files around since livy is growing batch support

Erick Tryzelaar 10 years ago
parent
commit
a71a5b6f86

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

@@ -2,6 +2,7 @@ package com.cloudera.hue.livy.server
 
 import javax.servlet.ServletContext
 
+import com.cloudera.hue.livy.server.sessions._
 import com.cloudera.hue.livy.{Utils, Logging, LivyConf, WebServer}
 import org.scalatra._
 import org.scalatra.servlet.ScalatraListener

+ 1 - 1
apps/spark/java/livy-server/src/main/scala/com/cloudera/hue/livy/server/sessions/Session.scala

@@ -5,7 +5,7 @@ import java.util.concurrent.TimeoutException
 
 import com.cloudera.hue.livy.Utils
 import com.cloudera.hue.livy.msgs.ExecuteRequest
-import com.cloudera.hue.livy.server.Statement
+import com.cloudera.hue.livy.server.sessions.Statement
 
 import scala.concurrent._
 import scala.concurrent.duration.Duration

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

@@ -1,9 +1,8 @@
-package com.cloudera.hue.livy.server
+package com.cloudera.hue.livy.server.sessions
 
 import java.util.UUID
 
 import com.cloudera.hue.livy.LivyConf
-import com.cloudera.hue.livy.server.sessions._
 import com.cloudera.hue.livy.yarn.Client
 
 import scala.concurrent.{ExecutionContext, Future}

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

@@ -1,7 +1,6 @@
-package com.cloudera.hue.livy.server
+package com.cloudera.hue.livy.server.sessions
 
 import com.cloudera.hue.livy.Logging
-import com.cloudera.hue.livy.server.sessions.Session
 
 import scala.collection.concurrent.TrieMap
 import scala.concurrent.duration.Duration

+ 1 - 1
apps/spark/java/livy-server/src/main/scala/com/cloudera/hue/livy/server/Statement.scala → apps/spark/java/livy-server/src/main/scala/com/cloudera/hue/livy/server/sessions/Statement.scala

@@ -1,4 +1,4 @@
-package com.cloudera.hue.livy.server
+package com.cloudera.hue.livy.server.sessions
 
 import com.cloudera.hue.livy.msgs.ExecuteRequest
 import org.json4s.JValue

+ 1 - 1
apps/spark/java/livy-server/src/main/scala/com/cloudera/hue/livy/server/sessions/ThreadSession.scala

@@ -6,8 +6,8 @@ import com.cloudera.hue.livy.msgs.ExecuteRequest
 import com.cloudera.hue.livy.repl
 import com.cloudera.hue.livy.repl.python.PythonSession
 import com.cloudera.hue.livy.repl.scala.SparkSession
-import com.cloudera.hue.livy.server.Statement
 import com.cloudera.hue.livy.server.sessions.Session._
+import com.cloudera.hue.livy.server.sessions.Statement
 
 import scala.collection.mutable.ArrayBuffer
 import scala.concurrent.{ExecutionContext, ExecutionContextExecutor, Future}

+ 1 - 2
apps/spark/java/livy-server/src/main/scala/com/cloudera/hue/livy/server/WebApp.scala → apps/spark/java/livy-server/src/main/scala/com/cloudera/hue/livy/server/sessions/WebApp.scala

@@ -1,11 +1,10 @@
-package com.cloudera.hue.livy.server
+package com.cloudera.hue.livy.server.sessions
 
 import java.net.URL
 import java.util.concurrent.TimeUnit
 
 import com.cloudera.hue.livy.Logging
 import com.cloudera.hue.livy.msgs.ExecuteRequest
-import com.cloudera.hue.livy.server.sessions.Session
 import com.cloudera.hue.livy.server.sessions.Session.SessionFailedToStart
 import com.fasterxml.jackson.core.JsonParseException
 import org.json4s.JsonAST.JString

+ 1 - 1
apps/spark/java/livy-server/src/main/scala/com/cloudera/hue/livy/server/sessions/WebSession.scala

@@ -5,8 +5,8 @@ import java.util.concurrent.TimeUnit
 
 import com.cloudera.hue.livy._
 import com.cloudera.hue.livy.msgs.ExecuteRequest
-import com.cloudera.hue.livy.server.Statement
 import com.cloudera.hue.livy.server.sessions.Session._
+import com.cloudera.hue.livy.server.sessions.Statement
 import dispatch._
 import org.json4s.jackson.Serialization.write
 import org.json4s.{DefaultFormats, Formats}