diff options
| author | Prashant Sharma <scrapcodes@gmail.com> | 2013-09-15 15:51:02 +0530 |
|---|---|---|
| committer | Prashant Sharma <scrapcodes@gmail.com> | 2013-09-15 15:51:02 +0530 |
| commit | 69fd42aee3f3fed8dbb5f2933413cbf31cac74d1 (patch) | |
| tree | 0f04575cbc87b933d063bf336151d404ed6771b6 /repl | |
| parent | a90e0eff5982ba46b3658e91dec89bd08ce450e5 (diff) | |
| download | spark-69fd42aee3f3fed8dbb5f2933413cbf31cac74d1.tar.gz spark-69fd42aee3f3fed8dbb5f2933413cbf31cac74d1.tar.bz2 spark-69fd42aee3f3fed8dbb5f2933413cbf31cac74d1.zip | |
ported repl improvements from master
Diffstat (limited to 'repl')
| -rw-r--r-- | repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala | 4 | ||||
| -rw-r--r-- | repl/src/main/scala/org/apache/spark/repl/SparkImports.scala | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala b/repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala index bd132c29bf..988b624feb 100644 --- a/repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala +++ b/repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala @@ -915,6 +915,10 @@ class SparkILoop(in0: Option[BufferedReader], protected val out: JPrintWriter, } def createSparkContext(): SparkContext = { + val uri = System.getenv("SPARK_EXECUTOR_URI") + if (uri != null) { + System.setProperty("spark.executor.uri", uri) + } val master = this.master match { case Some(m) => m case None => { diff --git a/repl/src/main/scala/org/apache/spark/repl/SparkImports.scala b/repl/src/main/scala/org/apache/spark/repl/SparkImports.scala index a33f07a83e..64084209e8 100644 --- a/repl/src/main/scala/org/apache/spark/repl/SparkImports.scala +++ b/repl/src/main/scala/org/apache/spark/repl/SparkImports.scala @@ -185,8 +185,13 @@ trait SparkImports { if (currentImps contains imv) addWrapper() val objName = req.lineRep.readPath val valName = "$VAL" + newValId(); - code.append("val " + valName + " = " + objName + ".INSTANCE;\n") - code.append("import " + valName + req.accessPath + ".`" + imv + "`;\n") + + if(!code.toString.endsWith(".`" + imv + "`;\n")) { // Which means already imported + code.append("val " + valName + " = " + objName + ".INSTANCE;\n") + code.append("import " + valName + req.accessPath + ".`" + imv + "`;\n") + } + // code.append("val " + valName + " = " + objName + ".INSTANCE;\n") + // code.append("import " + valName + req.accessPath + ".`" + imv + "`;\n") // code append ("import " + (req fullPath imv) + "\n") currentImps += imv } |