HIVE-20019: Ban commons-logging and log4j (Prasanth Jayachandran reviewed by Ashutosh Chauhan)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/b3923255 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/b3923255 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/b3923255 Branch: refs/heads/master Commit: b3923255a2e1f9a43036c8bb35180fe335fb7195 Parents: 5ade740 Author: Prasanth Jayachandran <[email protected]> Authored: Thu Jul 12 11:18:22 2018 -0700 Committer: Prasanth Jayachandran <[email protected]> Committed: Thu Jul 12 11:18:22 2018 -0700 ---------------------------------------------------------------------- .../apache/hadoop/hive/conf/HiveConfUtil.java | 6 ++--- .../JavaIOTmpdirVariableCoercion.java | 10 ++++---- .../org/apache/hive/http/JMXJsonServlet.java | 6 ++--- .../hive/hbase/HiveHBaseInputFormatUtil.java | 8 +++--- .../hive/hcatalog/templeton/ListDelegator.java | 8 +++--- .../services/impl/LlapIoMemoryServlet.java | 6 ++--- .../llap/security/LlapServerSecurityInfo.java | 8 +++--- .../endpoint/LlapPluginSecurityInfo.java | 9 +++---- pom.xml | 23 ++++++++++++++++- .../keyseries/VectorKeySeriesSingleImpl.java | 5 +--- .../exec/vector/ptf/VectorPTFEvaluatorBase.java | 7 ----- .../vector/ptf/VectorPTFEvaluatorCount.java | 9 +------ .../vector/ptf/VectorPTFEvaluatorCountStar.java | 12 +-------- .../ptf/VectorPTFEvaluatorDecimalAvg.java | 8 +----- .../VectorPTFEvaluatorDecimalFirstValue.java | 10 +------- .../ptf/VectorPTFEvaluatorDecimalLastValue.java | 9 +------ .../ptf/VectorPTFEvaluatorDecimalMax.java | 9 +------ .../ptf/VectorPTFEvaluatorDecimalMin.java | 9 +------ .../ptf/VectorPTFEvaluatorDecimalSum.java | 8 +----- .../vector/ptf/VectorPTFEvaluatorDenseRank.java | 8 +----- .../vector/ptf/VectorPTFEvaluatorDoubleAvg.java | 8 +----- .../ptf/VectorPTFEvaluatorDoubleFirstValue.java | 9 +------ .../ptf/VectorPTFEvaluatorDoubleLastValue.java | 13 +++------- .../vector/ptf/VectorPTFEvaluatorDoubleMax.java | 8 +----- .../vector/ptf/VectorPTFEvaluatorDoubleMin.java | 8 +----- .../vector/ptf/VectorPTFEvaluatorDoubleSum.java | 8 +----- .../vector/ptf/VectorPTFEvaluatorLongAvg.java | 8 +----- .../ptf/VectorPTFEvaluatorLongFirstValue.java | 9 +------ .../ptf/VectorPTFEvaluatorLongLastValue.java | 8 +----- .../vector/ptf/VectorPTFEvaluatorLongMax.java | 8 +----- .../vector/ptf/VectorPTFEvaluatorLongMin.java | 8 +----- .../vector/ptf/VectorPTFEvaluatorLongSum.java | 8 +----- .../exec/vector/ptf/VectorPTFEvaluatorRank.java | 8 +----- .../vector/ptf/VectorPTFEvaluatorRowNumber.java | 8 +----- .../exec/vector/ptf/VectorPTFGroupBatches.java | 6 ----- .../ql/exec/vector/ptf/VectorPTFOperator.java | 20 ++++----------- .../VectorReduceSinkCommonOperator.java | 6 ++--- .../VectorReduceSinkEmptyKeyOperator.java | 6 ++--- .../VectorReduceSinkLongOperator.java | 4 --- .../VectorReduceSinkMultiKeyOperator.java | 4 --- .../VectorReduceSinkObjectHashOperator.java | 8 +++--- .../VectorReduceSinkStringOperator.java | 5 ---- .../VectorReduceSinkUniformHashOperator.java | 6 ++--- .../optimizer/FixedBucketPruningOptimizer.java | 5 ---- .../ql/optimizer/PartitionColumnsSeparator.java | 6 ++--- .../TablePropertyEnrichmentOptimizer.java | 27 ++++++++++---------- .../rules/HivePointLookupOptimizerRule.java | 13 +++++----- .../hadoop/hive/ql/plan/VectorPTFInfo.java | 4 --- .../hadoop/hive/ql/udf/generic/BaseMaskUDF.java | 23 +++++++++++++---- .../hive/testutils/MiniZooKeeperCluster.java | 8 +++--- .../hive/http/JdbcJarDownloadServlet.java | 6 ++--- .../java/org/apache/hive/http/LlapServlet.java | 6 ++--- .../apache/hadoop/hive/shims/ShimLoader.java | 16 +++--------- .../hive/metastore/FileMetadataHandler.java | 6 ++--- .../hive/metastore/FileMetadataManager.java | 27 ++++++++------------ 55 files changed, 162 insertions(+), 347 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/common/src/java/org/apache/hadoop/hive/conf/HiveConfUtil.java ---------------------------------------------------------------------- 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 @@ package org.apache.hadoop.hive.conf; 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 @@ import java.util.StringTokenizer; @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 http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/common/src/java/org/apache/hadoop/hive/conf/valcoersion/JavaIOTmpdirVariableCoercion.java ---------------------------------------------------------------------- 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 @@ import java.io.IOException; * @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(); http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/common/src/java/org/apache/hive/http/JMXJsonServlet.java ---------------------------------------------------------------------- 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.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.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 @@ import org.codehaus.jackson.JsonGenerator; * */ 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 = http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHBaseInputFormatUtil.java ---------------------------------------------------------------------- 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.HashMap; 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.IntWritable; 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. http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/ListDelegator.java ---------------------------------------------------------------------- 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"; /** http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/services/impl/LlapIoMemoryServlet.java ---------------------------------------------------------------------- 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.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.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"; http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/llap-server/src/java/org/apache/hadoop/hive/llap/security/LlapServerSecurityInfo.java ---------------------------------------------------------------------- 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 @@ package org.apache.hadoop.hive.llap.security; 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) { http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/endpoint/LlapPluginSecurityInfo.java ---------------------------------------------------------------------- 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 @@ package org.apache.hadoop.hive.llap.tezplugins.endpoint; 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) { http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 604ee76..79b5ee6 100644 --- a/pom.xml +++ b/pom.xml @@ -1222,7 +1222,7 @@ </configuration> </execution> <execution> - <id>enforce-banned-dependencies</id> + <id>enforce-banned-dependencies-licenses</id> <goals> <goal>enforce</goal> </goals> @@ -1233,6 +1233,27 @@ <!--LGPL licenced library--> <exclude>com.google.code.findbugs:annotations</exclude> </excludes> + <message>A banned license dependency was found!</message> + </bannedDependencies> + </rules> + <fail>true</fail> + </configuration> + </execution> + <execution> + <id>enforce-banned-dependencies-logging</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <bannedDependencies> + <excludes> + <!-- Move to SLF4J --> + <exclude>commons-logging:commons-logging</exclude> + <exclude>log4j:log4j</exclude> + </excludes> + <searchTransitive>false</searchTransitive> + <message>A banned logging dependency was found!</message> </bannedDependencies> </rules> <fail>true</fail> http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/keyseries/VectorKeySeriesSingleImpl.java ---------------------------------------------------------------------- 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 @@ import com.google.common.base.Preconditions; 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. http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorBase.java ---------------------------------------------------------------------- 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 @@ import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable; */ 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; http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorCount.java ---------------------------------------------------------------------- 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 @@ import com.google.common.base.Preconditions; */ 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, http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorCountStar.java ---------------------------------------------------------------------- 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 @@ import com.google.common.base.Preconditions; */ 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, http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalAvg.java ---------------------------------------------------------------------- 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 @@ import com.google.common.base.Preconditions; */ 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; http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalFirstValue.java ---------------------------------------------------------------------- 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 @@ import com.google.common.base.Preconditions; */ 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; http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalLastValue.java ---------------------------------------------------------------------- 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 @@ import com.google.common.base.Preconditions; */ 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; http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalMax.java ---------------------------------------------------------------------- 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 @@ import com.google.common.base.Preconditions; */ 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; http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalMin.java ---------------------------------------------------------------------- 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 @@ import com.google.common.base.Preconditions; */ 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; http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalSum.java ---------------------------------------------------------------------- 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 @@ import com.google.common.base.Preconditions; */ 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; http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDenseRank.java ---------------------------------------------------------------------- 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 @@ import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef; */ 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, http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleAvg.java ---------------------------------------------------------------------- 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 @@ import com.google.common.base.Preconditions; */ 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; http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleFirstValue.java ---------------------------------------------------------------------- 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 @@ import com.google.common.base.Preconditions; */ 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; http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleLastValue.java ---------------------------------------------------------------------- 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 @@ import com.google.common.base.Preconditions; /** * 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); http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleMax.java ---------------------------------------------------------------------- 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 @@ import com.google.common.base.Preconditions; */ 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; http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleMin.java ---------------------------------------------------------------------- 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 @@ import com.google.common.base.Preconditions; */ 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; http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleSum.java ---------------------------------------------------------------------- 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 @@ import com.google.common.base.Preconditions; */ 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; http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongAvg.java ---------------------------------------------------------------------- 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 @@ import com.google.common.base.Preconditions; */ 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; http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongFirstValue.java ---------------------------------------------------------------------- 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 @@ import com.google.common.base.Preconditions; */ 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; http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongLastValue.java ---------------------------------------------------------------------- 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 @@ import com.google.common.base.Preconditions; */ 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; http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongMax.java ---------------------------------------------------------------------- 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 @@ import com.google.common.base.Preconditions; */ 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; http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongMin.java ---------------------------------------------------------------------- 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 @@ import com.google.common.base.Preconditions; */ 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; http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongSum.java ---------------------------------------------------------------------- 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 @@ import com.google.common.base.Preconditions; */ 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; http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorRank.java ---------------------------------------------------------------------- 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 @@ import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef; */ 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; http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorRowNumber.java ---------------------------------------------------------------------- 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 @@ import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef; */ 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, http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFGroupBatches.java ---------------------------------------------------------------------- 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 @@ package org.apache.hadoop.hive.ql.exec.vector.ptf; 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 @@ import com.google.common.base.Preconditions; */ 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; http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFOperator.java ---------------------------------------------------------------------- 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.Operator; 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.VectorizationContextRegion; 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 @@ public class VectorPTFOperator extends Operator<PTFDesc> 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; http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkCommonOperator.java ---------------------------------------------------------------------- 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.io.Serializable; 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.lazybinary.fast.LazyBinarySerializeWrite; 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 @@ public abstract class VectorReduceSinkCommonOperator extends TerminalOperator<Re 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 http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkEmptyKeyOperator.java ---------------------------------------------------------------------- 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.exec.vector.expressions.VectorExpression; 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 @@ public class VectorReduceSinkEmptyKeyOperator extends VectorReduceSinkCommonOper 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. http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkLongOperator.java ---------------------------------------------------------------------- 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 @@ import org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo; 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; http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkMultiKeyOperator.java ---------------------------------------------------------------------- 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 @@ import org.apache.hadoop.hive.serde2.binarysortable.fast.BinarySortableSerialize 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. http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkObjectHashOperator.java ---------------------------------------------------------------------- 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 @@ package org.apache.hadoop.hive.ql.exec.vector.reducesink; 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.exec.vector.expressions.VectorExpression; 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 @@ public class VectorReduceSinkObjectHashOperator extends VectorReduceSinkCommonOp 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; http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkStringOperator.java ---------------------------------------------------------------------- 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.metadata.HiveException; 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 @@ import org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo; 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; http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkUniformHashOperator.java ---------------------------------------------------------------------- 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.OperatorDesc; 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 @@ public abstract class VectorReduceSinkUniformHashOperator extends VectorReduceSi 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. http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/optimizer/FixedBucketPruningOptimizer.java ---------------------------------------------------------------------- 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 334b8e9..35053e3 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.Set; 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; @@ -65,9 +63,6 @@ import com.google.common.base.Preconditions; */ public class FixedBucketPruningOptimizer extends Transform { - private static final Log LOG = LogFactory - .getLog(FixedBucketPruningOptimizer.class.getName()); - private final boolean compat; public FixedBucketPruningOptimizer(boolean compat) { http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/optimizer/PartitionColumnsSeparator.java ---------------------------------------------------------------------- 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.Map.Entry; 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.GenericUDFIn; 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 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory; */ 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 = http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/optimizer/TablePropertyEnrichmentOptimizer.java ---------------------------------------------------------------------- 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.parse.SemanticException; 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 @@ import java.util.Stack; */ 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 { http://git-wip-us.apache.org/repos/asf/hive/blob/b3923255/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HivePointLookupOptimizerRule.java ---------------------------------------------------------------------- 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 java.util.Set; 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.RexShuttle; 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.Lists; 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 abstract class HivePointLookupOptimizerRule extends RelOptRule { } } - 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;
