diff --git a/accumulo-handler/pom.xml b/accumulo-handler/pom.xml
index ec9575e..34cde08 100644
--- a/accumulo-handler/pom.xml
+++ b/accumulo-handler/pom.xml
@@ -44,19 +44,57 @@
commons-collections
commons-collections
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
org.apache.accumulo
accumulo-fate
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.accumulo
accumulo-start
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.accumulo
accumulo-trace
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hive
@@ -126,6 +164,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -133,12 +175,40 @@
hadoop-common
${hadoop.version}
true
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
hadoop-mapreduce-client-core
${hadoop.version}
true
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
junit
diff --git a/beeline/pom.xml b/beeline/pom.xml
index 4567d5e..3c6a917 100644
--- a/beeline/pom.xml
+++ b/beeline/pom.xml
@@ -81,6 +81,12 @@
hadoop-common
${hadoop.version}
true
+
+
+ log4j
+ log4j
+
+
org.apache.thrift
@@ -99,6 +105,12 @@
${project.version}
tests
test
+
+
+ commons-logging
+ commons-logging
+
+
org.apache.hive
@@ -112,6 +124,12 @@
hadoop-mapreduce-client-core
${hadoop.version}
test
+
+
+ log4j
+ log4j
+
+
junit
diff --git a/cli/pom.xml b/cli/pom.xml
index 7c50ace..7dd48d0 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -63,6 +63,12 @@
org.apache.hive
hive-exec
${project.version}
+
+
+ commons-logging
+ commons-logging
+
+
@@ -96,18 +102,36 @@
org.apache.thrift
libthrift
${libthrift.version}
+
+
+ commons-logging
+ commons-logging
+
+
org.apache.hadoop
hadoop-common
${hadoop.version}
true
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
hadoop-mapreduce-client-core
${hadoop.version}
true
+
+
+ log4j
+ log4j
+
+
@@ -115,6 +139,16 @@
hbase-common
${hbase.version}
test
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
junit
diff --git a/common/pom.xml b/common/pom.xml
index 91d9ce0..6cf7fba 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -67,6 +67,16 @@
org.apache.orc
orc-core
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
jline
@@ -159,6 +169,10 @@
slf4j-log4j12
+ log4j
+ log4j
+
+
commons-logging
commons-logging
@@ -198,6 +212,10 @@
slf4j-log4j12
+ log4j
+ log4j
+
+
commons-logging
commons-logging
diff --git a/common/src/java/org/apache/hadoop/hive/conf/HiveConfUtil.java b/common/src/java/org/apache/hadoop/hive/conf/HiveConfUtil.java
index d826f8b..2ad5f9e 100644
--- a/common/src/java/org/apache/hadoop/hive/conf/HiveConfUtil.java
+++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConfUtil.java
@@ -20,13 +20,13 @@
import com.google.common.collect.Iterables;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hive.common.classification.InterfaceAudience.Private;
import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hive.common.util.HiveStringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.File;
import java.util.ArrayList;
@@ -45,7 +45,7 @@
@Private
public class HiveConfUtil {
private static final String CLASS_NAME = HiveConfUtil.class.getName();
- private static final Log LOG = LogFactory.getLog(CLASS_NAME);
+ private static final Logger LOG = LoggerFactory.getLogger(CLASS_NAME);
/**
* Check if metastore is being used in embedded mode.
* This utility function exists so that the logic for determining the mode is same
diff --git a/common/src/java/org/apache/hadoop/hive/conf/valcoersion/JavaIOTmpdirVariableCoercion.java b/common/src/java/org/apache/hadoop/hive/conf/valcoersion/JavaIOTmpdirVariableCoercion.java
index 6523301..d2a24f3 100644
--- a/common/src/java/org/apache/hadoop/hive/conf/valcoersion/JavaIOTmpdirVariableCoercion.java
+++ b/common/src/java/org/apache/hadoop/hive/conf/valcoersion/JavaIOTmpdirVariableCoercion.java
@@ -17,14 +17,14 @@
*/
package org.apache.hadoop.hive.conf.valcoersion;
+import java.io.IOException;
+
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.LocalFileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hive.common.FileUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import java.io.IOException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Enforces absolute paths to be used for the java.io.tmpdir system variable.
@@ -32,7 +32,7 @@
* @see org.apache.hadoop.hive.conf.SystemVariables
*/
public class JavaIOTmpdirVariableCoercion extends VariableCoercion {
- private static final Log LOG = LogFactory.getLog(JavaIOTmpdirVariableCoercion.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JavaIOTmpdirVariableCoercion.class);
private static final String NAME = "system:java.io.tmpdir";
private static final FileSystem LOCAL_FILE_SYSTEM = new LocalFileSystem();
diff --git a/common/src/java/org/apache/hive/http/JMXJsonServlet.java b/common/src/java/org/apache/hive/http/JMXJsonServlet.java
index 5112dba..7b2f89e 100644
--- a/common/src/java/org/apache/hive/http/JMXJsonServlet.java
+++ b/common/src/java/org/apache/hive/http/JMXJsonServlet.java
@@ -44,10 +44,10 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.codehaus.jackson.JsonFactory;
import org.codehaus.jackson.JsonGenerator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/*
* This servlet is based off of the JMXProxyServlet from Tomcat 7.0.14. It has
@@ -117,7 +117,7 @@
*
*/
public class JMXJsonServlet extends HttpServlet {
- private static final Log LOG = LogFactory.getLog(JMXJsonServlet.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JMXJsonServlet.class);
static final String ACCESS_CONTROL_ALLOW_METHODS =
"Access-Control-Allow-Methods";
static final String ACCESS_CONTROL_ALLOW_ORIGIN =
diff --git a/contrib/pom.xml b/contrib/pom.xml
index df5e5d7..d85c784 100644
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -38,11 +38,27 @@
org.apache.hive
hive-exec
${project.version}
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hive
hive-serde
${project.version}
+
+
+ log4j
+ log4j
+
+
org.apache.hive
@@ -60,12 +76,24 @@
hadoop-common
${hadoop.version}
true
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
hadoop-mapreduce-client-core
${hadoop.version}
true
+
+
+ log4j
+ log4j
+
+
diff --git a/druid-handler/pom.xml b/druid-handler/pom.xml
index ef1231f..ada4470 100644
--- a/druid-handler/pom.xml
+++ b/druid-handler/pom.xml
@@ -73,6 +73,14 @@
com.fasterxml.jackson.core
jackson-databind
+
+ log4j
+ log4j
+
+
+ commons-logging
+ commons-logging
+
@@ -145,6 +153,10 @@
com.google.code.findbugs
annotations
+
+ commons-logging
+ commons-logging
+
true
@@ -211,6 +223,10 @@
commons-logging
+ log4j
+ log4j
+
+
com.fasterxml.jackson.core
jackson-databind
@@ -251,6 +267,10 @@
com.fasterxml.jackson.core
jackson-databind
+
+ log4j
+ log4j
+
diff --git a/hbase-handler/pom.xml b/hbase-handler/pom.xml
index 06939a4..d30cc16 100644
--- a/hbase-handler/pom.xml
+++ b/hbase-handler/pom.xml
@@ -38,6 +38,20 @@
org.apache.hive
hive-exec
${project.version}
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
@@ -59,6 +73,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -66,16 +84,58 @@
hadoop-mapreduce-client-core
${hadoop.version}
true
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
hbase-hadoop2-compat
${hbase.version}
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
hbase-client
${hbase.version}
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
@@ -90,6 +150,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
org.glassfish.web
javax.servlet.jsp
@@ -109,6 +173,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -116,11 +184,39 @@
org.apache.hbase
hbase-common
${hbase.version}
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
hbase-hadoop-compat
${hbase.version}
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
@@ -130,12 +226,40 @@
${hadoop.version}
tests
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
hbase-hadoop2-compat
${hbase.version}
tests
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
@@ -143,6 +267,20 @@
${hbase.version}
test-jar
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
@@ -163,6 +301,10 @@
org.glassfish.web
javax.servlet.jsp
+
+ log4j
+ log4j
+
@@ -180,6 +322,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -188,6 +334,20 @@
${hbase.version}
test-jar
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.eclipse.jetty
@@ -216,6 +376,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
diff --git a/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHBaseInputFormatUtil.java b/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHBaseInputFormatUtil.java
index 8b73bfb..bfcb1fa 100644
--- a/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHBaseInputFormatUtil.java
+++ b/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHBaseInputFormatUtil.java
@@ -24,13 +24,11 @@
import java.util.List;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.filter.FilterList;
import org.apache.hadoop.hbase.filter.FirstKeyOnlyFilter;
import org.apache.hadoop.hbase.filter.KeyOnlyFilter;
-import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hive.hbase.ColumnMappings.ColumnMapping;
import org.apache.hadoop.hive.ql.exec.ExprNodeConstantEvaluator;
@@ -56,13 +54,15 @@
import org.apache.hadoop.io.LongWritable;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapred.JobConf;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Util code common between HiveHBaseTableInputFormat and HiveHBaseTableSnapshotInputFormat.
*/
class HiveHBaseInputFormatUtil {
- private static final Log LOG = LogFactory.getLog(HiveHBaseInputFormatUtil.class);
+ private static final Logger LOG = LoggerFactory.getLogger(HiveHBaseInputFormatUtil.class);
/**
* Parse {@code jobConf} to create a {@link Scan} instance.
diff --git a/hcatalog/core/pom.xml b/hcatalog/core/pom.xml
index 4315527..13bbf50 100644
--- a/hcatalog/core/pom.xml
+++ b/hcatalog/core/pom.xml
@@ -73,6 +73,20 @@
${project.version}
test-jar
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
@@ -118,6 +132,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -133,12 +151,30 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
org.apache.hadoop
hadoop-hdfs
${hadoop.version}
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
@@ -168,6 +204,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -176,6 +216,20 @@
${hadoop.version}
tests
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
@@ -191,6 +245,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -207,6 +265,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -224,6 +286,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -237,6 +303,14 @@
org.slf4j
slf4j-log4j12
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
@@ -250,6 +324,10 @@
org.mortbay.jetty
jetty-util
+
+ commons-logging
+ commons-logging
+
org.mortbay.jetty
jetty
diff --git a/hcatalog/hcatalog-pig-adapter/pom.xml b/hcatalog/hcatalog-pig-adapter/pom.xml
index a1c8ddf..522580c 100644
--- a/hcatalog/hcatalog-pig-adapter/pom.xml
+++ b/hcatalog/hcatalog-pig-adapter/pom.xml
@@ -50,16 +50,46 @@
org.apache.hadoop
hadoop-common
${hadoop.version}
+
+
+ log4j
+ log4j
+
+
+ commons-logging
+ commons-logging
+
+
org.apache.hadoop
hadoop-mapreduce-client-jobclient
${hadoop.version}
+
+
+ log4j
+ log4j
+
+
+ commons-logging
+ commons-logging
+
+
org.apache.hadoop
hadoop-mapreduce-client-core
${hadoop.version}
+
+
+ log4j
+ log4j
+
+
+ commons-logging
+ commons-logging
+
+
org.apache.pig
@@ -72,6 +102,14 @@
jetty-util
+ log4j
+ log4j
+
+
+ commons-logging
+ commons-logging
+
+
org.mortbay.jetty
jetty
@@ -98,6 +136,16 @@
hadoop-hdfs
${hadoop.version}
test
+
+
+ log4j
+ log4j
+
+
+ commons-logging
+ commons-logging
+
+
@@ -135,6 +193,16 @@
${hadoop.version}
tests
test
+
+
+ log4j
+ log4j
+
+
+ commons-logging
+ commons-logging
+
+
org.apache.hadoop
@@ -147,6 +215,10 @@
org.slf4j
slf4j-log4j12
+
+ log4j
+ log4j
+
commons-logging
commons-logging
@@ -168,6 +240,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
diff --git a/hcatalog/pom.xml b/hcatalog/pom.xml
index 4894e9a..5f0034f 100644
--- a/hcatalog/pom.xml
+++ b/hcatalog/pom.xml
@@ -58,12 +58,32 @@
hadoop-common
${hadoop.version}
test
+
+
+ log4j
+ log4j
+
+
+ commons-logging
+ commons-logging
+
+
org.apache.hadoop
hadoop-mapreduce-client-core
${hadoop.version}
test
+
+
+ log4j
+ log4j
+
+
+ commons-logging
+ commons-logging
+
+
org.apache.pig
@@ -76,6 +96,14 @@
org.mortbay.jetty
jetty-util
+
+ log4j
+ log4j
+
+
+ commons-logging
+ commons-logging
+
org.mortbay.jetty
jetty
diff --git a/hcatalog/server-extensions/pom.xml b/hcatalog/server-extensions/pom.xml
index 6bafcc7..1918afa 100644
--- a/hcatalog/server-extensions/pom.xml
+++ b/hcatalog/server-extensions/pom.xml
@@ -70,6 +70,16 @@
org.apache.hadoop
hadoop-common
${hadoop.version}
+
+
+ log4j
+ log4j
+
+
+ commons-logging
+ commons-logging
+
+
@@ -85,6 +95,16 @@
${project.version}
test-jar
test
+
+
+ log4j
+ log4j
+
+
+ commons-logging
+ commons-logging
+
+
@@ -103,6 +123,10 @@
org.springframework
spring-context
+
+ commons-logging
+ commons-logging
+
@@ -116,6 +140,16 @@
pig
${pig.version}
test
+
+
+ log4j
+ log4j
+
+
+ commons-logging
+ commons-logging
+
+
diff --git a/hcatalog/streaming/pom.xml b/hcatalog/streaming/pom.xml
index e8555c8..0f7ce65 100644
--- a/hcatalog/streaming/pom.xml
+++ b/hcatalog/streaming/pom.xml
@@ -49,6 +49,12 @@
org.apache.hive
hive-exec
${project.version}
+
+
+ commons-logging
+ commons-logging
+
+
org.apache.hive
@@ -72,6 +78,20 @@
hadoop-common
true
${hadoop.version}
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ log4j
+ log4j
+
+
+ commons-logging
+ commons-logging
+
+
org.apache.hadoop
@@ -84,6 +104,10 @@
slf4j-log4j12
+ log4j
+ log4j
+
+
commons-logging
commons-logging
diff --git a/hcatalog/webhcat/java-client/pom.xml b/hcatalog/webhcat/java-client/pom.xml
index 56b6d53..c96a36f 100644
--- a/hcatalog/webhcat/java-client/pom.xml
+++ b/hcatalog/webhcat/java-client/pom.xml
@@ -54,17 +54,59 @@
org.apache.hive
hive-exec
${project.version}
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
hadoop-common
${hadoop.version}
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
hadoop-mapreduce-client-core
${hadoop.version}
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
@@ -73,6 +115,20 @@
${project.version}
test-jar
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hive
@@ -80,6 +136,20 @@
${project.version}
test-jar
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hive.hcatalog
diff --git a/hcatalog/webhcat/svr/pom.xml b/hcatalog/webhcat/svr/pom.xml
index 5c093b0..2a1198f 100644
--- a/hcatalog/webhcat/svr/pom.xml
+++ b/hcatalog/webhcat/svr/pom.xml
@@ -122,6 +122,20 @@
org.apache.zookeeper
zookeeper
${zookeeper.version}
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
com.fasterxml.jackson.core
@@ -156,6 +170,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -171,6 +189,10 @@
org.mortbay.jetty
jetty-util
+
+ log4j
+ log4j
+
@@ -186,6 +208,14 @@
org.mortbay.jetty
jetty-util
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
@@ -197,6 +227,10 @@
org.mortbay.jetty
jetty-util
+
+ log4j
+ log4j
+
@@ -206,6 +240,12 @@
${project.version}
test-jar
test
+
+
+ commons-logging
+ commons-logging
+
+
junit
diff --git a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/ListDelegator.java b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/ListDelegator.java
index 6324a5f..1cdaeda 100644
--- a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/ListDelegator.java
+++ b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/ListDelegator.java
@@ -19,25 +19,25 @@
package org.apache.hive.hcatalog.templeton;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import java.util.ArrayList;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.hive.shims.HadoopShims.WebHCatJTShim;
import org.apache.hadoop.hive.shims.ShimLoader;
import org.apache.hadoop.mapred.JobStatus;
import org.apache.hadoop.security.UserGroupInformation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* List jobs owned by a user.
*/
public class ListDelegator extends TempletonDelegator {
- private static final Log LOG = LogFactory.getLog(ListDelegator.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ListDelegator.class);
private final String JOB_LIST_EXECUTE_THREAD_PREFIX = "JobListExecute";
/**
diff --git a/hplsql/pom.xml b/hplsql/pom.xml
index 4ad9ef9..2284770 100644
--- a/hplsql/pom.xml
+++ b/hplsql/pom.xml
@@ -57,6 +57,20 @@
org.apache.hive
hive-exec
${project.version}
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ log4j
+ log4j
+
+
+ commons-logging
+ commons-logging
+
+
org.antlr
@@ -68,6 +82,20 @@
hadoop-common
${hadoop.version}
true
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ log4j
+ log4j
+
+
+ commons-logging
+ commons-logging
+
+
junit
diff --git a/itests/custom-serde/pom.xml b/itests/custom-serde/pom.xml
index f204a85..e2828e0 100644
--- a/itests/custom-serde/pom.xml
+++ b/itests/custom-serde/pom.xml
@@ -38,6 +38,20 @@
hive-exec
${project.version}
true
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ log4j
+ log4j
+
+
+ commons-logging
+ commons-logging
+
+
@@ -45,6 +59,20 @@
hadoop-common
${hadoop.version}
true
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ log4j
+ log4j
+
+
+ commons-logging
+ commons-logging
+
+
diff --git a/itests/custom-udfs/pom.xml b/itests/custom-udfs/pom.xml
index 9955b04..adf7dcb 100644
--- a/itests/custom-udfs/pom.xml
+++ b/itests/custom-udfs/pom.xml
@@ -52,12 +52,40 @@ limitations under the License.
hive-exec
${project.version}
true
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ log4j
+ log4j
+
+
+ commons-logging
+ commons-logging
+
+
org.apache.hadoop
hadoop-common
${hadoop.version}
true
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ log4j
+ log4j
+
+
+ commons-logging
+ commons-logging
+
+
diff --git a/itests/hcatalog-unit/pom.xml b/itests/hcatalog-unit/pom.xml
index a1d2149..86b2489 100644
--- a/itests/hcatalog-unit/pom.xml
+++ b/itests/hcatalog-unit/pom.xml
@@ -101,6 +101,16 @@
hive-standalone-metastore
${project.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
org.apache.hive
@@ -147,6 +157,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -164,6 +178,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -171,6 +189,20 @@
hadoop-hdfs
${hadoop.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
@@ -178,12 +210,40 @@
${hadoop.version}
tests
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
hadoop-mapreduce-client-core
${hadoop.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
@@ -208,6 +268,20 @@
${hadoop.version}
test
tests
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
com.sun.jersey
@@ -235,12 +309,36 @@
hbase-client
${hbase.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
org.apache.hbase
hbase-common
${hbase.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
@@ -248,12 +346,36 @@
${hbase.version}
test
tests
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
hbase-hadoop-compat
${hbase.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
org.apache.hbase
@@ -261,12 +383,32 @@
${hbase.version}
test
tests
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
org.apache.hbase
hbase-hadoop2-compat
${hbase.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
org.apache.hbase
@@ -274,6 +416,16 @@
${hbase.version}
test
tests
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
org.apache.hbase
@@ -285,6 +437,14 @@
org.glassfish.web
javax.servlet.jsp
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
@@ -292,6 +452,20 @@
hbase-mapreduce
${hbase.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
@@ -299,6 +473,20 @@
${hbase.version}
tests
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.pig
@@ -306,6 +494,20 @@
${pig.version}
h2
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
@@ -174,11 +220,39 @@
org.apache.hadoop
hadoop-common
${hadoop.version}
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
hadoop-distcp
${hadoop.version}
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
@@ -186,6 +260,20 @@
${hadoop.version}
tests
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
@@ -202,6 +290,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -209,12 +301,40 @@
hadoop-mapreduce-client-core
${hadoop.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
hadoop-mapreduce-client-common
${hadoop.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
@@ -226,6 +346,18 @@
org.glassfish.web
javax.servlet.jsp
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
@@ -233,6 +365,20 @@
hbase-mapreduce
${hbase.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
@@ -247,6 +393,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
diff --git a/itests/hive-unit/pom.xml b/itests/hive-unit/pom.xml
index 5264617..923cd91 100644
--- a/itests/hive-unit/pom.xml
+++ b/itests/hive-unit/pom.xml
@@ -125,6 +125,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -180,6 +184,20 @@
hive-standalone-metastore
${project.version}
tests
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hive
@@ -198,6 +216,20 @@
hive-exec
${project.version}
tests
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hive
@@ -205,6 +237,20 @@
${project.version}
test-jar
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hive.hcatalog
@@ -237,6 +283,14 @@
io.netty
netty-all
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
@@ -261,12 +315,40 @@
hadoop-mapreduce-client-core
${hadoop.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
hadoop-mapreduce-client-common
${hadoop.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
@@ -277,6 +359,14 @@
org.glassfish.web
javax.servlet.jsp
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
@@ -284,6 +374,20 @@
hbase-server
${hbase.version}
test-jar
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
@@ -291,12 +395,40 @@
${hbase.version}
tests
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
hbase-procedure
${hbase.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
@@ -304,6 +436,20 @@
${hbase.version}
test-jar
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
@@ -311,6 +457,20 @@
${hbase.version}
test-jar
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
@@ -325,6 +485,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -353,6 +517,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -369,6 +537,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -376,6 +548,20 @@
tez-api
${tez.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.tez
@@ -441,30 +627,100 @@
${hadoop.version}
test
tests
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
hadoop-yarn-client
${hadoop.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
hadoop-yarn-common
${hadoop.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
hadoop-yarn-api
${hadoop.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
hadoop-yarn-registry
${hadoop.version}
true
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.curator
@@ -515,6 +771,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
com.esotericsoftware.kryo
kryo
diff --git a/itests/qtest-accumulo/pom.xml b/itests/qtest-accumulo/pom.xml
index 1a1100c..9e4203b 100644
--- a/itests/qtest-accumulo/pom.xml
+++ b/itests/qtest-accumulo/pom.xml
@@ -70,6 +70,20 @@
hive-standalone-metastore
${project.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hive
@@ -77,6 +91,20 @@
${project.version}
tests
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hive
@@ -112,6 +140,20 @@
${project.version}
test
core
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hive
@@ -119,6 +161,20 @@
${project.version}
test
tests
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
@@ -173,6 +229,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -190,6 +250,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -198,12 +262,40 @@
${hadoop.version}
tests
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
hadoop-hdfs
${hadoop.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
@@ -220,6 +312,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -236,6 +332,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -243,6 +343,20 @@
hadoop-mapreduce-client-core
${hadoop.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
@@ -250,36 +364,120 @@
${hadoop.version}
test
tests
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
hadoop-yarn-client
${hadoop.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
hbase-common
${hbase.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
hbase-hadoop-compat
${hbase.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
hbase-hadoop2-compat
${hbase.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
hbase-mapreduce
${hbase.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
@@ -291,6 +489,14 @@
org.glassfish.web
javax.servlet.jsp
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
@@ -298,18 +504,60 @@
htrace-core
${accumulo-htrace.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.tez
tez-tests
${tez.version}
test-jar
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.tez
tez-api
${tez.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.tez
@@ -341,6 +589,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -357,6 +609,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -388,6 +644,14 @@
commons-beanutils
commons-beanutils-core
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
diff --git a/itests/qtest-druid/pom.xml b/itests/qtest-druid/pom.xml
index 79a0fb3..c0c9663 100644
--- a/itests/qtest-druid/pom.xml
+++ b/itests/qtest-druid/pom.xml
@@ -82,6 +82,10 @@
jersey-core
com.sun.jersey
+
+ commons-logging
+ commons-logging
+
@@ -102,6 +106,10 @@
com.sun.jersey
jersey-client
+
+ commons-logging
+ commons-logging
+
@@ -206,6 +214,12 @@
org.apache.kafka
kafka_2.11
${kafka.version}
+
+
+ log4j
+ log4j
+
+
diff --git a/itests/qtest-spark/pom.xml b/itests/qtest-spark/pom.xml
index 8ed3171..968af61 100644
--- a/itests/qtest-spark/pom.xml
+++ b/itests/qtest-spark/pom.xml
@@ -61,6 +61,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -68,6 +72,20 @@
spark-yarn_${scala.binary.version}
${spark.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.eclipse.jetty
@@ -130,6 +148,20 @@
hive-standalone-metastore
${project.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hive
@@ -137,6 +169,20 @@
${project.version}
tests
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hive
@@ -167,6 +213,20 @@
hive-exec
${project.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
@@ -196,6 +256,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -213,6 +277,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -221,12 +289,40 @@
${hadoop.version}
tests
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
hadoop-hdfs
${hadoop.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
@@ -243,6 +339,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -259,6 +359,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -266,6 +370,20 @@
hadoop-mapreduce-client-core
${hadoop.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
@@ -273,18 +391,60 @@
${hadoop.version}
test
tests
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
hadoop-yarn-client
${hadoop.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
hbase-common
${hbase.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
@@ -292,12 +452,40 @@
${hbase.version}
test
tests
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
hbase-hadoop-compat
${hbase.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
@@ -305,12 +493,40 @@
${hbase.version}
test
tests
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
hbase-hadoop2-compat
${hbase.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
@@ -318,6 +534,20 @@
${hbase.version}
test
tests
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
@@ -329,6 +559,18 @@
org.glassfish.web
javax.servlet.jsp
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
@@ -337,12 +579,40 @@
${hbase.version}
tests
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
hbase-mapreduce
${hbase.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
junit
diff --git a/itests/qtest/pom.xml b/itests/qtest/pom.xml
index a1400fd..ffe7fe8 100644
--- a/itests/qtest/pom.xml
+++ b/itests/qtest/pom.xml
@@ -49,6 +49,20 @@
hive-common
${project.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hive
@@ -61,6 +75,20 @@
hive-standalone-metastore
${project.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hive
@@ -68,6 +96,20 @@
${project.version}
tests
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hive
@@ -99,12 +141,40 @@
hive-exec
${project.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
hadoop-yarn-registry
${hadoop.version}
true
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hive
@@ -160,6 +230,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -177,6 +251,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -191,12 +269,40 @@
${hadoop.version}
tests
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
hadoop-hdfs
${hadoop.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
@@ -213,6 +319,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -229,6 +339,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -256,30 +370,100 @@
${hadoop.version}
test
tests
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
hadoop-yarn-client
${hadoop.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
hadoop-yarn-common
${hadoop.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
hadoop-yarn-api
${hadoop.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
hbase-common
${hbase.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
@@ -287,12 +471,40 @@
${hbase.version}
test
tests
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
hbase-hadoop-compat
${hbase.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
@@ -300,12 +512,40 @@
${hbase.version}
test
tests
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
hbase-hadoop2-compat
${hbase.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
@@ -313,6 +553,20 @@
${hbase.version}
test
tests
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
@@ -324,6 +578,14 @@
org.glassfish.web
javax.servlet.jsp
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
@@ -332,24 +594,80 @@
${hbase.version}
tests
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
hbase-mapreduce
${hbase.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.tez
tez-tests
${tez.version}
test-jar
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.tez
tez-api
${tez.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.tez
@@ -365,6 +683,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -372,6 +694,20 @@
tez-mapreduce
${tez.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.tez
@@ -387,6 +723,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -407,6 +747,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
diff --git a/itests/test-serde/pom.xml b/itests/test-serde/pom.xml
index 3bfc778..eaf7a4f 100644
--- a/itests/test-serde/pom.xml
+++ b/itests/test-serde/pom.xml
@@ -39,6 +39,20 @@
hive-exec
${project.version}
true
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
@@ -46,6 +60,20 @@
hadoop-common
${hadoop.version}
true
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
diff --git a/itests/util/pom.xml b/itests/util/pom.xml
index 9334f90..eac8101 100644
--- a/itests/util/pom.xml
+++ b/itests/util/pom.xml
@@ -47,6 +47,10 @@
commons-logging
+ log4j
+ log4j
+
+
commons-beanutils
commons-beanutils-core
@@ -116,6 +120,20 @@
hive-standalone-metastore
${project.version}
test-jar
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hive
@@ -137,6 +155,10 @@
guice
com.google.inject
+
+ log4j
+ log4j
+
@@ -148,17 +170,49 @@
guice
com.google.inject
+
+ log4j
+ log4j
+
org.apache.hbase
hbase-client
${hbase.version}
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
hbase-common
${hbase.version}
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
@@ -169,17 +223,57 @@
org.glassfish.web
javax.servlet.jsp
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
org.apache.hbase
hbase-mapreduce
${hbase.version}
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.tez
tez-api
${tez.version}
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
@@ -192,6 +286,20 @@
hadoop-hdfs
${hadoop.version}
tests
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
@@ -207,6 +315,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -214,12 +326,40 @@
hbase-server
${hbase.version}
tests
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
hbase-mapreduce
${hbase.version}
tests
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hive
diff --git a/jdbc-handler/pom.xml b/jdbc-handler/pom.xml
index e892708..c67ab02 100644
--- a/jdbc-handler/pom.xml
+++ b/jdbc-handler/pom.xml
@@ -41,6 +41,10 @@
org.eclipse.jetty.aggregate
jetty-all
+
+ log4j
+ log4j
+
@@ -54,6 +58,20 @@
org.apache.hive
hive-exec
${project.version}
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
@@ -67,6 +85,20 @@
hadoop-mapreduce-client-core
${hadoop.version}
true
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
@@ -83,6 +115,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -113,6 +149,20 @@
${project.version}
test
test-jar
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 02e6e8a..04ddb4d 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -49,6 +49,10 @@
org.apache.hive
hive-exec
+
+ log4j
+ log4j
+
@@ -76,6 +80,12 @@
org.apache.httpcomponents
httpclient
${httpcomponents.client.version}
+
+
+ commons-logging
+ commons-logging
+
+
org.apache.httpcomponents
@@ -94,7 +104,11 @@
org.jboss.netty
- netty
+ netty
+
+
+ log4j
+ log4j
@@ -108,6 +122,12 @@
hadoop-common
${hadoop.version}
true
+
+
+ log4j
+ log4j
+
+
diff --git a/kryo-registrator/pom.xml b/kryo-registrator/pom.xml
index 477c40d..713ac2e 100644
--- a/kryo-registrator/pom.xml
+++ b/kryo-registrator/pom.xml
@@ -37,13 +37,41 @@
hive-exec
${project.version}
true
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ log4j
+ log4j
+
+
+ commons-logging
+ commons-logging
+
+
org.apache.spark
spark-core_${scala.binary.version}
${spark.version}
true
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ log4j
+ log4j
+
+
+ commons-logging
+ commons-logging
+
+
-
\ No newline at end of file
+
diff --git a/llap-client/pom.xml b/llap-client/pom.xml
index dc13803..31f7c23 100644
--- a/llap-client/pom.xml
+++ b/llap-client/pom.xml
@@ -49,6 +49,12 @@
org.apache.zookeeper
zookeeper
${zookeeper.version}
+
+
+ log4j
+ log4j
+
+
org.apache.curator
@@ -86,6 +92,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -93,12 +103,24 @@
hadoop-mapreduce-client-core
${hadoop.version}
true
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
hadoop-yarn-registry
${hadoop.version}
true
+
+
+ commons-logging
+ commons-logging
+
+
@@ -128,6 +150,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -144,6 +170,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
diff --git a/llap-common/pom.xml b/llap-common/pom.xml
index 35f9b26..b920acf 100644
--- a/llap-common/pom.xml
+++ b/llap-common/pom.xml
@@ -65,6 +65,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -81,6 +85,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -97,6 +105,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -147,6 +159,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
diff --git a/llap-ext-client/pom.xml b/llap-ext-client/pom.xml
index 70e641d..422c932 100644
--- a/llap-ext-client/pom.xml
+++ b/llap-ext-client/pom.xml
@@ -62,6 +62,10 @@
slf4j-log4j12
+ log4j
+ log4j
+
+
commons-logging
commons-logging
@@ -72,12 +76,40 @@
hadoop-mapreduce-client-core
${hadoop.version}
true
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ log4j
+ log4j
+
+
+ commons-logging
+ commons-logging
+
+
org.apache.hadoop
hadoop-yarn-registry
${hadoop.version}
true
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ log4j
+ log4j
+
+
+ commons-logging
+ commons-logging
+
+
org.apache.tez
@@ -90,6 +122,10 @@
slf4j-log4j12
+ log4j
+ log4j
+
+
commons-logging
commons-logging
@@ -143,6 +179,10 @@
slf4j-log4j12
+ log4j
+ log4j
+
+
commons-logging
commons-logging
diff --git a/llap-server/pom.xml b/llap-server/pom.xml
index 978d797..ce53439 100644
--- a/llap-server/pom.xml
+++ b/llap-server/pom.xml
@@ -99,6 +99,12 @@
org.apache.thrift
libthrift
${libthrift.version}
+
+
+ commons-logging
+ commons-logging
+
+
com.tdunning
@@ -118,6 +124,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -134,6 +144,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -151,6 +165,10 @@
commons-logging
+ log4j
+ log4j
+
+
io.netty
netty-all
@@ -246,6 +264,12 @@
${project.version}
test-jar
test
+
+
+ commons-logging
+ commons-logging
+
+
@@ -260,6 +284,10 @@
slf4j-log4j12
+ log4j
+ log4j
+
+
commons-logging
commons-logging
@@ -275,6 +303,14 @@
io.netty
netty-all
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
@@ -294,6 +330,14 @@
io.netty
netty-all
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
@@ -319,6 +363,12 @@
org.apache.hbase
hbase-hadoop2-compat
${hbase.version}
+
+
+ commons-logging
+ commons-logging
+
+
org.apache.hbase
@@ -329,6 +379,10 @@
org.glassfish.web
javax.servlet.jsp
+
+ commons-logging
+ commons-logging
+
@@ -345,6 +399,10 @@
commons-logging
+ log4j
+ log4j
+
+
org.glassfish.web
javax.servlet.jsp
@@ -363,17 +421,41 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
org.apache.hbase
hbase-common
${hbase.version}
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hbase
hbase-hadoop-compat
${hbase.version}
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/services/impl/LlapIoMemoryServlet.java b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/services/impl/LlapIoMemoryServlet.java
index 8877565..835b46a 100644
--- a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/services/impl/LlapIoMemoryServlet.java
+++ b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/services/impl/LlapIoMemoryServlet.java
@@ -24,16 +24,16 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hive.llap.io.api.LlapIo;
import org.apache.hadoop.hive.llap.io.api.LlapProxy;
import org.apache.hive.http.HttpServer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@SuppressWarnings("serial")
public class LlapIoMemoryServlet extends HttpServlet {
- private static final Log LOG = LogFactory.getLog(LlapIoMemoryServlet.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LlapIoMemoryServlet.class);
static final String ACCESS_CONTROL_ALLOW_METHODS = "Access-Control-Allow-Methods";
static final String ACCESS_CONTROL_ALLOW_ORIGIN = "Access-Control-Allow-Origin";
diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/security/LlapServerSecurityInfo.java b/llap-server/src/java/org/apache/hadoop/hive/llap/security/LlapServerSecurityInfo.java
index eb514f2..7ea9881 100644
--- a/llap-server/src/java/org/apache/hadoop/hive/llap/security/LlapServerSecurityInfo.java
+++ b/llap-server/src/java/org/apache/hadoop/hive/llap/security/LlapServerSecurityInfo.java
@@ -16,20 +16,20 @@
import java.lang.annotation.Annotation;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hive.conf.HiveConf;
-import org.apache.hadoop.hive.llap.protocol.LlapProtocolBlockingPB;
import org.apache.hadoop.hive.llap.protocol.LlapManagementProtocolPB;
+import org.apache.hadoop.hive.llap.protocol.LlapProtocolBlockingPB;
import org.apache.hadoop.security.KerberosInfo;
import org.apache.hadoop.security.SecurityInfo;
import org.apache.hadoop.security.token.TokenIdentifier;
import org.apache.hadoop.security.token.TokenInfo;
import org.apache.hadoop.security.token.TokenSelector;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class LlapServerSecurityInfo extends SecurityInfo {
- private static final Log LOG = LogFactory.getLog(LlapServerSecurityInfo.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LlapServerSecurityInfo.class);
@Override
public KerberosInfo getKerberosInfo(Class> protocol, Configuration conf) {
diff --git a/llap-tez/pom.xml b/llap-tez/pom.xml
index 3fdfe31..7f937b2 100644
--- a/llap-tez/pom.xml
+++ b/llap-tez/pom.xml
@@ -49,6 +49,12 @@
org.apache.zookeeper
zookeeper
${zookeeper.version}
+
+
+ log4j
+ log4j
+
+
org.apache.curator
@@ -86,6 +92,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -93,12 +103,40 @@
hadoop-mapreduce-client-core
${hadoop.version}
true
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
hadoop-yarn-registry
${hadoop.version}
true
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.tez
@@ -114,6 +152,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -209,6 +251,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
diff --git a/llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/endpoint/LlapPluginSecurityInfo.java b/llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/endpoint/LlapPluginSecurityInfo.java
index 60f4f5b..90a50fa 100644
--- a/llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/endpoint/LlapPluginSecurityInfo.java
+++ b/llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/endpoint/LlapPluginSecurityInfo.java
@@ -16,22 +16,19 @@
import java.lang.annotation.Annotation;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.llap.protocol.LlapPluginProtocolPB;
-import org.apache.hadoop.hive.llap.protocol.LlapProtocolBlockingPB;
-import org.apache.hadoop.hive.llap.protocol.LlapManagementProtocolPB;
import org.apache.hadoop.security.KerberosInfo;
import org.apache.hadoop.security.SecurityInfo;
import org.apache.hadoop.security.token.TokenIdentifier;
import org.apache.hadoop.security.token.TokenInfo;
import org.apache.hadoop.security.token.TokenSelector;
import org.apache.tez.runtime.common.security.JobTokenSelector;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class LlapPluginSecurityInfo extends SecurityInfo {
- private static final Log LOG = LogFactory.getLog(LlapPluginSecurityInfo.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LlapPluginSecurityInfo.class);
@Override
public KerberosInfo getKerberosInfo(Class> protocol, Configuration conf) {
diff --git a/metastore/pom.xml b/metastore/pom.xml
index dc1b4e8..eb76aa4 100644
--- a/metastore/pom.xml
+++ b/metastore/pom.xml
@@ -48,6 +48,16 @@
org.apache.hive
hive-standalone-metastore
${project.version}
+
+
+ log4j
+ log4j
+
+
+ commons-logging
+ commons-logging
+
+
javolution
@@ -73,6 +83,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -135,6 +149,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -151,6 +169,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -183,6 +205,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
diff --git a/packaging/pom.xml b/packaging/pom.xml
index cae1fa9..680827f 100644
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -161,6 +161,20 @@
org.apache.hive
hive-exec
${project.version}
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ log4j
+ log4j
+
+
+ commons-logging
+ commons-logging
+
+
org.apache.hive
diff --git a/pom.xml b/pom.xml
index 5202248..521122c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1232,7 +1232,11 @@
com.google.code.findbugs:annotations
+
+ commons-logging:commons-logging
+ log4j:log4j
+ A banned dependency or plugin was found!
true
diff --git a/ql/pom.xml b/ql/pom.xml
index 0c181e5..17431ac 100644
--- a/ql/pom.xml
+++ b/ql/pom.xml
@@ -193,6 +193,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
javax.servlet
servlet-api
@@ -232,6 +236,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -243,6 +251,14 @@
javax.servlet
servlet-api
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
true
@@ -251,6 +267,12 @@
hadoop-yarn-api
${hadoop.version}
true
+
+
+ commons-logging
+ commons-logging
+
+
org.apache.hadoop
@@ -261,6 +283,14 @@
javax.servlet
servlet-api
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
true
@@ -269,6 +299,16 @@
hadoop-yarn-client
${hadoop.version}
true
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.orc
@@ -285,11 +325,23 @@
org.apache.thrift
libthrift
${libthrift.version}
+
+
+ commons-logging
+ commons-logging
+
+
org.apache.zookeeper
zookeeper
${zookeeper.version}
+
+
+ log4j
+ log4j
+
+
org.apache.curator
@@ -462,6 +514,12 @@
${project.version}
test-jar
test
+
+
+ commons-logging
+ commons-logging
+
+
@@ -508,6 +566,10 @@
org.apache.hadoop
hadoop-hdfs
+
+ log4j
+ log4j
+
org.apache.hadoop
hadoop-yarn-client
@@ -713,6 +775,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
org.glassfish.jersey.containers
*
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/keyseries/VectorKeySeriesSingleImpl.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/keyseries/VectorKeySeriesSingleImpl.java
index f6d9141..9701fa8 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/keyseries/VectorKeySeriesSingleImpl.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/keyseries/VectorKeySeriesSingleImpl.java
@@ -18,9 +18,8 @@
package org.apache.hadoop.hive.ql.exec.vector.keyseries;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
+
import com.google.common.base.Preconditions;
/**
@@ -30,8 +29,6 @@
public abstract class VectorKeySeriesSingleImpl extends VectorKeySeriesImpl
implements VectorKeySeries {
- private static final Log LOG = LogFactory.getLog(VectorKeySeriesSingleImpl.class.getName());
-
protected int currentBatchSize;
// The number of keys (with sequential duplicates collapsed, both NULL and non-NULL) in the batch.
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorBase.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorBase.java
index ff09eb6..785725c 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorBase.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorBase.java
@@ -18,9 +18,6 @@
package org.apache.hadoop.hive.ql.exec.vector.ptf;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.hive.ql.exec.vector.ColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
import org.apache.hadoop.hive.ql.exec.vector.expressions.IdentityExpression;
@@ -46,10 +43,6 @@
*/
public abstract class VectorPTFEvaluatorBase {
- private static final long serialVersionUID = 1L;
- private static final String CLASS_NAME = VectorPTFEvaluatorBase.class.getName();
- private static final Log LOG = LogFactory.getLog(CLASS_NAME);
-
protected final WindowFrameDef windowFrameDef;
private final VectorExpression inputVecExpr;
protected final int inputColumnNum;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorCount.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorCount.java
index f837148..9409c80 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorCount.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorCount.java
@@ -18,12 +18,9 @@
package org.apache.hadoop.hive.ql.exec.vector.ptf;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hive.ql.exec.vector.ColumnVector;
-import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector;
-import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
+import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression;
import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef;
@@ -37,10 +34,6 @@
*/
public class VectorPTFEvaluatorCount extends VectorPTFEvaluatorBase {
- private static final long serialVersionUID = 1L;
- private static final String CLASS_NAME = VectorPTFEvaluatorCount.class.getName();
- private static final Log LOG = LogFactory.getLog(CLASS_NAME);
-
protected long count;
public VectorPTFEvaluatorCount(WindowFrameDef windowFrameDef, VectorExpression inputVecExpr,
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorCountStar.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorCountStar.java
index c537237..9f9c04a 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorCountStar.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorCountStar.java
@@ -18,17 +18,11 @@
package org.apache.hadoop.hive.ql.exec.vector.ptf;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.hive.ql.exec.vector.ColumnVector;
-import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector;
-import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
+import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression;
import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef;
-import com.google.common.base.Preconditions;
-
/**
* This class evaluates count(*) for a PTF group.
*
@@ -36,10 +30,6 @@
*/
public class VectorPTFEvaluatorCountStar extends VectorPTFEvaluatorBase {
- private static final long serialVersionUID = 1L;
- private static final String CLASS_NAME = VectorPTFEvaluatorCountStar.class.getName();
- private static final Log LOG = LogFactory.getLog(CLASS_NAME);
-
protected long count;
public VectorPTFEvaluatorCountStar(WindowFrameDef windowFrameDef, VectorExpression inputVecExpr,
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalAvg.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalAvg.java
index d0589d2..4541843 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalAvg.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalAvg.java
@@ -18,12 +18,10 @@
package org.apache.hadoop.hive.ql.exec.vector.ptf;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hive.common.type.HiveDecimal;
+import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.DecimalColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
-import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression;
import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef;
@@ -38,10 +36,6 @@
*/
public class VectorPTFEvaluatorDecimalAvg extends VectorPTFEvaluatorBase {
- private static final long serialVersionUID = 1L;
- private static final String CLASS_NAME = VectorPTFEvaluatorDecimalAvg.class.getName();
- private static final Log LOG = LogFactory.getLog(CLASS_NAME);
-
protected boolean isGroupResultNull;
protected HiveDecimalWritable sum;
private int nonNullGroupCount;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalFirstValue.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalFirstValue.java
index dc037ae..c36fb77 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalFirstValue.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalFirstValue.java
@@ -18,14 +18,10 @@
package org.apache.hadoop.hive.ql.exec.vector.ptf;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.hive.common.type.FastHiveDecimal;
import org.apache.hadoop.hive.common.type.HiveDecimal;
+import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.DecimalColumnVector;
-import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
-import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression;
import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef;
@@ -41,10 +37,6 @@
*/
public class VectorPTFEvaluatorDecimalFirstValue extends VectorPTFEvaluatorBase {
- private static final long serialVersionUID = 1L;
- private static final String CLASS_NAME = VectorPTFEvaluatorDecimalFirstValue.class.getName();
- private static final Log LOG = LogFactory.getLog(CLASS_NAME);
-
protected boolean haveFirstValue;
protected boolean isGroupResultNull;
protected HiveDecimalWritable firstValue;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalLastValue.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalLastValue.java
index 7cc6158..380ce60 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalLastValue.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalLastValue.java
@@ -18,13 +18,10 @@
package org.apache.hadoop.hive.ql.exec.vector.ptf;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.hive.common.type.FastHiveDecimal;
import org.apache.hadoop.hive.common.type.HiveDecimal;
+import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.DecimalColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
-import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression;
import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef;
@@ -40,10 +37,6 @@
*/
public class VectorPTFEvaluatorDecimalLastValue extends VectorPTFEvaluatorBase {
- private static final long serialVersionUID = 1L;
- private static final String CLASS_NAME = VectorPTFEvaluatorDecimalLastValue.class.getName();
- private static final Log LOG = LogFactory.getLog(CLASS_NAME);
-
protected boolean isGroupResultNull;
protected HiveDecimalWritable lastValue;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalMax.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalMax.java
index ae4792e..46ee261 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalMax.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalMax.java
@@ -18,13 +18,10 @@
package org.apache.hadoop.hive.ql.exec.vector.ptf;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.hive.common.type.FastHiveDecimal;
import org.apache.hadoop.hive.common.type.HiveDecimal;
+import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.DecimalColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
-import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression;
import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef;
@@ -37,10 +34,6 @@
*/
public class VectorPTFEvaluatorDecimalMax extends VectorPTFEvaluatorBase {
- private static final long serialVersionUID = 1L;
- private static final String CLASS_NAME = VectorPTFEvaluatorDecimalMax.class.getName();
- private static final Log LOG = LogFactory.getLog(CLASS_NAME);
-
protected boolean isGroupResultNull;
protected HiveDecimalWritable max;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalMin.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalMin.java
index 521a2ff..f881356 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalMin.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalMin.java
@@ -18,13 +18,10 @@
package org.apache.hadoop.hive.ql.exec.vector.ptf;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.hive.common.type.FastHiveDecimal;
import org.apache.hadoop.hive.common.type.HiveDecimal;
+import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.DecimalColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
-import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression;
import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef;
@@ -37,10 +34,6 @@
*/
public class VectorPTFEvaluatorDecimalMin extends VectorPTFEvaluatorBase {
- private static final long serialVersionUID = 1L;
- private static final String CLASS_NAME = VectorPTFEvaluatorDecimalMin.class.getName();
- private static final Log LOG = LogFactory.getLog(CLASS_NAME);
-
protected boolean isGroupResultNull;
protected HiveDecimalWritable min;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalSum.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalSum.java
index 5a7dc4c..4b31dc4 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalSum.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalSum.java
@@ -18,12 +18,10 @@
package org.apache.hadoop.hive.ql.exec.vector.ptf;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hive.common.type.HiveDecimal;
+import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.DecimalColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
-import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression;
import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef;
@@ -36,10 +34,6 @@
*/
public class VectorPTFEvaluatorDecimalSum extends VectorPTFEvaluatorBase {
- private static final long serialVersionUID = 1L;
- private static final String CLASS_NAME = VectorPTFEvaluatorDecimalSum.class.getName();
- private static final Log LOG = LogFactory.getLog(CLASS_NAME);
-
protected boolean isGroupResultNull;
protected HiveDecimalWritable sum;
protected HiveDecimalWritable temp;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDenseRank.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDenseRank.java
index f639316..5025171 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDenseRank.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDenseRank.java
@@ -18,11 +18,9 @@
package org.apache.hadoop.hive.ql.exec.vector.ptf;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
-import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression;
import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef;
@@ -35,10 +33,6 @@
*/
public class VectorPTFEvaluatorDenseRank extends VectorPTFEvaluatorBase {
- private static final long serialVersionUID = 1L;
- private static final String CLASS_NAME = VectorPTFEvaluatorDenseRank.class.getName();
- private static final Log LOG = LogFactory.getLog(CLASS_NAME);
-
private int denseRank;
public VectorPTFEvaluatorDenseRank(WindowFrameDef windowFrameDef, VectorExpression inputVecExpr,
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleAvg.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleAvg.java
index cd09ce7..224177a 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleAvg.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleAvg.java
@@ -18,11 +18,9 @@
package org.apache.hadoop.hive.ql.exec.vector.ptf;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.DoubleColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
-import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression;
import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef;
@@ -36,10 +34,6 @@
*/
public class VectorPTFEvaluatorDoubleAvg extends VectorPTFEvaluatorBase {
- private static final long serialVersionUID = 1L;
- private static final String CLASS_NAME = VectorPTFEvaluatorDoubleAvg.class.getName();
- private static final Log LOG = LogFactory.getLog(CLASS_NAME);
-
protected boolean isGroupResultNull;
protected double sum;
private int nonNullGroupCount;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleFirstValue.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleFirstValue.java
index 7d1fb61..d20d10c 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleFirstValue.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleFirstValue.java
@@ -18,12 +18,9 @@
package org.apache.hadoop.hive.ql.exec.vector.ptf;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.DoubleColumnVector;
-import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
-import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression;
import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef;
@@ -38,10 +35,6 @@
*/
public class VectorPTFEvaluatorDoubleFirstValue extends VectorPTFEvaluatorBase {
- private static final long serialVersionUID = 1L;
- private static final String CLASS_NAME = VectorPTFEvaluatorDoubleFirstValue.class.getName();
- private static final Log LOG = LogFactory.getLog(CLASS_NAME);
-
protected boolean haveFirstValue;
protected boolean isGroupResultNull;
protected double firstValue;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleLastValue.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleLastValue.java
index dbc78eb..83a8e33 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleLastValue.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleLastValue.java
@@ -18,11 +18,9 @@
package org.apache.hadoop.hive.ql.exec.vector.ptf;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.DoubleColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
-import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression;
import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef;
@@ -31,27 +29,22 @@
/**
* This class evaluates double first_value() for a PTF group.
- *
* We capture the last value from the last batch. It can be NULL.
* It becomes the group value.
*/
public class VectorPTFEvaluatorDoubleLastValue extends VectorPTFEvaluatorBase {
- private static final long serialVersionUID = 1L;
- private static final String CLASS_NAME = VectorPTFEvaluatorDoubleLastValue.class.getName();
- private static final Log LOG = LogFactory.getLog(CLASS_NAME);
-
protected boolean isGroupResultNull;
protected double lastValue;
public VectorPTFEvaluatorDoubleLastValue(WindowFrameDef windowFrameDef,
- VectorExpression inputVecExpr, int outputColumnNum) {
+ VectorExpression inputVecExpr, int outputColumnNum) {
super(windowFrameDef, inputVecExpr, outputColumnNum);
resetEvaluator();
}
public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch)
- throws HiveException {
+ throws HiveException {
evaluateInputExpr(batch);
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleMax.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleMax.java
index 93745c4..50280d9 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleMax.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleMax.java
@@ -18,11 +18,9 @@
package org.apache.hadoop.hive.ql.exec.vector.ptf;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.DoubleColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
-import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression;
import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef;
@@ -34,10 +32,6 @@
*/
public class VectorPTFEvaluatorDoubleMax extends VectorPTFEvaluatorBase {
- private static final long serialVersionUID = 1L;
- private static final String CLASS_NAME = VectorPTFEvaluatorDoubleMax.class.getName();
- private static final Log LOG = LogFactory.getLog(CLASS_NAME);
-
protected boolean isGroupResultNull;
protected double max;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleMin.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleMin.java
index 42cce54..24788af 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleMin.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleMin.java
@@ -18,11 +18,9 @@
package org.apache.hadoop.hive.ql.exec.vector.ptf;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.DoubleColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
-import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression;
import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef;
@@ -34,10 +32,6 @@
*/
public class VectorPTFEvaluatorDoubleMin extends VectorPTFEvaluatorBase {
- private static final long serialVersionUID = 1L;
- private static final String CLASS_NAME = VectorPTFEvaluatorDoubleMin.class.getName();
- private static final Log LOG = LogFactory.getLog(CLASS_NAME);
-
protected boolean isGroupResultNull;
protected double min;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleSum.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleSum.java
index 552d4a9..902d81e 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleSum.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleSum.java
@@ -18,11 +18,9 @@
package org.apache.hadoop.hive.ql.exec.vector.ptf;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.DoubleColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
-import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression;
import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef;
@@ -34,10 +32,6 @@
*/
public class VectorPTFEvaluatorDoubleSum extends VectorPTFEvaluatorBase {
- private static final long serialVersionUID = 1L;
- private static final String CLASS_NAME = VectorPTFEvaluatorDoubleSum.class.getName();
- private static final Log LOG = LogFactory.getLog(CLASS_NAME);
-
protected boolean isGroupResultNull;
protected double sum;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongAvg.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongAvg.java
index ad3950f..e2d1768 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongAvg.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongAvg.java
@@ -18,11 +18,9 @@
package org.apache.hadoop.hive.ql.exec.vector.ptf;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
-import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression;
import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef;
@@ -36,10 +34,6 @@
*/
public class VectorPTFEvaluatorLongAvg extends VectorPTFEvaluatorBase {
- private static final long serialVersionUID = 1L;
- private static final String CLASS_NAME = VectorPTFEvaluatorLongAvg.class.getName();
- private static final Log LOG = LogFactory.getLog(CLASS_NAME);
-
protected boolean isGroupResultNull;
protected long sum;
private int nonNullGroupCount;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongFirstValue.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongFirstValue.java
index a288f16..37323fe 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongFirstValue.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongFirstValue.java
@@ -18,12 +18,9 @@
package org.apache.hadoop.hive.ql.exec.vector.ptf;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.hive.ql.exec.vector.ColumnVector;
+import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
-import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression;
import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef;
@@ -38,10 +35,6 @@
*/
public class VectorPTFEvaluatorLongFirstValue extends VectorPTFEvaluatorBase {
- private static final long serialVersionUID = 1L;
- private static final String CLASS_NAME = VectorPTFEvaluatorLongFirstValue.class.getName();
- private static final Log LOG = LogFactory.getLog(CLASS_NAME);
-
protected boolean haveFirstValue;
protected boolean isGroupResultNull;
protected long firstValue;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongLastValue.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongLastValue.java
index cf7bf24..925841b 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongLastValue.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongLastValue.java
@@ -18,11 +18,9 @@
package org.apache.hadoop.hive.ql.exec.vector.ptf;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
-import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression;
import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef;
@@ -37,10 +35,6 @@
*/
public class VectorPTFEvaluatorLongLastValue extends VectorPTFEvaluatorBase {
- private static final long serialVersionUID = 1L;
- private static final String CLASS_NAME = VectorPTFEvaluatorLongLastValue.class.getName();
- private static final Log LOG = LogFactory.getLog(CLASS_NAME);
-
protected boolean isGroupResultNull;
protected long lastValue;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongMax.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongMax.java
index 04f106b..638f1b7 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongMax.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongMax.java
@@ -18,11 +18,9 @@
package org.apache.hadoop.hive.ql.exec.vector.ptf;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
-import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression;
import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef;
@@ -34,10 +32,6 @@
*/
public class VectorPTFEvaluatorLongMax extends VectorPTFEvaluatorBase {
- private static final long serialVersionUID = 1L;
- private static final String CLASS_NAME = VectorPTFEvaluatorLongMax.class.getName();
- private static final Log LOG = LogFactory.getLog(CLASS_NAME);
-
protected boolean isGroupResultNull;
protected long max;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongMin.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongMin.java
index a80819d..6238a03 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongMin.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongMin.java
@@ -18,11 +18,9 @@
package org.apache.hadoop.hive.ql.exec.vector.ptf;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
-import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression;
import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef;
@@ -34,10 +32,6 @@
*/
public class VectorPTFEvaluatorLongMin extends VectorPTFEvaluatorBase {
- private static final long serialVersionUID = 1L;
- private static final String CLASS_NAME = VectorPTFEvaluatorLongMin.class.getName();
- private static final Log LOG = LogFactory.getLog(CLASS_NAME);
-
protected boolean isGroupResultNull;
protected long min;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongSum.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongSum.java
index 277cff3..afd3952 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongSum.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongSum.java
@@ -18,11 +18,9 @@
package org.apache.hadoop.hive.ql.exec.vector.ptf;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
-import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression;
import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef;
@@ -34,10 +32,6 @@
*/
public class VectorPTFEvaluatorLongSum extends VectorPTFEvaluatorBase {
- private static final long serialVersionUID = 1L;
- private static final String CLASS_NAME = VectorPTFEvaluatorLongSum.class.getName();
- private static final Log LOG = LogFactory.getLog(CLASS_NAME);
-
protected boolean isGroupResultNull;
protected long sum;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorRank.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorRank.java
index 9b2710f..9cbc816 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorRank.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorRank.java
@@ -18,11 +18,9 @@
package org.apache.hadoop.hive.ql.exec.vector.ptf;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
-import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression;
import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef;
@@ -35,10 +33,6 @@
*/
public class VectorPTFEvaluatorRank extends VectorPTFEvaluatorBase {
- private static final long serialVersionUID = 1L;
- private static final String CLASS_NAME = VectorPTFEvaluatorRank.class.getName();
- private static final Log LOG = LogFactory.getLog(CLASS_NAME);
-
private int rank;
private int groupCount;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorRowNumber.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorRowNumber.java
index 3bc70c8..94de1d7 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorRowNumber.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorRowNumber.java
@@ -18,11 +18,9 @@
package org.apache.hadoop.hive.ql.exec.vector.ptf;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
-import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression;
import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef;
@@ -34,10 +32,6 @@
*/
public class VectorPTFEvaluatorRowNumber extends VectorPTFEvaluatorBase {
- private static final long serialVersionUID = 1L;
- private static final String CLASS_NAME = VectorPTFEvaluatorRowNumber.class.getName();
- private static final Log LOG = LogFactory.getLog(CLASS_NAME);
-
private int rowNumber;
public VectorPTFEvaluatorRowNumber(WindowFrameDef windowFrameDef, VectorExpression inputVecExpr,
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFGroupBatches.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFGroupBatches.java
index a39da0d..ff89775 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFGroupBatches.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFGroupBatches.java
@@ -21,8 +21,6 @@
import java.io.IOException;
import java.util.ArrayList;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hive.ql.exec.vector.ColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.DecimalColumnVector;
@@ -47,10 +45,6 @@
*/
public class VectorPTFGroupBatches {
- private static final long serialVersionUID = 1L;
- private static final String CLASS_NAME = VectorPTFGroupBatches.class.getName();
- private static final Log LOG = LogFactory.getLog(CLASS_NAME);
-
private Configuration hconf;
private VectorPTFEvaluatorBase[] evaluators;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFOperator.java
index 39fab2c..3c6378e 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFOperator.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFOperator.java
@@ -18,16 +18,9 @@
package org.apache.hadoop.hive.ql.exec.vector.ptf;
-import java.io.IOException;
import java.sql.Timestamp;
-import java.util.ArrayList;
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.apache.commons.lang.ArrayUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hive.common.type.HiveIntervalDayTime;
import org.apache.hadoop.hive.ql.CompilationOpContext;
@@ -35,6 +28,7 @@
import org.apache.hadoop.hive.ql.exec.Utilities;
import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.ColumnVector;
+import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.DecimalColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.DoubleColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.IntervalDayTimeColumnVector;
@@ -45,28 +39,24 @@
import org.apache.hadoop.hive.ql.exec.vector.VectorizationOperator;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedBatchUtil;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
-import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
-import org.apache.hadoop.hive.ql.exec.vector.expressions.IdentityExpression;
import org.apache.hadoop.hive.ql.exec.vector.expressions.StringExpr;
import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression;
import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.ql.plan.BaseWork;
-import org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc;
import org.apache.hadoop.hive.ql.plan.ExprNodeDesc;
import org.apache.hadoop.hive.ql.plan.OperatorDesc;
import org.apache.hadoop.hive.ql.plan.PTFDesc;
import org.apache.hadoop.hive.ql.plan.VectorDesc;
import org.apache.hadoop.hive.ql.plan.VectorPTFDesc;
-import org.apache.hadoop.hive.ql.plan.VectorPTFDesc.SupportedFunctionType;
+import org.apache.hadoop.hive.ql.plan.VectorPTFInfo;
import org.apache.hadoop.hive.ql.plan.api.OperatorType;
import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef;
-import org.apache.hadoop.hive.ql.plan.VectorPTFInfo;
import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector.PrimitiveCategory;
-import org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo;
import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class is native vectorized PTF operator class.
@@ -76,7 +66,7 @@
private static final long serialVersionUID = 1L;
private static final String CLASS_NAME = VectorPTFOperator.class.getName();
- private static final Log LOG = LogFactory.getLog(CLASS_NAME);
+ private static final Logger LOG = LoggerFactory.getLogger(CLASS_NAME);
private VectorizationContext vContext;
private VectorPTFDesc vectorDesc;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkCommonOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkCommonOperator.java
index 4077552..4664ae9 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkCommonOperator.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkCommonOperator.java
@@ -23,8 +23,6 @@
import java.util.Arrays;
import java.util.Properties;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hive.ql.CompilationOpContext;
import org.apache.hadoop.hive.ql.exec.Operator;
@@ -54,6 +52,8 @@
import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
import org.apache.hadoop.io.BytesWritable;
import org.apache.hadoop.mapred.OutputCollector;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
@@ -66,7 +66,7 @@
private static final long serialVersionUID = 1L;
private static final String CLASS_NAME = VectorReduceSinkCommonOperator.class.getName();
- private static final Log LOG = LogFactory.getLog(CLASS_NAME);
+ private static final Logger LOG = LoggerFactory.getLogger(CLASS_NAME);
/**
* Information about our native vectorized reduce sink created by the Vectorizer class during
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkEmptyKeyOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkEmptyKeyOperator.java
index 78e64d8..ee8c055 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkEmptyKeyOperator.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkEmptyKeyOperator.java
@@ -18,8 +18,6 @@
package org.apache.hadoop.hive.ql.exec.vector.reducesink;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hive.ql.CompilationOpContext;
import org.apache.hadoop.hive.ql.exec.vector.VectorizationContext;
@@ -28,6 +26,8 @@
import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.ql.plan.OperatorDesc;
import org.apache.hadoop.hive.ql.plan.VectorDesc;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
@@ -40,7 +40,7 @@
private static final long serialVersionUID = 1L;
private static final String CLASS_NAME = VectorReduceSinkEmptyKeyOperator.class.getName();
- private static final Log LOG = LogFactory.getLog(CLASS_NAME);
+ private static final Logger LOG = LoggerFactory.getLogger(CLASS_NAME);
// The above members are initialized by the constructor and must not be
// transient.
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkLongOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkLongOperator.java
index 342290a..a67af65 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkLongOperator.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkLongOperator.java
@@ -18,8 +18,6 @@
package org.apache.hadoop.hive.ql.exec.vector.reducesink;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hive.ql.CompilationOpContext;
import org.apache.hadoop.hive.ql.exec.vector.VectorizationContext;
@@ -37,8 +35,6 @@
public class VectorReduceSinkLongOperator extends VectorReduceSinkUniformHashOperator {
private static final long serialVersionUID = 1L;
- private static final String CLASS_NAME = VectorReduceSinkLongOperator.class.getName();
- private static final Log LOG = LogFactory.getLog(CLASS_NAME);
// The column number and type information for this one column long reduce key.
private transient int singleKeyColumn;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkMultiKeyOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkMultiKeyOperator.java
index 0cf5706..4cde239 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkMultiKeyOperator.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkMultiKeyOperator.java
@@ -18,8 +18,6 @@
package org.apache.hadoop.hive.ql.exec.vector.reducesink;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hive.ql.CompilationOpContext;
import org.apache.hadoop.hive.ql.exec.vector.VectorizationContext;
@@ -36,8 +34,6 @@
public class VectorReduceSinkMultiKeyOperator extends VectorReduceSinkUniformHashOperator {
private static final long serialVersionUID = 1L;
- private static final String CLASS_NAME = VectorReduceSinkMultiKeyOperator.class.getName();
- private static final Log LOG = LogFactory.getLog(CLASS_NAME);
// The above members are initialized by the constructor and must not be
// transient.
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkObjectHashOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkObjectHashOperator.java
index 42b7784..5ab59c9 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkObjectHashOperator.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkObjectHashOperator.java
@@ -20,8 +20,6 @@
import java.util.Random;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hive.ql.CompilationOpContext;
import org.apache.hadoop.hive.ql.exec.vector.VectorExtractRow;
@@ -32,16 +30,16 @@
import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.ql.plan.OperatorDesc;
import org.apache.hadoop.hive.ql.plan.VectorDesc;
-import org.apache.hadoop.hive.serde2.ByteStream;
import org.apache.hadoop.hive.serde2.ByteStream.Output;
import org.apache.hadoop.hive.serde2.binarysortable.fast.BinarySortableSerializeWrite;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorUtils;
import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
-import org.apache.hive.common.util.Murmur3;
/**
* This class is the object hash (not Uniform Hash) operator class for native vectorized reduce sink.
@@ -52,7 +50,7 @@
private static final long serialVersionUID = 1L;
private static final String CLASS_NAME = VectorReduceSinkObjectHashOperator.class.getName();
- private static final Log LOG = LogFactory.getLog(CLASS_NAME);
+ private static final Logger LOG = LoggerFactory.getLogger(CLASS_NAME);
protected boolean isEmptyBuckets;
protected int[] reduceSinkBucketColumnMap;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkStringOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkStringOperator.java
index 931a7a8..692baf7 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkStringOperator.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkStringOperator.java
@@ -18,8 +18,6 @@
package org.apache.hadoop.hive.ql.exec.vector.reducesink;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hive.ql.CompilationOpContext;
import org.apache.hadoop.hive.ql.exec.vector.VectorizationContext;
@@ -28,7 +26,6 @@
import org.apache.hadoop.hive.ql.plan.OperatorDesc;
import org.apache.hadoop.hive.ql.plan.VectorDesc;
import org.apache.hadoop.hive.serde2.binarysortable.fast.BinarySortableSerializeWrite;
-import org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo;
/*
* Specialized class for native vectorized reduce sink that is reducing on a Uniform Hash
@@ -37,8 +34,6 @@
public class VectorReduceSinkStringOperator extends VectorReduceSinkUniformHashOperator {
private static final long serialVersionUID = 1L;
- private static final String CLASS_NAME = VectorReduceSinkStringOperator.class.getName();
- private static final Log LOG = LogFactory.getLog(CLASS_NAME);
// The column number and type information for this one column string reduce key.
private transient int singleKeyColumn;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkUniformHashOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkUniformHashOperator.java
index c98663c..324aa97 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkUniformHashOperator.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkUniformHashOperator.java
@@ -18,8 +18,6 @@
package org.apache.hadoop.hive.ql.exec.vector.reducesink;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hive.ql.CompilationOpContext;
import org.apache.hadoop.hive.ql.exec.vector.VectorizationContext;
@@ -31,6 +29,8 @@
import org.apache.hadoop.hive.ql.plan.VectorDesc;
import org.apache.hadoop.hive.serde2.ByteStream.Output;
import org.apache.hive.common.util.HashCodeUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
@@ -43,7 +43,7 @@
private static final long serialVersionUID = 1L;
private static final String CLASS_NAME = VectorReduceSinkUniformHashOperator.class.getName();
- private static final Log LOG = LogFactory.getLog(CLASS_NAME);
+ private static final Logger LOG = LoggerFactory.getLogger(CLASS_NAME);
// The above members are initialized by the constructor and must not be
// transient.
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/FixedBucketPruningOptimizer.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/FixedBucketPruningOptimizer.java
index 2debaca..3ca1036 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/FixedBucketPruningOptimizer.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/FixedBucketPruningOptimizer.java
@@ -25,8 +25,6 @@
import java.util.Stack;
import java.util.stream.Collectors;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hive.common.type.Date;
import org.apache.hadoop.hive.common.type.Timestamp;
import org.apache.hadoop.hive.ql.exec.FilterOperator;
@@ -64,9 +62,6 @@
*/
public class FixedBucketPruningOptimizer extends Transform {
- private static final Log LOG = LogFactory
- .getLog(FixedBucketPruningOptimizer.class.getName());
-
private final boolean compat;
public FixedBucketPruningOptimizer(boolean compat) {
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/PartitionColumnsSeparator.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/PartitionColumnsSeparator.java
index 278766c..5fc29d2 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/PartitionColumnsSeparator.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/PartitionColumnsSeparator.java
@@ -28,8 +28,6 @@
import java.util.Set;
import java.util.Stack;
-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.FilterOperator;
import org.apache.hadoop.hive.ql.exec.FunctionRegistry;
@@ -54,6 +52,8 @@
import org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPAnd;
import org.apache.hadoop.hive.ql.udf.generic.GenericUDFStruct;
import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This optimization will take a Filter expression, and if its predicate contains
@@ -64,7 +64,7 @@
*/
public class PartitionColumnsSeparator extends Transform {
- private static final Log LOG = LogFactory.getLog(PartitionColumnsSeparator.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PartitionColumnsSeparator.class);
private static final String IN_UDF =
GenericUDFIn.class.getAnnotation(Description.class).name();
private static final String STRUCT_UDF =
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/TablePropertyEnrichmentOptimizer.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/TablePropertyEnrichmentOptimizer.java
index bc17691..a904182 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/TablePropertyEnrichmentOptimizer.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/TablePropertyEnrichmentOptimizer.java
@@ -18,11 +18,14 @@
package org.apache.hadoop.hive.ql.optimizer;
-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 java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.Stack;
+
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.metastore.api.Table;
@@ -42,14 +45,12 @@
import org.apache.hadoop.hive.ql.plan.TableScanDesc;
import org.apache.hadoop.hive.serde2.Deserializer;
import org.apache.hive.common.util.ReflectionUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.Stack;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
/**
* Optimizer that updates TableScanOperators' Table-references with properties that might be
@@ -58,7 +59,7 @@
*/
class TablePropertyEnrichmentOptimizer extends Transform {
- private static Log LOG = LogFactory.getLog(TablePropertyEnrichmentOptimizer.class);
+ private static Logger LOG = LoggerFactory.getLogger(TablePropertyEnrichmentOptimizer.class);
private static class WalkerCtx implements NodeProcessorCtx {
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HivePointLookupOptimizerRule.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HivePointLookupOptimizerRule.java
index 2a525ad..01ad41c 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HivePointLookupOptimizerRule.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HivePointLookupOptimizerRule.java
@@ -26,9 +26,12 @@
import org.apache.calcite.plan.RelOptRule;
import org.apache.calcite.plan.RelOptRuleCall;
+import org.apache.calcite.plan.RelOptRuleOperand;
import org.apache.calcite.plan.RelOptUtil;
+import org.apache.calcite.rel.AbstractRelNode;
import org.apache.calcite.rel.RelNode;
import org.apache.calcite.rel.core.Filter;
+import org.apache.calcite.rel.core.Join;
import org.apache.calcite.rel.type.RelDataType;
import org.apache.calcite.rex.RexBuilder;
import org.apache.calcite.rex.RexCall;
@@ -39,13 +42,13 @@
import org.apache.calcite.rex.RexUtil;
import org.apache.calcite.sql.SqlKind;
import org.apache.calcite.sql.fun.SqlStdOperatorTable;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hive.ql.optimizer.calcite.HiveCalciteUtil;
import org.apache.hadoop.hive.ql.optimizer.calcite.reloperators.HiveIn;
import org.apache.hadoop.hive.ql.optimizer.calcite.translator.TypeConverter;
import org.apache.hadoop.hive.ql.parse.SemanticException;
import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ImmutableList;
@@ -55,10 +58,6 @@
import com.google.common.collect.Maps;
import com.google.common.collect.Multimap;
import com.google.common.collect.Sets;
-import org.apache.calcite.plan.RelOptRuleOperand;
-import org.apache.calcite.rel.AbstractRelNode;
-import org.apache.calcite.rel.core.Join;
-import org.apache.calcite.rel.core.JoinRelType;
public abstract class HivePointLookupOptimizerRule extends RelOptRule {
@@ -118,7 +117,7 @@ public void onMatch(RelOptRuleCall call) {
}
}
- protected static final Log LOG = LogFactory.getLog(HivePointLookupOptimizerRule.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(HivePointLookupOptimizerRule.class);
// Minimum number of OR clauses needed to transform into IN clauses
protected final int minNumORClauses;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorPTFInfo.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorPTFInfo.java
index a2cdd81..a56bf5b 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorPTFInfo.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorPTFInfo.java
@@ -18,10 +18,8 @@
package org.apache.hadoop.hive.ql.plan;
-import org.apache.commons.lang.ArrayUtils;
import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression;
-import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
/**
* VectorGroupByAggregrationInfo.
@@ -34,8 +32,6 @@
*/
public class VectorPTFInfo {
- private static final long serialVersionUID = 1L;
-
private int[] outputColumnMap;
private int[] orderColumnMap;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/BaseMaskUDF.java b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/BaseMaskUDF.java
index d69a4f7..c79cee6 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/BaseMaskUDF.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/BaseMaskUDF.java
@@ -19,25 +19,38 @@
package org.apache.hadoop.hive.ql.udf.generic;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+
import org.apache.hadoop.hive.common.type.Date;
import org.apache.hadoop.hive.common.type.HiveChar;
import org.apache.hadoop.hive.common.type.HiveVarchar;
import org.apache.hadoop.hive.ql.exec.UDFArgumentException;
import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.ql.udf.generic.GenericUDF.DeferredObject;
-import org.apache.hadoop.hive.serde2.io.*;
+import org.apache.hadoop.hive.serde2.io.ByteWritable;
+import org.apache.hadoop.hive.serde2.io.DateWritableV2;
+import org.apache.hadoop.hive.serde2.io.HiveCharWritable;
+import org.apache.hadoop.hive.serde2.io.HiveVarcharWritable;
+import org.apache.hadoop.hive.serde2.io.ShortWritable;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.primitive.*;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.ByteObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.DateObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.HiveCharObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.HiveVarcharObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.IntObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.LongObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.ShortObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.StringObjectInspector;
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.LongWritable;
import org.apache.hadoop.io.Text;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class BaseMaskUDF extends GenericUDF {
- private static final Log LOG = LogFactory.getLog(BaseMaskUDF.class);
+ private static final Logger LOG = LoggerFactory.getLogger(BaseMaskUDF.class);
final protected AbstractTransformer transformer;
final protected String displayName;
diff --git a/ql/src/test/org/apache/hive/testutils/MiniZooKeeperCluster.java b/ql/src/test/org/apache/hive/testutils/MiniZooKeeperCluster.java
index 6e9e6dd..ca01a7f 100644
--- a/ql/src/test/org/apache/hive/testutils/MiniZooKeeperCluster.java
+++ b/ql/src/test/org/apache/hive/testutils/MiniZooKeeperCluster.java
@@ -20,9 +20,9 @@
import java.io.BufferedReader;
import java.io.File;
-import java.io.InterruptedIOException;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.io.InterruptedIOException;
import java.io.OutputStream;
import java.io.Reader;
import java.net.BindException;
@@ -32,13 +32,13 @@
import java.util.List;
import java.util.Random;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HConstants;
import org.apache.zookeeper.server.NIOServerCnxnFactory;
import org.apache.zookeeper.server.ZooKeeperServer;
import org.apache.zookeeper.server.persistence.FileTxnLog;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.annotations.VisibleForTesting;
@@ -50,7 +50,7 @@
*XXX: copied from the only used class by qtestutil from hbase-tests
*/
class MiniZooKeeperCluster {
- private static final Log LOG = LogFactory.getLog(MiniZooKeeperCluster.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MiniZooKeeperCluster.class);
private static final int TICK_TIME = 2000;
private static final int DEFAULT_CONNECTION_TIMEOUT = 30000;
diff --git a/serde/pom.xml b/serde/pom.xml
index 8c37414..b6cb9e0 100644
--- a/serde/pom.xml
+++ b/serde/pom.xml
@@ -89,6 +89,12 @@
org.apache.thrift
libthrift
${libthrift.version}
+
+
+ commons-logging
+ commons-logging
+
+
net.sf.opencsv
@@ -114,6 +120,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -121,6 +131,12 @@
hadoop-mapreduce-client-core
${hadoop.version}
true
+
+
+ log4j
+ log4j
+
+
@@ -163,6 +179,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -176,6 +196,20 @@
hadoop-hdfs
${hadoop.version}
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
@@ -183,6 +217,20 @@
${hadoop.version}
tests
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
diff --git a/service-rpc/pom.xml b/service-rpc/pom.xml
index d6a07a5..3e43805 100644
--- a/service-rpc/pom.xml
+++ b/service-rpc/pom.xml
@@ -52,6 +52,12 @@
org.apache.thrift
libthrift
${libthrift.version}
+
+
+ commons-logging
+ commons-logging
+
+
diff --git a/service/pom.xml b/service/pom.xml
index ebe7863..f36fba7 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -136,6 +136,12 @@
org.apache.thrift
libthrift
${libthrift.version}
+
+
+ commons-logging
+ commons-logging
+
+
org.apache.curator
@@ -181,6 +187,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -205,6 +215,10 @@
commons-logging
commons-logging
+
+ log4j
+ log4j
+
@@ -227,6 +241,12 @@
${project.version}
test
test-jar
+
+
+ log4j
+ log4j
+
+
org.apache.hive
@@ -234,6 +254,16 @@
${project.version}
test-jar
test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
@@ -247,6 +277,16 @@
tez-api
${tez.version}
test
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.tez
diff --git a/service/src/java/org/apache/hive/http/JdbcJarDownloadServlet.java b/service/src/java/org/apache/hive/http/JdbcJarDownloadServlet.java
index d3bfd1b..142e0a1 100644
--- a/service/src/java/org/apache/hive/http/JdbcJarDownloadServlet.java
+++ b/service/src/java/org/apache/hive/http/JdbcJarDownloadServlet.java
@@ -31,12 +31,12 @@
import org.apache.commons.io.filefilter.WildcardFileFilter;
import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class JdbcJarDownloadServlet extends HttpServlet {
- private static final Log LOG = LogFactory.getLog(JdbcJarDownloadServlet.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JdbcJarDownloadServlet.class);
private static final String JDBC_JAR_DIR = System.getenv("HIVE_HOME") + "/jdbc/";
private static final String JDBC_JAR_PATTERN = "hive-jdbc-*-standalone.jar";
diff --git a/service/src/java/org/apache/hive/http/LlapServlet.java b/service/src/java/org/apache/hive/http/LlapServlet.java
index a0eb409..3aad095 100644
--- a/service/src/java/org/apache/hive/http/LlapServlet.java
+++ b/service/src/java/org/apache/hive/http/LlapServlet.java
@@ -24,17 +24,17 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.llap.cli.LlapStatusOptionsProcessor;
import org.apache.hadoop.hive.llap.cli.LlapStatusServiceDriver;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@SuppressWarnings("serial")
public class LlapServlet extends HttpServlet {
- private static final Log LOG = LogFactory.getLog(JMXJsonServlet.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JMXJsonServlet.class);
/**
* Initialize this servlet.
diff --git a/shims/0.23/pom.xml b/shims/0.23/pom.xml
index 4e11ba5..97a8bae 100644
--- a/shims/0.23/pom.xml
+++ b/shims/0.23/pom.xml
@@ -51,16 +51,20 @@
hadoop-common
${hadoop.version}
true
-
-
- org.slf4j
- slf4j-log4j12
-
-
- commons-logging
- commons-logging
-
-
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
@@ -73,6 +77,16 @@
hadoop-hdfs
${hadoop.version}
true
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
@@ -80,6 +94,16 @@
${hadoop.version}
test-jar
true
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
@@ -163,18 +187,48 @@
hadoop-yarn-api
${hadoop.version}
true
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
hadoop-yarn-common
${hadoop.version}
true
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
hadoop-yarn-client
${hadoop.version}
true
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
@@ -189,6 +243,14 @@
org.slf4j
slf4j-log4j12
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
@@ -209,6 +271,10 @@
com.codahale.metrics
metrics-core
+
+ commons-logging
+ commons-logging
+
diff --git a/shims/common/pom.xml b/shims/common/pom.xml
index d0c23c9..ac94ff5 100644
--- a/shims/common/pom.xml
+++ b/shims/common/pom.xml
@@ -50,16 +50,20 @@
hadoop-client
${hadoop.version}
true
-
-
- org.slf4j
- slf4j-log4j12
-
-
- commons-logging
- commons-logging
-
-
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
commons-lang
@@ -70,6 +74,12 @@
org.apache.thrift
libthrift
${libthrift.version}
+
+
+ commons-logging
+ commons-logging
+
+
org.apache.curator
@@ -84,6 +94,10 @@
org.apache.hadoop
hadoop-core
+
+ log4j
+ log4j
+
diff --git a/shims/common/src/main/java/org/apache/hadoop/hive/shims/ShimLoader.java b/shims/common/src/main/java/org/apache/hadoop/hive/shims/ShimLoader.java
index 28ab7c4..12dbace 100644
--- a/shims/common/src/main/java/org/apache/hadoop/hive/shims/ShimLoader.java
+++ b/shims/common/src/main/java/org/apache/hadoop/hive/shims/ShimLoader.java
@@ -17,14 +17,13 @@
*/
package org.apache.hadoop.hive.shims;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.hadoop.util.VersionInfo;
-import org.apache.log4j.AppenderSkeleton;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* ShimLoader.
*
@@ -34,8 +33,6 @@
public static final String HADOOP23VERSIONNAME = "0.23";
private static volatile HadoopShims hadoopShims;
- private static JettyShims jettyShims;
- private static AppenderSkeleton eventCounter;
private static SchedulerShim schedulerShim;
/**
@@ -94,13 +91,6 @@ public static HadoopShims getHadoopShims() {
return hadoopShims;
}
- public static synchronized AppenderSkeleton getEventCounter() {
- if (eventCounter == null) {
- eventCounter = loadShims(EVENT_COUNTER_SHIM_CLASSES, AppenderSkeleton.class);
- }
- return eventCounter;
- }
-
public static synchronized SchedulerShim getSchedulerShims() {
if (schedulerShim == null) {
schedulerShim = createShim(SCHEDULER_SHIM_CLASSE, SchedulerShim.class);
diff --git a/shims/scheduler/pom.xml b/shims/scheduler/pom.xml
index 48b2097..59f6e60 100644
--- a/shims/scheduler/pom.xml
+++ b/shims/scheduler/pom.xml
@@ -46,6 +46,16 @@
hadoop-common
${hadoop.version}
true
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
@@ -58,18 +68,48 @@
hadoop-yarn-api
${hadoop.version}
true
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
hadoop-yarn-common
${hadoop.version}
true
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
hadoop-yarn-client
${hadoop.version}
true
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.apache.hadoop
@@ -81,6 +121,14 @@
org.slf4j
slf4j-log4j12
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
@@ -94,6 +142,14 @@
com.codahale.metrics
metrics-core
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
diff --git a/spark-client/pom.xml b/spark-client/pom.xml
index 9a1e1c2..8c4e95f 100644
--- a/spark-client/pom.xml
+++ b/spark-client/pom.xml
@@ -62,6 +62,10 @@
org.eclipse.jetty.aggregate
jetty-all
+
+ log4j
+ log4j
+
@@ -86,6 +90,10 @@
slf4j-log4j12
+ log4j
+ log4j
+
+
commons-logging
commons-logging
@@ -104,6 +112,12 @@
spark-yarn_${scala.binary.version}
${spark.version}
runtime
+
+
+ log4j
+ log4j
+
+
junit
diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/FileMetadataHandler.java b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/FileMetadataHandler.java
index 4c14ab0..ff30260 100644
--- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/FileMetadataHandler.java
+++ b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/FileMetadataHandler.java
@@ -22,12 +22,12 @@
import java.nio.ByteBuffer;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hive.metastore.api.FileMetadataExprType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The base implementation of a file metadata handler for a specific file type.
@@ -36,7 +36,7 @@
* contains the actual implementation that depends on some stuff in QL (for ORC).
*/
public abstract class FileMetadataHandler {
- protected static final Log LOG = LogFactory.getLog(FileMetadataHandler.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(FileMetadataHandler.class);
private Configuration conf;
private PartitionExpressionProxy expressionProxy;
diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/FileMetadataManager.java b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/FileMetadataManager.java
index 0b8b310..8204829 100644
--- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/FileMetadataManager.java
+++ b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/FileMetadataManager.java
@@ -18,36 +18,31 @@
package org.apache.hadoop.hive.metastore;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hdfs.DistributedFileSystem;
-
-import org.apache.hadoop.fs.LocatedFileStatus;
-
-import org.apache.hadoop.fs.RemoteIterator;
-
+import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-
-import com.google.common.collect.Lists;
-
-import java.io.IOException;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.LocatedFileStatus;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.RemoteIterator;
+import org.apache.hadoop.hdfs.DistributedFileSystem;
import org.apache.hadoop.hive.metastore.api.FileMetadataExprType;
import org.apache.hadoop.hive.metastore.api.MetaException;
-
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
import org.apache.hadoop.hive.metastore.conf.MetastoreConf;
import org.apache.hadoop.hive.metastore.utils.HdfsUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.collect.Lists;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
public class FileMetadataManager {
- private static final Log LOG = LogFactory.getLog(FileMetadataManager.class);
+ private static final Logger LOG = LoggerFactory.getLogger(FileMetadataManager.class);
private final RawStore tlms;
private final ExecutorService threadPool;
diff --git a/streaming/pom.xml b/streaming/pom.xml
index 99697a8..013344a 100644
--- a/streaming/pom.xml
+++ b/streaming/pom.xml
@@ -49,6 +49,20 @@
org.apache.hive
hive-exec
${project.version}
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ log4j
+ log4j
+
+
+ commons-logging
+ commons-logging
+
+
org.slf4j
@@ -60,6 +74,20 @@
hadoop-common
true
${hadoop.version}
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ log4j
+ log4j
+
+
+ commons-logging
+ commons-logging
+
+
org.apache.hadoop
@@ -71,6 +99,10 @@
org.slf4j
slf4j-log4j12
+
+ log4j
+ log4j
+
commons-logging
commons-logging