use HiveContext by default for spark 1.3
Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/f11afb6e Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/f11afb6e Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/f11afb6e Branch: refs/heads/master Commit: f11afb6e41059be41a99d857396cc1b4c6b53ac9 Parents: 1e43c5c Author: Lee moon soo <[email protected]> Authored: Sat Mar 14 20:45:38 2015 +0900 Committer: Lee moon soo <[email protected]> Committed: Sat Mar 14 20:45:38 2015 +0900 ---------------------------------------------------------------------- .../main/java/com/nflabs/zeppelin/spark/SparkInterpreter.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/f11afb6e/spark/src/main/java/com/nflabs/zeppelin/spark/SparkInterpreter.java ---------------------------------------------------------------------- diff --git a/spark/src/main/java/com/nflabs/zeppelin/spark/SparkInterpreter.java b/spark/src/main/java/com/nflabs/zeppelin/spark/SparkInterpreter.java index eb3b9ec..d770c89 100644 --- a/spark/src/main/java/com/nflabs/zeppelin/spark/SparkInterpreter.java +++ b/spark/src/main/java/com/nflabs/zeppelin/spark/SparkInterpreter.java @@ -142,7 +142,12 @@ public class SparkInterpreter extends Interpreter { public SQLContext getSQLContext() { if (sqlc == null) { - sqlc = new SQLContext(getSparkContext()); + // for spark 1.3x default HiveContext + if (getSparkContext().version().startsWith("1.3")) { + sqlc = getHiveContext(); + } else { + sqlc = new SQLContext(getSparkContext()); + } } return sqlc; }
