Return-Path: X-Original-To: apmail-hive-commits-archive@www.apache.org Delivered-To: apmail-hive-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 315E918963 for ; Wed, 28 Oct 2015 15:45:59 +0000 (UTC) Received: (qmail 6873 invoked by uid 500); 28 Oct 2015 15:45:50 -0000 Delivered-To: apmail-hive-commits-archive@hive.apache.org Received: (qmail 6757 invoked by uid 500); 28 Oct 2015 15:45:50 -0000 Mailing-List: contact commits-help@hive.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hive-dev@hive.apache.org Delivered-To: mailing list commits@hive.apache.org Received: (qmail 5723 invoked by uid 99); 28 Oct 2015 15:45:49 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Oct 2015 15:45:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BBD90E152A; Wed, 28 Oct 2015 15:45:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hashutosh@apache.org To: commits@hive.apache.org Date: Wed, 28 Oct 2015 15:46:01 -0000 Message-Id: In-Reply-To: <960c6ec41ec1424db14aae09edfcbd1a@git.apache.org> References: <960c6ec41ec1424db14aae09edfcbd1a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [13/14] hive git commit: HIVE-12237 : Use slf4j as logging facade http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/common/src/java/org/apache/hadoop/hive/common/JvmPauseMonitor.java ---------------------------------------------------------------------- diff --git a/common/src/java/org/apache/hadoop/hive/common/JvmPauseMonitor.java b/common/src/java/org/apache/hadoop/hive/common/JvmPauseMonitor.java index 6ffaf94..5d475f4 100644 --- a/common/src/java/org/apache/hadoop/hive/common/JvmPauseMonitor.java +++ b/common/src/java/org/apache/hadoop/hive/common/JvmPauseMonitor.java @@ -23,13 +23,14 @@ import com.google.common.base.Stopwatch; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.common.metrics.common.Metrics; import org.apache.hadoop.hive.common.metrics.common.MetricsConstant; import org.apache.hadoop.hive.common.metrics.common.MetricsFactory; import org.apache.hadoop.util.Daemon; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.lang.management.GarbageCollectorMXBean; import java.lang.management.ManagementFactory; @@ -41,7 +42,7 @@ import java.util.Set; * Based on the JvmPauseMonitor from Hadoop. */ public class JvmPauseMonitor { - private static final Log LOG = LogFactory.getLog( + private static final Logger LOG = LoggerFactory.getLogger( JvmPauseMonitor.class); /** The target sleep time */ @@ -164,8 +165,8 @@ public class JvmPauseMonitor { return "count=" + gcCount + " time=" + gcTimeMillis + "ms"; } - private long gcCount; - private long gcTimeMillis; + private final long gcCount; + private final long gcTimeMillis; } private class Monitor implements Runnable { http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/common/src/java/org/apache/hadoop/hive/common/LogUtils.java ---------------------------------------------------------------------- diff --git a/common/src/java/org/apache/hadoop/hive/common/LogUtils.java b/common/src/java/org/apache/hadoop/hive/common/LogUtils.java index 3ca5c0f..3be8733 100644 --- a/common/src/java/org/apache/hadoop/hive/common/LogUtils.java +++ b/common/src/java/org/apache/hadoop/hive/common/LogUtils.java @@ -21,11 +21,11 @@ package org.apache.hadoop.hive.common; import java.io.File; import java.net.URL; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.conf.HiveConf.ConfVars; import org.apache.logging.log4j.core.config.Configurator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Utilities common to logging operations. @@ -34,7 +34,7 @@ public class LogUtils { private static final String HIVE_L4J = "hive-log4j2.xml"; private static final String HIVE_EXEC_L4J = "hive-exec-log4j2.xml"; - private static final Log l4j = LogFactory.getLog(LogUtils.class); + private static final Logger l4j = LoggerFactory.getLogger(LogUtils.class); @SuppressWarnings("serial") public static class LogInitializationException extends Exception { http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/common/src/java/org/apache/hadoop/hive/common/RunnableWithNdc.java ---------------------------------------------------------------------- diff --git a/common/src/java/org/apache/hadoop/hive/common/RunnableWithNdc.java b/common/src/java/org/apache/hadoop/hive/common/RunnableWithNdc.java deleted file mode 100644 index 35a45d1..0000000 --- a/common/src/java/org/apache/hadoop/hive/common/RunnableWithNdc.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.hive.common; - -import java.util.Stack; - -import org.apache.log4j.NDC; - -//TODO: cloned from TEZ-2003; replace when that's in a release. -public abstract class RunnableWithNdc implements Runnable { - private final Stack ndcStack; - - public RunnableWithNdc() { - ndcStack = NDC.cloneStack(); - } - - @Override - public final void run() { - NDC.inherit(ndcStack); - try { - runInternal(); - } finally { - NDC.clear(); - } - } - - protected abstract void runInternal(); -} http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/common/src/java/org/apache/hadoop/hive/common/ServerUtils.java ---------------------------------------------------------------------- diff --git a/common/src/java/org/apache/hadoop/hive/common/ServerUtils.java b/common/src/java/org/apache/hadoop/hive/common/ServerUtils.java index a284f18..83517ce 100644 --- a/common/src/java/org/apache/hadoop/hive/common/ServerUtils.java +++ b/common/src/java/org/apache/hadoop/hive/common/ServerUtils.java @@ -18,8 +18,8 @@ package org.apache.hadoop.hive.common; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.conf.HiveConf; @@ -29,7 +29,7 @@ import org.apache.hadoop.hive.conf.HiveConf; */ public class ServerUtils { - public static final Log LOG = LogFactory.getLog(ServerUtils.class); + public static final Logger LOG = LoggerFactory.getLogger(ServerUtils.class); public static void cleanUpScratchDir(HiveConf hiveConf) { if (hiveConf.getBoolVar(HiveConf.ConfVars.HIVE_START_CLEANUP_SCRATCHDIR)) { http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/common/src/java/org/apache/hadoop/hive/common/jsonexplain/tez/TezJsonParser.java ---------------------------------------------------------------------- diff --git a/common/src/java/org/apache/hadoop/hive/common/jsonexplain/tez/TezJsonParser.java b/common/src/java/org/apache/hadoop/hive/common/jsonexplain/tez/TezJsonParser.java index 20ce27b..b193fef 100644 --- a/common/src/java/org/apache/hadoop/hive/common/jsonexplain/tez/TezJsonParser.java +++ b/common/src/java/org/apache/hadoop/hive/common/jsonexplain/tez/TezJsonParser.java @@ -27,14 +27,14 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hive.common.jsonexplain.JsonParser; import org.json.JSONObject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public final class TezJsonParser implements JsonParser { public final Map stages = new LinkedHashMap<>(); - protected final Log LOG; + protected final Logger LOG; // the object that has been printed. public final Set printSet = new LinkedHashSet<>(); // the vertex that should be inlined. startTimes = new HashMap(); protected final Map endTimes = new HashMap(); - static final private Log LOG = LogFactory.getLog(PerfLogger.class.getName()); + static final private Logger LOG = LoggerFactory.getLogger(PerfLogger.class.getName()); protected static final ThreadLocal perfLogger = new ThreadLocal(); @@ -154,7 +154,7 @@ public class PerfLogger { sb.append(" ").append(additionalInfo); } sb.append(">"); - LOG.info(sb); + LOG.info(sb.toString()); return duration; } http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/common/src/java/org/apache/hive/common/HiveCompat.java ---------------------------------------------------------------------- diff --git a/common/src/java/org/apache/hive/common/HiveCompat.java b/common/src/java/org/apache/hive/common/HiveCompat.java index a48625b..1abcb6d 100644 --- a/common/src/java/org/apache/hive/common/HiveCompat.java +++ b/common/src/java/org/apache/hive/common/HiveCompat.java @@ -18,13 +18,13 @@ package org.apache.hive.common; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hive.conf.HiveConf; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class HiveCompat { - private static Log LOG = LogFactory.getLog(HiveCompat.class); + private static Logger LOG = LoggerFactory.getLogger(HiveCompat.class); /** * Enum to represent a level of backward compatibility support. http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/common/src/java/org/apache/hive/common/util/FixedSizedObjectPool.java ---------------------------------------------------------------------- diff --git a/common/src/java/org/apache/hive/common/util/FixedSizedObjectPool.java b/common/src/java/org/apache/hive/common/util/FixedSizedObjectPool.java index 45e8a71..600c443 100644 --- a/common/src/java/org/apache/hive/common/util/FixedSizedObjectPool.java +++ b/common/src/java/org/apache/hive/common/util/FixedSizedObjectPool.java @@ -19,16 +19,16 @@ package org.apache.hive.common.util; import java.util.concurrent.atomic.AtomicLong; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hive.common.Pool; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.annotations.VisibleForTesting; /** Simple object pool of limited size. Implemented as a lock-free ring buffer; * may fail to produce items if there are too many concurrent users. */ public class FixedSizedObjectPool implements Pool { - public static final Log LOG = LogFactory.getLog(FixedSizedObjectPool.class); + public static final Logger LOG = LoggerFactory.getLogger(FixedSizedObjectPool.class); /** * Ring buffer has two "markers" - where objects are present ('objects' list), and where they are http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/common/src/java/org/apache/hive/common/util/HiveStringUtils.java ---------------------------------------------------------------------- diff --git a/common/src/java/org/apache/hive/common/util/HiveStringUtils.java b/common/src/java/org/apache/hive/common/util/HiveStringUtils.java index 4bac077..6d28396 100644 --- a/common/src/java/org/apache/hive/common/util/HiveStringUtils.java +++ b/common/src/java/org/apache/hive/common/util/HiveStringUtils.java @@ -685,7 +685,7 @@ public class HiveStringUtils { * @param LOG the target log object */ public static void startupShutdownMessage(Class clazz, String[] args, - final org.apache.commons.logging.Log LOG) { + final org.slf4j.Logger LOG) { final String hostname = getHostname(); final String classname = clazz.getSimpleName(); LOG.info( http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/common/src/java/org/apache/hive/common/util/HiveTestUtils.java ---------------------------------------------------------------------- diff --git a/common/src/java/org/apache/hive/common/util/HiveTestUtils.java b/common/src/java/org/apache/hive/common/util/HiveTestUtils.java index 06caa53..88b9f81 100644 --- a/common/src/java/org/apache/hive/common/util/HiveTestUtils.java +++ b/common/src/java/org/apache/hive/common/util/HiveTestUtils.java @@ -25,15 +25,16 @@ import java.io.InputStreamReader; import java.net.URL; import com.google.common.io.Files; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; + import org.apache.hadoop.hive.common.classification.InterfaceAudience; import org.apache.hadoop.hive.common.classification.InterfaceStability; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @InterfaceAudience.Private @InterfaceStability.Unstable public class HiveTestUtils { - public static final Log LOG = LogFactory.getLog(HiveTestUtils.class); + public static final Logger LOG = LoggerFactory.getLogger(HiveTestUtils.class); public final static String JAVA_FILE_EXT = ".java"; public final static String CLAZZ_FILE_EXT = ".class"; @@ -51,6 +52,7 @@ public class HiveTestUtils { private static void executeCmd(String[] cmdArr, File dir) throws IOException, InterruptedException { final Process p1 = Runtime.getRuntime().exec(cmdArr, null, dir); new Thread(new Runnable() { + @Override public void run() { BufferedReader input = new BufferedReader(new InputStreamReader(p1.getErrorStream())); String line; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/common/src/java/org/apache/hive/common/util/HiveVersionInfo.java ---------------------------------------------------------------------- diff --git a/common/src/java/org/apache/hive/common/util/HiveVersionInfo.java b/common/src/java/org/apache/hive/common/util/HiveVersionInfo.java index de42e6c..3627150 100644 --- a/common/src/java/org/apache/hive/common/util/HiveVersionInfo.java +++ b/common/src/java/org/apache/hive/common/util/HiveVersionInfo.java @@ -18,8 +18,8 @@ package org.apache.hive.common.util; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.common.classification.InterfaceAudience; import org.apache.hadoop.hive.common.classification.InterfaceStability; import org.apache.hive.common.HiveVersionAnnotation; @@ -31,7 +31,7 @@ import org.apache.hive.common.HiveVersionAnnotation; @InterfaceAudience.Private @InterfaceStability.Unstable public class HiveVersionInfo { - private static final Log LOG = LogFactory.getLog(HiveVersionInfo.class); + private static final Logger LOG = LoggerFactory.getLogger(HiveVersionInfo.class); private static Package myPackage; private static HiveVersionAnnotation version; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/common/src/java/org/apache/hive/common/util/ShutdownHookManager.java ---------------------------------------------------------------------- diff --git a/common/src/java/org/apache/hive/common/util/ShutdownHookManager.java b/common/src/java/org/apache/hive/common/util/ShutdownHookManager.java index 0392eb5..b5f7e69 100644 --- a/common/src/java/org/apache/hive/common/util/ShutdownHookManager.java +++ b/common/src/java/org/apache/hive/common/util/ShutdownHookManager.java @@ -29,8 +29,8 @@ import java.util.List; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * The ShutdownHookManager enables running shutdownHook @@ -49,7 +49,7 @@ public class ShutdownHookManager { private static final DeleteOnExitHook DELETE_ON_EXIT_HOOK = new DeleteOnExitHook(); - private static final Log LOG = LogFactory.getLog(ShutdownHookManager.class); + private static final Logger LOG = LoggerFactory.getLogger(ShutdownHookManager.class); static { MGR.addShutdownHookInternal(DELETE_ON_EXIT_HOOK, -1); http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/common/src/test/org/apache/hive/common/util/TestFixedSizedObjectPool.java ---------------------------------------------------------------------- diff --git a/common/src/test/org/apache/hive/common/util/TestFixedSizedObjectPool.java b/common/src/test/org/apache/hive/common/util/TestFixedSizedObjectPool.java index 17b640f..dd56f01 100644 --- a/common/src/test/org/apache/hive/common/util/TestFixedSizedObjectPool.java +++ b/common/src/test/org/apache/hive/common/util/TestFixedSizedObjectPool.java @@ -27,11 +27,11 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.FutureTask; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hive.common.util.FixedSizedObjectPool; import org.apache.hadoop.hive.common.Pool; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class TestFixedSizedObjectPool { @@ -50,6 +50,7 @@ public class TestFixedSizedObjectPool { this.count = count; } + @Override public void run() { syncThreadStart(cdlIn, cdlOut); for (int i = 0; i < count; ++i) { @@ -66,6 +67,7 @@ public class TestFixedSizedObjectPool { super(pool, cdlIn, cdlOut, count); } + @Override protected void doOneOp() { Object o = new Object(); if (pool.tryOffer(o)) { @@ -80,6 +82,7 @@ public class TestFixedSizedObjectPool { super(pool, cdlIn, cdlOut, count); } + @Override protected void doOneOp() { Object o = pool.take(); if (o != OneObjHelper.THE_OBJECT) { @@ -132,7 +135,7 @@ public class TestFixedSizedObjectPool { assertNotSame(newObj, newObj2); } - public static final Log LOG = LogFactory.getLog(TestFixedSizedObjectPool.class); + public static final Logger LOG = LoggerFactory.getLogger(TestFixedSizedObjectPool.class); @Test public void testMTT1() { http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/contrib/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/pom.xml b/contrib/pom.xml index 51602d4..6a81de5 100644 --- a/contrib/pom.xml +++ b/contrib/pom.xml @@ -56,11 +56,6 @@ ${commons-codec.version} - commons-logging - commons-logging - ${commons-logging.version} - - org.apache.hadoop hadoop-common ${hadoop.version} http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/contrib/src/java/org/apache/hadoop/hive/contrib/genericudf/example/GenericUDFDBOutput.java ---------------------------------------------------------------------- diff --git a/contrib/src/java/org/apache/hadoop/hive/contrib/genericudf/example/GenericUDFDBOutput.java b/contrib/src/java/org/apache/hadoop/hive/contrib/genericudf/example/GenericUDFDBOutput.java index 76b1fa5..b5f6857 100644 --- a/contrib/src/java/org/apache/hadoop/hive/contrib/genericudf/example/GenericUDFDBOutput.java +++ b/contrib/src/java/org/apache/hadoop/hive/contrib/genericudf/example/GenericUDFDBOutput.java @@ -22,8 +22,8 @@ import java.sql.DriverManager; import java.sql.PreparedStatement; import java.sql.SQLException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.ql.exec.Description; import org.apache.hadoop.hive.ql.exec.UDFArgumentTypeException; import org.apache.hadoop.hive.ql.metadata.HiveException; @@ -61,8 +61,8 @@ import org.apache.hadoop.io.IntWritable; + "passed to the PreparedStatement object\n") @UDFType(deterministic = false) public class GenericUDFDBOutput extends GenericUDF { - private static final Log LOG = LogFactory - .getLog(GenericUDFDBOutput.class.getName()); + private static final Logger LOG = LoggerFactory + .getLogger(GenericUDFDBOutput.class.getName()); private transient ObjectInspector[] argumentOI; private transient Connection connection = null; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/MultiDelimitSerDe.java ---------------------------------------------------------------------- diff --git a/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/MultiDelimitSerDe.java b/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/MultiDelimitSerDe.java index 3e1be7d..9a162d5 100644 --- a/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/MultiDelimitSerDe.java +++ b/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/MultiDelimitSerDe.java @@ -25,14 +25,11 @@ import java.util.Map; import java.util.Properties; import java.util.regex.Pattern; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.serde.serdeConstants; import org.apache.hadoop.hive.serde2.*; import org.apache.hadoop.hive.serde2.lazy.ByteArrayRef; import org.apache.hadoop.hive.serde2.lazy.LazyFactory; -import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe; import org.apache.hadoop.hive.serde2.lazy.LazyStruct; import org.apache.hadoop.hive.serde2.lazy.LazyUtils; import org.apache.hadoop.hive.serde2.lazy.LazySerDeParameters; @@ -67,7 +64,7 @@ import org.apache.hadoop.io.Writable; LazySerDeParameters.SERIALIZATION_EXTEND_NESTING_LEVELS, LazySerDeParameters.SERIALIZATION_EXTEND_ADDITIONAL_NESTING_LEVELS}) public class MultiDelimitSerDe extends AbstractSerDe { - private static final Log LOG = LogFactory.getLog(MultiDelimitSerDe.class.getName()); + private static final byte[] DEFAULT_SEPARATORS = {(byte) 1, (byte) 2, (byte) 3}; // Due to HIVE-6404, define our own constant private static final String COLLECTION_DELIM = "collection.delim"; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/RegexSerDe.java ---------------------------------------------------------------------- diff --git a/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/RegexSerDe.java b/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/RegexSerDe.java index aadfb51..8defe34 100644 --- a/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/RegexSerDe.java +++ b/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/RegexSerDe.java @@ -25,8 +25,8 @@ import java.util.Properties; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.serde.serdeConstants; import org.apache.hadoop.hive.serde2.AbstractSerDe; @@ -77,7 +77,7 @@ import org.apache.hadoop.io.Writable; RegexSerDe.INPUT_REGEX_CASE_SENSITIVE }) public class RegexSerDe extends AbstractSerDe { - public static final Log LOG = LogFactory.getLog(RegexSerDe.class.getName()); + public static final Logger LOG = LoggerFactory.getLogger(RegexSerDe.class.getName()); public static final String INPUT_REGEX = "input.regex"; public static final String OUTPUT_FORMAT_STRING = "output.format.string"; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/TypedBytesSerDe.java ---------------------------------------------------------------------- diff --git a/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/TypedBytesSerDe.java b/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/TypedBytesSerDe.java index ea87bf6..5a018ae 100644 --- a/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/TypedBytesSerDe.java +++ b/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/TypedBytesSerDe.java @@ -23,8 +23,8 @@ import java.util.Arrays; import java.util.List; import java.util.Properties; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.contrib.util.typedbytes.Type; import org.apache.hadoop.hive.contrib.util.typedbytes.TypedBytesWritableInput; @@ -77,7 +77,7 @@ import org.apache.hadoop.io.Writable; @SerDeSpec(schemaProps = {serdeConstants.LIST_COLUMNS, serdeConstants.LIST_COLUMN_TYPES}) public class TypedBytesSerDe extends AbstractSerDe { - public static final Log LOG = LogFactory.getLog(TypedBytesSerDe.class + public static final Logger LOG = LoggerFactory.getLogger(TypedBytesSerDe.class .getName()); int numColumns; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/s3/S3LogDeserializer.java ---------------------------------------------------------------------- diff --git a/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/s3/S3LogDeserializer.java b/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/s3/S3LogDeserializer.java index ce445b0..217deb2 100644 --- a/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/s3/S3LogDeserializer.java +++ b/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/s3/S3LogDeserializer.java @@ -24,8 +24,8 @@ import java.util.Properties; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.serde2.AbstractDeserializer; import org.apache.hadoop.hive.serde2.SerDeException; @@ -45,7 +45,7 @@ import org.apache.hadoop.io.Writable; */ public class S3LogDeserializer extends AbstractDeserializer { - public static final Log LOG = LogFactory.getLog(S3LogDeserializer.class + public static final Logger LOG = LoggerFactory.getLogger(S3LogDeserializer.class .getName()); static { http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hbase-handler/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-handler/pom.xml b/hbase-handler/pom.xml index a6801eb..0f10580 100644 --- a/hbase-handler/pom.xml +++ b/hbase-handler/pom.xml @@ -46,11 +46,6 @@ ${commons-lang.version} - commons-logging - commons-logging - ${commons-logging.version} - - org.apache.hadoop hadoop-common ${hadoop.version} http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hbase-handler/src/java/org/apache/hadoop/hive/hbase/AbstractHBaseKeyPredicateDecomposer.java ---------------------------------------------------------------------- diff --git a/hbase-handler/src/java/org/apache/hadoop/hive/hbase/AbstractHBaseKeyPredicateDecomposer.java b/hbase-handler/src/java/org/apache/hadoop/hive/hbase/AbstractHBaseKeyPredicateDecomposer.java index 0cc21fa..62a991d 100644 --- a/hbase-handler/src/java/org/apache/hadoop/hive/hbase/AbstractHBaseKeyPredicateDecomposer.java +++ b/hbase-handler/src/java/org/apache/hadoop/hive/hbase/AbstractHBaseKeyPredicateDecomposer.java @@ -20,8 +20,8 @@ package org.apache.hadoop.hive.hbase; import java.util.ArrayList; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.ql.index.IndexPredicateAnalyzer; import org.apache.hadoop.hive.ql.index.IndexSearchCondition; import org.apache.hadoop.hive.ql.metadata.HiveStoragePredicateHandler.DecomposedPredicate; @@ -35,7 +35,7 @@ import org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc; * */ public abstract class AbstractHBaseKeyPredicateDecomposer { - public static final Log LOG = LogFactory.getLog(AbstractHBaseKeyPredicateDecomposer.class); + public static final Logger LOG = LoggerFactory.getLogger(AbstractHBaseKeyPredicateDecomposer.class); public DecomposedPredicate decomposePredicate(String keyColName, ExprNodeDesc predicate) { IndexPredicateAnalyzer analyzer = IndexPredicateAnalyzer.createAnalyzer(true); @@ -77,4 +77,4 @@ public abstract class AbstractHBaseKeyPredicateDecomposer { protected IndexPredicateAnalyzer.FieldValidator getFieldValidator() { return null; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hbase-handler/src/java/org/apache/hadoop/hive/hbase/CompositeHBaseKeyFactory.java ---------------------------------------------------------------------- diff --git a/hbase-handler/src/java/org/apache/hadoop/hive/hbase/CompositeHBaseKeyFactory.java b/hbase-handler/src/java/org/apache/hadoop/hive/hbase/CompositeHBaseKeyFactory.java index 480b31f..0989451 100644 --- a/hbase-handler/src/java/org/apache/hadoop/hive/hbase/CompositeHBaseKeyFactory.java +++ b/hbase-handler/src/java/org/apache/hadoop/hive/hbase/CompositeHBaseKeyFactory.java @@ -22,8 +22,8 @@ import java.io.IOException; import java.lang.reflect.Constructor; import java.util.Properties; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil; import org.apache.hadoop.hive.ql.plan.TableDesc; @@ -34,7 +34,7 @@ import org.apache.hadoop.mapred.JobConf; public class CompositeHBaseKeyFactory extends DefaultHBaseKeyFactory { - public static final Log LOG = LogFactory.getLog(CompositeHBaseKeyFactory.class); + public static final Logger LOG = LoggerFactory.getLogger(CompositeHBaseKeyFactory.class); private final Class keyClass; private final Constructor constructor; @@ -62,4 +62,4 @@ public class CompositeHBaseKeyFactory extends Defau throw new SerDeException(e); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDe.java ---------------------------------------------------------------------- diff --git a/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDe.java b/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDe.java index 1adb913..41d6302 100644 --- a/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDe.java +++ b/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDe.java @@ -22,8 +22,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Properties; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hive.hbase.ColumnMappings.ColumnMapping; @@ -68,7 +68,7 @@ import org.apache.hadoop.mapred.JobConf; HBaseSerDe.HBASE_SCAN_BATCH, HBaseSerDe.HBASE_AUTOGENERATE_STRUCT}) public class HBaseSerDe extends AbstractSerDe { - public static final Log LOG = LogFactory.getLog(HBaseSerDe.class); + public static final Logger LOG = LoggerFactory.getLogger(HBaseSerDe.class); public static final String HBASE_COLUMNS_MAPPING = "hbase.columns.mapping"; public static final String HBASE_TABLE_NAME = "hbase.table.name"; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDeHelper.java ---------------------------------------------------------------------- diff --git a/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDeHelper.java b/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDeHelper.java index 20362e5..bb8a173 100644 --- a/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDeHelper.java +++ b/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDeHelper.java @@ -30,8 +30,8 @@ import java.util.Properties; import org.apache.avro.Schema; import org.apache.avro.reflect.ReflectData; import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FileSystem; @@ -57,7 +57,7 @@ public class HBaseSerDeHelper { /** * Logger * */ - public static final Log LOG = LogFactory.getLog(HBaseSerDeHelper.class); + public static final Logger LOG = LoggerFactory.getLogger(HBaseSerDeHelper.class); /** * Autogenerates the columns from the given serialization class @@ -573,4 +573,4 @@ public class HBaseSerDeHelper { HBaseCompositeKey compKey = keyFactory.createKey(null); return compKey.getParts(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java ---------------------------------------------------------------------- diff --git a/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java b/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java index cedb6e0..42ea24e 100644 --- a/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java +++ b/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java @@ -29,8 +29,8 @@ import java.util.Properties; import java.util.Set; import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseConfiguration; @@ -78,7 +78,7 @@ import com.yammer.metrics.core.MetricsRegistry; public class HBaseStorageHandler extends DefaultStorageHandler implements HiveMetaHook, HiveStoragePredicateHandler { - private static final Log LOG = LogFactory.getLog(HBaseStorageHandler.class); + private static final Logger LOG = LoggerFactory.getLogger(HBaseStorageHandler.class); /** HBase-internal config by which input format receives snapshot name. */ private static final String HBASE_SNAPSHOT_NAME_KEY = "hbase.TableSnapshotInputFormat.snapshot.name"; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseTableSnapshotInputFormatUtil.java ---------------------------------------------------------------------- diff --git a/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseTableSnapshotInputFormatUtil.java b/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseTableSnapshotInputFormatUtil.java index 3e710c4..2492942 100644 --- a/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseTableSnapshotInputFormatUtil.java +++ b/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseTableSnapshotInputFormatUtil.java @@ -18,8 +18,8 @@ package org.apache.hadoop.hive.hbase; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.mapreduce.TableSnapshotInputFormatImpl; @@ -37,7 +37,7 @@ import java.lang.reflect.InvocationTargetException; */ public class HBaseTableSnapshotInputFormatUtil { - private static final Log LOG = LogFactory.getLog(HBaseTableSnapshotInputFormatUtil.class); + private static final Logger LOG = LoggerFactory.getLogger(HBaseTableSnapshotInputFormatUtil.class); /** The class we look for to determine if hbase snapshots are supported. */ private static final String TABLESNAPSHOTINPUTFORMAT_CLASS http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHBaseTableInputFormat.java ---------------------------------------------------------------------- diff --git a/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHBaseTableInputFormat.java b/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHBaseTableInputFormat.java index 5f4a1e4..fff9871 100644 --- a/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHBaseTableInputFormat.java +++ b/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHBaseTableInputFormat.java @@ -24,8 +24,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HConstants; @@ -83,7 +83,7 @@ import org.apache.hadoop.security.UserGroupInformation; public class HiveHBaseTableInputFormat extends TableInputFormatBase implements InputFormat { - static final Log LOG = LogFactory.getLog(HiveHBaseTableInputFormat.class); + static final Logger LOG = LoggerFactory.getLogger(HiveHBaseTableInputFormat.class); private static final Object hbaseTableMonitor = new Object(); @Override http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHBaseTableOutputFormat.java ---------------------------------------------------------------------- diff --git a/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHBaseTableOutputFormat.java b/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHBaseTableOutputFormat.java index 0715a51..4b8f62c 100644 --- a/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHBaseTableOutputFormat.java +++ b/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHBaseTableOutputFormat.java @@ -20,8 +20,8 @@ package org.apache.hadoop.hive.hbase; import java.io.IOException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.client.Durability; @@ -53,7 +53,7 @@ public class HiveHBaseTableOutputFormat extends TableOutputFormat implements OutputFormat { - static final Log LOG = LogFactory.getLog(HiveHBaseTableOutputFormat.class); + static final Logger LOG = LoggerFactory.getLogger(HiveHBaseTableOutputFormat.class); public static final String HBASE_WAL_ENABLED = "hive.hbase.wal.enabled"; /** http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHFileOutputFormat.java ---------------------------------------------------------------------- diff --git a/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHFileOutputFormat.java b/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHFileOutputFormat.java index da376d8..0cf1acc 100644 --- a/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHFileOutputFormat.java +++ b/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHFileOutputFormat.java @@ -28,8 +28,8 @@ import java.util.SortedMap; import java.util.TreeMap; import org.apache.commons.lang.NotImplementedException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; @@ -64,7 +64,7 @@ public class HiveHFileOutputFormat extends public static final String HFILE_FAMILY_PATH = "hfile.family.path"; - static final Log LOG = LogFactory.getLog(HiveHFileOutputFormat.class.getName()); + static final Logger LOG = LoggerFactory.getLogger(HiveHFileOutputFormat.class.getName()); private org.apache.hadoop.mapreduce.RecordWriter http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hcatalog/core/src/main/java/org/apache/hive/hcatalog/cli/HCatCli.java ---------------------------------------------------------------------- diff --git a/hcatalog/core/src/main/java/org/apache/hive/hcatalog/cli/HCatCli.java b/hcatalog/core/src/main/java/org/apache/hive/hcatalog/cli/HCatCli.java index f8d69cc..187ca4e 100644 --- a/hcatalog/core/src/main/java/org/apache/hive/hcatalog/cli/HCatCli.java +++ b/hcatalog/core/src/main/java/org/apache/hive/hcatalog/cli/HCatCli.java @@ -38,8 +38,8 @@ import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; import org.apache.commons.cli.Parser; import org.apache.commons.lang.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.fs.permission.FsPermission; import org.apache.hadoop.hive.cli.CliSessionState; import org.apache.hadoop.hive.common.LogUtils; @@ -55,7 +55,7 @@ import org.apache.hive.hcatalog.common.HCatConstants; import org.apache.hive.hcatalog.common.HCatUtil; public class HCatCli { - private static Log LOG = null; + private static Logger LOG = null; @SuppressWarnings("static-access") @@ -66,7 +66,7 @@ public class HCatCli { } catch (LogInitializationException e) { } - LOG = LogFactory.getLog(HCatCli.class); + LOG = LoggerFactory.getLogger(HCatCli.class); CliSessionState ss = new CliSessionState(new HiveConf(SessionState.class)); ss.in = System.in; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/HCatBaseOutputFormat.java ---------------------------------------------------------------------- diff --git a/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/HCatBaseOutputFormat.java b/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/HCatBaseOutputFormat.java index 4f7a74a..3e2ed97 100644 --- a/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/HCatBaseOutputFormat.java +++ b/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/HCatBaseOutputFormat.java @@ -40,8 +40,6 @@ import org.apache.hive.hcatalog.data.schema.HCatSchema; public abstract class HCatBaseOutputFormat extends OutputFormat, HCatRecord> { -// static final private Log LOG = LogFactory.getLog(HCatBaseOutputFormat.class); - /** * Gets the table schema for the table specified in the HCatOutputFormat.setOutput call * on the specified job context. http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/SpecialCases.java ---------------------------------------------------------------------- diff --git a/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/SpecialCases.java b/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/SpecialCases.java index 7da2ab0..1bf6f07 100644 --- a/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/SpecialCases.java +++ b/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/SpecialCases.java @@ -18,8 +18,8 @@ */ package org.apache.hive.hcatalog.mapreduce; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.ql.io.RCFileOutputFormat; @@ -54,7 +54,7 @@ import java.util.Properties; */ public class SpecialCases { - static final private Log LOG = LogFactory.getLog(SpecialCases.class); + static final private Logger LOG = LoggerFactory.getLogger(SpecialCases.class); /** * Method to do any file-format specific special casing while http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/listener/DbNotificationListener.java ---------------------------------------------------------------------- diff --git a/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/listener/DbNotificationListener.java b/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/listener/DbNotificationListener.java index 932ce8d..8a49bf7 100644 --- a/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/listener/DbNotificationListener.java +++ b/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/listener/DbNotificationListener.java @@ -17,8 +17,8 @@ */ package org.apache.hive.hcatalog.listener; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.metastore.MetaStoreEventListener; @@ -58,7 +58,7 @@ import java.util.concurrent.TimeUnit; */ public class DbNotificationListener extends MetaStoreEventListener { - private static final Log LOG = LogFactory.getLog(DbNotificationListener.class.getName()); + private static final Logger LOG = LoggerFactory.getLogger(DbNotificationListener.class.getName()); private static CleanerThread cleaner = null; // This is the same object as super.conf, but it's convenient to keep a copy of it as a http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/json/JSONMessageFactory.java ---------------------------------------------------------------------- diff --git a/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/json/JSONMessageFactory.java b/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/json/JSONMessageFactory.java index 2db05c6..6b74b54 100644 --- a/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/json/JSONMessageFactory.java +++ b/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/json/JSONMessageFactory.java @@ -22,8 +22,8 @@ package org.apache.hive.hcatalog.messaging.json; import com.google.common.base.Function; import com.google.common.collect.Iterators; import com.google.common.collect.Lists; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.metastore.api.Database; import org.apache.hadoop.hive.metastore.api.Partition; import org.apache.hadoop.hive.metastore.api.Table; @@ -52,7 +52,7 @@ import java.util.Map; */ public class JSONMessageFactory extends MessageFactory { - private static final Log LOG = LogFactory.getLog(JSONMessageFactory.class.getName()); + private static final Logger LOG = LoggerFactory.getLogger(JSONMessageFactory.class.getName()); private static JSONMessageDeserializer deserializer = new JSONMessageDeserializer(); http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/AbstractRecordWriter.java ---------------------------------------------------------------------- diff --git a/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/AbstractRecordWriter.java b/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/AbstractRecordWriter.java index a2cd2f5..c20e04c 100644 --- a/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/AbstractRecordWriter.java +++ b/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/AbstractRecordWriter.java @@ -19,8 +19,8 @@ package org.apache.hive.hcatalog.streaming; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.common.JavaUtils; import org.apache.hadoop.hive.conf.HiveConf; @@ -49,7 +49,7 @@ import java.util.List; abstract class AbstractRecordWriter implements RecordWriter { - static final private Log LOG = LogFactory.getLog(AbstractRecordWriter.class.getName()); + static final private Logger LOG = LoggerFactory.getLogger(AbstractRecordWriter.class.getName()); final HiveConf conf; final HiveEndPoint endPoint; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/DelimitedInputWriter.java ---------------------------------------------------------------------- diff --git a/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/DelimitedInputWriter.java b/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/DelimitedInputWriter.java index fd36a38..b4d94e3 100644 --- a/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/DelimitedInputWriter.java +++ b/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/DelimitedInputWriter.java @@ -20,8 +20,8 @@ package org.apache.hive.hcatalog.streaming; import com.google.common.annotations.VisibleForTesting; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.metastore.MetaStoreUtils; import org.apache.hadoop.hive.metastore.api.FieldSchema; @@ -59,7 +59,7 @@ public class DelimitedInputWriter extends AbstractRecordWriter { private final ObjectInspector[] bucketObjInspectors; private final StructField[] bucketStructFields; - static final private Log LOG = LogFactory.getLog(DelimitedInputWriter.class.getName()); + static final private Logger LOG = LoggerFactory.getLogger(DelimitedInputWriter.class.getName()); /** Constructor. Uses default separator of the LazySimpleSerde * @param colNamesForFields Column name assignment for input fields. nulls or empty http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/HiveEndPoint.java ---------------------------------------------------------------------- diff --git a/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/HiveEndPoint.java b/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/HiveEndPoint.java index 5de3f1d..306c93d 100644 --- a/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/HiveEndPoint.java +++ b/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/HiveEndPoint.java @@ -18,8 +18,8 @@ package org.apache.hive.hcatalog.streaming; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.cli.CliSessionState; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.metastore.IMetaStoreClient; @@ -63,7 +63,7 @@ public class HiveEndPoint { public final ArrayList partitionVals; - static final private Log LOG = LogFactory.getLog(HiveEndPoint.class.getName()); + static final private Logger LOG = LoggerFactory.getLogger(HiveEndPoint.class.getName()); /** * http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/StreamingIntegrationTester.java ---------------------------------------------------------------------- diff --git a/hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/StreamingIntegrationTester.java b/hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/StreamingIntegrationTester.java index e8d0f05..0fcc103 100644 --- a/hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/StreamingIntegrationTester.java +++ b/hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/StreamingIntegrationTester.java @@ -24,8 +24,8 @@ import org.apache.commons.cli.OptionBuilder; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; import org.apache.commons.cli.Parser; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.common.LogUtils; import org.apache.hadoop.util.StringUtils; @@ -37,7 +37,7 @@ import java.util.Random; */ public class StreamingIntegrationTester { - static final private Log LOG = LogFactory.getLog(StreamingIntegrationTester.class.getName()); + static final private Logger LOG = LoggerFactory.getLogger(StreamingIntegrationTester.class.getName()); public static void main(String[] args) { http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hcatalog/webhcat/java-client/src/test/java/org/apache/hive/hcatalog/api/repl/CommandTestUtils.java ---------------------------------------------------------------------- diff --git a/hcatalog/webhcat/java-client/src/test/java/org/apache/hive/hcatalog/api/repl/CommandTestUtils.java b/hcatalog/webhcat/java-client/src/test/java/org/apache/hive/hcatalog/api/repl/CommandTestUtils.java index 468f84f..c0fa6df 100644 --- a/hcatalog/webhcat/java-client/src/test/java/org/apache/hive/hcatalog/api/repl/CommandTestUtils.java +++ b/hcatalog/webhcat/java-client/src/test/java/org/apache/hive/hcatalog/api/repl/CommandTestUtils.java @@ -19,8 +19,8 @@ package org.apache.hive.hcatalog.api.repl; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.IOException; import java.util.Arrays; @@ -35,7 +35,7 @@ import static org.junit.Assert.assertNull; */ public class CommandTestUtils { - private static Log LOG = LogFactory.getLog(CommandTestUtils.class.getName()); + private static Logger LOG = LoggerFactory.getLogger(CommandTestUtils.class.getName()); public static void compareCommands(Command expected, Command actual, boolean ignoreSortOrder) { // The reason we use compare-command, rather than simply getting the serialized output and comparing http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hcatalog/webhcat/java-client/src/test/java/org/apache/hive/hcatalog/api/repl/commands/TestCommands.java ---------------------------------------------------------------------- diff --git a/hcatalog/webhcat/java-client/src/test/java/org/apache/hive/hcatalog/api/repl/commands/TestCommands.java b/hcatalog/webhcat/java-client/src/test/java/org/apache/hive/hcatalog/api/repl/commands/TestCommands.java index 9f9e6bf..65f54e3 100644 --- a/hcatalog/webhcat/java-client/src/test/java/org/apache/hive/hcatalog/api/repl/commands/TestCommands.java +++ b/hcatalog/webhcat/java-client/src/test/java/org/apache/hive/hcatalog/api/repl/commands/TestCommands.java @@ -18,8 +18,8 @@ */ package org.apache.hive.hcatalog.api.repl.commands; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.cli.CliSessionState; @@ -64,7 +64,7 @@ import static org.junit.Assert.assertTrue; public class TestCommands { - private static Log LOG = LogFactory.getLog(CommandTestUtils.class.getName()); + private static Logger LOG = LoggerFactory.getLogger(CommandTestUtils.class.getName()); private static HiveConf hconf; private static Driver driver; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/AppConfig.java ---------------------------------------------------------------------- diff --git a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/AppConfig.java b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/AppConfig.java index 403ff14..992aa38 100644 --- a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/AppConfig.java +++ b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/AppConfig.java @@ -30,8 +30,8 @@ import java.util.List; import java.util.Map; import java.util.StringTokenizer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.conf.HiveConf; @@ -168,7 +168,7 @@ public class AppConfig extends Configuration { public static final String HIVE_EXTRA_FILES = "templeton.hive.extra.files"; - private static final Log LOG = LogFactory.getLog(AppConfig.class); + private static final Logger LOG = LoggerFactory.getLogger(AppConfig.class); public AppConfig() { init(); http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/CatchallExceptionMapper.java ---------------------------------------------------------------------- diff --git a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/CatchallExceptionMapper.java b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/CatchallExceptionMapper.java index 4288f5d..320da0e 100644 --- a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/CatchallExceptionMapper.java +++ b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/CatchallExceptionMapper.java @@ -22,8 +22,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.eclipse.jetty.http.HttpStatus; import com.sun.jersey.api.NotFoundException; @@ -35,7 +35,7 @@ import com.sun.jersey.api.NotFoundException; @Provider public class CatchallExceptionMapper implements ExceptionMapper { - private static final Log LOG = LogFactory.getLog(CatchallExceptionMapper.class); + private static final Logger LOG = LoggerFactory.getLogger(CatchallExceptionMapper.class); public Response toResponse(Exception e) { LOG.error(e.getMessage(), e); http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/CompleteDelegator.java ---------------------------------------------------------------------- diff --git a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/CompleteDelegator.java b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/CompleteDelegator.java index e3be5b7..ef770d5 100644 --- a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/CompleteDelegator.java +++ b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/CompleteDelegator.java @@ -22,8 +22,8 @@ import java.io.IOException; import java.net.URL; import java.util.Date; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.common.classification.InterfaceAudience; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.metastore.IMetaStoreClient; @@ -50,7 +50,7 @@ import org.apache.hive.hcatalog.templeton.tool.TempletonUtils; */ @InterfaceAudience.Private public class CompleteDelegator extends TempletonDelegator { - private static final Log LOG = LogFactory.getLog(CompleteDelegator.class); + private static final Logger LOG = LoggerFactory.getLogger(CompleteDelegator.class); public CompleteDelegator(AppConfig appConf) { super(appConf); http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/DeleteDelegator.java ---------------------------------------------------------------------- diff --git a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/DeleteDelegator.java b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/DeleteDelegator.java index 5610ced..4b2dfec 100644 --- a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/DeleteDelegator.java +++ b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/DeleteDelegator.java @@ -21,8 +21,8 @@ package org.apache.hive.hcatalog.templeton; import java.io.IOException; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.shims.HadoopShims.WebHCatJTShim; import org.apache.hadoop.hive.shims.ShimLoader; import org.apache.hadoop.mapred.JobID; @@ -33,7 +33,7 @@ import org.apache.hive.hcatalog.templeton.tool.JobState; * Delete a job */ public class DeleteDelegator extends TempletonDelegator { - private static final Log LOG = LogFactory.getLog(DeleteDelegator.class); + private static final Logger LOG = LoggerFactory.getLogger(DeleteDelegator.class); public DeleteDelegator(AppConfig appConf) { super(appConf); } http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/ExecServiceImpl.java ---------------------------------------------------------------------- diff --git a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/ExecServiceImpl.java b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/ExecServiceImpl.java index a919079..363541b 100644 --- a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/ExecServiceImpl.java +++ b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/ExecServiceImpl.java @@ -37,8 +37,8 @@ import org.apache.commons.exec.DefaultExecutor; import org.apache.commons.exec.ExecuteException; import org.apache.commons.exec.ExecuteWatchdog; import org.apache.commons.exec.PumpStreamHandler; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.util.Shell; class StreamOutputWriter extends Thread @@ -78,7 +78,7 @@ class StreamOutputWriter extends Thread * ExecService.run and ExecService.runUnlimited for details. */ public class ExecServiceImpl implements ExecService { - private static final Log LOG = LogFactory.getLog(ExecServiceImpl.class); + private static final Logger LOG = LoggerFactory.getLogger(ExecServiceImpl.class); private static AppConfig appConf = Main.getAppConfigInstance(); private static volatile ExecServiceImpl theSingleton; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/HcatDelegator.java ---------------------------------------------------------------------- diff --git a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/HcatDelegator.java b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/HcatDelegator.java index 8a4758c..d2b0365 100644 --- a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/HcatDelegator.java +++ b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/HcatDelegator.java @@ -28,8 +28,8 @@ import javax.ws.rs.core.Response; import org.apache.commons.exec.ExecuteException; import org.apache.commons.lang.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -43,7 +43,7 @@ import org.eclipse.jetty.http.HttpStatus; * the backend of the ddl web service. */ public class HcatDelegator extends LauncherDelegator { - private static final Log LOG = LogFactory.getLog(HcatDelegator.class); + private static final Logger LOG = LoggerFactory.getLogger(HcatDelegator.class); private ExecService execService; public HcatDelegator(AppConfig appConf, ExecService execService) { http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/LauncherDelegator.java ---------------------------------------------------------------------- diff --git a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/LauncherDelegator.java b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/LauncherDelegator.java index 82e5cb8..b3f44a2 100644 --- a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/LauncherDelegator.java +++ b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/LauncherDelegator.java @@ -24,8 +24,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.shims.HadoopShimsSecure; @@ -45,7 +45,7 @@ import org.apache.hive.hcatalog.templeton.tool.ZooKeeperStorage; * launch child jobs. */ public class LauncherDelegator extends TempletonDelegator { - private static final Log LOG = LogFactory.getLog(LauncherDelegator.class); + private static final Logger LOG = LoggerFactory.getLogger(LauncherDelegator.class); protected String runAs = null; static public enum JobType {JAR, STREAMING, PIG, HIVE, SQOOP} private boolean secureMeatastoreAccess = false; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/Main.java ---------------------------------------------------------------------- diff --git a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/Main.java b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/Main.java index d1f45f3..8aca9da 100644 --- a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/Main.java +++ b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/Main.java @@ -26,8 +26,8 @@ import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.common.classification.InterfaceAudience; import org.apache.hadoop.hive.common.classification.InterfaceStability; import org.apache.hadoop.hdfs.web.AuthFilter; @@ -55,7 +55,7 @@ import javax.servlet.http.HttpServletRequest; @InterfaceStability.Unstable public class Main { public static final String SERVLET_PATH = "templeton"; - private static final Log LOG = LogFactory.getLog(Main.class); + private static final Logger LOG = LoggerFactory.getLogger(Main.class); public static final int DEFAULT_PORT = 8080; private Server server; @@ -120,7 +120,7 @@ public class Main { LOG.info("Templeton listening on port " + port); } catch (Exception e) { System.err.println("templeton: Server failed to start: " + e.getMessage()); - LOG.fatal("Server failed to start: " + e); + LOG.error("Server failed to start: " , e); System.exit(1); } } @@ -148,7 +148,7 @@ public class Main { if (!pwd.exists()) { String msg = "Server failed to start: templeton: Current working directory '.' does not exist!"; System.err.println(msg); - LOG.fatal(msg); + LOG.error(msg); System.exit(1); } } http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/PigDelegator.java ---------------------------------------------------------------------- diff --git a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/PigDelegator.java b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/PigDelegator.java index 2679a97..b589917 100644 --- a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/PigDelegator.java +++ b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/PigDelegator.java @@ -27,8 +27,8 @@ import java.util.List; import java.util.Map; import org.apache.commons.exec.ExecuteException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hive.hcatalog.templeton.tool.JobSubmissionConstants; import org.apache.hive.hcatalog.templeton.tool.TempletonControllerJob; import org.apache.hive.hcatalog.templeton.tool.TempletonUtils; @@ -39,7 +39,7 @@ import org.apache.hive.hcatalog.templeton.tool.TempletonUtils; * This is the backend of the pig web service. */ public class PigDelegator extends LauncherDelegator { - private static final Log LOG = LogFactory.getLog(PigDelegator.class); + private static final Logger LOG = LoggerFactory.getLogger(PigDelegator.class); public PigDelegator(AppConfig appConf) { super(appConf); } http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/ProxyUserSupport.java ---------------------------------------------------------------------- diff --git a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/ProxyUserSupport.java b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/ProxyUserSupport.java index ec5acb4..b652995 100644 --- a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/ProxyUserSupport.java +++ b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/ProxyUserSupport.java @@ -18,8 +18,8 @@ */ package org.apache.hive.hcatalog.templeton; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.security.Groups; import java.io.IOException; @@ -39,7 +39,7 @@ import java.util.Set; * call is allowed to impersonate doAs user and is making a call from authorized host. */ final class ProxyUserSupport { - private static final Log LOG = LogFactory.getLog(ProxyUserSupport.class); + private static final Logger LOG = LoggerFactory.getLogger(ProxyUserSupport.class); private static final String CONF_PROXYUSER_PREFIX = "webhcat.proxyuser."; private static final String CONF_GROUPS_SUFFIX = ".groups"; private static final String CONF_HOSTS_SUFFIX = ".hosts"; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/SecureProxySupport.java ---------------------------------------------------------------------- diff --git a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/SecureProxySupport.java b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/SecureProxySupport.java index 1ef5f27..2ac62c0 100644 --- a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/SecureProxySupport.java +++ b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/SecureProxySupport.java @@ -24,8 +24,8 @@ import java.security.PrivilegedExceptionAction; import java.util.List; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -53,7 +53,7 @@ public class SecureProxySupport { isEnabled = UserGroupInformation.isSecurityEnabled(); } - private static final Log LOG = LogFactory.getLog(SecureProxySupport.class); + private static final Logger LOG = LoggerFactory.getLogger(SecureProxySupport.class); /** * The file where we store the auth token http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/Server.java ---------------------------------------------------------------------- diff --git a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/Server.java b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/Server.java index 0c32792..a94b8e9 100644 --- a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/Server.java +++ b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/Server.java @@ -46,8 +46,8 @@ import javax.ws.rs.core.SecurityContext; import javax.ws.rs.core.UriInfo; import org.apache.commons.exec.ExecuteException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.shims.ShimLoader; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.authentication.client.PseudoAuthenticator; @@ -123,7 +123,7 @@ public class Server { private @QueryParam(DO_AS_PARAM) String doAs; private @Context HttpServletRequest request; - private static final Log LOG = LogFactory.getLog(Server.class); + private static final Logger LOG = LoggerFactory.getLogger(Server.class); /** * Check the status of this server. Always OK. http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/SqoopDelegator.java ---------------------------------------------------------------------- diff --git a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/SqoopDelegator.java b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/SqoopDelegator.java index 9002482..3f2a797 100644 --- a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/SqoopDelegator.java +++ b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/SqoopDelegator.java @@ -25,8 +25,8 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.fs.Path; import org.apache.hive.hcatalog.templeton.tool.JobSubmissionConstants; import org.apache.hive.hcatalog.templeton.tool.TempletonControllerJob; @@ -38,7 +38,7 @@ import org.apache.hive.hcatalog.templeton.tool.TempletonUtils; * This is the backend of the Sqoop web service. */ public class SqoopDelegator extends LauncherDelegator { - private static final Log LOG = LogFactory.getLog(SqoopDelegator.class); + private static final Logger LOG = LoggerFactory.getLogger(SqoopDelegator.class); public SqoopDelegator(AppConfig appConf) { super(appConf); http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/StatusDelegator.java ---------------------------------------------------------------------- diff --git a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/StatusDelegator.java b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/StatusDelegator.java index c15da98..fac0170 100644 --- a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/StatusDelegator.java +++ b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/StatusDelegator.java @@ -20,8 +20,8 @@ package org.apache.hive.hcatalog.templeton; import java.io.IOException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.shims.HadoopShims.WebHCatJTShim; import org.apache.hadoop.hive.shims.ShimLoader; import org.apache.hadoop.security.UserGroupInformation; @@ -40,7 +40,7 @@ import org.apache.hive.hcatalog.templeton.tool.JobState; * Currently there is no permission restriction, any user can query any job */ public class StatusDelegator extends TempletonDelegator { - private static final Log LOG = LogFactory.getLog(StatusDelegator.class); + private static final Logger LOG = LoggerFactory.getLogger(StatusDelegator.class); public StatusDelegator(AppConfig appConf) { super(appConf); http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/HDFSCleanup.java ---------------------------------------------------------------------- diff --git a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/HDFSCleanup.java b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/HDFSCleanup.java index 73dbe51..8ae46f9 100644 --- a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/HDFSCleanup.java +++ b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/HDFSCleanup.java @@ -27,8 +27,8 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hive.hcatalog.templeton.tool.TempletonStorage.Type; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This does periodic cleanup @@ -48,7 +48,7 @@ public class HDFSCleanup extends Thread { protected static long maxage = 1000L * 60L * 60L * 24L * 7L; // The logger - private static final Log LOG = LogFactory.getLog(HDFSCleanup.class); + private static final Logger LOG = LoggerFactory.getLogger(HDFSCleanup.class); // Handle to cancel loop private boolean stop = false; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/HDFSStorage.java ---------------------------------------------------------------------- diff --git a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/HDFSStorage.java b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/HDFSStorage.java index 9c73a73..1a26555 100644 --- a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/HDFSStorage.java +++ b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/HDFSStorage.java @@ -27,8 +27,8 @@ import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; @@ -50,7 +50,7 @@ public class HDFSStorage implements TempletonStorage { public static final String JOB_TRACKINGPATH = "/created"; public static final String OVERHEAD_PATH = "/overhead"; - private static final Log LOG = LogFactory.getLog(HDFSStorage.class); + private static final Logger LOG = LoggerFactory.getLogger(HDFSStorage.class); public void startCleanup(Configuration config) { try {