Repository: hive Updated Branches: refs/heads/master 5ade74060 -> b3923255a
http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorPTFInfo.java ---------------------------------------------------------------------- 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 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo; */ public class VectorPTFInfo { - private static final long serialVersionUID = 1L; - private int[] outputColumnMap; private int[] orderColumnMap; http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/BaseMaskUDF.java ---------------------------------------------------------------------- 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; http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/test/org/apache/hive/testutils/MiniZooKeeperCluster.java ---------------------------------------------------------------------- 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 @@ package org.apache.hive.testutils; 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.ArrayList; 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 @@ import com.google.common.annotations.VisibleForTesting; *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; http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/service/src/java/org/apache/hive/http/JdbcJarDownloadServlet.java ---------------------------------------------------------------------- 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 javax.servlet.http.HttpServletResponse; 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"; http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/service/src/java/org/apache/hive/http/LlapServlet.java ---------------------------------------------------------------------- diff --git a/service/src/java/org/apache/hive/http/LlapServlet.java b/service/src/java/org/apache/hive/http/LlapServlet.java index 2bc59b5..92264d2 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.HttpServlet; 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(LlapServlet.class); + private static final Logger LOG = LoggerFactory.getLogger(LlapServlet.class); /** * Initialize this servlet. http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/shims/common/src/main/java/org/apache/hadoop/hive/shims/ShimLoader.java ---------------------------------------------------------------------- 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 abstract class ShimLoader { 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 abstract class ShimLoader { 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); http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/FileMetadataHandler.java ---------------------------------------------------------------------- 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.io.IOException; 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 @@ import org.apache.hadoop.hive.metastore.api.FileMetadataExprType; * 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; http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/FileMetadataManager.java ---------------------------------------------------------------------- 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;
