You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2015/10/28 16:46:00 UTC
[12/14] hive git commit: HIVE-12237 : Use slf4j as logging facade
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/JobState.java
----------------------------------------------------------------------
diff --git a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/JobState.java b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/JobState.java
index d0e7ac6..91a9cb1 100644
--- a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/JobState.java
+++ b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/JobState.java
@@ -23,8 +23,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.conf.Configuration;
import org.apache.hadoop.hive.common.JavaUtils;
import org.apache.hive.hcatalog.templeton.JsonBuilder;
@@ -35,7 +35,7 @@ import org.apache.hive.hcatalog.templeton.JsonBuilder;
*/
public class JobState {
- private static final Log LOG = LogFactory.getLog(JobState.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JobState.class);
private String id;
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/JobStateTracker.java
----------------------------------------------------------------------
diff --git a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/JobStateTracker.java b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/JobStateTracker.java
index 41fd82f..9a7e093 100644
--- a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/JobStateTracker.java
+++ b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/JobStateTracker.java
@@ -22,8 +22,8 @@ import java.io.IOException;
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.curator.framework.CuratorFramework;
import org.apache.hadoop.conf.Configuration;
import org.apache.zookeeper.CreateMode;
@@ -56,7 +56,7 @@ public class JobStateTracker {
private String jobid;
// The logger
- private static final Log LOG = LogFactory.getLog(JobStateTracker.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JobStateTracker.class);
/**
* Constructor for a new node -- takes the jobid of an existing job
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/LaunchMapper.java
----------------------------------------------------------------------
diff --git a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/LaunchMapper.java b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/LaunchMapper.java
index a5ff67e..41ddb9c 100644
--- a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/LaunchMapper.java
+++ b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/LaunchMapper.java
@@ -18,8 +18,8 @@
*/
package org.apache.hive.hcatalog.templeton.tool;
-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;
@@ -73,7 +73,7 @@ public class LaunchMapper extends Mapper<NullWritable, NullWritable, Text, Text>
* This class currently sends everything to stderr, but it should probably use Log4J -
* it will end up in 'syslog' of this Map task. For example, look for KeepAlive heartbeat msgs.
*/
- private static final Log LOG = LogFactory.getLog(LaunchMapper.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LaunchMapper.class);
/**
* When a Pig job is submitted and it uses HCat, WebHCat may be configured to ship hive tar
* to the target node. Pig on the target node needs some env vars configured.
@@ -481,7 +481,7 @@ public class LaunchMapper extends Mapper<NullWritable, NullWritable, Text, Text>
try {
state.close();
} catch (IOException e) {
- LOG.warn(e);
+ LOG.warn("Caught exception while closing job state ", e);
}
}
}
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/LogRetriever.java
----------------------------------------------------------------------
diff --git a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/LogRetriever.java b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/LogRetriever.java
index 6dc27f4..3f5104c 100644
--- a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/LogRetriever.java
+++ b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/LogRetriever.java
@@ -146,7 +146,7 @@ public class LogRetriever {
e.printStackTrace();
}
- // Log jobs
+ // Logger jobs
PrintWriter listWriter = null;
try {
listWriter = new PrintWriter(new OutputStreamWriter(
@@ -174,7 +174,7 @@ public class LogRetriever {
Path jobDir = new Path(logDir, jobID);
fs.mkdirs(jobDir);
- // Log jobconf
+ // Logger jobconf
try {
logJobConf(jobID, jobURLString, jobDir.toString());
} catch (IOException e) {
@@ -207,7 +207,7 @@ public class LogRetriever {
e.printStackTrace();
}
- // Log attempts
+ // Logger attempts
for (AttemptInfo attempt : attempts) {
try {
logAttempt(jobID, attempt, jobDir.toString());
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/TempletonControllerJob.java
----------------------------------------------------------------------
diff --git a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/TempletonControllerJob.java b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/TempletonControllerJob.java
index f47feeb..15ab8b9 100644
--- a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/TempletonControllerJob.java
+++ b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/TempletonControllerJob.java
@@ -22,8 +22,8 @@ import java.io.IOException;
import java.security.PrivilegedExceptionAction;
import java.util.Arrays;
-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.conf.Configured;
import org.apache.hadoop.hive.common.classification.InterfaceAudience;
@@ -67,7 +67,7 @@ import org.apache.thrift.TException;
*/
@InterfaceAudience.Private
public class TempletonControllerJob extends Configured implements Tool, JobSubmissionConstants {
- private static final Log LOG = LogFactory.getLog(TempletonControllerJob.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TempletonControllerJob.class);
private final boolean secureMetastoreAccess;
private final AppConfig appConf;
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/TempletonUtils.java
----------------------------------------------------------------------
diff --git a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/TempletonUtils.java b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/TempletonUtils.java
index a7c6137..83584d3 100644
--- a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/TempletonUtils.java
+++ b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/TempletonUtils.java
@@ -42,8 +42,8 @@ import java.util.regex.Pattern;
import javax.ws.rs.core.UriBuilder;
-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;
@@ -59,7 +59,7 @@ import org.apache.hive.hcatalog.templeton.BadParam;
* General utility methods.
*/
public class TempletonUtils {
- private static final Log LOG = LogFactory.getLog(TempletonUtils.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TempletonUtils.class);
/**
* Is the object non-empty?
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/TrivialExecService.java
----------------------------------------------------------------------
diff --git a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/TrivialExecService.java b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/TrivialExecService.java
index 3b58559..1f0f2e8 100644
--- a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/TrivialExecService.java
+++ b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/TrivialExecService.java
@@ -18,8 +18,8 @@
*/
package org.apache.hive.hcatalog.templeton.tool;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
@@ -39,7 +39,7 @@ import java.util.StringTokenizer;
* not available on every node in the cluster (outside webhcat jar)
*/
final class TrivialExecService {
- private static final Log LOG = LogFactory.getLog(TrivialExecService.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TrivialExecService.class);
private static volatile TrivialExecService theSingleton;
/**
* Retrieve the singleton.
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/ZooKeeperCleanup.java
----------------------------------------------------------------------
diff --git a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/ZooKeeperCleanup.java b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/ZooKeeperCleanup.java
index 24336e2..1900761 100644
--- a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/ZooKeeperCleanup.java
+++ b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/ZooKeeperCleanup.java
@@ -27,8 +27,8 @@ import java.util.Date;
import org.apache.curator.framework.CuratorFramework;
import org.apache.hadoop.conf.Configuration;
-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 ZooKeeperCleanup extends Thread {
protected static long maxage = 1000L * 60L * 60L * 24L * 7L;
// The logger
- private static final Log LOG = LogFactory.getLog(ZooKeeperCleanup.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ZooKeeperCleanup.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/ZooKeeperStorage.java
----------------------------------------------------------------------
diff --git a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/ZooKeeperStorage.java b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/ZooKeeperStorage.java
index b9fc4b1..8d9193f 100644
--- a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/ZooKeeperStorage.java
+++ b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/ZooKeeperStorage.java
@@ -22,8 +22,8 @@ import java.io.IOException;
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.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.retry.ExponentialBackoffRetry;
@@ -55,7 +55,7 @@ public class ZooKeeperStorage implements TempletonStorage {
public static final String ENCODING = "UTF-8";
- private static final Log LOG = LogFactory.getLog(ZooKeeperStorage.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ZooKeeperStorage.class);
private CuratorFramework zk;
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hplsql/pom.xml
----------------------------------------------------------------------
diff --git a/hplsql/pom.xml b/hplsql/pom.xml
index b855007..0aa647b 100644
--- a/hplsql/pom.xml
+++ b/hplsql/pom.xml
@@ -54,11 +54,6 @@
<version>${commons-lang.version}</version>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hwi/pom.xml
----------------------------------------------------------------------
diff --git a/hwi/pom.xml b/hwi/pom.xml
index e9686c6..482ea2a 100644
--- a/hwi/pom.xml
+++ b/hwi/pom.xml
@@ -56,11 +56,6 @@
</dependency>
<!-- inter-project -->
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
- </dependency>
- <dependency>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all-server</artifactId>
<version>${jetty.version}</version>
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hwi/src/java/org/apache/hadoop/hive/hwi/HWIContextListener.java
----------------------------------------------------------------------
diff --git a/hwi/src/java/org/apache/hadoop/hive/hwi/HWIContextListener.java b/hwi/src/java/org/apache/hadoop/hive/hwi/HWIContextListener.java
index eae4040..1f5cb79 100644
--- a/hwi/src/java/org/apache/hadoop/hive/hwi/HWIContextListener.java
+++ b/hwi/src/java/org/apache/hadoop/hive/hwi/HWIContextListener.java
@@ -21,8 +21,8 @@ package org.apache.hadoop.hive.hwi;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* After getting a contextInitialized event this component starts an instance of
@@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFactory;
*/
public class HWIContextListener implements javax.servlet.ServletContextListener {
- protected static final Log l4j = LogFactory.getLog(HWIContextListener.class
+ protected static final Logger l4j = LoggerFactory.getLogger(HWIContextListener.class
.getName());
/**
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hwi/src/java/org/apache/hadoop/hive/hwi/HWIServer.java
----------------------------------------------------------------------
diff --git a/hwi/src/java/org/apache/hadoop/hive/hwi/HWIServer.java b/hwi/src/java/org/apache/hadoop/hive/hwi/HWIServer.java
index 545f687..5680ed9 100644
--- a/hwi/src/java/org/apache/hadoop/hive/hwi/HWIServer.java
+++ b/hwi/src/java/org/apache/hadoop/hive/hwi/HWIServer.java
@@ -21,8 +21,8 @@ package org.apache.hadoop.hive.hwi;
import java.io.File;
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.conf.HiveConf;
import org.apache.hadoop.hive.shims.JettyShims;
import org.apache.hadoop.hive.shims.ShimLoader;
@@ -33,7 +33,7 @@ import org.apache.hadoop.hive.shims.ShimLoader;
* started and a web application to work with hive is started.
*/
public class HWIServer {
- protected static final Log l4j = LogFactory.getLog(HWIServer.class.getName());
+ protected static final Logger l4j = LoggerFactory.getLogger(HWIServer.class.getName());
private JettyShims.Server webServer;
private final String[] args;
@@ -78,7 +78,7 @@ public class HWIServer {
String hivehome = System.getenv().get("HIVE_HOME");
File hwiWARFile = new File(hivehome, hwiWAR);
if (!hwiWARFile.exists()) {
- l4j.fatal("HWI WAR file not found at " + hwiWARFile.toString());
+ l4j.error("HWI WAR file not found at " + hwiWARFile.toString());
System.exit(1);
}
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hwi/src/java/org/apache/hadoop/hive/hwi/HWISessionItem.java
----------------------------------------------------------------------
diff --git a/hwi/src/java/org/apache/hadoop/hive/hwi/HWISessionItem.java b/hwi/src/java/org/apache/hadoop/hive/hwi/HWISessionItem.java
index 0ad8f89..f14608c 100644
--- a/hwi/src/java/org/apache/hadoop/hive/hwi/HWISessionItem.java
+++ b/hwi/src/java/org/apache/hadoop/hive/hwi/HWISessionItem.java
@@ -26,8 +26,8 @@ import java.util.ArrayList;
import java.util.List;
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.cli.CliSessionState;
import org.apache.hadoop.hive.cli.OptionsProcessor;
import org.apache.hadoop.hive.common.LogUtils;
@@ -47,7 +47,7 @@ import org.apache.hadoop.hive.ql.session.SessionState;
*/
public class HWISessionItem implements Runnable, Comparable<HWISessionItem> {
- protected static final Log l4j = LogFactory.getLog(HWISessionItem.class
+ protected static final Logger l4j = LoggerFactory.getLogger(HWISessionItem.class
.getName());
/** Represents the state a session item can be in. */
@@ -146,7 +146,7 @@ public class HWISessionItem implements Runnable, Comparable<HWISessionItem> {
try {
LogUtils.initHiveLog4j();
} catch (LogInitializationException e) {
- l4j.warn(e);
+ l4j.warn("Initialization Error", e);
}
conf = new HiveConf(SessionState.class);
ss = new CliSessionState(conf);
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/hwi/src/java/org/apache/hadoop/hive/hwi/HWISessionManager.java
----------------------------------------------------------------------
diff --git a/hwi/src/java/org/apache/hadoop/hive/hwi/HWISessionManager.java b/hwi/src/java/org/apache/hadoop/hive/hwi/HWISessionManager.java
index 3d5aea9..d6030ec 100644
--- a/hwi/src/java/org/apache/hadoop/hive/hwi/HWISessionManager.java
+++ b/hwi/src/java/org/apache/hadoop/hive/hwi/HWISessionManager.java
@@ -23,8 +23,8 @@ import java.util.Set;
import java.util.TreeMap;
import java.util.TreeSet;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* HiveSessionManager is a Runnable started inside a web application context.
@@ -36,7 +36,7 @@ import org.apache.commons.logging.LogFactory;
*/
public class HWISessionManager implements Runnable {
- protected static final Log l4j = LogFactory.getLog(HWISessionManager.class
+ protected static final Logger l4j = LoggerFactory.getLogger(HWISessionManager.class
.getName());
private boolean goOn;
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/itests/custom-serde/src/main/java/org/apache/hadoop/hive/serde2/CustomNonSettableStructObjectInspector1.java
----------------------------------------------------------------------
diff --git a/itests/custom-serde/src/main/java/org/apache/hadoop/hive/serde2/CustomNonSettableStructObjectInspector1.java b/itests/custom-serde/src/main/java/org/apache/hadoop/hive/serde2/CustomNonSettableStructObjectInspector1.java
index c09fd61..aaec278 100644
--- a/itests/custom-serde/src/main/java/org/apache/hadoop/hive/serde2/CustomNonSettableStructObjectInspector1.java
+++ b/itests/custom-serde/src/main/java/org/apache/hadoop/hive/serde2/CustomNonSettableStructObjectInspector1.java
@@ -21,8 +21,8 @@ package org.apache.hadoop.hive.serde2;
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.serde2.objectinspector.ObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorUtils;
import org.apache.hadoop.hive.serde2.objectinspector.StructField;
@@ -30,8 +30,8 @@ import org.apache.hadoop.hive.serde2.objectinspector.StructObjectInspector;
public class CustomNonSettableStructObjectInspector1 extends
StructObjectInspector {
- public static final Log LOG = LogFactory
- .getLog(CustomNonSettableStructObjectInspector1.class.getName());
+ public static final Logger LOG = LoggerFactory
+ .getLogger(CustomNonSettableStructObjectInspector1.class.getName());
protected static class MyField implements StructField {
protected int fieldID;
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/api/TestHCatClientNotification.java
----------------------------------------------------------------------
diff --git a/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/api/TestHCatClientNotification.java b/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/api/TestHCatClientNotification.java
index 7d7e7b1..a661962 100644
--- a/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/api/TestHCatClientNotification.java
+++ b/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/api/TestHCatClientNotification.java
@@ -24,8 +24,8 @@ import static junit.framework.Assert.assertTrue;
import static junit.framework.Assert.fail;
import junit.framework.Assert;
-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.HiveMetaStoreClient;
import org.apache.hadoop.hive.metastore.IMetaStoreClient;
@@ -52,7 +52,7 @@ import java.util.Map;
*/
public class TestHCatClientNotification {
- private static final Log LOG = LogFactory.getLog(TestHCatClientNotification.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(TestHCatClientNotification.class.getName());
private static HCatClient hCatClient;
private int startTime;
private long firstEventId;
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/listener/TestDbNotificationListener.java
----------------------------------------------------------------------
diff --git a/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/listener/TestDbNotificationListener.java b/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/listener/TestDbNotificationListener.java
index 91cc03e..da84c52 100644
--- a/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/listener/TestDbNotificationListener.java
+++ b/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/listener/TestDbNotificationListener.java
@@ -23,8 +23,8 @@ import static junit.framework.Assert.assertNull;
import static junit.framework.Assert.assertTrue;
import static junit.framework.Assert.fail;
-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.HiveMetaStoreClient;
@@ -56,7 +56,7 @@ import java.util.Map;
public class TestDbNotificationListener {
- private static final Log LOG = LogFactory.getLog(TestDbNotificationListener.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(TestDbNotificationListener.class.getName());
private static Map<String, String> emptyParameters = new HashMap<String, String>();
private static IMetaStoreClient msClient;
private static Driver driver;
@@ -565,4 +565,4 @@ public class TestDbNotificationListener {
assertEquals(firstEventId + 19, event.getEventId());
assertEquals(HCatConstants.HCAT_DROP_PARTITION_EVENT, event.getEventType());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/itests/hive-unit/pom.xml
----------------------------------------------------------------------
diff --git a/itests/hive-unit/pom.xml b/itests/hive-unit/pom.xml
index 326d646..b1e4199 100644
--- a/itests/hive-unit/pom.xml
+++ b/itests/hive-unit/pom.xml
@@ -76,11 +76,6 @@
<version>${tez.version}</version>
<type>test-jar</type>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
- </dependency>
<!-- dependencies are always listed in sorted order by groupId, artifectId -->
<!-- test intra-project -->
<dependency>
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java
index 93c817a..8601df0 100644
--- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java
+++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java
@@ -32,8 +32,8 @@ import java.util.Set;
import junit.framework.TestCase;
-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.fs.permission.FsPermission;
@@ -82,7 +82,7 @@ import org.junit.Test;
import com.google.common.collect.Lists;
public abstract class TestHiveMetaStore extends TestCase {
- private static final Log LOG = LogFactory.getLog(TestHiveMetaStore.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TestHiveMetaStore.class);
protected static HiveMetaStoreClient client;
protected static HiveConf hiveConf;
protected static Warehouse warehouse;
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTxns.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTxns.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTxns.java
index 5ad5f35..e9ce789 100644
--- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTxns.java
+++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTxns.java
@@ -18,6 +18,7 @@
package org.apache.hadoop.hive.metastore;
import junit.framework.Assert;
+
import org.apache.hadoop.hive.common.ValidTxnList;
import org.apache.hadoop.hive.common.ValidReadTxnList;
import org.apache.hadoop.hive.conf.HiveConf;
@@ -47,7 +48,7 @@ import java.util.List;
*/
public class TestHiveMetaStoreTxns {
- private HiveConf conf = new HiveConf();
+ private final HiveConf conf = new HiveConf();
private IMetaStoreClient client;
public TestHiveMetaStoreTxns() throws Exception {
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreWithEnvironmentContext.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreWithEnvironmentContext.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreWithEnvironmentContext.java
index c0f0d26..8a37c11 100644
--- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreWithEnvironmentContext.java
+++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreWithEnvironmentContext.java
@@ -48,7 +48,6 @@ import org.apache.hadoop.hive.ql.session.SessionState;
import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe;
import org.apache.hadoop.hive.shims.ShimLoader;
-import org.mortbay.log.Log;
/**
* TestHiveMetaStoreWithEnvironmentContext. Test case for _with_environment_context
@@ -113,7 +112,7 @@ public class TestHiveMetaStoreWithEnvironmentContext extends TestCase {
sd.getSerdeInfo().setSerializationLib(LazySimpleSerDe.class.getName());
sd.setInputFormat(HiveInputFormat.class.getName());
sd.setOutputFormat(HiveOutputFormat.class.getName());
-
+
table.setDbName(dbName);
table.setTableName(tblName);
table.setParameters(tableParams);
@@ -147,7 +146,6 @@ public class TestHiveMetaStoreWithEnvironmentContext extends TestCase {
CreateDatabaseEvent dbEvent = (CreateDatabaseEvent)(notifyList.get(listSize - 1));
assert dbEvent.getStatus();
- Log.debug("Creating table");
msc.createTable(table, envContext);
listSize++;
assertEquals(notifyList.size(), listSize);
@@ -157,7 +155,6 @@ public class TestHiveMetaStoreWithEnvironmentContext extends TestCase {
table = msc.getTable(dbName, tblName);
- Log.debug("Adding partition");
partition.getSd().setLocation(table.getSd().getLocation() + "/part1");
msc.add_partition(partition, envContext);
listSize++;
@@ -166,7 +163,6 @@ public class TestHiveMetaStoreWithEnvironmentContext extends TestCase {
assert partEvent.getStatus();
assertEquals(envContext, partEvent.getEnvironmentContext());
- Log.debug("Appending partition");
List<String> partVals = new ArrayList<String>();
partVals.add("2012");
msc.appendPartition(dbName, tblName, partVals, envContext);
@@ -176,7 +172,6 @@ public class TestHiveMetaStoreWithEnvironmentContext extends TestCase {
assert appendPartEvent.getStatus();
assertEquals(envContext, appendPartEvent.getEnvironmentContext());
- Log.debug("Renaming table");
table.setTableName(renamed);
msc.alter_table(dbName, tblName, table, envContext);
listSize++;
@@ -185,13 +180,11 @@ public class TestHiveMetaStoreWithEnvironmentContext extends TestCase {
assert alterTableEvent.getStatus();
assertEquals(envContext, alterTableEvent.getEnvironmentContext());
- Log.debug("Renaming table back");
table.setTableName(tblName);
msc.alter_table(dbName, renamed, table, envContext);
listSize++;
assertEquals(notifyList.size(), listSize);
- Log.debug("Dropping partition");
List<String> dropPartVals = new ArrayList<String>();
dropPartVals.add("2011");
msc.dropPartition(dbName, tblName, dropPartVals, envContext);
@@ -201,7 +194,6 @@ public class TestHiveMetaStoreWithEnvironmentContext extends TestCase {
assert dropPartEvent.getStatus();
assertEquals(envContext, dropPartEvent.getEnvironmentContext());
- Log.debug("Dropping partition by name");
msc.dropPartition(dbName, tblName, "b=2012", true, envContext);
listSize++;
assertEquals(notifyList.size(), listSize);
@@ -209,7 +201,6 @@ public class TestHiveMetaStoreWithEnvironmentContext extends TestCase {
assert dropPartByNameEvent.getStatus();
assertEquals(envContext, dropPartByNameEvent.getEnvironmentContext());
- Log.debug("Dropping table");
msc.dropTable(dbName, tblName, true, false, envContext);
listSize++;
assertEquals(notifyList.size(), listSize);
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetastoreVersion.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetastoreVersion.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetastoreVersion.java
index 5514228..fba315d 100644
--- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetastoreVersion.java
+++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetastoreVersion.java
@@ -23,8 +23,8 @@ import java.util.Random;
import junit.framework.TestCase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.commons.io.FileUtils;
import org.apache.hadoop.hive.cli.CliSessionState;
import org.apache.hadoop.hive.conf.HiveConf;
@@ -36,7 +36,7 @@ import org.apache.hadoop.hive.ql.processors.CommandProcessorResponse;
import org.apache.hadoop.hive.ql.session.SessionState;
public class TestMetastoreVersion extends TestCase {
- private static final Log LOG = LogFactory.getLog(TestMetastoreVersion.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TestMetastoreVersion.class);
protected HiveConf hiveConf;
private Driver driver;
private String metaStoreRoot;
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/HBaseIntegrationTests.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/HBaseIntegrationTests.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/HBaseIntegrationTests.java
index 3f5da4a..85fff23 100644
--- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/HBaseIntegrationTests.java
+++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/HBaseIntegrationTests.java
@@ -18,8 +18,8 @@
*/
package org.apache.hadoop.hive.metastore.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.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HBaseTestingUtility;
@@ -40,7 +40,7 @@ import java.util.Map;
*/
public class HBaseIntegrationTests {
- private static final Log LOG = LogFactory.getLog(HBaseIntegrationTests.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(HBaseIntegrationTests.class.getName());
protected static HBaseTestingUtility utility;
protected static HBaseAdmin admin;
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/TestHBaseAggrStatsCacheIntegration.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/TestHBaseAggrStatsCacheIntegration.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/TestHBaseAggrStatsCacheIntegration.java
index 899fee1..51d96dd 100644
--- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/TestHBaseAggrStatsCacheIntegration.java
+++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/TestHBaseAggrStatsCacheIntegration.java
@@ -18,8 +18,8 @@
*/
package org.apache.hadoop.hive.metastore.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.hive.metastore.api.AggrStats;
import org.apache.hadoop.hive.metastore.api.BooleanColumnStatsData;
import org.apache.hadoop.hive.metastore.api.ColumnStatistics;
@@ -52,7 +52,7 @@ import java.util.List;
*/
public class TestHBaseAggrStatsCacheIntegration extends HBaseIntegrationTests {
- private static final Log LOG = LogFactory.getLog(TestHBaseStoreIntegration.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(TestHBaseStoreIntegration.class.getName());
@Rule public ExpectedException thrown = ExpectedException.none();
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/TestHBaseImport.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/TestHBaseImport.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/TestHBaseImport.java
index 2d2bd46..af60660 100644
--- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/TestHBaseImport.java
+++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/TestHBaseImport.java
@@ -18,8 +18,8 @@
*/
package org.apache.hadoop.hive.metastore.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.hive.metastore.ObjectStore;
import org.apache.hadoop.hive.metastore.RawStore;
import org.apache.hadoop.hive.metastore.TestObjectStore;
@@ -58,7 +58,7 @@ import java.util.Set;
*/
public class TestHBaseImport extends HBaseIntegrationTests {
- private static final Log LOG = LogFactory.getLog(TestHBaseImport.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(TestHBaseImport.class.getName());
private static final String[] tableNames = new String[] {"allnonparttable", "allparttable"};
private static final String[] partVals = new String[] {"na", "emea", "latam", "apac"};
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/TestHBaseMetastoreSql.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/TestHBaseMetastoreSql.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/TestHBaseMetastoreSql.java
index c61ebb7..d4966b9 100644
--- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/TestHBaseMetastoreSql.java
+++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/TestHBaseMetastoreSql.java
@@ -18,8 +18,8 @@
*/
package org.apache.hadoop.hive.metastore.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.hive.ql.processors.CommandProcessorResponse;
import org.junit.AfterClass;
import org.junit.Assert;
@@ -34,7 +34,7 @@ import java.io.IOException;
*/
public class TestHBaseMetastoreSql extends HBaseIntegrationTests {
- private static final Log LOG = LogFactory.getLog(TestHBaseStoreIntegration.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(TestHBaseStoreIntegration.class.getName());
@BeforeClass
public static void startup() throws Exception {
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/TestHBaseStoreIntegration.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/TestHBaseStoreIntegration.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/TestHBaseStoreIntegration.java
index 8750a05..c621904 100644
--- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/TestHBaseStoreIntegration.java
+++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/TestHBaseStoreIntegration.java
@@ -18,8 +18,8 @@
*/
package org.apache.hadoop.hive.metastore.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.hive.metastore.HiveMetaStore;
import org.apache.hadoop.hive.metastore.api.BinaryColumnStatsData;
import org.apache.hadoop.hive.metastore.api.BooleanColumnStatsData;
@@ -74,7 +74,7 @@ import java.util.TreeSet;
*/
public class TestHBaseStoreIntegration extends HBaseIntegrationTests {
- private static final Log LOG = LogFactory.getLog(TestHBaseStoreIntegration.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(TestHBaseStoreIntegration.class.getName());
@Rule public ExpectedException thrown = ExpectedException.none();
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/TestStorageDescriptorSharing.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/TestStorageDescriptorSharing.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/TestStorageDescriptorSharing.java
index fa7273e..c29e46a 100644
--- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/TestStorageDescriptorSharing.java
+++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/TestStorageDescriptorSharing.java
@@ -18,8 +18,8 @@
*/
package org.apache.hadoop.hive.metastore.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.hive.metastore.api.FieldSchema;
import org.apache.hadoop.hive.metastore.api.Partition;
import org.apache.hadoop.hive.metastore.api.SerDeInfo;
@@ -42,7 +42,7 @@ import java.util.List;
*/
public class TestStorageDescriptorSharing extends HBaseIntegrationTests {
- private static final Log LOG = LogFactory.getLog(TestHBaseStoreIntegration.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(TestHBaseStoreIntegration.class.getName());
private MessageDigest md;
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/authorization/plugin/TestHiveAuthorizerCheckInvocation.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/authorization/plugin/TestHiveAuthorizerCheckInvocation.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/authorization/plugin/TestHiveAuthorizerCheckInvocation.java
index 6494ba0..4b48e7e 100644
--- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/authorization/plugin/TestHiveAuthorizerCheckInvocation.java
+++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/authorization/plugin/TestHiveAuthorizerCheckInvocation.java
@@ -33,8 +33,8 @@ import java.util.List;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
-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.conf.HiveConf.ConfVars;
import org.apache.hadoop.hive.ql.CommandNeedRetryException;
@@ -55,7 +55,7 @@ import org.mockito.Mockito;
* Test HiveAuthorizer api invocation
*/
public class TestHiveAuthorizerCheckInvocation {
- private final Log LOG = LogFactory.getLog(this.getClass().getName());;
+ private final Logger LOG = LoggerFactory.getLogger(this.getClass().getName());;
protected static HiveConf conf;
protected static Driver driver;
private static final String tableName = TestHiveAuthorizerCheckInvocation.class.getSimpleName()
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcDriver2.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcDriver2.java b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcDriver2.java
index 100ad42..995a33d 100644
--- a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcDriver2.java
+++ b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcDriver2.java
@@ -49,8 +49,8 @@ import java.util.Properties;
import java.util.Set;
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.fs.Path;
import org.apache.hadoop.hive.common.type.HiveIntervalDayTime;
import org.apache.hadoop.hive.common.type.HiveIntervalYearMonth;
@@ -76,7 +76,7 @@ import org.junit.Test;
*
*/
public class TestJdbcDriver2 {
- private static final Log LOG = LogFactory.getLog(TestJdbcDriver2.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TestJdbcDriver2.class);
private static final String driverName = "org.apache.hive.jdbc.HiveDriver";
private static final String tableName = "testHiveJdbcDriver_Table";
private static final String tableComment = "Simple table";
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/itests/hive-unit/src/test/java/org/apache/hive/jdbc/cbo_rp_TestJdbcDriver2.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/cbo_rp_TestJdbcDriver2.java b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/cbo_rp_TestJdbcDriver2.java
index 2093eb1..05361d2 100644
--- a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/cbo_rp_TestJdbcDriver2.java
+++ b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/cbo_rp_TestJdbcDriver2.java
@@ -49,8 +49,8 @@ import java.util.Properties;
import java.util.Set;
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.fs.Path;
import org.apache.hadoop.hive.common.type.HiveIntervalDayTime;
import org.apache.hadoop.hive.common.type.HiveIntervalYearMonth;
@@ -77,7 +77,7 @@ import org.junit.Test;
*
*/
public class cbo_rp_TestJdbcDriver2 {
- private static final Log LOG = LogFactory.getLog(cbo_rp_TestJdbcDriver2.class);
+ private static final Logger LOG = LoggerFactory.getLogger(cbo_rp_TestJdbcDriver2.class);
private static final String driverName = "org.apache.hive.jdbc.HiveDriver";
private static final String tableName = "testHiveJdbcDriver_Table";
private static final String tableComment = "Simple table";
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/itests/qtest-accumulo/pom.xml
----------------------------------------------------------------------
diff --git a/itests/qtest-accumulo/pom.xml b/itests/qtest-accumulo/pom.xml
index aafa034..6014639 100644
--- a/itests/qtest-accumulo/pom.xml
+++ b/itests/qtest-accumulo/pom.xml
@@ -115,12 +115,6 @@
</dependency>
<!-- inter-project -->
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
- </dependency>
- <!-- test inter-project -->
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/itests/qtest-spark/pom.xml
----------------------------------------------------------------------
diff --git a/itests/qtest-spark/pom.xml b/itests/qtest-spark/pom.xml
index e06871a..a0ccf66 100644
--- a/itests/qtest-spark/pom.xml
+++ b/itests/qtest-spark/pom.xml
@@ -205,11 +205,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-server-tests</artifactId>
<version>${hadoop.version}</version>
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/itests/qtest/pom.xml
----------------------------------------------------------------------
diff --git a/itests/qtest/pom.xml b/itests/qtest/pom.xml
index 9504813..65c3c75 100644
--- a/itests/qtest/pom.xml
+++ b/itests/qtest/pom.xml
@@ -41,11 +41,6 @@
<dependencies>
<!-- dependencies are always listed in sorted order by groupId, artifectId -->
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
- </dependency>
<!-- test intra-project -->
<dependency>
<groupId>org.apache.hive</groupId>
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/itests/test-serde/src/main/java/org/apache/hadoop/hive/serde2/TestSerDe.java
----------------------------------------------------------------------
diff --git a/itests/test-serde/src/main/java/org/apache/hadoop/hive/serde2/TestSerDe.java b/itests/test-serde/src/main/java/org/apache/hadoop/hive/serde2/TestSerDe.java
index 9f7a20a..37623f8 100644
--- a/itests/test-serde/src/main/java/org/apache/hadoop/hive/serde2/TestSerDe.java
+++ b/itests/test-serde/src/main/java/org/apache/hadoop/hive/serde2/TestSerDe.java
@@ -24,8 +24,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.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.objectinspector.MetadataListStructObjectInspector;
@@ -50,7 +50,7 @@ import com.google.common.collect.Lists;
TestSerDe.COLUMNS, TestSerDe.COLUMNS_COMMENTS, TestSerDe.DEFAULT_SERIALIZATION_FORMAT})
public class TestSerDe extends AbstractSerDe {
- public static final Log LOG = LogFactory.getLog(TestSerDe.class.getName());
+ public static final Logger LOG = LoggerFactory.getLogger(TestSerDe.class.getName());
public static final String COLUMNS = "columns";
public static final String COLUMNS_COMMENTS = "columns.comments";
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
----------------------------------------------------------------------
diff --git a/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java b/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
index 6ddd8e4..bf6bea7 100644
--- a/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
+++ b/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
@@ -56,8 +56,8 @@ import java.util.regex.Pattern;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
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.conf.Configuration;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
@@ -102,8 +102,6 @@ import org.apache.hadoop.hive.shims.HadoopShims;
import org.apache.hadoop.hive.shims.ShimLoader;
import org.apache.hadoop.util.Shell;
import org.apache.hive.common.util.StreamPrinter;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
import org.apache.tools.ant.BuildException;
import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher;
@@ -126,7 +124,7 @@ public class QTestUtil {
private static final String SECURITY_KEY_PROVIDER_URI_NAME = "dfs.encryption.key.provider.uri";
private static final String CRLF = System.getProperty("line.separator");
- private static final Log LOG = LogFactory.getLog("QTestUtil");
+ private static final Logger LOG = LoggerFactory.getLogger("QTestUtil");
private static final String QTEST_LEAVE_FILES = "QTEST_LEAVE_FILES";
private final static String defaultInitScript = "q_test_init.sql";
private final static String defaultCleanupScript = "q_test_cleanup.sql";
@@ -387,8 +385,6 @@ public class QTestUtil {
this.logDir = logDir;
this.useHBaseMetastore = useHBaseMetastore;
- Logger hadoopLog = Logger.getLogger("org.apache.hadoop");
- hadoopLog.setLevel(Level.INFO);
if (confDir != null && !confDir.isEmpty()) {
HiveConf.setHiveSiteLocation(new URL("file://"+ new File(confDir).toURI().getPath() + "/hive-site.xml"));
System.out.println("Setting hive-site: "+HiveConf.getHiveSiteLocation());
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/CheckColumnAccessHook.java
----------------------------------------------------------------------
diff --git a/itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/CheckColumnAccessHook.java b/itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/CheckColumnAccessHook.java
index adbb531..a3e160f 100644
--- a/itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/CheckColumnAccessHook.java
+++ b/itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/CheckColumnAccessHook.java
@@ -29,7 +29,6 @@ import org.apache.hadoop.hive.ql.session.SessionState;
import org.apache.hadoop.hive.ql.session.SessionState.LogHelper;
import org.apache.hadoop.hive.ql.parse.ColumnAccessInfo;
-import org.mortbay.log.Log;
/*
* This hook is used for verifying the column access information
@@ -40,8 +39,9 @@ import org.mortbay.log.Log;
*/
public class CheckColumnAccessHook implements ExecuteWithHookContext {
+ @Override
public void run(HookContext hookContext) {
- Log.info("Running CheckColumnAccessHook");
+
HiveConf conf = hookContext.getConf();
if (conf.getBoolVar(HiveConf.ConfVars.HIVE_STATS_COLLECT_SCANCOLS) == false) {
return;
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/itests/util/src/main/java/org/apache/hadoop/hive/ql/security/DummyHiveMetastoreAuthorizationProvider.java
----------------------------------------------------------------------
diff --git a/itests/util/src/main/java/org/apache/hadoop/hive/ql/security/DummyHiveMetastoreAuthorizationProvider.java b/itests/util/src/main/java/org/apache/hadoop/hive/ql/security/DummyHiveMetastoreAuthorizationProvider.java
index ed4b441..346abd6 100644
--- a/itests/util/src/main/java/org/apache/hadoop/hive/ql/security/DummyHiveMetastoreAuthorizationProvider.java
+++ b/itests/util/src/main/java/org/apache/hadoop/hive/ql/security/DummyHiveMetastoreAuthorizationProvider.java
@@ -21,8 +21,8 @@ package org.apache.hadoop.hive.ql.security;
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.hive.metastore.HiveMetaStore.HMSHandler;
import org.apache.hadoop.hive.metastore.api.Database;
@@ -80,7 +80,7 @@ public class DummyHiveMetastoreAuthorizationProvider implements HiveMetastoreAut
public static final List<AuthCallContext> authCalls = new ArrayList<AuthCallContext>();
private Configuration conf;
- public static final Log LOG = LogFactory.getLog(
+ public static final Logger LOG = LoggerFactory.getLogger(
DummyHiveMetastoreAuthorizationProvider.class);;
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/itests/util/src/main/java/org/apache/hadoop/hive/ql/udf/UDFFileLookup.java
----------------------------------------------------------------------
diff --git a/itests/util/src/main/java/org/apache/hadoop/hive/ql/udf/UDFFileLookup.java b/itests/util/src/main/java/org/apache/hadoop/hive/ql/udf/UDFFileLookup.java
index f804764..4a9221a 100644
--- a/itests/util/src/main/java/org/apache/hadoop/hive/ql/udf/UDFFileLookup.java
+++ b/itests/util/src/main/java/org/apache/hadoop/hive/ql/udf/UDFFileLookup.java
@@ -24,9 +24,6 @@ import java.io.FileReader;
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import org.apache.hadoop.hive.ql.exec.Description;
import org.apache.hadoop.hive.ql.exec.UDF;
import org.apache.hadoop.io.IntWritable;
@@ -38,7 +35,6 @@ import org.apache.hadoop.io.Text;
@Description(name = "lookup",
value = "_FUNC_(col) - UDF for key/value lookup from a file")
public class UDFFileLookup extends UDF {
- static Log LOG = LogFactory.getLog(UDFFileLookup.class);
IntWritable result = new IntWritable();
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/itests/util/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFSumList.java
----------------------------------------------------------------------
diff --git a/itests/util/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFSumList.java b/itests/util/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFSumList.java
index 55d7912..7a5da57 100644
--- a/itests/util/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFSumList.java
+++ b/itests/util/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFSumList.java
@@ -17,8 +17,8 @@
*/
package org.apache.hadoop.hive.ql.udf.generic;
-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;
@@ -39,7 +39,7 @@ import org.apache.hadoop.io.LongWritable;
@Description(name = "sum_list", value = "_FUNC_(x) - Returns the sum of a set of numbers")
public class GenericUDAFSumList extends AbstractGenericUDAFResolver {
- static final Log LOG = LogFactory.getLog(GenericUDAFSumList.class.getName());
+ static final Logger LOG = LoggerFactory.getLogger(GenericUDAFSumList.class.getName());
@Override
public GenericUDAFEvaluator getEvaluator(GenericUDAFParameterInfo info)
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 012908f..dadf9c3 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -68,11 +68,6 @@
</dependency>
<!-- inter-project -->
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${httpcomponents.client.version}</version>
@@ -155,12 +150,6 @@
</includes>
</filter>
<filter>
- <artifact>commons-logging:commons-logging</artifact>
- <includes>
- <include>**</include>
- </includes>
- </filter>
- <filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java
----------------------------------------------------------------------
diff --git a/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java b/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java
index 2969bc6..920d50f 100644
--- a/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java
+++ b/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java
@@ -60,8 +60,6 @@ import javax.security.sasl.SaslException;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.protocol.HttpContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hive.jdbc.Utils.JdbcConnectionParams;
import org.apache.hive.service.auth.HiveAuthFactory;
import org.apache.hive.service.auth.KerberosSaslHelper;
@@ -97,13 +95,15 @@ import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.transport.THttpClient;
import org.apache.thrift.transport.TTransport;
import org.apache.thrift.transport.TTransportException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* HiveConnection.
*
*/
public class HiveConnection implements java.sql.Connection {
- public static final Log LOG = LogFactory.getLog(HiveConnection.class.getName());
+ public static final Logger LOG = LoggerFactory.getLogger(HiveConnection.class.getName());
private static final String HIVE_VAR_PREFIX = "hivevar:";
private static final String HIVE_CONF_PREFIX = "hiveconf:";
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/jdbc/src/java/org/apache/hive/jdbc/HiveDataSource.java
----------------------------------------------------------------------
diff --git a/jdbc/src/java/org/apache/hive/jdbc/HiveDataSource.java b/jdbc/src/java/org/apache/hive/jdbc/HiveDataSource.java
index 459f08d..58feb97 100644
--- a/jdbc/src/java/org/apache/hive/jdbc/HiveDataSource.java
+++ b/jdbc/src/java/org/apache/hive/jdbc/HiveDataSource.java
@@ -41,20 +41,22 @@ public class HiveDataSource implements DataSource {
/*
* (non-Javadoc)
- *
+ *
* @see javax.sql.DataSource#getConnection()
*/
+ @Override
public Connection getConnection() throws SQLException {
return getConnection("", "");
}
/*
* (non-Javadoc)
- *
+ *
* @see javax.sql.DataSource#getConnection(java.lang.String, java.lang.String)
*/
+ @Override
public Connection getConnection(String username, String password)
throws SQLException {
try {
@@ -66,10 +68,11 @@ public class HiveDataSource implements DataSource {
/*
* (non-Javadoc)
- *
+ *
* @see javax.sql.CommonDataSource#getLogWriter()
*/
+ @Override
public PrintWriter getLogWriter() throws SQLException {
// TODO Auto-generated method stub
throw new SQLException("Method not supported");
@@ -77,10 +80,11 @@ public class HiveDataSource implements DataSource {
/*
* (non-Javadoc)
- *
+ *
* @see javax.sql.CommonDataSource#getLoginTimeout()
*/
+ @Override
public int getLoginTimeout() throws SQLException {
// TODO Auto-generated method stub
throw new SQLException("Method not supported");
@@ -93,10 +97,11 @@ public class HiveDataSource implements DataSource {
/*
* (non-Javadoc)
- *
+ *
* @see javax.sql.CommonDataSource#setLogWriter(java.io.PrintWriter)
*/
+ @Override
public void setLogWriter(PrintWriter arg0) throws SQLException {
// TODO Auto-generated method stub
throw new SQLException("Method not supported");
@@ -104,10 +109,11 @@ public class HiveDataSource implements DataSource {
/*
* (non-Javadoc)
- *
+ *
* @see javax.sql.CommonDataSource#setLoginTimeout(int)
*/
+ @Override
public void setLoginTimeout(int arg0) throws SQLException {
// TODO Auto-generated method stub
throw new SQLException("Method not supported");
@@ -115,10 +121,11 @@ public class HiveDataSource implements DataSource {
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Wrapper#isWrapperFor(java.lang.Class)
*/
+ @Override
public boolean isWrapperFor(Class<?> arg0) throws SQLException {
// TODO Auto-generated method stub
throw new SQLException("Method not supported");
@@ -126,10 +133,11 @@ public class HiveDataSource implements DataSource {
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Wrapper#unwrap(java.lang.Class)
*/
+ @Override
public <T> T unwrap(Class<T> arg0) throws SQLException {
// TODO Auto-generated method stub
throw new SQLException("Method not supported");
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/jdbc/src/java/org/apache/hive/jdbc/HiveDriver.java
----------------------------------------------------------------------
diff --git a/jdbc/src/java/org/apache/hive/jdbc/HiveDriver.java b/jdbc/src/java/org/apache/hive/jdbc/HiveDriver.java
index 396c314..dbc9612 100644
--- a/jdbc/src/java/org/apache/hive/jdbc/HiveDriver.java
+++ b/jdbc/src/java/org/apache/hive/jdbc/HiveDriver.java
@@ -92,6 +92,7 @@ public class HiveDriver implements Driver {
* TODO: - write a better regex. - decide on uri format
*/
+ @Override
public boolean acceptsURL(String url) throws SQLException {
return Pattern.matches(Utils.URL_PREFIX + ".*", url);
}
@@ -101,6 +102,7 @@ public class HiveDriver implements Driver {
* "If the Driver implementation understands the URL, it will return a Connection object;
* otherwise it returns null"
*/
+ @Override
public Connection connect(String url, Properties info) throws SQLException {
return acceptsURL(url) ? new HiveConnection(url, info) : null;
}
@@ -156,6 +158,7 @@ public class HiveDriver implements Driver {
/**
* Returns the major version of this driver.
*/
+ @Override
public int getMajorVersion() {
return HiveDriver.getMajorDriverVersion();
}
@@ -163,6 +166,7 @@ public class HiveDriver implements Driver {
/**
* Returns the minor version of this driver.
*/
+ @Override
public int getMinorVersion() {
return HiveDriver.getMinorDriverVersion();
}
@@ -172,6 +176,7 @@ public class HiveDriver implements Driver {
throw new SQLFeatureNotSupportedException("Method not supported");
}
+ @Override
public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws SQLException {
if (info == null) {
info = new Properties();
@@ -208,6 +213,7 @@ public class HiveDriver implements Driver {
/**
* Returns whether the driver is JDBC compliant.
*/
+ @Override
public boolean jdbcCompliant() {
return JDBC_COMPLIANT;
}
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/jdbc/src/java/org/apache/hive/jdbc/HiveQueryResultSet.java
----------------------------------------------------------------------
diff --git a/jdbc/src/java/org/apache/hive/jdbc/HiveQueryResultSet.java b/jdbc/src/java/org/apache/hive/jdbc/HiveQueryResultSet.java
index f6860f0..245c6a3 100644
--- a/jdbc/src/java/org/apache/hive/jdbc/HiveQueryResultSet.java
+++ b/jdbc/src/java/org/apache/hive/jdbc/HiveQueryResultSet.java
@@ -30,8 +30,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.concurrent.locks.ReentrantLock;
-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.type.HiveDecimal;
import org.apache.hive.service.cli.RowSet;
import org.apache.hive.service.cli.RowSetFactory;
@@ -61,7 +61,7 @@ import org.apache.hive.service.cli.thrift.TTypeQualifiers;
*/
public class HiveQueryResultSet extends HiveBaseResultSet {
- public static final Log LOG = LogFactory.getLog(HiveQueryResultSet.class);
+ public static final Logger LOG = LoggerFactory.getLogger(HiveQueryResultSet.class);
private TCLIService.Iface client;
private TOperationHandle stmtHandle;
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/jdbc/src/java/org/apache/hive/jdbc/HiveStatement.java
----------------------------------------------------------------------
diff --git a/jdbc/src/java/org/apache/hive/jdbc/HiveStatement.java b/jdbc/src/java/org/apache/hive/jdbc/HiveStatement.java
index d4041bb..25456af 100644
--- a/jdbc/src/java/org/apache/hive/jdbc/HiveStatement.java
+++ b/jdbc/src/java/org/apache/hive/jdbc/HiveStatement.java
@@ -27,10 +27,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.locks.ReentrantLock;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hive.service.cli.RowSet;
import org.apache.hive.service.cli.RowSetFactory;
import org.apache.hive.service.cli.thrift.TCLIService;
@@ -47,13 +44,15 @@ import org.apache.hive.service.cli.thrift.TSessionHandle;
import org.apache.hive.service.cli.thrift.TFetchResultsReq;
import org.apache.hive.service.cli.thrift.TFetchResultsResp;
import org.apache.hive.service.cli.thrift.TFetchOrientation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* HiveStatement.
*
*/
public class HiveStatement implements java.sql.Statement {
- public static final Log LOG = LogFactory.getLog(HiveStatement.class.getName());
+ public static final Logger LOG = LoggerFactory.getLogger(HiveStatement.class.getName());
private final HiveConnection connection;
private TCLIService.Iface client;
private TOperationHandle stmtHandle = null;
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/jdbc/src/java/org/apache/hive/jdbc/Utils.java
----------------------------------------------------------------------
diff --git a/jdbc/src/java/org/apache/hive/jdbc/Utils.java b/jdbc/src/java/org/apache/hive/jdbc/Utils.java
index d8368a4..11b4109 100644
--- a/jdbc/src/java/org/apache/hive/jdbc/Utils.java
+++ b/jdbc/src/java/org/apache/hive/jdbc/Utils.java
@@ -28,16 +28,16 @@ import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hive.service.cli.HiveSQLException;
import org.apache.hive.service.cli.thrift.TStatus;
import org.apache.hive.service.cli.thrift.TStatusCode;
import org.apache.http.client.CookieStore;
import org.apache.http.cookie.Cookie;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
class Utils {
- static final Log LOG = LogFactory.getLog(Utils.class.getName());
+ static final Logger LOG = LoggerFactory.getLogger(Utils.class.getName());
/**
* The required prefix for the connection URL.
*/
@@ -138,7 +138,7 @@ class Utils {
private String[] authorityList;
private String zooKeeperEnsemble = null;
private String currentHostZnodePath;
- private List<String> rejectedHostZnodePaths = new ArrayList<String>();
+ private final List<String> rejectedHostZnodePaths = new ArrayList<String>();
public JdbcConnectionParams() {
}
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/jdbc/src/java/org/apache/hive/jdbc/ZooKeeperHiveClientHelper.java
----------------------------------------------------------------------
diff --git a/jdbc/src/java/org/apache/hive/jdbc/ZooKeeperHiveClientHelper.java b/jdbc/src/java/org/apache/hive/jdbc/ZooKeeperHiveClientHelper.java
index 6c21423..306ce8d 100644
--- a/jdbc/src/java/org/apache/hive/jdbc/ZooKeeperHiveClientHelper.java
+++ b/jdbc/src/java/org/apache/hive/jdbc/ZooKeeperHiveClientHelper.java
@@ -24,22 +24,23 @@ import java.util.Random;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.retry.ExponentialBackoffRetry;
import org.apache.hive.jdbc.Utils.JdbcConnectionParams;
import org.apache.zookeeper.Watcher;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
class ZooKeeperHiveClientHelper {
- static final Log LOG = LogFactory.getLog(ZooKeeperHiveClientHelper.class.getName());
+ static final Logger LOG = LoggerFactory.getLogger(ZooKeeperHiveClientHelper.class.getName());
// Pattern for key1=value1;key2=value2
private static final Pattern kvPattern = Pattern.compile("([^=;]*)=([^;]*)[;]?");
/**
* A no-op watcher class
*/
static class DummyWatcher implements Watcher {
+ @Override
public void process(org.apache.zookeeper.WatchedEvent event) {
}
}
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/llap-client/pom.xml
----------------------------------------------------------------------
diff --git a/llap-client/pom.xml b/llap-client/pom.xml
index ff7c82c..02243f8 100644
--- a/llap-client/pom.xml
+++ b/llap-client/pom.xml
@@ -56,11 +56,6 @@
<version>${commons-lang.version}</version>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
<version>${libthrift.version}</version>
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/llap-server/pom.xml
----------------------------------------------------------------------
diff --git a/llap-server/pom.xml b/llap-server/pom.xml
index 42e53b6..4be45a5 100644
--- a/llap-server/pom.xml
+++ b/llap-server/pom.xml
@@ -71,11 +71,6 @@
<version>${commons-lang.version}</version>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>${avro.version}</version>
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/llap-server/src/java/org/apache/hadoop/hive/llap/cache/BuddyAllocator.java
----------------------------------------------------------------------
diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/cache/BuddyAllocator.java b/llap-server/src/java/org/apache/hadoop/hive/llap/cache/BuddyAllocator.java
index ae64d20..f69ac5b 100644
--- a/llap-server/src/java/org/apache/hadoop/hive/llap/cache/BuddyAllocator.java
+++ b/llap-server/src/java/org/apache/hadoop/hive/llap/cache/BuddyAllocator.java
@@ -30,7 +30,7 @@ import org.apache.hadoop.hive.llap.metrics.LlapDaemonCacheMetrics;
public final class BuddyAllocator implements EvictionAwareAllocator, BuddyAllocatorMXBean {
private final Arena[] arenas;
- private AtomicInteger allocatedArenas = new AtomicInteger(0);
+ private final AtomicInteger allocatedArenas = new AtomicInteger(0);
private final MemoryManager memoryManager;
@@ -48,11 +48,10 @@ public final class BuddyAllocator implements EvictionAwareAllocator, BuddyAlloca
maxAllocation = HiveConf.getIntVar(conf, ConfVars.LLAP_ORC_CACHE_MAX_ALLOC);
arenaSize = HiveConf.getIntVar(conf, ConfVars.LLAP_ORC_CACHE_ARENA_SIZE);
long maxSizeVal = HiveConf.getLongVar(conf, ConfVars.LLAP_ORC_CACHE_MAX_SIZE);
- if (LlapIoImpl.LOGL.isInfoEnabled()) {
- LlapIoImpl.LOG.info("Buddy allocator with " + (isDirect ? "direct" : "byte")
- + " buffers; allocation sizes " + minAllocation + " - " + maxAllocation
- + ", arena size " + arenaSize + ". total size " + maxSizeVal);
- }
+ LlapIoImpl.LOG.info("Buddy allocator with {}", (isDirect ? "direct" : "byte")
+ , " buffers; allocation sizes {} ", minAllocation, " - {}", maxAllocation
+ , ", arena size {}", arenaSize, ". total size {}", maxSizeVal);
+
if (minAllocation < 8) {
throw new AssertionError("Min allocation must be at least 8: " + minAllocation);
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelCacheImpl.java
----------------------------------------------------------------------
diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelCacheImpl.java b/llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelCacheImpl.java
index 4d83bb9..e7b8f1a 100644
--- a/llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelCacheImpl.java
+++ b/llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelCacheImpl.java
@@ -41,13 +41,13 @@ import com.google.common.annotations.VisibleForTesting;
public class LowLevelCacheImpl implements LowLevelCache, LlapOomDebugDump {
private static final int DEFAULT_CLEANUP_INTERVAL = 600;
private final EvictionAwareAllocator allocator;
- private AtomicInteger newEvictions = new AtomicInteger(0);
+ private final AtomicInteger newEvictions = new AtomicInteger(0);
private Thread cleanupThread = null;
private final ConcurrentHashMap<Long, FileCache> cache =
new ConcurrentHashMap<Long, FileCache>();
private final LowLevelCachePolicy cachePolicy;
private final long cleanupInterval;
- private LlapDaemonCacheMetrics metrics;
+ private final LlapDaemonCacheMetrics metrics;
private final boolean doAssumeGranularBlocks;
public LowLevelCacheImpl(LlapDaemonCacheMetrics metrics, LowLevelCachePolicy cachePolicy,
@@ -58,9 +58,8 @@ public class LowLevelCacheImpl implements LowLevelCache, LlapOomDebugDump {
@VisibleForTesting
LowLevelCacheImpl(LlapDaemonCacheMetrics metrics, LowLevelCachePolicy cachePolicy,
EvictionAwareAllocator allocator, boolean doAssumeGranularBlocks, long cleanupInterval) {
- if (LlapIoImpl.LOGL.isInfoEnabled()) {
- LlapIoImpl.LOG.info("Low level cache; cleanup interval " + cleanupInterval + "sec");
- }
+ LlapIoImpl.LOG.info("Low level cache; cleanup interval {}", cleanupInterval, "sec");
+
this.cachePolicy = cachePolicy;
this.allocator = allocator;
this.cleanupInterval = cleanupInterval;
@@ -380,9 +379,9 @@ public class LowLevelCacheImpl implements LowLevelCache, LlapOomDebugDump {
// In fact, CSLM has slow single-threaded operation, and one file is probably often read
// by just one (or few) threads, so a much more simple DS with locking might be better.
// Let's use CSLM for now, since it's available.
- private ConcurrentSkipListMap<Long, LlapDataBuffer> cache
+ private final ConcurrentSkipListMap<Long, LlapDataBuffer> cache
= new ConcurrentSkipListMap<Long, LlapDataBuffer>();
- private AtomicInteger refCount = new AtomicInteger(0);
+ private final AtomicInteger refCount = new AtomicInteger(0);
boolean incRef() {
while (true) {
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelCacheMemoryManager.java
----------------------------------------------------------------------
diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelCacheMemoryManager.java b/llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelCacheMemoryManager.java
index 4a256ee..8a39e35 100644
--- a/llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelCacheMemoryManager.java
+++ b/llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelCacheMemoryManager.java
@@ -44,9 +44,8 @@ public class LowLevelCacheMemoryManager implements MemoryManager {
this.usedMemory = new AtomicLong(0);
this.metrics = metrics;
metrics.incrCacheCapacityTotal(maxSize);
- if (LlapIoImpl.LOGL.isInfoEnabled()) {
- LlapIoImpl.LOG.info("Cache memory manager initialized with max size " + maxSize);
- }
+ LlapIoImpl.LOG.info("Cache memory manager initialized with max size {}", maxSize);
+
}
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelFifoCachePolicy.java
----------------------------------------------------------------------
diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelFifoCachePolicy.java b/llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelFifoCachePolicy.java
index 9de159c..0838682 100644
--- a/llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelFifoCachePolicy.java
+++ b/llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelFifoCachePolicy.java
@@ -19,15 +19,12 @@
package org.apache.hadoop.hive.llap.cache;
import java.util.Iterator;
-import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hive.conf.HiveConf;
-import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
import org.apache.hadoop.hive.llap.cache.LowLevelCache.Priority;
import org.apache.hadoop.hive.llap.io.api.impl.LlapIoImpl;
@@ -38,9 +35,7 @@ public class LowLevelFifoCachePolicy implements LowLevelCachePolicy {
private LlapOomDebugDump parentDebugDump;
public LowLevelFifoCachePolicy(Configuration conf) {
- if (LlapIoImpl.LOGL.isInfoEnabled()) {
- LlapIoImpl.LOG.info("FIFO cache policy");
- }
+ LlapIoImpl.LOG.info("FIFO cache policy");
buffers = new LinkedList<LlapCacheableBuffer>();
}
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelLrfuCachePolicy.java
----------------------------------------------------------------------
diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelLrfuCachePolicy.java b/llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelLrfuCachePolicy.java
index 76e7605..49e1b59 100644
--- a/llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelLrfuCachePolicy.java
+++ b/llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelLrfuCachePolicy.java
@@ -78,10 +78,9 @@ public class LowLevelLrfuCachePolicy implements LowLevelCachePolicy {
int lrfuThreshold = (int)((Math.log(1 - Math.pow(0.5, lambda)) / Math.log(0.5)) / lambda);
maxHeapSize = Math.min(lrfuThreshold, maxBuffers);
}
- if (LlapIoImpl.LOGL.isInfoEnabled()) {
- LlapIoImpl.LOG.info("LRFU cache policy with min buffer size " + minBufferSize
- + " and lambda " + lambda + " (heap size " + maxHeapSize + ")");
- }
+ LlapIoImpl.LOG.info("LRFU cache policy with min buffer size {}", minBufferSize
+ , " and lambda {}", lambda, " (heap size {} ", maxHeapSize + ")");
+
heap = new LlapCacheableBuffer[maxHeapSize];
listHead = listTail = null;
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapOptionsProcessor.java
----------------------------------------------------------------------
diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapOptionsProcessor.java b/llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapOptionsProcessor.java
index e55b083..8fd615c 100644
--- a/llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapOptionsProcessor.java
+++ b/llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapOptionsProcessor.java
@@ -30,8 +30,8 @@ import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-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.StringUtils;
public class LlapOptionsProcessor {
@@ -95,7 +95,7 @@ public class LlapOptionsProcessor {
}
}
- protected static final Log l4j = LogFactory.getLog(LlapOptionsProcessor.class.getName());
+ protected static final Logger l4j = LoggerFactory.getLogger(LlapOptionsProcessor.class.getName());
private final Options options = new Options();
Map<String, String> hiveVariables = new HashMap<String, String>();
private org.apache.commons.cli.CommandLine commandLine;
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java
----------------------------------------------------------------------
diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java b/llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java
index 05fecc7..317fa20 100644
--- a/llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java
+++ b/llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java
@@ -25,8 +25,8 @@ import java.util.Map;
import java.util.Map.Entry;
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.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileSystem;
@@ -47,7 +47,7 @@ import com.google.common.base.Preconditions;
public class LlapServiceDriver {
- protected static final Log LOG = LogFactory.getLog(LlapServiceDriver.class.getName());
+ protected static final Logger LOG = LoggerFactory.getLogger(LlapServiceDriver.class.getName());
private final Configuration conf;
public LlapServiceDriver() {
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/HistoryLogger.java
----------------------------------------------------------------------
diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/HistoryLogger.java b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/HistoryLogger.java
index b4fc618..3c9ad24 100644
--- a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/HistoryLogger.java
+++ b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/HistoryLogger.java
@@ -14,7 +14,8 @@
package org.apache.hadoop.hive.llap.daemon;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class HistoryLogger {
@@ -36,7 +37,7 @@ public class HistoryLogger {
private static final String EVENT_TYPE_FRAGMENT_START = "FRAGMENT_START";
private static final String EVENT_TYPE_FRAGMENT_END = "FRAGMENT_END";
- private static final Logger HISTORY_LOGGER = Logger.getLogger(HistoryLogger.class);
+ private static final Logger HISTORY_LOGGER = LoggerFactory.getLogger(HistoryLogger.class);
public static void logFragmentStart(String applicationIdStr, String containerIdStr,
String hostname,
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/AMReporter.java
----------------------------------------------------------------------
diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/AMReporter.java b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/AMReporter.java
index 2fd2546..6d54fd4 100644
--- a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/AMReporter.java
+++ b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/AMReporter.java
@@ -15,6 +15,7 @@
package org.apache.hadoop.hive.llap.daemon.impl;
import javax.net.SocketFactory;
+
import java.io.IOException;
import java.net.InetSocketAddress;
import java.security.PrivilegedExceptionAction;
@@ -36,8 +37,8 @@ import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.ListeningExecutorService;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
+
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hive.common.CallableWithNdc;
import org.apache.hadoop.hive.llap.LlapNodeId;
import org.apache.hadoop.hive.llap.configuration.LlapConfiguration;
import org.apache.hadoop.hive.llap.daemon.QueryFailedHandler;
@@ -51,6 +52,7 @@ import org.apache.hadoop.security.SecurityUtil;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.token.Token;
import org.apache.hadoop.service.AbstractService;
+import org.apache.tez.common.CallableWithNdc;
import org.apache.tez.common.security.JobTokenIdentifier;
import org.apache.tez.dag.records.TezTaskAttemptID;
import org.slf4j.Logger;
@@ -90,7 +92,7 @@ public class AMReporter extends AbstractService {
private final RetryPolicy retryPolicy;
private final long retryTimeout;
private final SocketFactory socketFactory;
- private final DelayQueue<AMNodeInfo> pendingHeartbeatQueeu = new DelayQueue();
+ private final DelayQueue<AMNodeInfo> pendingHeartbeatQueeu = new DelayQueue<>();
private final AtomicReference<InetSocketAddress> localAddress;
private final long heartbeatInterval;
private final AtomicBoolean isShutdown = new AtomicBoolean(false);