HIVE-27925: HiveConf: unify ConfVars enum and use underscore for bett…

…er readability (apache#4919) (Kokila N reviewed by Laszlo Bodor)
dengzhhu653 · Mar 7, 2024 · 892aa01 · 892aa01
1 parent 7cf28ce
commit 892aa01
Show file tree

Hide file tree

Showing 345 changed files with 1,539 additions and 1,650 deletions.
diff --git a/beeline/src/java/org/apache/hive/beeline/BeeLine.java b/beeline/src/java/org/apache/hive/beeline/BeeLine.java
@@ -1831,7 +1831,7 @@ String getPromptForCli() {
     String prompt;
     // read prompt configuration and substitute variables.
     HiveConf conf = getCommands().getHiveConf(true);
-    prompt = conf.getVar(HiveConf.ConfVars.CLIPROMPT);
+    prompt = conf.getVar(HiveConf.ConfVars.CLI_PROMPT);
     prompt = getCommands().substituteVariables(conf, prompt);
     return prompt + getFormattedDb() + "> ";
   }

diff --git a/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java b/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java
@@ -291,7 +291,7 @@ public void updateBeeLineOptsFromConf() {
       if (conf == null) {
         conf = beeLine.getCommands().getHiveConf(false);
       }
-      setForce(HiveConf.getBoolVar(conf, HiveConf.ConfVars.CLIIGNOREERRORS));
+      setForce(HiveConf.getBoolVar(conf, HiveConf.ConfVars.CLI_IGNORE_ERRORS));
     }
   }
 
@@ -529,7 +529,7 @@ public boolean getShowDbInPrompt() {
       return showDbInPrompt;
     } else {
       HiveConf conf = beeLine.getCommands().getHiveConf(true);
-      return HiveConf.getBoolVar(conf, HiveConf.ConfVars.CLIPRINTCURRENTDB);
+      return HiveConf.getBoolVar(conf, HiveConf.ConfVars.CLI_PRINT_CURRENT_DB);
     }
   }
 

