[zeppelin] branch master updated: [ZEPPELIN-4626]. zeppelin.spark.useHiveContext doesn't work

[zjffdu]

This is an automated email from the ASF dual-hosted git repository.

zjffdu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git


The following commit(s) were added to refs/heads/master by this push:
     new e87cb15  [ZEPPELIN-4626]. zeppelin.spark.useHiveContext doesn't work
e87cb15 is described below

commit e87cb15433671e207f962e0fa68fb32e41e936a1
Author: Jeff Zhang <zjf...@apache.org>
AuthorDate: Fri Feb 28 17:02:26 2020 +0800

    [ZEPPELIN-4626]. zeppelin.spark.useHiveContext doesn't work
    
    ### What is this PR for?
    
    This is a trivial PR which fix the issue just by renaming the property name 
to correct one.
    
    ### What type of PR is it?
    [Bug Fix]
    
    ### Todos
    * [ ] - Task
    
    ### What is the Jira issue?
    * https://issues.apache.org/jira/browse/ZEPPELIN-4626
    
    ### How should this be tested?
    * CI pass
    
    ### 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 <zjf...@apache.org>
    
    Closes #3671 from zjffdu/ZEPPELIN-4626 and squashes the following commits:
    
    35d90b843 [Jeff Zhang] [ZEPPELIN-4626]. zeppelin.spark.useHiveContext 
doesn't work
---
 .../scala/org/apache/zeppelin/spark/BaseSparkScalaInterpreter.scala   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/spark/spark-scala-parent/src/main/scala/org/apache/zeppelin/spark/BaseSparkScalaInterpreter.scala
 
b/spark/spark-scala-parent/src/main/scala/org/apache/zeppelin/spark/BaseSparkScalaInterpreter.scala
index 772d279..104e543 100644
--- 
a/spark/spark-scala-parent/src/main/scala/org/apache/zeppelin/spark/BaseSparkScalaInterpreter.scala
+++ 
b/spark/spark-scala-parent/src/main/scala/org/apache/zeppelin/spark/BaseSparkScalaInterpreter.scala
@@ -210,7 +210,7 @@ abstract class BaseSparkScalaInterpreter(val conf: 
SparkConf,
 
     val hiveSiteExisted: Boolean =
       
Thread.currentThread().getContextClassLoader.getResource("hive-site.xml") != 
null
-    val hiveEnabled = conf.getBoolean("spark.useHiveContext", false)
+    val hiveEnabled = conf.getBoolean("zeppelin.spark.useHiveContext", false)
     if (hiveEnabled && hiveSiteExisted) {
       sqlContext = Class.forName("org.apache.spark.sql.hive.HiveContext")
         
.getConstructor(classOf[SparkContext]).newInstance(sc).asInstanceOf[SQLContext]
@@ -244,7 +244,7 @@ abstract class BaseSparkScalaInterpreter(val conf: 
SparkConf,
     builder.getClass.getMethod("config", classOf[SparkConf]).invoke(builder, 
conf)
 
     if (conf.get("spark.sql.catalogImplementation", "in-memory").toLowerCase 
== "hive"
-      || conf.get("spark.useHiveContext", "false").toLowerCase == "true") {
+      || conf.get("zeppelin.spark.useHiveContext", "false").toLowerCase == 
"true") {
       val hiveSiteExisted: Boolean =
         
Thread.currentThread().getContextClassLoader.getResource("hive-site.xml") != 
null
       val hiveClassesPresent =