hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hashut...@apache.org
Subject [1/3] hive git commit: HIVE-17740 : HiveConf - Use SLF4J Parameterization (Beluga Behr via Ashutosh Chauhan)
Date Mon, 09 Oct 2017 19:22:18 GMT
Repository: hive
Updated Branches:
  refs/heads/master 139d8d0b1 -> 2fdd5aff4


HIVE-17740 : HiveConf - Use SLF4J Parameterization (Beluga Behr via Ashutosh Chauhan)

Signed-off-by: Ashutosh Chauhan <hashutosh@apache.org>


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

Branch: refs/heads/master
Commit: bc8149c293038b83275d3a78f5c860c4614c81b1
Parents: 139d8d0
Author: BELUGA BEHR <dam6923@gmail.com>
Authored: Mon Oct 9 12:19:34 2017 -0700
Committer: Ashutosh Chauhan <hashutosh@apache.org>
Committed: Mon Oct 9 12:19:34 2017 -0700

----------------------------------------------------------------------
 .../org/apache/hadoop/hive/conf/HiveConf.java   | 30 +++++++++-----------
 1 file changed, 13 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/bc8149c2/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
----------------------------------------------------------------------
diff --git a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
index d2afc2c..e3aa71f3 100644
--- a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
+++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
@@ -76,7 +76,7 @@ public class HiveConf extends Configuration {
   protected String hiveJar;
   protected Properties origProp;
   protected String auxJars;
-  private static final Logger l4j = LoggerFactory.getLogger(HiveConf.class);
+  private static final Logger LOG = LoggerFactory.getLogger(HiveConf.class);
   private static boolean loadMetastoreConfig = false;
   private static boolean loadHiveServer2Config = false;
   private static URL hiveDefaultURL = null;
@@ -170,9 +170,7 @@ public class HiveConf extends Configuration {
             URL sourceUrl = HiveConf.class.getProtectionDomain().getCodeSource().getLocation();
             jarUri = sourceUrl.getProtocol().equalsIgnoreCase("jar") ? new URI(sourceUrl.getPath())
: sourceUrl.toURI();
           } catch (Throwable e) {
-            if (l4j.isInfoEnabled()) {
-              l4j.info("Cannot get jar URI", e);
-            }
+            LOG.info("Cannot get jar URI", e);
             System.err.println("Cannot get jar URI: " + e.getMessage());
           }
           // From the jar file, the parent is /lib folder
@@ -183,8 +181,8 @@ public class HiveConf extends Configuration {
         }
       }
     }
-    if (doLog && l4j.isInfoEnabled()) {
-      l4j.info("Found configuration file " + result);
+    if (doLog)  {
+      LOG.info("Found configuration file {}", result);
     }
     return result;
   }
@@ -193,9 +191,7 @@ public class HiveConf extends Configuration {
     try {
       return (f.exists() && f.isFile()) ? f.toURI().toURL() : null;
     } catch (Throwable e) {
-      if (l4j.isInfoEnabled()) {
-        l4j.info("Error looking for config " + f, e);
-      }
+      LOG.info("Error looking for config {}", f, e);
       System.err.println("Error looking for config " + f + ": " + e.getMessage());
       return null;
     }
@@ -4143,13 +4139,13 @@ public class HiveConf extends Configuration {
 
   public String getLogIdVar(String defaultValue) {
     String retval = getVar(ConfVars.HIVE_LOG_TRACE_ID);
-    if (retval.equals("")) {
-      l4j.info("Using the default value passed in for log id: " + defaultValue);
+    if (StringUtils.EMPTY.equals(retval)) {
+      LOG.info("Using the default value passed in for log id: {}", defaultValue);
       retval = defaultValue;
     }
     if (retval.length() > LOG_PREFIX_LENGTH) {
-      l4j.warn("The original log id prefix is " + retval + " has been truncated to "
-          + retval.substring(0, LOG_PREFIX_LENGTH - 1));
+      LOG.warn("The original log id prefix is {} has been truncated to {}", retval,
+          retval.substring(0, LOG_PREFIX_LENGTH - 1));
       retval = retval.substring(0, LOG_PREFIX_LENGTH - 1);
     }
     return retval;
@@ -4283,7 +4279,7 @@ public class HiveConf extends Configuration {
 
     if ((this.get("hive.metastore.ds.retry.attempts") != null) ||
       this.get("hive.metastore.ds.retry.interval") != null) {
-        l4j.warn("DEPRECATED: hive.metastore.ds.retry.* no longer has any effect.  " +
+        LOG.warn("DEPRECATED: hive.metastore.ds.retry.* no longer has any effect.  " +
         "Use hive.hmshandler.retry.* instead");
     }
 
@@ -4316,9 +4312,9 @@ public class HiveConf extends Configuration {
           }
         }
         if (var == null) {
-          l4j.warn("HiveConf of name " + key + " does not exist");
+          LOG.warn("HiveConf of name {} does not exist", key);
         } else if (!var.isType(entry.getValue())) {
-          l4j.warn("HiveConf " + var.varname + " expects " + var.typeString() + " type value");
+          LOG.warn("HiveConf {} expects {} type value", var.varname, var.typeString());
         }
       }
       for (String key : trimmed) {
@@ -4826,7 +4822,7 @@ public class HiveConf extends Configuration {
   }
 
   public static String getNonMrEngines() {
-    String result = "";
+    String result = StringUtils.EMPTY;
     for (String s : ConfVars.HIVE_EXECUTION_ENGINE.getValidStringValues()) {
       if ("mr".equals(s)) {
         continue;


Mime
View raw message