[hive] branch master updated: HIVE-26402: HiveSchemaTool does not honor metastore-site.xml (#3449) (Zhihua Deng, reviewed by Naveen Gangam)

[dengzh]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 3e3ff38b652 HIVE-26402: HiveSchemaTool does not honor 
metastore-site.xml (#3449) (Zhihua Deng,  reviewed by Naveen Gangam)
3e3ff38b652 is described below

commit 3e3ff38b652d0fbcdb471b815d342dcbcd9495ed
Author: dengzh <dengzhhu...@gmail.com>
AuthorDate: Mon Aug 8 09:40:35 2022 +0800

    HIVE-26402: HiveSchemaTool does not honor metastore-site.xml (#3449) 
(Zhihua Deng,  reviewed by Naveen Gangam)
---
 .../src/java/org/apache/hive/beeline/schematool/HiveSchemaTool.java  | 5 ++---
 .../hadoop/hive/metastore/tools/schematool/MetastoreSchemaTool.java  | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git 
a/beeline/src/java/org/apache/hive/beeline/schematool/HiveSchemaTool.java 
b/beeline/src/java/org/apache/hive/beeline/schematool/HiveSchemaTool.java
index 223bda782bd..a20e1fcf3f5 100644
--- a/beeline/src/java/org/apache/hive/beeline/schematool/HiveSchemaTool.java
+++ b/beeline/src/java/org/apache/hive/beeline/schematool/HiveSchemaTool.java
@@ -22,7 +22,6 @@ import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.OptionGroup;
 import org.apache.commons.io.output.NullOutputStream;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.metastore.HiveMetaException;
 import org.apache.hadoop.hive.metastore.conf.MetastoreConf;
 import org.apache.hadoop.hive.metastore.tools.schematool.HiveSchemaHelper;
@@ -135,7 +134,7 @@ public class HiveSchemaTool extends MetastoreSchemaTool {
         .create("metaDbType");
     additionalGroup.addOption(metaDbTypeOpt);
     
System.setProperty(MetastoreConf.ConfVars.SCHEMA_VERIFICATION.getVarname(), 
"true");
-    System.exit(tool.run(System.getenv("HIVE_HOME"), args, additionalGroup,
-        new HiveConf(HiveSchemaTool.class)));
+    System.exit(tool.run(findHomeDir(), args, additionalGroup,
+        MetastoreConf.newMetastoreConf()));
   }
 }
diff --git 
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/schematool/MetastoreSchemaTool.java
 
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/schematool/MetastoreSchemaTool.java
index ce2138b1349..c373b32138d 100644
--- 
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/schematool/MetastoreSchemaTool.java
+++ 
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/schematool/MetastoreSchemaTool.java
@@ -75,7 +75,7 @@ public class MetastoreSchemaTool {
 
   private static String homeDir;
 
-  private static String findHomeDir() {
+  protected static String findHomeDir() {
     // If METASTORE_HOME is set, use it, else use HIVE_HOME for backwards 
compatibility.
     homeDir = homeDir == null ? System.getenv("METASTORE_HOME") : homeDir;
     return homeDir == null ? System.getenv("HIVE_HOME") : homeDir;
@@ -122,7 +122,7 @@ public class MetastoreSchemaTool {
     if (cmdLine.hasOption("userName")) {
       setUserName(cmdLine.getOptionValue("userName"));
     } else {
-      
setUserName(getConf().get(MetastoreConf.ConfVars.CONNECTION_USER_NAME.getVarname()));
+      setUserName(MetastoreConf.getAsString(getConf(), 
MetastoreConf.ConfVars.CONNECTION_USER_NAME));
     }
     if (cmdLine.hasOption("passWord")) {
       setPassWord(cmdLine.getOptionValue("passWord"));