diff --git a/beeline/src/test/org/apache/hive/beeline/cli/TestHiveCli.java b/beeline/src/test/org/apache/hive/beeline/cli/TestHiveCli.java
@@ -280,7 +280,7 @@ private void verifyCMD(String CMD, String keywords, OutputStream os, String[] op
   public static void init(){
     // something changed scratch dir permissions, so test can't execute
     HiveConf hiveConf = new HiveConf();
-    String scratchDir = hiveConf.get(HiveConf.ConfVars.SCRATCHDIR.varname);
+    String scratchDir = hiveConf.get(HiveConf.ConfVars.SCRATCH_DIR.varname);
     File file = new File(scratchDir);
     if (file.exists()) {
       file.setWritable(true, false);

diff --git a/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java b/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java
@@ -425,7 +425,7 @@ public void handle(Signal signal) {
           ret = processCmd(command.toString());
           lastRet = ret;
         } catch (CommandProcessorException e) {
-          boolean ignoreErrors = HiveConf.getBoolVar(conf, HiveConf.ConfVars.CLIIGNOREERRORS);
+          boolean ignoreErrors = HiveConf.getBoolVar(conf, HiveConf.ConfVars.CLI_IGNORE_ERRORS);
           if (!ignoreErrors) {
             throw e;
           }
@@ -773,7 +773,7 @@ public int run(String[] args) throws Exception {
     }
 
     // read prompt configuration and substitute variables.
-    prompt = conf.getVar(HiveConf.ConfVars.CLIPROMPT);
+    prompt = conf.getVar(HiveConf.ConfVars.CLI_PROMPT);
     prompt = new VariableSubstitution(new HiveVariableSource() {
       @Override
       public Map<String, String> getHiveVariable() {
@@ -936,7 +936,7 @@ protected void setupConsoleReader() throws IOException {
    * @return String to show user for current db value
    */
   private static String getFormattedDb(HiveConf conf, CliSessionState ss) {
-    if (!HiveConf.getBoolVar(conf, HiveConf.ConfVars.CLIPRINTCURRENTDB)) {
+    if (!HiveConf.getBoolVar(conf, HiveConf.ConfVars.CLI_PRINT_CURRENT_DB)) {
       return "";
     }
     //BUG: This will not work in remote mode - HIVE-5153

diff --git a/common/src/java/org/apache/hadoop/hive/common/LogUtils.java b/common/src/java/org/apache/hadoop/hive/common/LogUtils.java
@@ -117,11 +117,11 @@ public static String initHiveLog4jCommon(HiveConf conf, ConfVars confVarName)
         // property specified file found in local file system
         // use the specified file
         if (confVarName == HiveConf.ConfVars.HIVE_EXEC_LOG4J_FILE) {
-          String queryId = HiveConf.getVar(conf, HiveConf.ConfVars.HIVEQUERYID);
+          String queryId = HiveConf.getVar(conf, HiveConf.ConfVars.HIVE_QUERY_ID);
           if(queryId == null || (queryId = queryId.trim()).isEmpty()) {
             queryId = "unknown-" + System.currentTimeMillis();
           }
-          System.setProperty(HiveConf.ConfVars.HIVEQUERYID.toString(), queryId);
+          System.setProperty(HiveConf.ConfVars.HIVE_QUERY_ID.toString(), queryId);
         }
         final boolean async = checkAndSetAsyncLogging(conf);
         // required for MDC based routing appender so that child threads can inherit the MDC context
@@ -157,8 +157,8 @@ private static String initHiveLog4jDefault(
         if (hive_l4j == null) {
           hive_l4j = LogUtils.class.getClassLoader().getResource(HIVE_L4J);
         }
-        System.setProperty(HiveConf.ConfVars.HIVEQUERYID.toString(),
-          HiveConf.getVar(conf, HiveConf.ConfVars.HIVEQUERYID));
+        System.setProperty(HiveConf.ConfVars.HIVE_QUERY_ID.toString(),
+          HiveConf.getVar(conf, HiveConf.ConfVars.HIVE_QUERY_ID));
         break;
       case HIVE_LOG4J_FILE:
         hive_l4j = LogUtils.class.getClassLoader().getResource(HIVE_L4J);
@@ -216,8 +216,8 @@ public static String maskIfPassword(String key, String value) {
    */
   public static void registerLoggingContext(Configuration conf) {
     if (HiveConf.getBoolVar(conf, HiveConf.ConfVars.HIVE_SERVER2_LOGGING_OPERATION_ENABLED)) {
-      MDC.put(SESSIONID_LOG_KEY, HiveConf.getVar(conf, HiveConf.ConfVars.HIVESESSIONID));
-      MDC.put(QUERYID_LOG_KEY, HiveConf.getVar(conf, HiveConf.ConfVars.HIVEQUERYID));
+      MDC.put(SESSIONID_LOG_KEY, HiveConf.getVar(conf, HiveConf.ConfVars.HIVE_SESSION_ID));
+      MDC.put(QUERYID_LOG_KEY, HiveConf.getVar(conf, HiveConf.ConfVars.HIVE_QUERY_ID));
       MDC.put(OPERATIONLOG_LEVEL_KEY, HiveConf.getVar(conf, HiveConf.ConfVars.HIVE_SERVER2_LOGGING_OPERATION_LEVEL));
       MDC.put(OPERATIONLOG_LOCATION_KEY, HiveConf.getVar(conf, HiveConf.ConfVars.HIVE_SERVER2_LOGGING_OPERATION_LOG_LOCATION));
       l4j.info("Thread context registration is done.");

diff --git a/common/src/java/org/apache/hadoop/hive/common/ServerUtils.java b/common/src/java/org/apache/hadoop/hive/common/ServerUtils.java
@@ -38,7 +38,7 @@ public class ServerUtils {
 
   public static void cleanUpScratchDir(HiveConf hiveConf) {
     if (hiveConf.getBoolVar(HiveConf.ConfVars.HIVE_START_CLEANUP_SCRATCHDIR)) {
-      String hiveScratchDir = hiveConf.get(HiveConf.ConfVars.SCRATCHDIR.varname);
+      String hiveScratchDir = hiveConf.get(HiveConf.ConfVars.SCRATCH_DIR.varname);
       try {
         Path jobScratchDir = new Path(hiveScratchDir);
         LOG.info("Cleaning scratchDir : " + hiveScratchDir);