Parcourir la source

[livy] Fix some minor warnings

Erick Tryzelaar il y a 10 ans
Parent
commit
a373086

+ 1 - 24
apps/spark/java/livy-repl/src/main/scala/com/cloudera/hue/livy/repl/python/PythonInterpreter.scala

@@ -76,7 +76,7 @@ object PythonInterpreter extends Logging {
 
         require(py4jFile.exists(),
           "py4j-*-src.zip not found in Spark environment; cannot run pyspark application in YARN mode.")
-        Seq(pyArchivesFile.getAbsolutePath(), py4jFile.getAbsolutePath())
+        Seq(pyArchivesFile.getAbsolutePath, py4jFile.getAbsolutePath)
       }.getOrElse(Seq())
     }
   }
@@ -101,29 +101,6 @@ object PythonInterpreter extends Logging {
 
     file
   }
-
-  private def createFakePySpark(): File = {
-    val source: InputStream = getClass.getClassLoader.getResourceAsStream("fake_pyspark.sh")
-
-    val file = Files.createTempFile("", "").toFile
-    file.deleteOnExit()
-
-    file.setExecutable(true)
-
-    val sink = new FileOutputStream(file)
-    val buf = new Array[Byte](1024)
-    var n = source.read(buf)
-
-    while (n > 0) {
-      sink.write(buf, 0, n)
-      n = source.read(buf)
-    }
-
-    source.close()
-    sink.close()
-
-    file
-  }
 }
 
 private class PythonInterpreter(process: Process, gatewayServer: GatewayServer)

+ 6 - 6
apps/spark/java/livy-repl/src/main/scala/com/cloudera/hue/livy/repl/scala/SparkInterpreter.scala

@@ -180,22 +180,22 @@ class SparkInterpreter extends Interpreter {
           case value: JValue => List(JField("0", value))
         }
 
-        cols.map { case (name, value) =>
-          val typeName = convertTableType(value)
+        cols.map { case (k, v) =>
+          val typeName = convertTableType(v)
 
-          headers.get(name) match {
+          headers.get(k) match {
             case Some(header) =>
               if (header.get("type").get != typeName) {
                 throw new TypesDoNotMatch
               }
             case None =>
-              headers.put(name, Map(
+              headers.put(k, Map(
                 "type" -> typeName,
-                "name" -> name
+                "name" -> k
               ))
           }
 
-          value
+          v
         }
       }
 

+ 1 - 1
apps/spark/java/livy-spark/src/main/scala/com/cloudera/hue/livy/spark/ConfigOptionNotAllowed.scala

@@ -26,7 +26,7 @@ package com.cloudera.hue.livy.spark
  *
  */
 case class ConfigOptionNotAllowed(key: String, value: String) extends Exception {
-  override def getMessage(): String = {
+  override def getMessage: String = {
     s"Not allowed to specify the '$key' configuration variable"
   }
 }