Repository: incubator-zeppelin Updated Branches: refs/heads/master 42d875dfa -> 79a92c789
[ZEPPELIN-421] Remove deprecated spark interpreter properties from in⦠â¦terpreter ui Removed deprecated properties `spark.home`, `spark.yarn.jar`. Corresponding docs will be updated in different PR after #430, #431 merged. Author: Mina Lee <[email protected]> Closes #435 from minahlee/ZEPPELIN-421 and squashes the following commits: 3548b3e [Mina Lee] [ZEPPELIN-421] Remove deprecated spark interpreter properties from interpreter ui Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/79a92c78 Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/79a92c78 Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/79a92c78 Branch: refs/heads/master Commit: 79a92c789ff43ce5320655da24e456a7719df7a2 Parents: 42d875d Author: Mina Lee <[email protected]> Authored: Sun Nov 15 16:46:23 2015 +0900 Committer: Lee moon soo <[email protected]> Committed: Tue Nov 17 23:29:14 2015 +0900 ---------------------------------------------------------------------- .../org/apache/zeppelin/spark/PySparkInterpreter.java | 13 ------------- .../org/apache/zeppelin/spark/SparkInterpreter.java | 6 +----- 2 files changed, 1 insertion(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/79a92c78/spark/src/main/java/org/apache/zeppelin/spark/PySparkInterpreter.java ---------------------------------------------------------------------- diff --git a/spark/src/main/java/org/apache/zeppelin/spark/PySparkInterpreter.java b/spark/src/main/java/org/apache/zeppelin/spark/PySparkInterpreter.java index d0e5fec..9bd258b 100644 --- a/spark/src/main/java/org/apache/zeppelin/spark/PySparkInterpreter.java +++ b/spark/src/main/java/org/apache/zeppelin/spark/PySparkInterpreter.java @@ -82,9 +82,6 @@ public class PySparkInterpreter extends Interpreter implements ExecuteResultHand "spark", PySparkInterpreter.class.getName(), new InterpreterPropertyBuilder() - .add("spark.home", - SparkInterpreter.getSystemDefault("SPARK_HOME", "spark.home", ""), - "Spark home path. Should be provided for pyspark") .add("zeppelin.pyspark.python", SparkInterpreter.getSystemDefault("PYSPARK_PYTHON", null, "python"), "Python command to run pyspark with").build()); @@ -96,16 +93,6 @@ public class PySparkInterpreter extends Interpreter implements ExecuteResultHand scriptPath = System.getProperty("java.io.tmpdir") + "/zeppelin_pyspark.py"; } - private String getSparkHome() { - String sparkHome = getProperty("spark.home"); - if (sparkHome == null) { - throw new InterpreterException("spark.home is undefined"); - } else { - return sparkHome; - } - } - - private void createPythonScript() { ClassLoader classLoader = getClass().getClassLoader(); File out = new File(scriptPath); http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/79a92c78/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java ---------------------------------------------------------------------- diff --git a/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java b/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java index 77d4986..528005e 100644 --- a/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java +++ b/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java @@ -100,10 +100,6 @@ public class SparkInterpreter extends Interpreter { .add("spark.cores.max", getSystemDefault(null, "spark.cores.max", ""), "Total number of cores to use. Empty value uses all available core.") - .add("spark.yarn.jar", - getSystemDefault("SPARK_YARN_JAR", "spark.yarn.jar", ""), - "The location of the Spark jar file. If you use yarn as a cluster, " - + "we should set this value") .add("zeppelin.spark.useHiveContext", getSystemDefault("ZEPPELIN_SPARK_USEHIVECONTEXT", "zeppelin.spark.useHiveContext", "true"), @@ -310,7 +306,7 @@ public class SparkInterpreter extends Interpreter { } //TODO(jongyoul): Move these codes into PySparkInterpreter.java - String pysparkBasePath = getSystemDefault("SPARK_HOME", "spark.home", null); + String pysparkBasePath = getSystemDefault("SPARK_HOME", null, null); File pysparkPath; if (null == pysparkBasePath) { pysparkBasePath = getSystemDefault("ZEPPELIN_HOME", "zeppelin.home", "../");
