You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by fe...@apache.org on 2017/01/07 18:35:16 UTC

zeppelin git commit: remove org.apache.spark.sql.hive.HiveSharedState class check

Repository: zeppelin
Updated Branches:
  refs/heads/master a6d01aaf3 -> 0f6571452


remove org.apache.spark.sql.hive.HiveSharedState class check

### What is this PR for?
remove org.apache.spark.sql.hive.HiveSharedState class check
because it has been removed since spark 2.1.x

### What type of PR is it?
[Bug Fix ]

### What is the Jira issue?
[ZEPPELIN-1909](https://issues.apache.org/jira/browse/ZEPPELIN-1909)

Author: lichenglin <li...@126.com>

Closes #1856 from lichenglin/master and squashes the following commits:

60c3c04 [lichenglin] Merge pull request #1 from lichenglin/lichenglin-patch-1
3f90485 [lichenglin] make hive enable under spark 2.1.0


Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/0f657145
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/0f657145
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/0f657145

Branch: refs/heads/master
Commit: 0f6571452fff5ea889b96cfdb885774f8af560b0
Parents: a6d01aa
Author: lichenglin <li...@126.com>
Authored: Fri Jan 6 14:54:25 2017 +0800
Committer: Felix Cheung <fe...@apache.org>
Committed: Sat Jan 7 10:34:03 2017 -0800

----------------------------------------------------------------------
 .../src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0f657145/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 e8c76bc..301dd23 100644
--- a/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
+++ b/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
@@ -205,7 +205,6 @@ public class SparkInterpreter extends Interpreter {
   private boolean hiveClassesArePresent() {
     try {
       this.getClass().forName("org.apache.spark.sql.hive.HiveSessionState");
-      this.getClass().forName("org.apache.spark.sql.hive.HiveSharedState");
       this.getClass().forName("org.apache.hadoop.hive.conf.HiveConf");
       return true;
     } catch (ClassNotFoundException | NoClassDefFoundError e) {
@@ -355,7 +354,7 @@ public class SparkInterpreter extends Interpreter {
             new Class[]{ String.class, String.class},
             new Object[]{ "spark.sql.catalogImplementation", "in-memory"});
         sparkSession = Utils.invokeMethod(builder, "getOrCreate");
-        logger.info("Created Spark session with Hive support");
+        logger.info("Created Spark session with Hive support use in-memory catalogImplementation");
       }
     } else {
       sparkSession = Utils.invokeMethod(builder, "getOrCreate");