diff --git a/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/mr/IndexOutputConfigurator.java b/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/mr/IndexOutputConfigurator.java index 98294bbe15..f6bcf51526 100644 --- a/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/mr/IndexOutputConfigurator.java +++ b/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/mr/IndexOutputConfigurator.java @@ -28,7 +28,7 @@ /** * Accumulo Write options. */ - public static enum WriteOpts { + public enum WriteOpts { DEFAULT_TABLE_NAME, INDEX_TABLE_NAME, INDEX_COLUMNS, diff --git a/common/src/java/org/apache/hadoop/hive/common/jsonexplain/Vertex.java b/common/src/java/org/apache/hadoop/hive/common/jsonexplain/Vertex.java index 799355a971..6f621ace4f 100644 --- a/common/src/java/org/apache/hadoop/hive/common/jsonexplain/Vertex.java +++ b/common/src/java/org/apache/hadoop/hive/common/jsonexplain/Vertex.java @@ -68,12 +68,12 @@ public String tag; protected final Logger LOG = LoggerFactory.getLogger(this.getClass().getName()); - public static enum VertexType { + public enum VertexType { MAP, REDUCE, UNION, UNKNOWN }; public VertexType vertexType; - public static enum EdgeType { + public enum EdgeType { BROADCAST, SHUFFLE, MULTICAST, PARTITION_ONLY_SHUFFLE, UNKNOWN }; public String edgeType; diff --git a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java index c7afe2bc4a..98e9d7b5f9 100644 --- a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java +++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java @@ -425,7 +425,7 @@ private static void populateLlapDaemonVarsSet(Set llapDaemonVarsSetLocal * with non-null values to this list as they will override any values defined * in the underlying Hadoop configuration. */ - public static enum ConfVars { + public enum ConfVars { // QL execution stuff SCRIPTWRAPPER("hive.exec.script.wrapper", null, ""), PLAN("hive.exec.plan", "", ""), diff --git a/common/src/java/org/apache/hive/common/util/HiveStringUtils.java b/common/src/java/org/apache/hive/common/util/HiveStringUtils.java index 71d11bd5af..c776cae481 100644 --- a/common/src/java/org/apache/hive/common/util/HiveStringUtils.java +++ b/common/src/java/org/apache/hive/common/util/HiveStringUtils.java @@ -811,7 +811,7 @@ public static String getHostname() { * which can be represented by a 64-bit integer. * TraditionalBinaryPrefix symbol are case insensitive. */ - public static enum TraditionalBinaryPrefix { + public enum TraditionalBinaryPrefix { KILO(1024), MEGA(KILO.value << 10), GIGA(MEGA.value << 10), diff --git a/common/src/test/org/apache/hadoop/hive/common/type/HiveDecimalTestBase.java b/common/src/test/org/apache/hadoop/hive/common/type/HiveDecimalTestBase.java index dee49f9df2..8fd7291106 100644 --- a/common/src/test/org/apache/hadoop/hive/common/type/HiveDecimalTestBase.java +++ b/common/src/test/org/apache/hadoop/hive/common/type/HiveDecimalTestBase.java @@ -30,14 +30,14 @@ public static int POUND_FACTOR = 1000; - public static enum BigDecimalFlavor { + public enum BigDecimalFlavor { NORMAL_RANGE, FRACTIONS_ONLY, NEGATIVE_SCALE, LONG_TAIL } - public static enum BigDecimalPairFlavor { + public enum BigDecimalPairFlavor { RANDOM, NEAR, INVERSE diff --git a/hcatalog/hcatalog-pig-adapter/src/main/java/org/apache/hive/hcatalog/pig/HCatBaseStorer.java b/hcatalog/hcatalog-pig-adapter/src/main/java/org/apache/hive/hcatalog/pig/HCatBaseStorer.java index ae60030633..9b6e72d1fc 100644 --- a/hcatalog/hcatalog-pig-adapter/src/main/java/org/apache/hive/hcatalog/pig/HCatBaseStorer.java +++ b/hcatalog/hcatalog-pig-adapter/src/main/java/org/apache/hive/hcatalog/pig/HCatBaseStorer.java @@ -100,7 +100,7 @@ /** * valid values for ON_OOR_VALUE_OPT */ - public static enum OOR_VALUE_OPT_VALUES {Null, Throw} + public enum OOR_VALUE_OPT_VALUES {Null, Throw} protected String sign; //it's key that this is a per HCatStorer instance object private final DataLossLogger dataLossLogger = new DataLossLogger(); diff --git a/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/HCatEventMessage.java b/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/HCatEventMessage.java index dca95c747c..33f4d108c4 100644 --- a/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/HCatEventMessage.java +++ b/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/HCatEventMessage.java @@ -30,7 +30,7 @@ /** * Enumeration of all supported types of Metastore operations. */ - public static enum EventType { + public enum EventType { CREATE_DATABASE(HCatConstants.HCAT_CREATE_DATABASE_EVENT), DROP_DATABASE(HCatConstants.HCAT_DROP_DATABASE_EVENT), diff --git a/hcatalog/webhcat/java-client/src/main/java/org/apache/hive/hcatalog/api/HCatTable.java b/hcatalog/webhcat/java-client/src/main/java/org/apache/hive/hcatalog/api/HCatTable.java index c08942cb1e..d12108d46e 100644 --- a/hcatalog/webhcat/java-client/src/main/java/org/apache/hive/hcatalog/api/HCatTable.java +++ b/hcatalog/webhcat/java-client/src/main/java/org/apache/hive/hcatalog/api/HCatTable.java @@ -60,7 +60,7 @@ public class HCatTable { private static final Logger LOG = LoggerFactory.getLogger(HCatTable.class); - public static enum Type { + public enum Type { MANAGED_TABLE, EXTERNAL_TABLE, VIRTUAL_VIEW, @@ -70,7 +70,7 @@ /** * Attributes that can be compared between HCatTables. */ - public static enum TableAttribute { + public enum TableAttribute { COLUMNS, PARTITION_COLUMNS, INPUT_FORMAT, diff --git a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/TableDesc.java b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/TableDesc.java index f7cc3e919d..3ddb8f590b 100644 --- a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/TableDesc.java +++ b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/TableDesc.java @@ -137,7 +137,7 @@ public boolean equals(Object o) { * Ther ASC or DESC sort order. */ @XmlRootElement - public static enum SortDirectionDesc { + public enum SortDirectionDesc { ASC, DESC } diff --git a/hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/TestWebHCatE2e.java b/hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/TestWebHCatE2e.java index b62716ec80..59982afd7c 100644 --- a/hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/TestWebHCatE2e.java +++ b/hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/TestWebHCatE2e.java @@ -297,7 +297,7 @@ String getAssertMsg() { } } - private static enum HTTP_METHOD_TYPE {GET, POST, DELETE, PUT} + private enum HTTP_METHOD_TYPE {GET, POST, DELETE, PUT} private static MethodCallRetVal doHttpCall(String uri, HTTP_METHOD_TYPE type) throws IOException { return doHttpCall(uri, type, null, null); } diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/TestAcidOnTez.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/TestAcidOnTez.java index 2bf9871956..db69ac758d 100644 --- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/TestAcidOnTez.java +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/TestAcidOnTez.java @@ -58,7 +58,7 @@ public TestName testName = new TestName(); private HiveConf hiveConf; private Driver d; - private static enum Table { + private enum Table { ACIDTBL("acidTbl"), ACIDTBLPART("acidTblPart"), NONACIDORCTBL("nonAcidOrcTbl"), diff --git a/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/AbstractCliConfig.java b/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/AbstractCliConfig.java index c12f51eb7b..3d577e26d1 100644 --- a/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/AbstractCliConfig.java +++ b/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/AbstractCliConfig.java @@ -44,7 +44,7 @@ public static final String HIVE_ROOT = getHiveRoot(); - public static enum MetastoreType { + public enum MetastoreType { sql, hbase }; diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/counters/QueryFragmentCounters.java b/llap-server/src/java/org/apache/hadoop/hive/llap/counters/QueryFragmentCounters.java index 0c858eb715..f921f435b3 100644 --- a/llap-server/src/java/org/apache/hadoop/hive/llap/counters/QueryFragmentCounters.java +++ b/llap-server/src/java/org/apache/hadoop/hive/llap/counters/QueryFragmentCounters.java @@ -31,7 +31,7 @@ public class QueryFragmentCounters implements LowLevelCacheCounters { private final boolean doUseTimeCounters; - public static enum Desc { + public enum Desc { MACHINE, TABLE, FILE, diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/shufflehandler/DirWatcher.java b/llap-server/src/java/org/apache/hadoop/hive/llap/shufflehandler/DirWatcher.java index 83ccc7f154..cb48e97811 100644 --- a/llap-server/src/java/org/apache/hadoop/hive/llap/shufflehandler/DirWatcher.java +++ b/llap-server/src/java/org/apache/hadoop/hive/llap/shufflehandler/DirWatcher.java @@ -49,7 +49,7 @@ private static final Logger LOG = LoggerFactory.getLogger(DirWatcher.class); - private static enum Type { + private enum Type { BASE, // App Base Dir / ${dagDir} OUTPUT, // appBase/output/ FINAL, // appBase/output/attemptDir diff --git a/metastore/src/java/org/apache/hadoop/hive/metastore/IExtrapolatePartStatus.java b/metastore/src/java/org/apache/hadoop/hive/metastore/IExtrapolatePartStatus.java index d0569fb8d8..c49eeedff3 100644 --- a/metastore/src/java/org/apache/hadoop/hive/metastore/IExtrapolatePartStatus.java +++ b/metastore/src/java/org/apache/hadoop/hive/metastore/IExtrapolatePartStatus.java @@ -57,7 +57,7 @@ /** * The sequence of colStatTypes. */ - static enum ColStatType { + enum ColStatType { Long, Double, Decimal } @@ -70,7 +70,7 @@ /** * The sequence of aggregation function on colStats. */ - static enum AggrType { + enum AggrType { Min, Max, Sum, Avg } diff --git a/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java b/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java index a960b2d26b..4449c200c6 100644 --- a/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java +++ b/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java @@ -1077,7 +1077,7 @@ protected boolean shouldStop() { return filterBuffer.hasError(); } - private static enum FilterType { + private enum FilterType { Integral, String, Date, diff --git a/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java b/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java index db4ec91cdb..4b0a49b04b 100644 --- a/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java +++ b/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java @@ -196,7 +196,7 @@ private final static AtomicBoolean isSchemaVerified = new AtomicBoolean(false); private static final Logger LOG = LoggerFactory.getLogger(ObjectStore.class.getName()); - private static enum TXN_STATUS { + private enum TXN_STATUS { NO_STATE, OPEN, COMMITED, ROLLBACK } diff --git a/metastore/src/java/org/apache/hadoop/hive/metastore/events/PreEventContext.java b/metastore/src/java/org/apache/hadoop/hive/metastore/events/PreEventContext.java index ee24a35f96..2d6712c568 100644 --- a/metastore/src/java/org/apache/hadoop/hive/metastore/events/PreEventContext.java +++ b/metastore/src/java/org/apache/hadoop/hive/metastore/events/PreEventContext.java @@ -27,7 +27,7 @@ public abstract class PreEventContext { - public static enum PreEventType { + public enum PreEventType { CREATE_TABLE, DROP_TABLE, ALTER_TABLE, diff --git a/metastore/src/java/org/apache/hadoop/hive/metastore/messaging/EventMessage.java b/metastore/src/java/org/apache/hadoop/hive/metastore/messaging/EventMessage.java index 1ec0de0849..06c83f1434 100644 --- a/metastore/src/java/org/apache/hadoop/hive/metastore/messaging/EventMessage.java +++ b/metastore/src/java/org/apache/hadoop/hive/metastore/messaging/EventMessage.java @@ -28,7 +28,7 @@ /** * Enumeration of all supported types of Metastore operations. */ - public static enum EventType { + public enum EventType { CREATE_DATABASE(MessageFactory.CREATE_DATABASE_EVENT), DROP_DATABASE(MessageFactory.DROP_DATABASE_EVENT), diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/AbstractMapOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/AbstractMapOperator.java index 2e0ef746f0..95cb87508d 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/AbstractMapOperator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/AbstractMapOperator.java @@ -68,7 +68,7 @@ * Counter. * */ - public static enum Counter { + public enum Counter { DESERIALIZE_ERRORS, RECORDS_IN } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java index 4d46d65227..af3d19d8a5 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java @@ -126,7 +126,7 @@ /** * Counters. */ - public static enum Counter { + public enum Counter { RECORDS_OUT } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/FunctionInfo.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/FunctionInfo.java index 8014dabea2..28c45cbb9c 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/FunctionInfo.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/FunctionInfo.java @@ -36,7 +36,7 @@ */ public class FunctionInfo { - public static enum FunctionType { + public enum FunctionType { BUILTIN, PERSISTENT, TEMPORARY; } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/JoinOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/JoinOperator.java index a4bca45f7b..21d68495cd 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/JoinOperator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/JoinOperator.java @@ -48,7 +48,7 @@ * SkewkeyTableCounter. * */ - public static enum SkewkeyTableCounter { + public enum SkewkeyTableCounter { SKEWJOINFOLLOWUPJOBS } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/JoinUtil.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/JoinUtil.java index 07a3dc6888..791a8b0f50 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/JoinUtil.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/JoinUtil.java @@ -52,7 +52,7 @@ /** * Represents the join result between two tables */ - public static enum JoinResult { + public enum JoinResult { MATCH, // A match is found NOMATCH, // No match is found, and the current row will be dropped SPILL // The current row has been spilled to disk, as the join is postponed diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java index 7f646c484a..3d814121d9 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java @@ -96,7 +96,7 @@ * State. * */ - public static enum State { + public enum State { UNINIT, // initialize() has not been called INIT, // initialize() has been called and close() has not been called, // or close() has been called but one of its parent is not closed. diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/ReduceSinkOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/ReduceSinkOperator.java index 92741ee62c..91aa7b62c6 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/ReduceSinkOperator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/ReduceSinkOperator.java @@ -65,7 +65,7 @@ /** * Counters. */ - public static enum Counter { + public enum Counter { RECORDS_OUT_INTERMEDIATE } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/ScriptOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/ScriptOperator.java index e15bbbaf3d..ccf8849fd3 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/ScriptOperator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/ScriptOperator.java @@ -72,7 +72,7 @@ * Counter. * */ - public static enum Counter { + public enum Counter { DESERIALIZE_ERRORS, SERIALIZE_ERRORS } 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 ba97d22ed9..0ad6866cba 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 @@ -241,7 +241,7 @@ * KEY: record key * VALUE: record value */ - public static enum ReduceField { + public enum ReduceField { KEY, VALUE }; @@ -861,7 +861,7 @@ public static String abbreviate(String str, int max) { * StreamStatus. * */ - public static enum StreamStatus { + public enum StreamStatus { EOF, TERMINATED } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/history/HiveHistory.java b/ql/src/java/org/apache/hadoop/hive/ql/history/HiveHistory.java index 687f551651..ffe2bdad01 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/history/HiveHistory.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/history/HiveHistory.java @@ -38,7 +38,7 @@ * RecordTypes. * */ - public static enum RecordTypes { + public enum RecordTypes { QueryStart, QueryEnd, TaskStart, @@ -53,7 +53,7 @@ * Keys. * */ - public static enum Keys { + public enum Keys { SESSION_ID, QUERY_ID, TASK_ID, diff --git a/ql/src/java/org/apache/hadoop/hive/ql/hooks/Entity.java b/ql/src/java/org/apache/hadoop/hive/ql/hooks/Entity.java index 131c1e1bb5..ee64817f7d 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/hooks/Entity.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/hooks/Entity.java @@ -40,7 +40,7 @@ /** * The type of the entity. */ - public static enum Type { + public enum Type { DATABASE, TABLE, PARTITION, DUMMYPARTITION, DFS_DIR, LOCAL_DIR, FUNCTION } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/hooks/LineageInfo.java b/ql/src/java/org/apache/hadoop/hive/ql/hooks/LineageInfo.java index 73054361f8..1e965f0c14 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/hooks/LineageInfo.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/hooks/LineageInfo.java @@ -54,7 +54,7 @@ * of a user script through a TRANSFORM, MAP or REDUCE syntax * or from the output of a PTF chain execution. */ - public static enum DependencyType { + public enum DependencyType { SIMPLE, EXPRESSION, SCRIPT } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/hooks/LineageLogger.java b/ql/src/java/org/apache/hadoop/hive/ql/hooks/LineageLogger.java index c1f688360c..3699da1a03 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/hooks/LineageLogger.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/hooks/LineageLogger.java @@ -74,7 +74,7 @@ private static final String FORMAT_VERSION = "1.0"; final static class Edge { - public static enum Type { + public enum Type { PROJECTION, PREDICATE } @@ -92,7 +92,7 @@ } final static class Vertex { - public static enum Type { + public enum Type { COLUMN, TABLE } private Type type; diff --git a/ql/src/java/org/apache/hadoop/hive/ql/hooks/WriteEntity.java b/ql/src/java/org/apache/hadoop/hive/ql/hooks/WriteEntity.java index da8c1e2305..7fb5dec3d6 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/hooks/WriteEntity.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/hooks/WriteEntity.java @@ -40,7 +40,7 @@ private boolean isTempURI = false; private transient boolean isDynamicPartitionWrite = false; - public static enum WriteType { + public enum WriteType { DDL_EXCLUSIVE, // for use in DDL statements that require an exclusive lock, // such as dropping a table or partition DDL_SHARED, // for use in DDL operations that only need a shared lock, such as creating a table 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 2c3ba7f9e7..bc3979f2de 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 @@ -29,7 +29,7 @@ public static final Logger l4j = LoggerFactory.getLogger("HiveIndex"); public static final String INDEX_TABLE_CREATETIME = "hive.index.basetbl.dfs.lastModifiedTime"; - public static enum IndexType { + public enum IndexType { AGGREGATE_TABLE("aggregate", AggregateIndexHandler.class.getName()), COMPACT_SUMMARY_TABLE("compact", CompactIndexHandler.class.getName()), BITMAP_TABLE("bitmap", BitmapIndexHandler.class.getName()); diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/IOContext.java b/ql/src/java/org/apache/hadoop/hive/ql/io/IOContext.java index 019db8db83..3ef8c5ad02 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/io/IOContext.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/io/IOContext.java @@ -50,7 +50,7 @@ */ private RecordIdentifier ri; - public static enum Comparison { + public enum Comparison { GREATER, LESS, EQUAL, 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 de49fc84bb..3862e79d00 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 @@ -151,7 +151,7 @@ SelfDescribingInputFormatInterface, AcidInputFormat, CombineHiveInputFormat.AvoidSplitCombination, BatchToRowInputFormat { - static enum SplitStrategyKind { + enum SplitStrategyKind { HYBRID, BI, ETL diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/HiveGBOpConvUtil.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/HiveGBOpConvUtil.java index 0f6c5b5355..6c0634f0d9 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/HiveGBOpConvUtil.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/HiveGBOpConvUtil.java @@ -75,7 +75,7 @@ */ public class HiveGBOpConvUtil { - private static enum HIVEGBPHYSICALMODE { + private enum HIVEGBPHYSICALMODE { MAP_SIDE_GB_NO_SKEW_NO_ADD_MR_JOB, MAP_SIDE_GB_NO_SKEW_ADD_MR_JOB, MAP_SIDE_GB_SKEW_GBKEYS_OR_DIST_UDAF_PRESENT, diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/HiveOpConverter.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/HiveOpConverter.java index 471675b53b..e5f02bd44b 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/HiveOpConverter.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/HiveOpConverter.java @@ -104,7 +104,7 @@ private static final Logger LOG = LoggerFactory.getLogger(HiveOpConverter.class); - public static enum HIVEAGGOPMODE { + public enum HIVEAGGOPMODE { NO_SKEW_NO_MAP_SIDE_AGG, // Corresponds to SemAnalyzer genGroupByPlan1MR SKEW_NO_MAP_SIDE_AGG, // Corresponds to SemAnalyzer genGroupByPlan2MR NO_SKEW_MAP_SIDE_AGG, // Corresponds to SemAnalyzer 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 30fdd3067e..ce6945ac6f 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 @@ -29,7 +29,7 @@ private static final long serialVersionUID = 1L; - public static enum VectorizerNodeIssue { + public enum VectorizerNodeIssue { NONE, NODE_ISSUE, OPERATOR_ISSUE, 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 136e951475..af8ae41718 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 @@ -1102,7 +1102,7 @@ private static String getUnionTypeStringFromAST(ASTNode typeNode) public Partition partHandle; public int numDynParts; // number of dynamic partition columns public List partitions; // involved partitions in TableScanOperator/FileSinkOperator - public static enum SpecType {TABLE_ONLY, STATIC_PARTITION, DYNAMIC_PARTITION}; + public enum SpecType {TABLE_ONLY, STATIC_PARTITION, DYNAMIC_PARTITION}; public SpecType specType; public TableSpec(Hive db, HiveConf conf, ASTNode ast) diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/PTFInvocationSpec.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/PTFInvocationSpec.java index ecf3cfc1c7..bac333a759 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/parse/PTFInvocationSpec.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/PTFInvocationSpec.java @@ -68,7 +68,7 @@ public void setAstNode(ASTNode astNode) { public abstract PTFQueryInputSpec getQueryInput(); } - public static enum PTFQueryInputType { + public enum PTFQueryInputType { TABLE, SUBQUERY, PTFCOMPONENT, @@ -502,13 +502,13 @@ public String toString() } } - public static enum Order + public enum Order { ASC, DESC; } - public static enum NullOrder + public enum NullOrder { NULLS_FIRST, NULLS_LAST; diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/QBExpr.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/QBExpr.java index 7601509dcc..ce01244228 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/parse/QBExpr.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/QBExpr.java @@ -34,7 +34,7 @@ * Opcode. * */ - public static enum Opcode { + public enum Opcode { NULLOP, UNION, INTERSECT, INTERSECTALL, EXCEPT, EXCEPTALL, DIFF }; diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/QBParseInfo.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/QBParseInfo.java index 38df5dea8f..ac7ede0ae1 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/parse/QBParseInfo.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/QBParseInfo.java @@ -627,7 +627,7 @@ public TableSpec getTableSpec() { return destToLateralView; } - protected static enum ClauseType { + protected enum ClauseType { CLUSTER_BY_CLAUSE, DISTRIBUTE_BY_CLAUSE, ORDER_BY_CLAUSE, diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/QBSubQuery.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/QBSubQuery.java index aee9903b52..b2a5ce1e25 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/parse/QBSubQuery.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/QBSubQuery.java @@ -40,7 +40,7 @@ public class QBSubQuery implements ISubQueryJoinInfo { - public static enum SubQueryType { + public enum SubQueryType { EXISTS, NOT_EXISTS, IN, @@ -109,7 +109,7 @@ public SubQueryType getType() { * - has a reference to a SubQuery table source * - has a reference to Outer(parent) Query table source */ - static enum ExprType { + enum ExprType { REFERS_NONE(false, false) { @Override public ExprType combine(ExprType other) { 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 9b03d05b17..a7cf3b3d1b 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 @@ -561,7 +561,7 @@ public String toString() } - public static enum Direction + public enum Direction { PRECEDING, CURRENT, @@ -569,7 +569,7 @@ public String toString() }; // The types for ROWS BETWEEN or RANGE BETWEEN windowing spec - public static enum WindowType + public enum WindowType { ROWS, RANGE diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/AlterDatabaseDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/AlterDatabaseDesc.java index 368db0fa08..57a8a14efc 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/plan/AlterDatabaseDesc.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/AlterDatabaseDesc.java @@ -34,7 +34,7 @@ private static final long serialVersionUID = 1L; // Only altering the database property and owner is currently supported - public static enum ALTER_DB_TYPES { + public enum ALTER_DB_TYPES { ALTER_PROPERTY, ALTER_OWNER }; diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/AlterIndexDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/AlterIndexDesc.java index 019210b4a3..ab109ec058 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/plan/AlterIndexDesc.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/AlterIndexDesc.java @@ -39,7 +39,7 @@ * alterIndexTypes. * */ - public static enum AlterIndexTypes { + public enum AlterIndexTypes { UPDATETIMESTAMP, ADDPROPS}; diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/AlterTableDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/AlterTableDesc.java index 2691faa7b5..a95fc435de 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/plan/AlterTableDesc.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/AlterTableDesc.java @@ -55,7 +55,7 @@ * alterTableTypes. * */ - public static enum AlterTableTypes { + public enum AlterTableTypes { RENAME("rename"), ADDCOLS("add columns"), REPLACECOLS("replace columns"), ADDPROPS("add props"), DROPPROPS("drop props"), ADDSERDE("add serde"), ADDSERDEPROPS("add serde props"), ADDFILEFORMAT("add fileformat"), ADDCLUSTERSORTCOLUMN("add cluster sort column"), @@ -75,7 +75,7 @@ ImmutableList.of(ADDPROPS, DROPPROPS); } - public static enum ProtectModeType { + public enum ProtectModeType { NO_DROP, OFFLINE, READ_ONLY, NO_DROP_CASCADE } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/ArchiveWork.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/ArchiveWork.java index 468d1bf25d..7a0fea7891 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/plan/ArchiveWork.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/ArchiveWork.java @@ -31,7 +31,7 @@ private static final long serialVersionUID = 1L; private ArchiveActionType type; - public static enum ArchiveActionType { + public enum ArchiveActionType { ARCHIVE, UNARCHIVE }; diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeSubQueryDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeSubQueryDesc.java index 462e7308c7..eea2449a04 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeSubQueryDesc.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeSubQueryDesc.java @@ -32,7 +32,7 @@ public class ExprNodeSubQueryDesc extends ExprNodeDesc implements Serializable { private static final long serialVersionUID = 1L; - public static enum SubqueryType{ + public enum SubqueryType{ IN, EXISTS, SCALAR 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 45d100d9eb..503f25a22b 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 @@ -57,7 +57,7 @@ * Mode. * */ - public static enum Mode { + public enum Mode { COMPLETE, PARTIAL1, PARTIAL2, PARTIALS, FINAL, HASH, MERGEPARTIAL }; diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/PlanUtils.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/PlanUtils.java index d82973cedc..0ce3756207 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/plan/PlanUtils.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/PlanUtils.java @@ -92,7 +92,7 @@ * ExpressionTypes. * */ - public static enum ExpressionTypes { + public enum ExpressionTypes { FIELD, JEXL }; public static final String LLAP_OUTPUT_FORMAT_KEY = "Llap"; 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 24636c575b..a4a09790e8 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 @@ -99,7 +99,7 @@ private boolean isPTFReduceSink = false; private boolean skipTag; // Skip writing tags when feeding into mapjoin hashtable - public static enum ReducerTraits { + public enum ReducerTraits { UNSET(0), // unset FIXED(1), // distribution of keys is fixed AUTOPARALLEL(2), // can change reducer count (ORDER BY can concat adjacent buckets) diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/RoleDDLDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/RoleDDLDesc.java index a7e639175e..a1f2858c01 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/plan/RoleDDLDesc.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/RoleDDLDesc.java @@ -72,7 +72,7 @@ public static String getShowRolePrincipalsSchema() { return roleShowRolePrincipals; } - public static enum RoleOperation { + public enum RoleOperation { DROP_ROLE("drop_role"), CREATE_ROLE("create_role"), SHOW_ROLE_GRANT("show_role_grant"), SHOW_ROLES("show_roles"), SET_ROLE("set_role"), SHOW_CURRENT_ROLE("show_current_role"), SHOW_ROLE_PRINCIPALS("show_role_principals"); 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 89d868d103..025f31b111 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 @@ -50,7 +50,7 @@ * NOTE: Hash can spill partial result rows prematurely if it runs low on memory. * NOTE: Streaming has to compare keys where MergePartial gets an endGroup call. */ - public static enum ProcessingMode { + public enum ProcessingMode { NONE, GLOBAL, HASH, 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 60400de1c5..639a9e2100 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 @@ -37,20 +37,20 @@ private static final long serialVersionUID = 1L; - public static enum HashTableImplementationType { + public enum HashTableImplementationType { NONE, OPTIMIZED, FAST } - public static enum HashTableKind { + public enum HashTableKind { NONE, HASH_SET, HASH_MULTISET, HASH_MAP } - public static enum HashTableKeyType { + public enum HashTableKeyType { NONE, BOOLEAN, BYTE, @@ -83,7 +83,7 @@ public PrimitiveTypeInfo getPrimitiveTypeInfo() { } } - public static enum OperatorVariation { + public enum OperatorVariation { NONE, INNER_BIG_ONLY, INNER, 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 bb8f5e13b3..c0c76092f5 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 @@ -53,14 +53,14 @@ // Conversion necessary from partition field values to vector columns. // - public static enum VectorMapOperatorReadType { + public enum VectorMapOperatorReadType { NONE, VECTORIZED_INPUT_FILE_FORMAT, VECTOR_DESERIALIZE, ROW_DESERIALIZE } - public static enum VectorDeserializeType { + public enum VectorDeserializeType { NONE, LAZY_SIMPLE, LAZY_BINARY 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 f148eb42f0..241d85646f 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 @@ -30,7 +30,7 @@ private static final long serialVersionUID = 1L; - public static enum ReduceSinkKeyType { + public enum ReduceSinkKeyType { NONE, LONG, STRING, diff --git a/ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java b/ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java index d7592bb966..ccaf19f45d 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java @@ -1358,7 +1358,7 @@ public void setATSDomainId(String domainId) { * ResourceType. * */ - public static enum ResourceType { + public enum ResourceType { FILE, JAR { diff --git a/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFDateFloor.java b/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFDateFloor.java index 126ed44ebc..80270d9774 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFDateFloor.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFDateFloor.java @@ -89,7 +89,7 @@ public static QueryGranularity fromString(String str) { return new DurationGranularity(convertValue(str), 0); } - private static enum MillisIn { + private enum MillisIn { SECOND(1000), MINUTE(60 * 1000), FIFTEEN_MINUTE(15 * 60 * 1000), THIRTY_MINUTE( 30 * 60 * 1000), HOUR(3600 * 1000), DAY(24 * 3600 * 1000); diff --git a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFEvaluator.java b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFEvaluator.java index 3a982768e3..c90775c3d4 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFEvaluator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFEvaluator.java @@ -67,7 +67,7 @@ public static boolean isEstimable(AggregationBuffer buffer) { * Mode. * */ - public static enum Mode { + public enum Mode { /** * PARTIAL1: from original data to partial aggregation data: iterate() and * terminatePartial() will be called. diff --git a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFNextDay.java b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFNextDay.java index 67b4c548d6..187469d42f 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFNextDay.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFNextDay.java @@ -164,7 +164,7 @@ protected int getIntDayOfWeek(String dayOfWeek) throws UDFArgumentException { return -1; } - public static enum DayOfWeek { + public enum DayOfWeek { MON("MO", "MON", "MONDAY"), TUE("TU", "TUE", "TUESDAY"), WED("WE", "WED", "WEDNESDAY"), THU( "TH", "THU", "THURSDAY"), FRI("FR", "FRI", "FRIDAY"), SAT("SA", "SAT", "SATURDAY"), SUN( "SU", "SUN", "SUNDAY"); diff --git a/ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands.java b/ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands.java index c531aeb8d2..82406b5c93 100644 --- a/ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands.java +++ b/ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands.java @@ -80,7 +80,7 @@ public TestName testName = new TestName(); private HiveConf hiveConf; private Driver d; - private static enum Table { + private enum Table { ACIDTBL("acidTbl"), ACIDTBLPART("acidTblPart"), ACIDTBL2("acidTbl2"), diff --git a/ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands2.java b/ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands2.java index ed1a32853e..955a898ba3 100644 --- a/ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands2.java +++ b/ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands2.java @@ -86,7 +86,7 @@ protected HiveConf hiveConf; protected Driver d; - protected static enum Table { + protected enum Table { ACIDTBL("acidTbl"), ACIDTBLPART("acidTblPart", "p"), NONACIDORCTBL("nonAcidOrcTbl"), diff --git a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorSerDeRow.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorSerDeRow.java index 5520cde052..df105d039d 100644 --- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorSerDeRow.java +++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorSerDeRow.java @@ -55,7 +55,7 @@ */ public class TestVectorSerDeRow extends TestCase { - public static enum SerializationType { + public enum SerializationType { NONE, BINARY_SORTABLE, LAZY_BINARY, diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerdeUtils.java b/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerdeUtils.java index 391a300549..4c7375281e 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerdeUtils.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerdeUtils.java @@ -61,7 +61,7 @@ * add it here. Putting them in an enum rather than separate strings * allows them to be programmatically grouped and referenced together. */ - public static enum AvroTableProperties { + public enum AvroTableProperties { SCHEMA_LITERAL("avro.schema.literal"), SCHEMA_URL("avro.schema.url"), SCHEMA_NAMESPACE("avro.schema.namespace"), diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspector.java b/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspector.java index 7238fbcf8c..40a6de16fd 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspector.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspector.java @@ -41,7 +41,7 @@ * Category. * */ - public static enum Category { + public enum Category { PRIMITIVE, LIST, MAP, STRUCT, UNION }; diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/PrimitiveObjectInspector.java b/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/PrimitiveObjectInspector.java index b03754040a..a612ad83e4 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/PrimitiveObjectInspector.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/PrimitiveObjectInspector.java @@ -29,7 +29,7 @@ /** * The primitive types supported by Hive. */ - public static enum PrimitiveCategory { + public enum PrimitiveCategory { VOID, BOOLEAN, BYTE, SHORT, INT, LONG, FLOAT, DOUBLE, STRING, DATE, TIMESTAMP, TIMESTAMPTZ, BINARY, DECIMAL, VARCHAR, CHAR, INTERVAL_YEAR_MONTH, INTERVAL_DAY_TIME, UNKNOWN diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorUtils.java b/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorUtils.java index 886c298852..1dd6af2700 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorUtils.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorUtils.java @@ -1301,7 +1301,7 @@ public static HiveIntervalDayTime getHiveIntervalDayTime(Object o, PrimitiveObje /** * Provide a general grouping for each primitive data type. */ - public static enum PrimitiveGrouping { + public enum PrimitiveGrouping { NUMERIC_GROUP, STRING_GROUP, BOOLEAN_GROUP, DATE_GROUP, INTERVAL_GROUP, BINARY_GROUP, VOID_GROUP, UNKNOWN_GROUP }; diff --git a/spark-client/src/main/java/org/apache/hive/spark/client/JobHandle.java b/spark-client/src/main/java/org/apache/hive/spark/client/JobHandle.java index dffd60c2fa..080770568c 100644 --- a/spark-client/src/main/java/org/apache/hive/spark/client/JobHandle.java +++ b/spark-client/src/main/java/org/apache/hive/spark/client/JobHandle.java @@ -68,7 +68,7 @@ /** * The current state of the submitted job. */ - static enum State { + enum State { SENT, QUEUED, STARTED, diff --git a/spark-client/src/main/java/org/apache/hive/spark/client/rpc/Rpc.java b/spark-client/src/main/java/org/apache/hive/spark/client/rpc/Rpc.java index cbbfb1ca64..f40ba93851 100644 --- a/spark-client/src/main/java/org/apache/hive/spark/client/rpc/Rpc.java +++ b/spark-client/src/main/java/org/apache/hive/spark/client/rpc/Rpc.java @@ -349,7 +349,7 @@ public void close() { } - static enum MessageType { + enum MessageType { CALL, REPLY, ERROR; diff --git a/storage-api/src/java/org/apache/hadoop/hive/common/type/FastHiveDecimal.java b/storage-api/src/java/org/apache/hadoop/hive/common/type/FastHiveDecimal.java index 7fa9fdf5a4..93489ddfee 100644 --- a/storage-api/src/java/org/apache/hadoop/hive/common/type/FastHiveDecimal.java +++ b/storage-api/src/java/org/apache/hadoop/hive/common/type/FastHiveDecimal.java @@ -557,7 +557,7 @@ protected FastCheckPrecisionScaleStatus fastCheckPrecisionScale( maxPrecision, maxScale); } - protected static enum FastCheckPrecisionScaleStatus { + protected enum FastCheckPrecisionScaleStatus { NO_CHANGE, OVERFLOW, UPDATE_SCALE_DOWN; diff --git a/storage-api/src/java/org/apache/hadoop/hive/ql/exec/vector/ColumnVector.java b/storage-api/src/java/org/apache/hadoop/hive/ql/exec/vector/ColumnVector.java index 065c1fa2ed..2596651919 100644 --- a/storage-api/src/java/org/apache/hadoop/hive/ql/exec/vector/ColumnVector.java +++ b/storage-api/src/java/org/apache/hadoop/hive/ql/exec/vector/ColumnVector.java @@ -35,7 +35,7 @@ /* * The current kinds of column vectors. */ - public static enum Type { + public enum Type { NONE, // Useful when the type of column vector has not be determined yet. LONG, DOUBLE, diff --git a/storage-api/src/java/org/apache/hadoop/hive/ql/io/sarg/PredicateLeaf.java b/storage-api/src/java/org/apache/hadoop/hive/ql/io/sarg/PredicateLeaf.java index 469a3dad47..0683e9f103 100644 --- a/storage-api/src/java/org/apache/hadoop/hive/ql/io/sarg/PredicateLeaf.java +++ b/storage-api/src/java/org/apache/hadoop/hive/ql/io/sarg/PredicateLeaf.java @@ -33,7 +33,7 @@ * The possible operators for predicates. To get the opposites, construct * an expression with a not operator. */ - public static enum Operator { + public enum Operator { EQUALS, NULL_SAFE_EQUALS, LESS_THAN, @@ -46,7 +46,7 @@ /** * The possible types for sargs. */ - public static enum Type { + public enum Type { LONG(Long.class), // all of the integer types FLOAT(Double.class), // float and double STRING(String.class), // string, char, varchar diff --git a/storage-api/src/java/org/apache/hadoop/hive/ql/io/sarg/SearchArgument.java b/storage-api/src/java/org/apache/hadoop/hive/ql/io/sarg/SearchArgument.java index d70b3b067b..76b5aacb03 100644 --- a/storage-api/src/java/org/apache/hadoop/hive/ql/io/sarg/SearchArgument.java +++ b/storage-api/src/java/org/apache/hadoop/hive/ql/io/sarg/SearchArgument.java @@ -35,7 +35,7 @@ /** * The potential result sets of logical operations. */ - public static enum TruthValue { + public enum TruthValue { YES, NO, NULL, YES_NULL, NO_NULL, YES_NO, YES_NO_NULL; /** diff --git a/storage-api/src/test/org/apache/hadoop/hive/common/type/HiveDecimalTestBase.java b/storage-api/src/test/org/apache/hadoop/hive/common/type/HiveDecimalTestBase.java index 553c456a63..88eaf0dc5b 100644 --- a/storage-api/src/test/org/apache/hadoop/hive/common/type/HiveDecimalTestBase.java +++ b/storage-api/src/test/org/apache/hadoop/hive/common/type/HiveDecimalTestBase.java @@ -27,14 +27,14 @@ public static int POUND_FACTOR = 1000; - public static enum BigDecimalFlavor { + public enum BigDecimalFlavor { NORMAL_RANGE, FRACTIONS_ONLY, NEGATIVE_SCALE, LONG_TAIL } - public static enum BigDecimalPairFlavor { + public enum BigDecimalPairFlavor { RANDOM, NEAR, INVERSE