You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by xu...@apache.org on 2017/03/17 02:20:58 UTC
[2/2] hive git commit: HIVE-16183: Fix potential thread safety issues
with static variables (reviewed by rui, sergey, and peter)
HIVE-16183: Fix potential thread safety issues with static variables (reviewed by rui, sergey, and peter)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/71f4930d
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/71f4930d
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/71f4930d
Branch: refs/heads/master
Commit: 71f4930d95475e7e63b5acc55af3809aefcc71e0
Parents: 1f7e26f
Author: Xuefu Zhang <xu...@uber.com>
Authored: Thu Mar 16 19:20:41 2017 -0700
Committer: Xuefu Zhang <xu...@uber.com>
Committed: Thu Mar 16 19:20:41 2017 -0700
----------------------------------------------------------------------
.../org/apache/hive/beeline/BeeLineOpts.java | 2 +-
.../apache/hive/beeline/HiveSchemaHelper.java | 12 ++--
.../org/apache/hive/beeline/HiveSchemaTool.java | 2 +-
.../org/apache/hadoop/hive/cli/RCFileCat.java | 13 ++--
.../apache/hadoop/hive/cli/TestRCFileCat.java | 4 +-
.../org/apache/hadoop/hive/common/LogUtils.java | 5 +-
.../hadoop/hive/common/StatsSetupConst.java | 2 +-
.../hive/metastore/TestMetastoreVersion.java | 4 +-
.../hive/metastore/MetaStoreSchemaInfo.java | 16 ++---
.../hadoop/hive/ql/exec/ArchiveUtils.java | 7 +-
.../hadoop/hive/ql/exec/FunctionRegistry.java | 2 +-
.../apache/hadoop/hive/ql/exec/Utilities.java | 21 +++---
.../ql/exec/vector/VectorizationContext.java | 2 +-
.../exec/vector/expressions/CuckooSetBytes.java | 4 +-
.../fast/VectorMapJoinFastHashTable.java | 6 +-
.../hadoop/hive/ql/history/HiveHistoryImpl.java | 5 +-
.../apache/hadoop/hive/ql/index/HiveIndex.java | 4 +-
.../hadoop/hive/ql/io/HiveFileFormatUtils.java | 2 +-
.../hadoop/hive/ql/io/HiveInputFormat.java | 3 +-
.../org/apache/hadoop/hive/ql/io/RCFile.java | 2 +-
.../hadoop/hive/ql/io/orc/OrcInputFormat.java | 6 +-
.../ql/io/rcfile/stats/PartialScanTask.java | 6 +-
.../hadoop/hive/ql/metadata/VirtualColumn.java | 2 +-
.../hive/ql/optimizer/GenMapRedUtils.java | 6 +-
.../ListBucketingPrunerUtils.java | 4 +-
.../physical/GenMRSkewJoinProcessor.java | 10 +--
.../hive/ql/optimizer/physical/Vectorizer.java | 42 +----------
.../ql/optimizer/physical/VectorizerReason.java | 2 +-
.../hive/ql/parse/BaseSemanticAnalyzer.java | 8 +--
.../hive/ql/parse/DDLSemanticAnalyzer.java | 2 +-
.../hadoop/hive/ql/parse/WindowingSpec.java | 2 +-
.../hadoop/hive/ql/plan/AbstractVectorDesc.java | 4 +-
.../apache/hadoop/hive/ql/plan/GroupByDesc.java | 2 +-
.../apache/hadoop/hive/ql/plan/MapJoinDesc.java | 6 +-
.../hadoop/hive/ql/plan/ReduceSinkDesc.java | 2 +-
.../hive/ql/plan/VectorAppMasterEventDesc.java | 2 +-
.../hadoop/hive/ql/plan/VectorFileSinkDesc.java | 2 +-
.../hadoop/hive/ql/plan/VectorFilterDesc.java | 2 +-
.../hadoop/hive/ql/plan/VectorGroupByDesc.java | 2 +-
.../hadoop/hive/ql/plan/VectorLimitDesc.java | 2 +-
.../hadoop/hive/ql/plan/VectorMapJoinDesc.java | 2 +-
.../hadoop/hive/ql/plan/VectorMapJoinInfo.java | 2 +-
.../hive/ql/plan/VectorPartitionDesc.java | 2 +-
.../hive/ql/plan/VectorReduceSinkDesc.java | 2 +-
.../hive/ql/plan/VectorReduceSinkInfo.java | 2 +-
.../hadoop/hive/ql/plan/VectorSMBJoinDesc.java | 2 +-
.../hadoop/hive/ql/plan/VectorSelectDesc.java | 2 +-
.../ql/plan/VectorSparkHashTableSinkDesc.java | 2 +-
.../VectorSparkPartitionPruningSinkDesc.java | 2 +-
.../hive/ql/plan/VectorTableScanDesc.java | 2 +-
.../hadoop/hive/ql/processors/HiveCommand.java | 2 +-
.../udf/generic/GenericUDFInternalInterval.java | 4 +-
.../mapjoin/fast/CheckFastRowHashMap.java | 17 ++---
.../mapjoin/fast/CommonFastHashTable.java | 4 +-
.../apache/hadoop/hive/serde2/SerDeUtils.java | 2 +-
.../hive/serde2/avro/AvroDeserializer.java | 2 +-
.../lazy/fast/LazySimpleDeserializeRead.java | 4 +-
.../hive/serde2/lazy/fast/StringToDouble.java | 4 +-
.../hive/serde2/lazybinary/LazyBinaryUtils.java | 2 +-
.../hive/serde2/typeinfo/TypeInfoUtils.java | 2 +-
.../org/apache/hadoop/hive/io/HdfsUtils.java | 4 +-
.../hive/io/HiveIOExceptionHandlerChain.java | 2 +-
.../hive/io/HiveIOExceptionHandlerUtil.java | 4 +-
.../apache/hadoop/hive/shims/ShimLoader.java | 2 +-
.../hive/common/type/FastHiveDecimalImpl.java | 73 +++++++++-----------
.../hadoop/hive/common/type/RandomTypeUtil.java | 10 +--
.../hive/testutils/jdbc/HiveBurnInClient.java | 4 +-
67 files changed, 151 insertions(+), 243 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java
----------------------------------------------------------------------
diff --git a/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java b/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java
index 048d744..f85d8a3 100644
--- a/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java
+++ b/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java
@@ -62,7 +62,7 @@ class BeeLineOpts implements Completer {
public static final int DEFAULT_MAX_COLUMN_WIDTH = 50;
public static final int DEFAULT_INCREMENTAL_BUFFER_ROWS = 1000;
- public static String URL_ENV_PREFIX = "BEELINE_URL_";
+ public static final String URL_ENV_PREFIX = "BEELINE_URL_";
private final BeeLine beeLine;
private boolean autosave = false;
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/beeline/src/java/org/apache/hive/beeline/HiveSchemaHelper.java
----------------------------------------------------------------------
diff --git a/beeline/src/java/org/apache/hive/beeline/HiveSchemaHelper.java b/beeline/src/java/org/apache/hive/beeline/HiveSchemaHelper.java
index 181f0d2..711f6a8 100644
--- a/beeline/src/java/org/apache/hive/beeline/HiveSchemaHelper.java
+++ b/beeline/src/java/org/apache/hive/beeline/HiveSchemaHelper.java
@@ -292,7 +292,7 @@ public class HiveSchemaHelper {
// Derby commandline parser
public static class DerbyCommandParser extends AbstractCommandParser {
- private static String DERBY_NESTING_TOKEN = "RUN";
+ private static final String DERBY_NESTING_TOKEN = "RUN";
public DerbyCommandParser(String dbOpts, String msUsername, String msPassword,
HiveConf hiveConf) {
@@ -380,11 +380,11 @@ public class HiveSchemaHelper {
// Postgres specific parser
public static class PostgresCommandParser extends AbstractCommandParser {
- private static String POSTGRES_NESTING_TOKEN = "\\i";
+ private static final String POSTGRES_NESTING_TOKEN = "\\i";
@VisibleForTesting
- public static String POSTGRES_STANDARD_STRINGS_OPT = "SET standard_conforming_strings";
+ public static final String POSTGRES_STANDARD_STRINGS_OPT = "SET standard_conforming_strings";
@VisibleForTesting
- public static String POSTGRES_SKIP_STANDARD_STRINGS_DBOPT = "postgres.filter.81";
+ public static final String POSTGRES_SKIP_STANDARD_STRINGS_DBOPT = "postgres.filter.81";
public PostgresCommandParser(String dbOpts, String msUsername, String msPassword,
HiveConf hiveConf) {
@@ -427,7 +427,7 @@ public class HiveSchemaHelper {
//Oracle specific parser
public static class OracleCommandParser extends AbstractCommandParser {
- private static String ORACLE_NESTING_TOKEN = "@";
+ private static final String ORACLE_NESTING_TOKEN = "@";
public OracleCommandParser(String dbOpts, String msUsername, String msPassword,
HiveConf hiveConf) {
@@ -451,7 +451,7 @@ public class HiveSchemaHelper {
//MSSQL specific parser
public static class MSSQLCommandParser extends AbstractCommandParser {
- private static String MSSQL_NESTING_TOKEN = ":r";
+ private static final String MSSQL_NESTING_TOKEN = ":r";
public MSSQLCommandParser(String dbOpts, String msUsername, String msPassword,
HiveConf hiveConf) {
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/beeline/src/java/org/apache/hive/beeline/HiveSchemaTool.java
----------------------------------------------------------------------
diff --git a/beeline/src/java/org/apache/hive/beeline/HiveSchemaTool.java b/beeline/src/java/org/apache/hive/beeline/HiveSchemaTool.java
index 2c088c9..18f0c5e 100644
--- a/beeline/src/java/org/apache/hive/beeline/HiveSchemaTool.java
+++ b/beeline/src/java/org/apache/hive/beeline/HiveSchemaTool.java
@@ -89,7 +89,7 @@ public class HiveSchemaTool {
}
this.hiveConf = hiveConf;
this.dbType = dbType;
- this.metaStoreSchemaInfo = new MetaStoreSchemaInfo(hiveHome, hiveConf, dbType);
+ this.metaStoreSchemaInfo = new MetaStoreSchemaInfo(hiveHome, dbType);
userName = hiveConf.get(ConfVars.METASTORE_CONNECTION_USER_NAME.varname);
try {
passWord = ShimLoader.getHadoopShims().getPassword(hiveConf,
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/cli/src/java/org/apache/hadoop/hive/cli/RCFileCat.java
----------------------------------------------------------------------
diff --git a/cli/src/java/org/apache/hadoop/hive/cli/RCFileCat.java b/cli/src/java/org/apache/hadoop/hive/cli/RCFileCat.java
index f1806a0..24550fa 100644
--- a/cli/src/java/org/apache/hadoop/hive/cli/RCFileCat.java
+++ b/cli/src/java/org/apache/hadoop/hive/cli/RCFileCat.java
@@ -54,7 +54,7 @@ public class RCFileCat implements Tool{
// In verbose mode, print an update per RECORD_PRINT_INTERVAL records
private static final int RECORD_PRINT_INTERVAL = (1024*1024);
- protected static boolean test=false;
+ protected boolean test = false;
public RCFileCat() {
super();
@@ -63,12 +63,12 @@ public class RCFileCat implements Tool{
onUnmappableCharacter(CodingErrorAction.REPLACE);
}
- private static CharsetDecoder decoder;
+ private CharsetDecoder decoder;
Configuration conf = null;
- private static String TAB ="\t";
- private static String NEWLINE ="\r\n";
+ private static final String TAB ="\t";
+ private static final String NEWLINE ="\r\n";
@Override
public int run(String[] args) throws Exception {
@@ -243,7 +243,7 @@ public class RCFileCat implements Tool{
this.conf = conf;
}
- private static String Usage = "RCFileCat [--start=start_offet] [--length=len] [--verbose] " +
+ private static final String Usage = "RCFileCat [--start=start_offet] [--length=len] [--verbose] " +
"[--column-sizes | --column-sizes-pretty] [--file-sizes] fileName";
public static void main(String[] args) {
@@ -262,7 +262,7 @@ public class RCFileCat implements Tool{
}
}
- private static void setupBufferedOutput() {
+ private void setupBufferedOutput() {
OutputStream pdataOut;
if (test) {
pdataOut = System.out;
@@ -275,6 +275,7 @@ public class RCFileCat implements Tool{
new PrintStream(bos, false);
System.setOut(ps);
}
+
private static void printUsage(String errorMsg) {
System.err.println(Usage);
if(errorMsg != null) {
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/cli/src/test/org/apache/hadoop/hive/cli/TestRCFileCat.java
----------------------------------------------------------------------
diff --git a/cli/src/test/org/apache/hadoop/hive/cli/TestRCFileCat.java b/cli/src/test/org/apache/hadoop/hive/cli/TestRCFileCat.java
index 11ceb31..4cb4a19 100644
--- a/cli/src/test/org/apache/hadoop/hive/cli/TestRCFileCat.java
+++ b/cli/src/test/org/apache/hadoop/hive/cli/TestRCFileCat.java
@@ -25,8 +25,6 @@ import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.PrintStream;
-import java.net.URI;
-
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -77,7 +75,7 @@ public class TestRCFileCat {
writer.close();
RCFileCat fileCat = new RCFileCat();
- RCFileCat.test=true;
+ fileCat.test=true;
fileCat.setConf(new Configuration());
// set fake input and output streams
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/common/src/java/org/apache/hadoop/hive/common/LogUtils.java
----------------------------------------------------------------------
diff --git a/common/src/java/org/apache/hadoop/hive/common/LogUtils.java b/common/src/java/org/apache/hadoop/hive/common/LogUtils.java
index c2a0d9a..01b2e7c 100644
--- a/common/src/java/org/apache/hadoop/hive/common/LogUtils.java
+++ b/common/src/java/org/apache/hadoop/hive/common/LogUtils.java
@@ -25,7 +25,6 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.config.Configurator;
import org.apache.logging.log4j.core.impl.Log4jContextFactory;
import org.slf4j.Logger;
@@ -45,8 +44,8 @@ public class LogUtils {
/**
* Constants for log masking
*/
- private static String KEY_TO_MASK_WITH = "password";
- private static String MASKED_VALUE = "###_MASKED_###";
+ private static final String KEY_TO_MASK_WITH = "password";
+ private static final String MASKED_VALUE = "###_MASKED_###";
@SuppressWarnings("serial")
public static class LogInitializationException extends Exception {
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/common/src/java/org/apache/hadoop/hive/common/StatsSetupConst.java
----------------------------------------------------------------------
diff --git a/common/src/java/org/apache/hadoop/hive/common/StatsSetupConst.java b/common/src/java/org/apache/hadoop/hive/common/StatsSetupConst.java
index 926b4a6..a9e17c2 100644
--- a/common/src/java/org/apache/hadoop/hive/common/StatsSetupConst.java
+++ b/common/src/java/org/apache/hadoop/hive/common/StatsSetupConst.java
@@ -49,7 +49,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
public class StatsSetupConst {
- protected final static Logger LOG = LoggerFactory.getLogger(StatsSetupConst.class.getName());
+ protected static final Logger LOG = LoggerFactory.getLogger(StatsSetupConst.class.getName());
public enum StatDB {
fs {
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetastoreVersion.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetastoreVersion.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetastoreVersion.java
index 6d1673d..7188af6 100644
--- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetastoreVersion.java
+++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetastoreVersion.java
@@ -189,13 +189,13 @@ public class TestMetastoreVersion extends TestCase {
// write the given version to metastore
private String getVersion(HiveConf conf) throws HiveMetaException {
- MetaStoreSchemaInfo schemInfo = new MetaStoreSchemaInfo(metaStoreRoot, conf, "derby");
+ MetaStoreSchemaInfo schemInfo = new MetaStoreSchemaInfo(metaStoreRoot, "derby");
return getMetaStoreVersion();
}
// write the given version to metastore
private void setVersion(HiveConf conf, String version) throws HiveMetaException {
- MetaStoreSchemaInfo schemInfo = new MetaStoreSchemaInfo(metaStoreRoot, conf, "derby");
+ MetaStoreSchemaInfo schemInfo = new MetaStoreSchemaInfo(metaStoreRoot, "derby");
setMetaStoreVersion(version, "setVersion test");
}
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java
----------------------------------------------------------------------
diff --git a/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java b/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java
index 9c30ee7..320902b 100644
--- a/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java
+++ b/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java
@@ -19,7 +19,6 @@ package org.apache.hadoop.hive.metastore;
import java.io.BufferedReader;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
@@ -27,21 +26,19 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hive.common.util.HiveVersionInfo;
import com.google.common.collect.ImmutableMap;
public class MetaStoreSchemaInfo {
- private static String SQL_FILE_EXTENSION=".sql";
- private static String UPGRADE_FILE_PREFIX="upgrade-";
- private static String INIT_FILE_PREFIX="hive-schema-";
- private static String VERSION_UPGRADE_LIST = "upgrade.order";
- private static String PRE_UPGRADE_PREFIX = "pre-";
+ private static final String SQL_FILE_EXTENSION = ".sql";
+ private static final String UPGRADE_FILE_PREFIX = "upgrade-";
+ private static final String INIT_FILE_PREFIX = "hive-schema-";
+ private static final String VERSION_UPGRADE_LIST = "upgrade.order";
+ private static final String PRE_UPGRADE_PREFIX = "pre-";
private final String dbType;
private final String hiveSchemaVersions[];
- private final HiveConf hiveConf;
private final String hiveHome;
// Some version upgrades often don't change schema. So they are equivalent to
@@ -55,10 +52,9 @@ public class MetaStoreSchemaInfo {
"1.2.1", "1.2.0"
);
- public MetaStoreSchemaInfo(String hiveHome, HiveConf hiveConf, String dbType) throws HiveMetaException {
+ public MetaStoreSchemaInfo(String hiveHome, String dbType) throws HiveMetaException {
this.hiveHome = hiveHome;
this.dbType = dbType;
- this.hiveConf = hiveConf;
// load upgrade order for the given dbType
List<String> upgradeOrderList = new ArrayList<String>();
String upgradeListFile = getMetaStoreScriptDir() + File.separator +
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/exec/ArchiveUtils.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/ArchiveUtils.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/ArchiveUtils.java
index 6381a21..f7fad94 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/ArchiveUtils.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/ArchiveUtils.java
@@ -28,8 +28,6 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.metastore.MetaStoreUtils;
@@ -40,7 +38,6 @@ import org.apache.hadoop.hive.ql.metadata.Hive;
import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.ql.metadata.Partition;
import org.apache.hadoop.hive.ql.metadata.Table;
-import org.apache.hadoop.hive.shims.HadoopShims;
/**
* ArchiveUtils.
@@ -48,9 +45,7 @@ import org.apache.hadoop.hive.shims.HadoopShims;
*/
@SuppressWarnings("nls")
public final class ArchiveUtils {
- private static final Logger LOG = LoggerFactory.getLogger(ArchiveUtils.class.getName());
-
- public static String ARCHIVING_LEVEL = "archiving_level";
+ public static final String ARCHIVING_LEVEL = "archiving_level";
/**
* PartSpecInfo keeps fields and values extracted from partial partition info
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/exec/FunctionRegistry.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/FunctionRegistry.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/FunctionRegistry.java
index e3ace2a..1653136 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/FunctionRegistry.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/FunctionRegistry.java
@@ -774,7 +774,7 @@ public final class FunctionRegistry {
*
* @return null if no common class could be found.
*/
- public static TypeInfo getCommonClassForComparison(TypeInfo a, TypeInfo b) {
+ public static synchronized TypeInfo getCommonClassForComparison(TypeInfo a, TypeInfo b) {
// If same return one of them
if (a.equals(b)) {
return a;
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
index 6693134..79955e9 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
@@ -143,7 +143,6 @@ import org.apache.hadoop.mapred.Reporter;
import org.apache.hadoop.mapred.SequenceFileInputFormat;
import org.apache.hadoop.mapred.SequenceFileOutputFormat;
import org.apache.hadoop.util.Progressable;
-import org.apache.hadoop.util.Shell;
import org.apache.hive.common.util.ACLConfigurationParser;
import org.apache.hive.common.util.ReflectionUtil;
import org.slf4j.Logger;
@@ -213,11 +212,11 @@ public final class Utilities {
* The object in the reducer are composed of these top level fields.
*/
- public static String HADOOP_LOCAL_FS = "file:///";
+ public static final String HADOOP_LOCAL_FS = "file:///";
public static final String HADOOP_LOCAL_FS_SCHEME = "file";
- public static String MAP_PLAN_NAME = "map.xml";
- public static String REDUCE_PLAN_NAME = "reduce.xml";
- public static String MERGE_PLAN_NAME = "merge.xml";
+ public static final String MAP_PLAN_NAME = "map.xml";
+ public static final String REDUCE_PLAN_NAME = "reduce.xml";
+ public static final String MERGE_PLAN_NAME = "merge.xml";
public static final String INPUT_NAME = "iocontext.input.name";
public static final String HAS_MAP_WORK = "has.map.work";
public static final String HAS_REDUCE_WORK = "has.reduce.work";
@@ -226,11 +225,11 @@ public final class Utilities {
public static final String HIVE_ADDED_JARS = "hive.added.jars";
public static final String VECTOR_MODE = "VECTOR_MODE";
public static final String USE_VECTORIZED_INPUT_FILE_FORMAT = "USE_VECTORIZED_INPUT_FILE_FORMAT";
- public static String MAPNAME = "Map ";
- public static String REDUCENAME = "Reducer ";
+ public static final String MAPNAME = "Map ";
+ public static final String REDUCENAME = "Reducer ";
@Deprecated
- protected static String DEPRECATED_MAPRED_DFSCLIENT_PARALLELISM_MAX = "mapred.dfsclient.parallelism.max";
+ protected static final String DEPRECATED_MAPRED_DFSCLIENT_PARALLELISM_MAX = "mapred.dfsclient.parallelism.max";
/**
* ReduceField:
@@ -690,8 +689,8 @@ public final class Utilities {
// Note: When DDL supports specifying what string to represent null,
// we should specify "NULL" to represent null in the temp table, and then
// we can make the following translation deprecated.
- public static String nullStringStorage = "\\N";
- public static String nullStringOutput = "NULL";
+ public static final String nullStringStorage = "\\N";
+ public static final String nullStringOutput = "NULL";
public static Random randGen = new Random();
@@ -2538,7 +2537,7 @@ public final class Utilities {
setColumnTypeList(jobConf, rowSchema, excludeVCs);
}
- public static String suffix = ".hashtable";
+ public static final String suffix = ".hashtable";
public static Path generatePath(Path basePath, String dumpFilePrefix,
Byte tag, String bigBucketFileName) {
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizationContext.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizationContext.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizationContext.java
index 5b0c2bf..2e27fd5 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizationContext.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizationContext.java
@@ -1359,7 +1359,7 @@ public class VectorizationContext {
return "arguments: " + Arrays.toString(args) + ", argument classes: " + argClasses.toString();
}
- private static int STACK_LENGTH_LIMIT = 15;
+ private static final int STACK_LENGTH_LIMIT = 15;
public static String getStackTraceAsSingleLine(Throwable e) {
StringBuilder sb = new StringBuilder();
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CuckooSetBytes.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CuckooSetBytes.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CuckooSetBytes.java
index 6383e8a..266365e 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CuckooSetBytes.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CuckooSetBytes.java
@@ -39,8 +39,8 @@ public class CuckooSetBytes {
private int salt = 0;
private Random gen = new Random(676983475);
private int rehashCount = 0;
- private static long INT_MASK = 0x00000000ffffffffL;
- private static long BYTE_MASK = 0x00000000000000ffL;
+ private static final long INT_MASK = 0x00000000ffffffffL;
+ private static final long BYTE_MASK = 0x00000000000000ffL;
/**
* Allocate a new set to hold expectedSize values. Re-allocation to expand
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/fast/VectorMapJoinFastHashTable.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/fast/VectorMapJoinFastHashTable.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/fast/VectorMapJoinFastHashTable.java
index 9030e5f..b6db3bc 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/fast/VectorMapJoinFastHashTable.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/fast/VectorMapJoinFastHashTable.java
@@ -40,10 +40,10 @@ public abstract class VectorMapJoinFastHashTable implements VectorMapJoinHashTab
protected int metricExpands;
// 2^30 (we cannot use Integer.MAX_VALUE which is 2^31-1).
- public static int HIGHEST_INT_POWER_OF_2 = 1073741824;
+ public static final int HIGHEST_INT_POWER_OF_2 = 1073741824;
- public static int ONE_QUARTER_LIMIT = HIGHEST_INT_POWER_OF_2 / 4;
- public static int ONE_SIXTH_LIMIT = HIGHEST_INT_POWER_OF_2 / 6;
+ public static final int ONE_QUARTER_LIMIT = HIGHEST_INT_POWER_OF_2 / 4;
+ public static final int ONE_SIXTH_LIMIT = HIGHEST_INT_POWER_OF_2 / 6;
public void throwExpandError(int limit, String dataTypeName) {
throw new RuntimeException(
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/history/HiveHistoryImpl.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/history/HiveHistoryImpl.java b/ql/src/java/org/apache/hadoop/hive/ql/history/HiveHistoryImpl.java
index 6582cdd..c23d202 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/history/HiveHistoryImpl.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/history/HiveHistoryImpl.java
@@ -46,13 +46,12 @@ import org.apache.hadoop.mapred.Counters.Group;
* Each session uses a new object, which creates a new file.
*/
public class HiveHistoryImpl implements HiveHistory{
+ private static final Logger LOG = LoggerFactory.getLogger("hive.ql.exec.HiveHistoryImpl");
PrintWriter histStream; // History File stream
String histFileName; // History file name
- private static final Logger LOG = LoggerFactory.getLogger("hive.ql.exec.HiveHistoryImpl");
-
private static final Random randGen = new Random();
private LogHelper console;
@@ -305,7 +304,7 @@ public class HiveHistoryImpl implements HiveHistory{
/**
* write out counters.
*/
- static ThreadLocal<Map<String,String>> ctrMapFactory =
+ static final ThreadLocal<Map<String,String>> ctrMapFactory =
new ThreadLocal<Map<String, String>>() {
@Override
protected Map<String,String> initialValue() {
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/index/HiveIndex.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/index/HiveIndex.java b/ql/src/java/org/apache/hadoop/hive/ql/index/HiveIndex.java
index a1408e9..2c3ba7f 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/index/HiveIndex.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/index/HiveIndex.java
@@ -26,10 +26,8 @@ import org.slf4j.LoggerFactory;
* Holds index related constants
*/
public class HiveIndex {
-
public static final Logger l4j = LoggerFactory.getLogger("HiveIndex");
-
- public static String INDEX_TABLE_CREATETIME = "hive.index.basetbl.dfs.lastModifiedTime";
+ public static final String INDEX_TABLE_CREATETIME = "hive.index.basetbl.dfs.lastModifiedTime";
public static enum IndexType {
AGGREGATE_TABLE("aggregate", AggregateIndexHandler.class.getName()),
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/io/HiveFileFormatUtils.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/HiveFileFormatUtils.java b/ql/src/java/org/apache/hadoop/hive/ql/io/HiveFileFormatUtils.java
index 7727114..cc69c7e 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/io/HiveFileFormatUtils.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/io/HiveFileFormatUtils.java
@@ -87,7 +87,7 @@ public final class HiveFileFormatUtils {
public static class FileChecker {
// we don't have many file formats that implement InputFormatChecker. We won't be holding
// multiple instances of such classes
- private static int MAX_CACHE_SIZE = 16;
+ private static final int MAX_CACHE_SIZE = 16;
// immutable maps
Map<Class<? extends InputFormat>, Class<? extends InputFormatChecker>> inputFormatCheckerMap;
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java b/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java
index 4995bdf..010b88c 100755
--- a/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java
@@ -83,14 +83,13 @@ import org.apache.hive.common.util.ReflectionUtil;
*/
public class HiveInputFormat<K extends WritableComparable, V extends Writable>
implements InputFormat<K, V>, JobConfigurable {
-
private static final String CLASS_NAME = HiveInputFormat.class.getName();
private static final Logger LOG = LoggerFactory.getLogger(CLASS_NAME);
/**
* A cache of InputFormat instances.
*/
- private static Map<Class, InputFormat<WritableComparable, Writable>> inputFormats
+ private static final Map<Class, InputFormat<WritableComparable, Writable>> inputFormats
= new ConcurrentHashMap<Class, InputFormat<WritableComparable, Writable>>();
private JobConf job;
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/io/RCFile.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/RCFile.java b/ql/src/java/org/apache/hadoop/hive/ql/io/RCFile.java
index d391164..f41edc4 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/io/RCFile.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/io/RCFile.java
@@ -839,7 +839,7 @@ public class RCFile {
// the max size of memory for buffering records before writes them out
private int columnsBufferSize = 4 * 1024 * 1024; // 4M
// the conf string for COLUMNS_BUFFER_SIZE
- public static String COLUMNS_BUFFER_SIZE_CONF_STR = "hive.io.rcfile.record.buffer.size";
+ public static final String COLUMNS_BUFFER_SIZE_CONF_STR = "hive.io.rcfile.record.buffer.size";
// how many records already buffered
private int bufferedRecords = 0;
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcInputFormat.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcInputFormat.java b/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcInputFormat.java
index 59682db..8318a62 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcInputFormat.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcInputFormat.java
@@ -158,7 +158,7 @@ public class OrcInputFormat implements InputFormat<NullWritable, OrcStruct>,
}
private static final Logger LOG = LoggerFactory.getLogger(OrcInputFormat.class);
- private static boolean isDebugEnabled = LOG.isDebugEnabled();
+ private static final boolean isDebugEnabled = LOG.isDebugEnabled();
static final HadoopShims SHIMS = ShimLoader.getHadoopShims();
private static final long DEFAULT_MIN_SPLIT_SIZE = 16 * 1024 * 1024;
@@ -1913,10 +1913,6 @@ public class OrcInputFormat implements InputFormat<NullWritable, OrcStruct>,
}
}
- // The schema type description does not include the ACID fields (i.e. it is the
- // non-ACID original schema).
- private static boolean SCHEMA_TYPES_IS_ORIGINAL = true;
-
@Override
public RowReader<OrcStruct> getReader(InputSplit inputSplit,
Options options)
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/stats/PartialScanTask.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/stats/PartialScanTask.java b/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/stats/PartialScanTask.java
index 90b1dff..77bce97 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/stats/PartialScanTask.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/stats/PartialScanTask.java
@@ -31,7 +31,6 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hive.common.JavaUtils;
import org.apache.hadoop.hive.common.StatsSetupConst;
-import org.apache.hadoop.hive.common.StatsSetupConst.StatDB;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.ql.CompilationOpContext;
import org.apache.hadoop.hive.ql.Context;
@@ -58,7 +57,6 @@ import org.apache.hadoop.hive.ql.stats.StatsPublisher;
import org.apache.hadoop.io.NullWritable;
import org.apache.hadoop.mapred.Counters;
import org.apache.hadoop.mapred.FileInputFormat;
-import org.apache.hadoop.mapred.InputFormat;
import org.apache.hadoop.mapred.JobClient;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.RunningJob;
@@ -77,8 +75,6 @@ import org.apache.logging.log4j.core.appender.RollingFileAppender;
@SuppressWarnings( { "deprecation"})
public class PartialScanTask extends Task<PartialScanWork> implements
Serializable, HadoopJobExecHook {
-
-
private static final long serialVersionUID = 1L;
protected transient JobConf job;
@@ -274,7 +270,7 @@ public class PartialScanTask extends Task<PartialScanWork> implements
return "RCFile Statistics Partial Scan";
}
- public static String INPUT_SEPERATOR = ":";
+ public static final String INPUT_SEPERATOR = ":";
public static void main(String[] args) {
String inputPathStr = null;
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/metadata/VirtualColumn.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/VirtualColumn.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/VirtualColumn.java
index 044d64c..2435bf1 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/VirtualColumn.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/VirtualColumn.java
@@ -60,7 +60,7 @@ public enum VirtualColumn {
*/
GROUPINGID("GROUPING__ID", TypeInfoFactory.intTypeInfo);
- public static ImmutableSet<String> VIRTUAL_COLUMN_NAMES =
+ public static final ImmutableSet<String> VIRTUAL_COLUMN_NAMES =
ImmutableSet.of(FILENAME.getName(), BLOCKOFFSET.getName(), ROWOFFSET.getName(),
RAWDATASIZE.getName(), GROUPINGID.getName(), ROWID.getName());
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
index 0e67ea6..88bf829 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
@@ -130,11 +130,7 @@ import com.google.common.collect.Interner;
* map-reduce tasks.
*/
public final class GenMapRedUtils {
- private static Logger LOG;
-
- static {
- LOG = LoggerFactory.getLogger("org.apache.hadoop.hive.ql.optimizer.GenMapRedUtils");
- }
+ private static final Logger LOG = LoggerFactory.getLogger("org.apache.hadoop.hive.ql.optimizer.GenMapRedUtils");
public static boolean needsTagging(ReduceWork rWork) {
return rWork != null && (rWork.getReducer().getClass() == JoinOperator.class ||
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/optimizer/listbucketingpruner/ListBucketingPrunerUtils.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/listbucketingpruner/ListBucketingPrunerUtils.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/listbucketingpruner/ListBucketingPrunerUtils.java
index 4d3e74e..88b8119 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/listbucketingpruner/ListBucketingPrunerUtils.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/listbucketingpruner/ListBucketingPrunerUtils.java
@@ -37,10 +37,10 @@ import org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPEqual;
public final class ListBucketingPrunerUtils {
/* Default list bucketing directory name. internal use only not for client. */
- public static String HIVE_LIST_BUCKETING_DEFAULT_DIR_NAME =
+ public static final String HIVE_LIST_BUCKETING_DEFAULT_DIR_NAME =
"HIVE_DEFAULT_LIST_BUCKETING_DIR_NAME";
/* Default list bucketing directory key. internal use only not for client. */
- public static String HIVE_LIST_BUCKETING_DEFAULT_KEY = "HIVE_DEFAULT_LIST_BUCKETING_KEY";
+ public static final String HIVE_LIST_BUCKETING_DEFAULT_KEY = "HIVE_DEFAULT_LIST_BUCKETING_KEY";
/**
* Decide if pruner skips the skewed directory
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/GenMRSkewJoinProcessor.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/GenMRSkewJoinProcessor.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/GenMRSkewJoinProcessor.java
index 93202c3..93b8a5d 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/GenMRSkewJoinProcessor.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/GenMRSkewJoinProcessor.java
@@ -383,11 +383,11 @@ public final class GenMRSkewJoinProcessor {
return true;
}
- private static String skewJoinPrefix = "hive_skew_join";
- private static String UNDERLINE = "_";
- private static String BIGKEYS = "bigkeys";
- private static String SMALLKEYS = "smallkeys";
- private static String RESULTS = "results";
+ private static final String skewJoinPrefix = "hive_skew_join";
+ private static final String UNDERLINE = "_";
+ private static final String BIGKEYS = "bigkeys";
+ private static final String SMALLKEYS = "smallkeys";
+ private static final String RESULTS = "results";
static Path getBigKeysDir(Path baseDir, Byte srcTbl) {
return StringInternUtils.internUriStringsInPath(
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/Vectorizer.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/Vectorizer.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/Vectorizer.java
index 50eda15..a2a3485 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/Vectorizer.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/Vectorizer.java
@@ -37,7 +37,6 @@ import java.util.regex.Pattern;
import org.apache.commons.lang.ArrayUtils;
import org.apache.calcite.util.Pair;
-import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -45,8 +44,6 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.ql.exec.*;
import org.apache.hadoop.hive.ql.exec.mr.MapRedTask;
-import org.apache.hadoop.hive.ql.exec.mr.MapredLocalTask;
-import org.apache.hadoop.hive.ql.exec.persistence.MapJoinBytesTableContainer;
import org.apache.hadoop.hive.ql.exec.persistence.MapJoinKey;
import org.apache.hadoop.hive.ql.exec.spark.SparkTask;
import org.apache.hadoop.hive.ql.exec.tez.TezTask;
@@ -70,10 +67,8 @@ import org.apache.hadoop.hive.ql.exec.vector.udf.VectorUDFAdaptor;
import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type;
import org.apache.hadoop.hive.ql.exec.vector.VectorColumnOutputMapping;
import org.apache.hadoop.hive.ql.exec.vector.VectorColumnSourceMapping;
-import org.apache.hadoop.hive.ql.exec.vector.VectorFilterOperator;
import org.apache.hadoop.hive.ql.exec.vector.VectorMapJoinOperator;
import org.apache.hadoop.hive.ql.exec.vector.VectorMapJoinOuterFilteredOperator;
-import org.apache.hadoop.hive.ql.exec.vector.VectorSMBMapJoinOperator;
import org.apache.hadoop.hive.ql.exec.vector.VectorizationContext;
import org.apache.hadoop.hive.ql.exec.vector.VectorizationContext.HiveVectorAdaptorUsageMode;
import org.apache.hadoop.hive.ql.exec.vector.VectorizationContext.InConstantType;
@@ -81,7 +76,6 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizationContextRegion;
import org.apache.hadoop.hive.ql.exec.vector.expressions.IdentityExpression;
import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression;
import org.apache.hadoop.hive.ql.exec.vector.expressions.aggregates.VectorAggregateExpression;
-import org.apache.hadoop.hive.ql.io.AcidUtils;
import org.apache.hadoop.hive.ql.io.orc.OrcInputFormat;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatchCtx;
import org.apache.hadoop.hive.ql.lib.DefaultGraphWalker;
@@ -107,16 +101,13 @@ import org.apache.hadoop.hive.ql.plan.Explain;
import org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc;
import org.apache.hadoop.hive.ql.plan.ExprNodeDesc;
import org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc;
-import org.apache.hadoop.hive.ql.plan.FetchWork;
import org.apache.hadoop.hive.ql.plan.FileSinkDesc;
import org.apache.hadoop.hive.ql.plan.FilterDesc;
import org.apache.hadoop.hive.ql.plan.GroupByDesc;
-import org.apache.hadoop.hive.ql.plan.HashTableSinkDesc;
import org.apache.hadoop.hive.ql.plan.JoinDesc;
import org.apache.hadoop.hive.ql.plan.LimitDesc;
import org.apache.hadoop.hive.ql.plan.MapJoinDesc;
import org.apache.hadoop.hive.ql.plan.MapWork;
-import org.apache.hadoop.hive.ql.plan.MapredLocalWork;
import org.apache.hadoop.hive.ql.plan.MapredWork;
import org.apache.hadoop.hive.ql.plan.OperatorDesc;
import org.apache.hadoop.hive.ql.plan.SelectDesc;
@@ -130,7 +121,6 @@ import org.apache.hadoop.hive.ql.plan.VectorSparkHashTableSinkDesc;
import org.apache.hadoop.hive.ql.plan.VectorSparkPartitionPruningSinkDesc;
import org.apache.hadoop.hive.ql.plan.VectorLimitDesc;
import org.apache.hadoop.hive.ql.plan.VectorMapJoinInfo;
-import org.apache.hadoop.hive.ql.plan.VectorPartitionConversion;
import org.apache.hadoop.hive.ql.plan.VectorSMBJoinDesc;
import org.apache.hadoop.hive.ql.plan.PartitionDesc;
import org.apache.hadoop.hive.ql.plan.ReduceSinkDesc;
@@ -149,7 +139,6 @@ import org.apache.hadoop.hive.ql.plan.VectorMapJoinDesc.HashTableKeyType;
import org.apache.hadoop.hive.ql.plan.VectorMapJoinDesc.HashTableKind;
import org.apache.hadoop.hive.ql.plan.VectorMapJoinDesc.OperatorVariation;
import org.apache.hadoop.hive.ql.plan.VectorPartitionDesc.VectorDeserializeType;
-import org.apache.hadoop.hive.ql.plan.VectorMapJoinInfo;
import org.apache.hadoop.hive.ql.plan.VectorReduceSinkDesc;
import org.apache.hadoop.hive.ql.plan.VectorReduceSinkInfo;
import org.apache.hadoop.hive.ql.plan.VectorPartitionDesc;
@@ -198,14 +187,11 @@ import org.apache.hadoop.hive.ql.udf.UDFWeekOfYear;
import org.apache.hadoop.hive.ql.udf.UDFYear;
import org.apache.hadoop.hive.ql.udf.generic.*;
import org.apache.hadoop.hive.serde.serdeConstants;
-import org.apache.hadoop.hive.serde2.ColumnProjectionUtils;
import org.apache.hadoop.hive.serde2.Deserializer;
import org.apache.hadoop.hive.serde2.NullStructSerDe;
import org.apache.hadoop.hive.serde2.SerDeUtils;
import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe;
import org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe;
-import org.apache.hadoop.hive.serde2.SerDeException;
-import org.apache.hadoop.hive.serde2.SerDeUtils;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorUtils;
@@ -219,8 +205,6 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoUtils;
import org.apache.hadoop.mapred.SequenceFileInputFormat;
import org.apache.hadoop.mapred.TextInputFormat;
import org.apache.hive.common.util.AnnotationUtils;
-import org.apache.hive.common.util.HiveStringUtils;
-import org.apache.hive.common.util.ReflectionUtil;
import org.apache.hadoop.util.ReflectionUtils;
import com.google.common.base.Preconditions;
@@ -264,16 +248,12 @@ public class Vectorizer implements PhysicalPlanResolver {
supportedDataTypesPattern = Pattern.compile(patternBuilder.toString());
}
- private List<Task<? extends Serializable>> vectorizableTasks =
- new ArrayList<Task<? extends Serializable>>();
private Set<Class<?>> supportedGenericUDFs = new HashSet<Class<?>>();
private Set<String> supportedAggregationUdfs = new HashSet<String>();
private HiveConf hiveConf;
- private boolean isSpark;
-
private boolean useVectorizedInputFileFormat;
private boolean useVectorDeserialize;
private boolean useRowDeserialize;
@@ -456,8 +436,6 @@ public class Vectorizer implements PhysicalPlanResolver {
Set<Operator<? extends OperatorDesc>> nonVectorizedOps;
- TableScanOperator tableScanOperator;
-
VectorTaskColumnInfo() {
partitionColumnCount = 0;
}
@@ -499,9 +477,6 @@ public class Vectorizer implements PhysicalPlanResolver {
public void setNonVectorizedOps(Set<Operator<? extends OperatorDesc>> nonVectorizedOps) {
this.nonVectorizedOps = nonVectorizedOps;
}
- public void setTableScanOperator(TableScanOperator tableScanOperator) {
- this.tableScanOperator = tableScanOperator;
- }
public Set<Operator<? extends OperatorDesc>> getNonVectorizedOps() {
return nonVectorizedOps;
@@ -540,12 +515,6 @@ public class Vectorizer implements PhysicalPlanResolver {
class VectorizationDispatcher implements Dispatcher {
- private final PhysicalContext physicalContext;
-
- public VectorizationDispatcher(PhysicalContext physicalContext) {
- this.physicalContext = physicalContext;
- }
-
@Override
public Object dispatch(Node nd, Stack<Node> stack, Object... nodeOutputs)
throws SemanticException {
@@ -1030,9 +999,6 @@ public class Vectorizer implements PhysicalPlanResolver {
vectorTaskColumnInfo.setPartitionColumnCount(partitionColumnCount);
vectorTaskColumnInfo.setUseVectorizedInputFileFormat(useVectorizedInputFileFormat);
- // Helps to keep this for debugging.
- vectorTaskColumnInfo.setTableScanOperator(tableScanOperator);
-
// Always set these so EXPLAIN can see.
mapWork.setVectorizationInputFileFormatClassNameSet(inputFileFormatClassNameSet);
mapWork.setVectorizationEnabledConditionsMet(new ArrayList(enabledConditionsMetSet));
@@ -1519,14 +1485,12 @@ public class Vectorizer implements PhysicalPlanResolver {
class MapWorkVectorizationNodeProcessor extends VectorizationNodeProcessor {
- private final MapWork mWork;
private final VectorTaskColumnInfo vectorTaskColumnInfo;
private final boolean isTezOrSpark;
public MapWorkVectorizationNodeProcessor(MapWork mWork, boolean isTezOrSpark,
VectorTaskColumnInfo vectorTaskColumnInfo) {
super(vectorTaskColumnInfo, vectorTaskColumnInfo.getNonVectorizedOps());
- this.mWork = mWork;
this.vectorTaskColumnInfo = vectorTaskColumnInfo;
this.isTezOrSpark = isTezOrSpark;
}
@@ -1684,8 +1648,6 @@ public class Vectorizer implements PhysicalPlanResolver {
return physicalContext;
}
- isSpark = (HiveConf.getVar(hiveConf, HiveConf.ConfVars.HIVE_EXECUTION_ENGINE).equals("spark"));
-
useVectorizedInputFileFormat =
HiveConf.getBoolVar(hiveConf,
HiveConf.ConfVars.HIVE_VECTORIZATION_USE_VECTORIZED_INPUT_FILE_FORMAT);
@@ -1710,7 +1672,7 @@ public class Vectorizer implements PhysicalPlanResolver {
hiveVectorAdaptorUsageMode = HiveVectorAdaptorUsageMode.getHiveConfValue(hiveConf);
// create dispatcher and graph walker
- Dispatcher disp = new VectorizationDispatcher(physicalContext);
+ Dispatcher disp = new VectorizationDispatcher();
TaskGraphWalker ogw = new TaskGraphWalker(disp);
// get all the tasks nodes from root task
@@ -2579,8 +2541,6 @@ public class Vectorizer implements PhysicalPlanResolver {
List<ExprNodeDesc> keyDesc = desc.getKeys().get(posBigTable);
VectorExpression[] allBigTableKeyExpressions = vContext.getVectorExpressions(keyDesc);
final int allBigTableKeyExpressionsLength = allBigTableKeyExpressions.length;
- boolean isEmptyKey = (allBigTableKeyExpressionsLength == 0);
-
boolean supportsKeyTypes = true; // Assume.
HashSet<String> notSupportedKeyTypes = new HashSet<String>();
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/VectorizerReason.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/VectorizerReason.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/VectorizerReason.java
index e0a6198..30fdd30 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/VectorizerReason.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/VectorizerReason.java
@@ -27,7 +27,7 @@ import org.apache.hadoop.hive.ql.plan.OperatorDesc;
*/
public class VectorizerReason {
- private static long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
public static enum VectorizerNodeIssue {
NONE,
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/parse/BaseSemanticAnalyzer.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/BaseSemanticAnalyzer.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/BaseSemanticAnalyzer.java
index f762fee..41245c8 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/BaseSemanticAnalyzer.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/BaseSemanticAnalyzer.java
@@ -119,10 +119,10 @@ public abstract class BaseSemanticAnalyzer {
// whether any ACID table is involved in a query
protected boolean acidInQuery;
- public static int HIVE_COLUMN_ORDER_ASC = 1;
- public static int HIVE_COLUMN_ORDER_DESC = 0;
- public static int HIVE_COLUMN_NULLS_FIRST = 0;
- public static int HIVE_COLUMN_NULLS_LAST = 1;
+ public static final int HIVE_COLUMN_ORDER_ASC = 1;
+ public static final int HIVE_COLUMN_ORDER_DESC = 0;
+ public static final int HIVE_COLUMN_NULLS_FIRST = 0;
+ public static final int HIVE_COLUMN_NULLS_LAST = 1;
/**
* ReadEntities that are passed to the hooks.
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java
index f175663..fc13292 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java
@@ -1808,7 +1808,7 @@ public class DDLSemanticAnalyzer extends BaseSemanticAnalyzer {
static class QualifiedNameUtil {
// delimiter to check DOT delimited qualified names
- static String delimiter = "\\.";
+ static final String delimiter = "\\.";
/**
* Get the fully qualified name in the ast. e.g. the ast of the form ^(DOT
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/parse/WindowingSpec.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/WindowingSpec.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/WindowingSpec.java
index 01b5559..9b03d05 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/WindowingSpec.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/WindowingSpec.java
@@ -586,7 +586,7 @@ public class WindowingSpec {
*/
public static class BoundarySpec implements Comparable<BoundarySpec>
{
- public static int UNBOUNDED_AMOUNT = Integer.MAX_VALUE;
+ public static final int UNBOUNDED_AMOUNT = Integer.MAX_VALUE;
Direction direction;
int amt;
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/plan/AbstractVectorDesc.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/AbstractVectorDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/AbstractVectorDesc.java
index e85a418..48b7f92 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/plan/AbstractVectorDesc.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/AbstractVectorDesc.java
@@ -18,11 +18,9 @@
package org.apache.hadoop.hive.ql.plan;
-import org.apache.hadoop.hive.ql.exec.Operator;
-
public class AbstractVectorDesc implements VectorDesc {
- private static long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
private Class<?> vectorOpClass;
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/plan/GroupByDesc.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/GroupByDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/GroupByDesc.java
index 0b49294..38a9ef2 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/plan/GroupByDesc.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/GroupByDesc.java
@@ -50,7 +50,7 @@ public class GroupByDesc extends AbstractOperatorDesc {
* MERGEPARTIAL: FINAL for non-distinct aggregations, COMPLETE for distinct
* aggregations.
*/
- private static long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
/**
* Mode.
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/plan/MapJoinDesc.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/MapJoinDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/MapJoinDesc.java
index ca69697..940630c 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/plan/MapJoinDesc.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/MapJoinDesc.java
@@ -22,7 +22,6 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
@@ -32,13 +31,10 @@ import java.util.Map.Entry;
import java.util.Set;
import org.apache.hadoop.hive.conf.HiveConf;
-import org.apache.hadoop.hive.ql.exec.vector.VectorColumnOutputMapping;
-import org.apache.hadoop.hive.ql.exec.vector.VectorColumnSourceMapping;
import org.apache.hadoop.hive.ql.plan.Explain.Level;
import org.apache.hadoop.hive.ql.plan.Explain.Vectorization;
import org.apache.hadoop.hive.ql.plan.VectorMapJoinDesc.HashTableImplementationType;
import org.apache.hadoop.hive.ql.plan.VectorMapJoinDesc.OperatorVariation;
-import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
/**
* Map Join operator Descriptor implementation.
@@ -392,7 +388,7 @@ public class MapJoinDesc extends JoinDesc implements Serializable {
}
// Use LinkedHashSet to give predictable display order.
- private static Set<String> vectorizableMapJoinNativeEngines =
+ private static final Set<String> vectorizableMapJoinNativeEngines =
new LinkedHashSet<String>(Arrays.asList("tez", "spark"));
public class MapJoinOperatorExplainVectorization extends OperatorExplainVectorization {
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/plan/ReduceSinkDesc.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/ReduceSinkDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/ReduceSinkDesc.java
index 9ae30ab..11e9c20 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/plan/ReduceSinkDesc.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/ReduceSinkDesc.java
@@ -482,7 +482,7 @@ public class ReduceSinkDesc extends AbstractOperatorDesc {
}
// Use LinkedHashSet to give predictable display order.
- private static Set<String> vectorizableReduceSinkNativeEngines =
+ private static final Set<String> vectorizableReduceSinkNativeEngines =
new LinkedHashSet<String>(Arrays.asList("tez", "spark"));
public class ReduceSinkOperatorExplainVectorization extends OperatorExplainVectorization {
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorAppMasterEventDesc.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorAppMasterEventDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorAppMasterEventDesc.java
index 2e11321..5aaf2ea 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorAppMasterEventDesc.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorAppMasterEventDesc.java
@@ -28,7 +28,7 @@ package org.apache.hadoop.hive.ql.plan;
*/
public class VectorAppMasterEventDesc extends AbstractVectorDesc {
- private static long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
public VectorAppMasterEventDesc() {
}
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorFileSinkDesc.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorFileSinkDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorFileSinkDesc.java
index 325ac91..5a00e5d 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorFileSinkDesc.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorFileSinkDesc.java
@@ -28,7 +28,7 @@ package org.apache.hadoop.hive.ql.plan;
*/
public class VectorFileSinkDesc extends AbstractVectorDesc {
- private static long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
public VectorFileSinkDesc() {
}
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorFilterDesc.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorFilterDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorFilterDesc.java
index 6feed84..b457f44 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorFilterDesc.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorFilterDesc.java
@@ -30,7 +30,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression;
*/
public class VectorFilterDesc extends AbstractVectorDesc {
- private static long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
private VectorExpression predicateExpression;
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorGroupByDesc.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorGroupByDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorGroupByDesc.java
index f8554e2..f9a8725 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorGroupByDesc.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorGroupByDesc.java
@@ -31,7 +31,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.aggregates.VectorAggreg
*/
public class VectorGroupByDesc extends AbstractVectorDesc {
- private static long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
/**
* GLOBAL No key. All rows --> 1 full aggregation on end of input
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorLimitDesc.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorLimitDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorLimitDesc.java
index c9bc45a..4093800 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorLimitDesc.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorLimitDesc.java
@@ -28,7 +28,7 @@ package org.apache.hadoop.hive.ql.plan;
*/
public class VectorLimitDesc extends AbstractVectorDesc {
- private static long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
public VectorLimitDesc() {
}
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorMapJoinDesc.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorMapJoinDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorMapJoinDesc.java
index 3aa65d3..60400de 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorMapJoinDesc.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorMapJoinDesc.java
@@ -35,7 +35,7 @@ import com.google.common.base.Preconditions;
*/
public class VectorMapJoinDesc extends AbstractVectorDesc {
- private static long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
public static enum HashTableImplementationType {
NONE,
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorMapJoinInfo.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorMapJoinInfo.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorMapJoinInfo.java
index 9429785..7432efa 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorMapJoinInfo.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorMapJoinInfo.java
@@ -36,7 +36,7 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
*/
public class VectorMapJoinInfo {
- private static long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
private int[] bigTableKeyColumnMap;
private String[] bigTableKeyColumnNames;
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorPartitionDesc.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorPartitionDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorPartitionDesc.java
index 4078c7d..bb8f5e1 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorPartitionDesc.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorPartitionDesc.java
@@ -34,7 +34,7 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
*/
public class VectorPartitionDesc {
- private static long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
// Data Type Conversion Needed?
//
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorReduceSinkDesc.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorReduceSinkDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorReduceSinkDesc.java
index 2eb44b8..445dcca 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorReduceSinkDesc.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorReduceSinkDesc.java
@@ -28,7 +28,7 @@ package org.apache.hadoop.hive.ql.plan;
*/
public class VectorReduceSinkDesc extends AbstractVectorDesc {
- private static long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
public static enum ReduceSinkKeyType {
NONE,
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorReduceSinkInfo.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorReduceSinkInfo.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorReduceSinkInfo.java
index 8c35415..da6e606 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorReduceSinkInfo.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorReduceSinkInfo.java
@@ -33,7 +33,7 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
*/
public class VectorReduceSinkInfo {
- private static long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
private int[] reduceSinkKeyColumnMap;
private TypeInfo[] reduceSinkKeyTypeInfos;
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorSMBJoinDesc.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorSMBJoinDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorSMBJoinDesc.java
index 031f11e..41919b6 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorSMBJoinDesc.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorSMBJoinDesc.java
@@ -28,7 +28,7 @@ package org.apache.hadoop.hive.ql.plan;
*/
public class VectorSMBJoinDesc extends AbstractVectorDesc {
- private static long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
public VectorSMBJoinDesc() {
}
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorSelectDesc.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorSelectDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorSelectDesc.java
index c2c9450..1f6ef18 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorSelectDesc.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorSelectDesc.java
@@ -30,7 +30,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression;
*/
public class VectorSelectDesc extends AbstractVectorDesc {
- private static long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
private VectorExpression[] selectExpressions;
private int[] projectedOutputColumns;
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorSparkHashTableSinkDesc.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorSparkHashTableSinkDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorSparkHashTableSinkDesc.java
index 7fb59db..e43b0f6 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorSparkHashTableSinkDesc.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorSparkHashTableSinkDesc.java
@@ -28,7 +28,7 @@ package org.apache.hadoop.hive.ql.plan;
*/
public class VectorSparkHashTableSinkDesc extends AbstractVectorDesc {
- private static long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
public VectorSparkHashTableSinkDesc() {
}
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorSparkPartitionPruningSinkDesc.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorSparkPartitionPruningSinkDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorSparkPartitionPruningSinkDesc.java
index c0bc7e4..6c65f83 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorSparkPartitionPruningSinkDesc.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorSparkPartitionPruningSinkDesc.java
@@ -28,7 +28,7 @@ package org.apache.hadoop.hive.ql.plan;
*/
public class VectorSparkPartitionPruningSinkDesc extends AbstractVectorDesc {
- private static long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
public VectorSparkPartitionPruningSinkDesc() {
}
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorTableScanDesc.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorTableScanDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorTableScanDesc.java
index 6e5ebe4..84729a5 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorTableScanDesc.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorTableScanDesc.java
@@ -28,7 +28,7 @@ package org.apache.hadoop.hive.ql.plan;
*/
public class VectorTableScanDesc extends AbstractVectorDesc {
- private static long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
private int[] projectedOutputColumns;
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/processors/HiveCommand.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/processors/HiveCommand.java b/ql/src/java/org/apache/hadoop/hive/ql/processors/HiveCommand.java
index 145808b..bd1b4f5 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/processors/HiveCommand.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/processors/HiveCommand.java
@@ -36,7 +36,7 @@ public enum HiveCommand {
DELETE(),
COMPILE();
- public static boolean ONLY_FOR_TESTING = true;
+ public static final boolean ONLY_FOR_TESTING = true;
private boolean usedOnlyForTesting;
HiveCommand() {
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFInternalInterval.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFInternalInterval.java b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFInternalInterval.java
index fcf291a..0b29c6a 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFInternalInterval.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFInternalInterval.java
@@ -51,7 +51,7 @@ import org.apache.hive.common.util.DateUtils;
public class GenericUDFInternalInterval extends GenericUDF {
- private static Map<Integer, IntervalProcessor> processorMap;
+ private Map<Integer, IntervalProcessor> processorMap;
private transient IntervalProcessor processor;
private transient PrimitiveObjectInspector inputOI;
@@ -286,7 +286,7 @@ public class GenericUDFInternalInterval extends GenericUDF {
}
}
- private static Map<Integer, IntervalProcessor> getProcessorMap() {
+ private Map<Integer, IntervalProcessor> getProcessorMap() {
if (processorMap != null) {
return processorMap;
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/mapjoin/fast/CheckFastRowHashMap.java
----------------------------------------------------------------------
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/mapjoin/fast/CheckFastRowHashMap.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/mapjoin/fast/CheckFastRowHashMap.java
index 638ccc5..72fceb9 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/mapjoin/fast/CheckFastRowHashMap.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/mapjoin/fast/CheckFastRowHashMap.java
@@ -90,16 +90,11 @@ public class CheckFastRowHashMap extends CheckFastHashTable {
}
}
- private static String debugDetailedReadPositionString;
-
- private static String debugDetailedHashMapResultPositionString;
-
- private static String debugExceptionMessage;
- private static StackTraceElement[] debugStackTrace;
-
public static void verifyHashMapRowsMore(List<Object[]> rows, int[] actualToValueMap,
VectorMapJoinHashMapResult hashMapResult, TypeInfo[] typeInfos,
int clipIndex, boolean useExactBytes) throws IOException {
+ String debugExceptionMessage = null;
+ StackTraceElement[] debugStackTrace = null;
final int count = rows.size();
final int columnCount = typeInfos.length;
@@ -134,7 +129,6 @@ public class CheckFastRowHashMap extends CheckFastHashTable {
boolean thrown = false;
Exception saveException = null;
- boolean notExpected = false;
int index = 0;
try {
for (index = 0; index < columnCount; index++) {
@@ -144,9 +138,9 @@ public class CheckFastRowHashMap extends CheckFastHashTable {
} catch (Exception e) {
thrown = true;
saveException = e;
- debugDetailedReadPositionString = lazyBinaryDeserializeRead.getDetailedReadPositionString();
+ lazyBinaryDeserializeRead.getDetailedReadPositionString();
- debugDetailedHashMapResultPositionString = hashMapResult.getDetailedHashMapResultPositionString();
+ hashMapResult.getDetailedHashMapResultPositionString();
debugExceptionMessage = saveException.getMessage();
debugStackTrace = saveException.getStackTrace();
@@ -159,7 +153,6 @@ public class CheckFastRowHashMap extends CheckFastHashTable {
if (saveException instanceof EOFException) {
// This is the one we are expecting.
} else if (saveException instanceof ArrayIndexOutOfBoundsException) {
- notExpected = true;
} else {
TestCase.fail("Expecting an EOFException to be thrown for the clipped case...");
}
@@ -385,7 +378,7 @@ public class CheckFastRowHashMap extends CheckFastHashTable {
}
}
- static int STACK_LENGTH_LIMIT = 20;
+ static final int STACK_LENGTH_LIMIT = 20;
public static String getStackTraceAsSingleLine(StackTraceElement[] stackTrace) {
StringBuilder sb = new StringBuilder();
sb.append("Stack trace: ");
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/mapjoin/fast/CommonFastHashTable.java
----------------------------------------------------------------------
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/mapjoin/fast/CommonFastHashTable.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/mapjoin/fast/CommonFastHashTable.java
index 90e8f33..ff51870 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/mapjoin/fast/CommonFastHashTable.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/mapjoin/fast/CommonFastHashTable.java
@@ -31,9 +31,9 @@ public class CommonFastHashTable {
protected static final int LARGE_CAPACITY = 8388608;
protected static Random random;
- protected static int MAX_KEY_LENGTH = 100;
+ protected static final int MAX_KEY_LENGTH = 100;
- protected static int MAX_VALUE_LENGTH = 1000;
+ protected static final int MAX_VALUE_LENGTH = 1000;
public static int generateLargeCount() {
int count = 0;
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java
----------------------------------------------------------------------
diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java b/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java
index 6802a05..5ecfbca 100644
--- a/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java
+++ b/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java
@@ -65,7 +65,7 @@ public final class SerDeUtils {
public static final char COMMA = ',';
// we should use '\0' for COLUMN_NAME_DELIMITER if column name contains COMMA
// but we should also take care of the backward compatibility
- public static char COLUMN_COMMENTS_DELIMITER = '\0';
+ public static final char COLUMN_COMMENTS_DELIMITER = '\0';
public static final String LBRACKET = "[";
public static final String RBRACKET = "]";
public static final String LBRACE = "{";
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroDeserializer.java
----------------------------------------------------------------------
diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroDeserializer.java b/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroDeserializer.java
index 88c3da9..ecfe15f 100644
--- a/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroDeserializer.java
+++ b/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroDeserializer.java
@@ -75,7 +75,7 @@ class AvroDeserializer {
* Flag to print the re-encoding warning message only once. Avoid excessive logging for each
* record encoding.
*/
- private static boolean warnedOnce = false;
+ private boolean warnedOnce = false;
/**
* When encountering a record with an older schema than the one we're trying
* to read, it is necessary to re-encode with a reader against the newer schema.
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/serde/src/java/org/apache/hadoop/hive/serde2/lazy/fast/LazySimpleDeserializeRead.java
----------------------------------------------------------------------
diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/fast/LazySimpleDeserializeRead.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/fast/LazySimpleDeserializeRead.java
index 3b35baf..606b246 100644
--- a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/fast/LazySimpleDeserializeRead.java
+++ b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/fast/LazySimpleDeserializeRead.java
@@ -666,9 +666,7 @@ public final class LazySimpleDeserializeRead extends DeserializeRead {
//------------------------------------------------------------------------------------------------
- private static byte[] maxLongBytes = ((Long) Long.MAX_VALUE).toString().getBytes();
- private static int maxLongDigitsCount = maxLongBytes.length;
- private static byte[] minLongNoSignBytes = ((Long) Long.MIN_VALUE).toString().substring(1).getBytes();
+ private static final byte[] maxLongBytes = ((Long) Long.MAX_VALUE).toString().getBytes();
public static int byteArrayCompareRanges(byte[] arg1, int start1, byte[] arg2, int start2, int len) {
for (int i = 0; i < len; i++) {
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/serde/src/java/org/apache/hadoop/hive/serde2/lazy/fast/StringToDouble.java
----------------------------------------------------------------------
diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/fast/StringToDouble.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/fast/StringToDouble.java
index f50b4fd..c784b69 100644
--- a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/fast/StringToDouble.java
+++ b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/fast/StringToDouble.java
@@ -15,12 +15,12 @@ package org.apache.hadoop.hive.serde2.lazy.fast;
import java.nio.charset.StandardCharsets;
public class StringToDouble {
- static int maxExponent = 511; /* Largest possible base 10 exponent. Any
+ static final int maxExponent = 511; /* Largest possible base 10 exponent. Any
* exponent larger than this will already
* produce underflow or overflow, so there's
* no need to worry about additional digits.
*/
- static double powersOf10[] = { /* Table giving binary powers of 10. Entry */
+ static final double powersOf10[] = { /* Table giving binary powers of 10. Entry */
10., /* is 10^2^i. Used to convert decimal */
100., /* exponents into floating-point numbers. */
1.0e4,
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUtils.java
----------------------------------------------------------------------
diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUtils.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUtils.java
index f4ac56f..8237b64 100644
--- a/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUtils.java
+++ b/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUtils.java
@@ -402,7 +402,7 @@ public final class LazyBinaryUtils {
return 1 + len;
}
- public static int VLONG_BYTES_LEN = 9;
+ public static final int VLONG_BYTES_LEN = 9;
private static ThreadLocal<byte[]> vLongBytesThreadLocal = new ThreadLocal<byte[]>() {
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfoUtils.java
----------------------------------------------------------------------
diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfoUtils.java b/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfoUtils.java
index 14349fa..54964e4 100644
--- a/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfoUtils.java
+++ b/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfoUtils.java
@@ -869,7 +869,7 @@ public final class TypeInfoUtils {
}
}
- public static void registerNumericType(PrimitiveCategory primitiveCategory, int level) {
+ public static synchronized void registerNumericType(PrimitiveCategory primitiveCategory, int level) {
numericTypeList.add(primitiveCategory);
numericTypes.put(primitiveCategory, level);
}
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/shims/common/src/main/java/org/apache/hadoop/hive/io/HdfsUtils.java
----------------------------------------------------------------------
diff --git a/shims/common/src/main/java/org/apache/hadoop/hive/io/HdfsUtils.java b/shims/common/src/main/java/org/apache/hadoop/hive/io/HdfsUtils.java
index 7270426..277738f 100644
--- a/shims/common/src/main/java/org/apache/hadoop/hive/io/HdfsUtils.java
+++ b/shims/common/src/main/java/org/apache/hadoop/hive/io/HdfsUtils.java
@@ -49,12 +49,12 @@ import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
public class HdfsUtils {
+ private static final Logger LOG = LoggerFactory.getLogger("shims.HdfsUtils");
// TODO: this relies on HDFS not changing the format; we assume if we could get inode ID, this
// is still going to work. Otherwise, file IDs can be turned off. Later, we should use
// as public utility method in HDFS to obtain the inode-based path.
- private static String HDFS_ID_PATH_PREFIX = "/.reserved/.inodes/";
- static Logger LOG = LoggerFactory.getLogger("shims.HdfsUtils");
+ private static final String HDFS_ID_PATH_PREFIX = "/.reserved/.inodes/";
public static Path getFileIdPath(
FileSystem fileSystem, Path path, long fileId) {
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/shims/common/src/main/java/org/apache/hadoop/hive/io/HiveIOExceptionHandlerChain.java
----------------------------------------------------------------------
diff --git a/shims/common/src/main/java/org/apache/hadoop/hive/io/HiveIOExceptionHandlerChain.java b/shims/common/src/main/java/org/apache/hadoop/hive/io/HiveIOExceptionHandlerChain.java
index a58f1f2..d937ddf 100644
--- a/shims/common/src/main/java/org/apache/hadoop/hive/io/HiveIOExceptionHandlerChain.java
+++ b/shims/common/src/main/java/org/apache/hadoop/hive/io/HiveIOExceptionHandlerChain.java
@@ -35,7 +35,7 @@ import org.apache.hadoop.util.ReflectionUtils;
*/
public class HiveIOExceptionHandlerChain {
- public static String HIVE_IO_EXCEPTION_HANDLE_CHAIN = "hive.io.exception.handlers";
+ public static final String HIVE_IO_EXCEPTION_HANDLE_CHAIN = "hive.io.exception.handlers";
@SuppressWarnings("unchecked")
public static HiveIOExceptionHandlerChain getHiveIOExceptionHandlerChain(
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/shims/common/src/main/java/org/apache/hadoop/hive/io/HiveIOExceptionHandlerUtil.java
----------------------------------------------------------------------
diff --git a/shims/common/src/main/java/org/apache/hadoop/hive/io/HiveIOExceptionHandlerUtil.java b/shims/common/src/main/java/org/apache/hadoop/hive/io/HiveIOExceptionHandlerUtil.java
index d972edb..6af3c8c 100644
--- a/shims/common/src/main/java/org/apache/hadoop/hive/io/HiveIOExceptionHandlerUtil.java
+++ b/shims/common/src/main/java/org/apache/hadoop/hive/io/HiveIOExceptionHandlerUtil.java
@@ -24,10 +24,10 @@ import org.apache.hadoop.mapred.RecordReader;
public class HiveIOExceptionHandlerUtil {
- private static ThreadLocal<HiveIOExceptionHandlerChain> handlerChainInstance =
+ private static final ThreadLocal<HiveIOExceptionHandlerChain> handlerChainInstance =
new ThreadLocal<HiveIOExceptionHandlerChain>();
- private static HiveIOExceptionHandlerChain get(JobConf job) {
+ private static synchronized HiveIOExceptionHandlerChain get(JobConf job) {
HiveIOExceptionHandlerChain cache = HiveIOExceptionHandlerUtil.handlerChainInstance
.get();
if (cache == null) {
http://git-wip-us.apache.org/repos/asf/hive/blob/71f4930d/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 44f24b2..f15e7ff 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
@@ -32,7 +32,7 @@ import java.util.Map;
*/
public abstract class ShimLoader {
private static final Logger LOG = LoggerFactory.getLogger(ShimLoader.class);
- public static String HADOOP23VERSIONNAME = "0.23";
+ public static final String HADOOP23VERSIONNAME = "0.23";
private static volatile HadoopShims hadoopShims;
private static JettyShims jettyShims;