Browse Source

[livy] Minor cleanup of Spark Interpreter

Erick Tryzelaar 10 years ago
parent
commit
6a1feb6752

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

@@ -294,34 +294,28 @@ class SparkInterpreter extends Interpreter {
     }
   }
 
-  def executeLine(code: String) = {
+  private def executeLine(code: String) = {
     code match {
       case MAGIC_REGEX(magic, rest) =>
         executeMagic(magic, rest)
       case _ =>
         scala.Console.withOut(outputStream) {
           sparkIMain.interpret(code) match {
-            case Results.Success =>
-              val output = outputStream.toString("UTF-8").trim
-              outputStream.reset()
-
-              ExecuteComplete(executeCount - 1, output)
-
-            case Results.Incomplete =>
-              val output = outputStream.toString("UTF-8").trim
-              outputStream.reset()
-
-              ExecuteIncomplete(executeCount - 1, output)
-
-            case Results.Error =>
-              val output = outputStream.toString("UTF-8").trim
-              outputStream.reset()
-              ExecuteError(executeCount - 1, output)
+            case Results.Success => ExecuteComplete(executeCount - 1, readStdout())
+            case Results.Incomplete => ExecuteIncomplete(executeCount - 1, readStdout())
+            case Results.Error => ExecuteError(executeCount - 1, readStdout())
           }
         }
     }
   }
 
+  private def readStdout() = {
+    val output = outputStream.toString("UTF-8").trim
+    outputStream.reset()
+
+    output
+  }
+
   @Override
   def close(): Unit = synchronized {
     _state = ShuttingDown()