restore mvn and SparkILoop.scala

Author: liu-zhaokun

build/mvn

@@ -91,13 +91,13 @@ install_mvn() {
 
 # Install zinc under the build/ folder
 install_zinc() {
-  local zinc_path="zinc-0.3.15/bin/zinc"
+  local zinc_path="zinc-0.3.11/bin/zinc"
   [ ! -f "${_DIR}/${zinc_path}" ] && ZINC_INSTALL_FLAG=1
   local TYPESAFE_MIRROR=${TYPESAFE_MIRROR:-https://downloads.typesafe.com}
 
   install_app \
-    "${TYPESAFE_MIRROR}/zinc/0.3.15" \
-    "zinc-0.3.15.tgz" \
+    "${TYPESAFE_MIRROR}/zinc/0.3.11" \
+    "zinc-0.3.11.tgz" \
     "${zinc_path}"
   ZINC_BIN="${_DIR}/${zinc_path}"
 }

repl/scala-2.11/src/main/scala/org/apache/spark/repl/SparkILoop.scala

@@ -97,13 +97,13 @@ class SparkILoop(in0: Option[BufferedReader], out: JPrintWriter)
   override def commands: List[LoopCommand] = sparkStandardCommands
 
   /**
-   * We override `createInterpreter` because we need to initialize Spark *before* the REPL
+   * We override `loadFiles` because we need to initialize Spark *before* the REPL
    * sees any files, so that the Spark context is visible in those files. This is a bit of a
    * hack, but there isn't another hook available to us at this point.
    */
-  override def createInterpreter(): Unit = {
-    super.createInterpreter()
+  override def loadFiles(settings: Settings): Unit = {
     initializeSpark()
+    super.loadFiles(settings)
   }
 
   override def resetCommand(line: String): Unit = {