[incubator-kyuubi] branch master updated: [KYUUBI #2257] Replace replace conf vars with strings in HiveSQLEngine

[ya...@apache.org]

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

yao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-kyuubi.git


The following commit(s) were added to refs/heads/master by this push:
     new 86c6b1f87 [KYUUBI #2257] Replace replace conf vars with strings in HiveSQLEngine
86c6b1f87 is described below

commit 86c6b1f872b18f7e027f20bbd052041919998704
Author: Min Zhao <zh...@163.com>
AuthorDate: Thu Apr 14 16:46:01 2022 +0800

    [KYUUBI #2257] Replace replace conf vars with strings in HiveSQLEngine
    
    ### _Why are the changes needed?_
    
    ### _How was this patch tested?_
    - [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible
    
    - [ ] Add screenshots for manual tests if appropriate
    
    - [ ] [Run test](https://kyuubi.apache.org/docs/latest/develop_tools/testing.html#running-tests) locally before make a pull request
    
    Closes #2259 from zhaomin1423/impr_hive_conf.
    
    Closes #2257
    
    d5b26f1d [Min Zhao] [KYUUBI #2257] Replace replace conf vars with strings in HiveSQLEngine
    5b7bd55d [Min Zhao] [KYUUBI #2257] Replace replace conf vars with strings in HiveSQLEngine
    
    Authored-by: Min Zhao <zh...@163.com>
    Signed-off-by: Kent Yao <ya...@apache.org>
---
 .../src/main/scala/org/apache/kyuubi/engine/hive/HiveSQLEngine.scala | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/externals/kyuubi-hive-sql-engine/src/main/scala/org/apache/kyuubi/engine/hive/HiveSQLEngine.scala b/externals/kyuubi-hive-sql-engine/src/main/scala/org/apache/kyuubi/engine/hive/HiveSQLEngine.scala
index 6ffa83327..c38b9723f 100644
--- a/externals/kyuubi-hive-sql-engine/src/main/scala/org/apache/kyuubi/engine/hive/HiveSQLEngine.scala
+++ b/externals/kyuubi-hive-sql-engine/src/main/scala/org/apache/kyuubi/engine/hive/HiveSQLEngine.scala
@@ -22,7 +22,6 @@ import java.net.InetAddress
 import scala.util.control.NonFatal
 
 import org.apache.hadoop.hive.conf.HiveConf
-import org.apache.hadoop.hive.conf.HiveConf.ConfVars
 
 import org.apache.kyuubi.{Logging, Utils}
 import org.apache.kyuubi.config.KyuubiConf
@@ -72,8 +71,8 @@ object HiveSQLEngine extends Logging {
     }
 
     val isEmbeddedMetaStore = {
-      val msUri = hiveConf.getVar(ConfVars.METASTOREURIS)
-      val msConnUrl = hiveConf.getVar(ConfVars.METASTORECONNECTURLKEY)
+      val msUri = hiveConf.get("hive.metastore.uris")
+      val msConnUrl = hiveConf.get("javax.jdo.option.ConnectionURL")
       (msUri == null || msUri.trim().isEmpty) &&
       (msConnUrl != null && msConnUrl.startsWith("jdbc:derby"))
     }