浏览代码

Merge pull request #334 from sky4star/master

PR-334 [livy] Recognize spark property: files, jars
Romain Rigaux 9 年之前
父节点
当前提交
15cc437

+ 2 - 2
apps/spark/java/livy-spark/src/main/scala/com/cloudera/hue/livy/spark/interactive/CreateInteractiveRequest.scala

@@ -23,9 +23,9 @@ import com.cloudera.hue.livy.sessions.Kind
 case class CreateInteractiveRequest(
     kind: Kind,
     proxyUser: Option[String] = None,
-    jars: List[String] = List(),
+    jars: Option[String] = None,
     pyFiles: List[String] = List(),
-    files: List[String] = List(),
+    files: Option[String] = None,
     driverMemory: Option[String] = None,
     driverCores: Option[Int] = None,
     executorMemory: Option[String] = None,

+ 2 - 2
apps/spark/java/livy-spark/src/main/scala/com/cloudera/hue/livy/spark/interactive/InteractiveSessionFactory.scala

@@ -72,8 +72,8 @@ abstract class InteractiveSessionFactory(processFactory: SparkProcessBuilderFact
     request.totalExecutorCores.foreach(builder.totalExecutorCores)
     request.executorMemory.foreach(builder.executorMemory)
     request.numExecutors.foreach(builder.numExecutors)
-    request.files.map(RelativePath).foreach(builder.file)
-    request.jars.map(RelativePath).foreach(builder.jar)
+    request.files.foreach(_.split(",").map(RelativePath).foreach(builder.file))
+    request.jars.foreach(_.split(",").map(RelativePath).foreach(builder.jar))
     request.proxyUser.foreach(builder.proxyUser)
     request.queue.foreach(builder.queue)
     request.name.foreach(builder.name)