Repository: incubator-zeppelin Updated Branches: refs/heads/master 21d43c25a -> 7599efb54
ZEPPELIN-127 DisplayUtils breaks some spark code working https://issues.apache.org/jira/browse/ZEPPELIN-127 This PR disables autoloading of DisplayUtil due to breaking some basic spark codes. Author: Lee moon soo <[email protected]> Closes #117 from Leemoonsoo/ZEPPELIN-127 and squashes the following commits: 6099bfc [Lee moon soo] Disable DisplayUtils Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/7599efb5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/7599efb5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/7599efb5 Branch: refs/heads/master Commit: 7599efb54e2941f097473db0b0b3c79b9af98099 Parents: 21d43c2 Author: Lee moon soo <[email protected]> Authored: Tue Jun 23 14:06:51 2015 -0700 Committer: Lee moon soo <[email protected]> Committed: Tue Jun 23 16:46:09 2015 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/7599efb5/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 b2aecb9..75ab263 100644 --- a/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java +++ b/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java @@ -442,6 +442,8 @@ public class SparkInterpreter extends Interpreter { intp.interpret("import org.apache.spark.sql.functions._"); } + /* Temporary disabling DisplayUtils. see https://issues.apache.org/jira/browse/ZEPPELIN-127 + * // Utility functions for display intp.interpret("import org.apache.zeppelin.spark.utils.DisplayUtils._"); @@ -449,6 +451,7 @@ public class SparkInterpreter extends Interpreter { intp.interpret("import org.apache.zeppelin.spark.utils.SparkMaxResult"); intp.interpret("implicit val sparkMaxResult = new SparkMaxResult(" + Integer.parseInt(getProperty("zeppelin.spark.maxResult")) + ")"); + */ try { if (sc.version().startsWith("1.1") || sc.version().startsWith("1.2")) {
