You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@livy.apache.org by GitBox <gi...@apache.org> on 2019/11/21 06:32:50 UTC
[GitHub] [incubator-livy] yiheng commented on a change in pull request #165:
[LIVY-581] Fix edge-case where livy overrides user-provided spark
properties instead of appending
yiheng commented on a change in pull request #165: [LIVY-581] Fix edge-case where livy overrides user-provided spark properties instead of appending
URL: https://github.com/apache/incubator-livy/pull/165#discussion_r348914530
##########
File path: server/src/main/scala/org/apache/livy/server/interactive/InteractiveSession.scala
##########
@@ -286,16 +286,33 @@ object InteractiveSession extends Logging {
}
def mergeHiveSiteAndHiveDeps(sparkMajorVersion: Int): Unit = {
- val sparkFiles = conf.get("spark.files").map(_.split(",")).getOrElse(Array.empty[String])
- hiveSiteFile(sparkFiles, livyConf) match {
+ val yarnFiles = conf.get(LivyConf.SPARK_YARN_DIST_FILES)
+ .map(_.split(",")).getOrElse(Array.empty[String])
+ val sparkFiles = conf.get(LivyConf.SPARK_FILES)
+ .map(_.split(",")).getOrElse(Array.empty[String])
+ var files = Array.empty[String]
+ if (!sparkFiles.isEmpty || yarnFiles.isEmpty) files = sparkFiles else files = yarnFiles
Review comment:
This code can be refactored like this
```scala
val files = if (!sparkFiles.isEmpty || yarnFiles.isEmpty) sparkFiles else yarnFiles
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services