zeppelin git commit: ZEPPELIN-2377. Hive Support can not be enabled in spark master

2017-09-07 Thread zjffdu 
Repository: zeppelin
Updated Branches:
  refs/heads/branch-0.7 05adf7ee2 -> e51988a94


ZEPPELIN-2377. Hive Support can not be enabled in spark master

### What is this PR for?
The root cause is that `org.apache.spark.sql.hive.HiveSessionState` is removed 
in spark master. I change it to 
`org.apache.spark.sql.hive.execution.InsertIntoHiveTable` which is existed 
early in spark 1.0.

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

### Todos
* [ ] - Task

### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-2377

### How should this be tested?
Verify it manually in spark master, spark 2.1.0 and spark 1.6.2

### 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: Jeff Zhang 

Closes #2237 from zjffdu/ZEPPELIN-2377 and squashes the following commits:

d16196b [Jeff Zhang] ZEPPELIN-2377. Hive Support can not be enabled in spark 
master

(cherry picked from commit 74c0408d30927b11c99a8e134284be4156b19f8a)
Signed-off-by: Jeff Zhang 


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

Branch: refs/heads/branch-0.7
Commit: e51988a94fdcb63c8143c2dc5fdb69dba050b3d6
Parents: 05adf7e
Author: Jeff Zhang 
Authored: Sun Apr 9 15:46:32 2017 +0800
Committer: Jeff Zhang 
Committed: Fri Sep 8 12:00:41 2017 +0800

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


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e51988a9/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 5b6dc76..23a698a 100644
--- a/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
+++ b/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
@@ -215,7 +215,7 @@ 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.execution.InsertIntoHiveTable");
   this.getClass().forName("org.apache.hadoop.hive.conf.HiveConf");
   return true;
 } catch (ClassNotFoundException | NoClassDefFoundError e) {

zeppelin git commit: ZEPPELIN-2377. Hive Support can not be enabled in spark master

2017-04-16 Thread zjffdu 
Repository: zeppelin
Updated Branches:
  refs/heads/master 5fd4ffc56 -> 74c0408d3


ZEPPELIN-2377. Hive Support can not be enabled in spark master

### What is this PR for?
The root cause is that `org.apache.spark.sql.hive.HiveSessionState` is removed 
in spark master. I change it to 
`org.apache.spark.sql.hive.execution.InsertIntoHiveTable` which is existed 
early in spark 1.0.

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

### Todos
* [ ] - Task

### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-2377

### How should this be tested?
Verify it manually in spark master, spark 2.1.0 and spark 1.6.2

### 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: Jeff Zhang 

Closes #2237 from zjffdu/ZEPPELIN-2377 and squashes the following commits:

d16196b [Jeff Zhang] ZEPPELIN-2377. Hive Support can not be enabled in spark 
master


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

Branch: refs/heads/master
Commit: 74c0408d30927b11c99a8e134284be4156b19f8a
Parents: 5fd4ffc
Author: Jeff Zhang 
Authored: Sun Apr 9 15:46:32 2017 +0800
Committer: Jeff Zhang 
Committed: Mon Apr 17 09:21:32 2017 +0800

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


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/74c0408d/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 af97d87..49c83dc 100644
--- a/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
+++ b/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
@@ -246,7 +246,7 @@ 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.execution.InsertIntoHiveTable");
   this.getClass().forName("org.apache.hadoop.hive.conf.HiveConf");
   return true;
 } catch (ClassNotFoundException | NoClassDefFoundError e) {