Repository: zeppelin Updated Branches: refs/heads/master 28ef8aa90 -> e5e3a88cd
[HOTFIX] Set interpreter context in zeppelin context from SparkSqlInterpreter ### What is this PR for? When running `%sql` paragraphs sometimes a NullPointer is thrown instead of presenting the result. This was traced back to `sparkInterpreter.getZeppelinContext().setInterpreterContext(context);` not being called as expected from SparkSqlInterpreter. Since the SparkInterpreter is used from the SparkSqlInterpreter, if a `%spark` paragraph is executed before a `%sql` paragraph it works as expected (as SparkInterpreter sets the interpreter context in the zeppelin context). ### What type of PR is it? [Hot Fix] ### Todos ### What is the Jira issue? Hotfix ### How should this be tested? Start the spark context by executing ``` %sql select 1 ``` Expected result is a table with 1 in. Before this patch a NullPointer will be thrown. ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: David Ersson <ders...@kth.se> Closes #2334 from FireArrow/sqlinterpreter_hotfix and squashes the following commits: 3d2b0a9 [David Ersson] Set interpreter context in zeppelin context Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/e5e3a88c Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/e5e3a88c Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/e5e3a88c Branch: refs/heads/master Commit: e5e3a88cd434880af6319392a61ef0571f8319d6 Parents: 28ef8aa Author: David Ersson <ders...@kth.se> Authored: Wed May 10 18:03:19 2017 +0200 Committer: Jeff Zhang <zjf...@apache.org> Committed: Thu May 11 10:27:43 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/zeppelin/spark/SparkSqlInterpreter.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e5e3a88c/spark/src/main/java/org/apache/zeppelin/spark/SparkSqlInterpreter.java ---------------------------------------------------------------------- diff --git a/spark/src/main/java/org/apache/zeppelin/spark/SparkSqlInterpreter.java b/spark/src/main/java/org/apache/zeppelin/spark/SparkSqlInterpreter.java index 61c697c..d9e7563 100644 --- a/spark/src/main/java/org/apache/zeppelin/spark/SparkSqlInterpreter.java +++ b/spark/src/main/java/org/apache/zeppelin/spark/SparkSqlInterpreter.java @@ -96,7 +96,8 @@ public class SparkSqlInterpreter extends Interpreter { } sparkInterpreter.populateSparkWebUrl(context); - sqlc = getSparkInterpreter().getSQLContext(); + sparkInterpreter.getZeppelinContext().setInterpreterContext(context); + sqlc = sparkInterpreter.getSQLContext(); SparkContext sc = sqlc.sparkContext(); if (concurrentSQL()) { sc.setLocalProperty("spark.scheduler.pool", "fair"); @@ -126,7 +127,7 @@ public class SparkSqlInterpreter extends Interpreter { throw new InterpreterException(e); } - String msg = getSparkInterpreter().getZeppelinContext().showData(rdd); + String msg = sparkInterpreter.getZeppelinContext().showData(rdd); sc.clearJobGroup(); return new InterpreterResult(Code.SUCCESS, msg); }