HIVE-12237 : Use slf4j as logging facade
Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/55337444 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/55337444 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/55337444 Branch: refs/heads/master Commit: 55337444784e2b211725ac64e5ae08eb507a6467 Parents: 34ba81a Author: Ashutosh Chauhan <[email protected]> Authored: Wed Oct 28 08:33:16 2015 -0700 Committer: Ashutosh Chauhan <[email protected]> Committed: Wed Oct 28 08:34:06 2015 -0700 ---------------------------------------------------------------------- accumulo-handler/pom.xml | 4 - .../hadoop/hive/accumulo/LazyAccumuloRow.java | 5 +- .../org/apache/hadoop/hive/accumulo/Utils.java | 5 +- .../hive/accumulo/columns/ColumnMapper.java | 5 +- .../accumulo/columns/ColumnMappingFactory.java | 5 +- .../columns/HiveAccumuloColumnMapping.java | 5 +- .../hive/accumulo/mr/HiveAccumuloSplit.java | 5 +- .../predicate/AccumuloPredicateHandler.java | 5 +- .../predicate/PrimitiveComparisonFilter.java | 5 +- .../hive/accumulo/predicate/PushdownTuple.java | 5 +- .../predicate/compare/StringCompare.java | 3 - .../accumulo/serde/AccumuloRowSerializer.java | 5 +- .../accumulo/serde/AccumuloSerDeParameters.java | 5 +- .../serde/CompositeAccumuloRowIdFactory.java | 5 +- .../predicate/TestAccumuloPredicateHandler.java | 3 - .../serde/DelimitedAccumuloRowIdFactory.java | 5 +- .../serde/FirstCharAccumuloCompositeRowId.java | 5 +- .../hive/accumulo/serde/TestAccumuloSerDe.java | 3 - beeline/pom.xml | 5 - .../apache/hive/beeline/ClassNameCompleter.java | 6 +- .../org/apache/hive/beeline/SQLCompleter.java | 6 +- .../apache/hive/beeline/util/QFileClient.java | 8 +- .../hive/beeline/TestBeelineArgParsing.java | 6 +- .../apache/hive/beeline/cli/TestHiveCli.java | 6 +- cli/pom.xml | 5 - .../org/apache/hadoop/hive/cli/CliDriver.java | 13 +- .../hadoop/hive/cli/OptionsProcessor.java | 6 +- common/pom.xml | 10 -- .../hadoop/hive/common/CallableWithNdc.java | 44 ------ .../hadoop/hive/common/CompressionUtils.java | 22 +-- .../apache/hadoop/hive/common/FileUtils.java | 8 +- .../hadoop/hive/common/JvmPauseMonitor.java | 11 +- .../org/apache/hadoop/hive/common/LogUtils.java | 6 +- .../hadoop/hive/common/RunnableWithNdc.java | 43 ------ .../apache/hadoop/hive/common/ServerUtils.java | 6 +- .../common/jsonexplain/tez/TezJsonParser.java | 8 +- .../metrics/metrics2/CodahaleMetrics.java | 17 ++- .../org/apache/hadoop/hive/conf/HiveConf.java | 8 +- .../hadoop/hive/conf/SystemVariables.java | 6 +- .../hadoop/hive/conf/VariableSubstitution.java | 8 +- .../apache/hadoop/hive/ql/log/PerfLogger.java | 8 +- .../java/org/apache/hive/common/HiveCompat.java | 6 +- .../hive/common/util/FixedSizedObjectPool.java | 6 +- .../hive/common/util/HiveStringUtils.java | 2 +- .../apache/hive/common/util/HiveTestUtils.java | 8 +- .../hive/common/util/HiveVersionInfo.java | 6 +- .../hive/common/util/ShutdownHookManager.java | 6 +- .../common/util/TestFixedSizedObjectPool.java | 9 +- contrib/pom.xml | 5 - .../genericudf/example/GenericUDFDBOutput.java | 8 +- .../hive/contrib/serde2/MultiDelimitSerDe.java | 5 +- .../hadoop/hive/contrib/serde2/RegexSerDe.java | 6 +- .../hive/contrib/serde2/TypedBytesSerDe.java | 6 +- .../contrib/serde2/s3/S3LogDeserializer.java | 6 +- hbase-handler/pom.xml | 5 - .../AbstractHBaseKeyPredicateDecomposer.java | 8 +- .../hive/hbase/CompositeHBaseKeyFactory.java | 8 +- .../apache/hadoop/hive/hbase/HBaseSerDe.java | 6 +- .../hadoop/hive/hbase/HBaseSerDeHelper.java | 8 +- .../hadoop/hive/hbase/HBaseStorageHandler.java | 6 +- .../HBaseTableSnapshotInputFormatUtil.java | 6 +- .../hive/hbase/HiveHBaseTableInputFormat.java | 6 +- .../hive/hbase/HiveHBaseTableOutputFormat.java | 6 +- .../hive/hbase/HiveHFileOutputFormat.java | 6 +- .../org/apache/hive/hcatalog/cli/HCatCli.java | 8 +- .../mapreduce/HCatBaseOutputFormat.java | 2 - .../hive/hcatalog/mapreduce/SpecialCases.java | 6 +- .../listener/DbNotificationListener.java | 6 +- .../messaging/json/JSONMessageFactory.java | 6 +- .../streaming/AbstractRecordWriter.java | 6 +- .../streaming/DelimitedInputWriter.java | 6 +- .../hive/hcatalog/streaming/HiveEndPoint.java | 6 +- .../streaming/StreamingIntegrationTester.java | 6 +- .../hcatalog/api/repl/CommandTestUtils.java | 6 +- .../api/repl/commands/TestCommands.java | 6 +- .../hive/hcatalog/templeton/AppConfig.java | 6 +- .../templeton/CatchallExceptionMapper.java | 6 +- .../hcatalog/templeton/CompleteDelegator.java | 6 +- .../hcatalog/templeton/DeleteDelegator.java | 6 +- .../hcatalog/templeton/ExecServiceImpl.java | 6 +- .../hive/hcatalog/templeton/HcatDelegator.java | 6 +- .../hcatalog/templeton/LauncherDelegator.java | 6 +- .../apache/hive/hcatalog/templeton/Main.java | 10 +- .../hive/hcatalog/templeton/PigDelegator.java | 6 +- .../hcatalog/templeton/ProxyUserSupport.java | 6 +- .../hcatalog/templeton/SecureProxySupport.java | 6 +- .../apache/hive/hcatalog/templeton/Server.java | 6 +- .../hive/hcatalog/templeton/SqoopDelegator.java | 6 +- .../hcatalog/templeton/StatusDelegator.java | 6 +- .../hcatalog/templeton/tool/HDFSCleanup.java | 6 +- .../hcatalog/templeton/tool/HDFSStorage.java | 6 +- .../hive/hcatalog/templeton/tool/JobState.java | 6 +- .../templeton/tool/JobStateTracker.java | 6 +- .../hcatalog/templeton/tool/LaunchMapper.java | 8 +- .../hcatalog/templeton/tool/LogRetriever.java | 6 +- .../templeton/tool/TempletonControllerJob.java | 6 +- .../hcatalog/templeton/tool/TempletonUtils.java | 6 +- .../templeton/tool/TrivialExecService.java | 6 +- .../templeton/tool/ZooKeeperCleanup.java | 6 +- .../templeton/tool/ZooKeeperStorage.java | 6 +- hplsql/pom.xml | 5 - hwi/pom.xml | 5 - .../hadoop/hive/hwi/HWIContextListener.java | 6 +- .../org/apache/hadoop/hive/hwi/HWIServer.java | 8 +- .../apache/hadoop/hive/hwi/HWISessionItem.java | 8 +- .../hadoop/hive/hwi/HWISessionManager.java | 6 +- ...CustomNonSettableStructObjectInspector1.java | 8 +- .../api/TestHCatClientNotification.java | 6 +- .../listener/TestDbNotificationListener.java | 8 +- itests/hive-unit/pom.xml | 5 - .../hive/metastore/TestHiveMetaStore.java | 6 +- .../hive/metastore/TestHiveMetaStoreTxns.java | 3 +- ...TestHiveMetaStoreWithEnvironmentContext.java | 11 +- .../hive/metastore/TestMetastoreVersion.java | 6 +- .../metastore/hbase/HBaseIntegrationTests.java | 6 +- .../TestHBaseAggrStatsCacheIntegration.java | 6 +- .../hive/metastore/hbase/TestHBaseImport.java | 6 +- .../metastore/hbase/TestHBaseMetastoreSql.java | 6 +- .../hbase/TestHBaseStoreIntegration.java | 6 +- .../hbase/TestStorageDescriptorSharing.java | 6 +- .../TestHiveAuthorizerCheckInvocation.java | 6 +- .../org/apache/hive/jdbc/TestJdbcDriver2.java | 6 +- .../hive/jdbc/cbo_rp_TestJdbcDriver2.java | 6 +- itests/qtest-accumulo/pom.xml | 6 - itests/qtest-spark/pom.xml | 5 - itests/qtest/pom.xml | 5 - .../apache/hadoop/hive/serde2/TestSerDe.java | 6 +- .../org/apache/hadoop/hive/ql/QTestUtil.java | 10 +- .../hive/ql/hooks/CheckColumnAccessHook.java | 4 +- ...DummyHiveMetastoreAuthorizationProvider.java | 6 +- .../hadoop/hive/ql/udf/UDFFileLookup.java | 4 - .../hive/ql/udf/generic/GenericUDAFSumList.java | 6 +- jdbc/pom.xml | 11 -- .../org/apache/hive/jdbc/HiveConnection.java | 6 +- .../org/apache/hive/jdbc/HiveDataSource.java | 24 ++-- .../java/org/apache/hive/jdbc/HiveDriver.java | 6 + .../apache/hive/jdbc/HiveQueryResultSet.java | 6 +- .../org/apache/hive/jdbc/HiveStatement.java | 7 +- jdbc/src/java/org/apache/hive/jdbc/Utils.java | 8 +- .../hive/jdbc/ZooKeeperHiveClientHelper.java | 7 +- llap-client/pom.xml | 5 - llap-server/pom.xml | 5 - .../hadoop/hive/llap/cache/BuddyAllocator.java | 11 +- .../hive/llap/cache/LowLevelCacheImpl.java | 13 +- .../llap/cache/LowLevelCacheMemoryManager.java | 5 +- .../llap/cache/LowLevelFifoCachePolicy.java | 7 +- .../llap/cache/LowLevelLrfuCachePolicy.java | 7 +- .../hive/llap/cli/LlapOptionsProcessor.java | 6 +- .../hadoop/hive/llap/cli/LlapServiceDriver.java | 6 +- .../hadoop/hive/llap/daemon/HistoryLogger.java | 5 +- .../hive/llap/daemon/impl/AMReporter.java | 6 +- .../impl/LlapDaemonProtocolServerImpl.java | 6 +- .../llap/daemon/impl/TaskRunnerCallable.java | 2 +- .../registry/impl/LlapFixedRegistryImpl.java | 7 +- .../registry/impl/LlapRegistryService.java | 5 +- .../registry/impl/LlapYarnRegistryImpl.java | 5 +- .../daemon/services/impl/LlapWebServices.java | 2 - .../hive/llap/io/api/impl/LlapInputFormat.java | 5 +- .../hive/llap/io/api/impl/LlapIoImpl.java | 22 ++- .../llap/io/decode/OrcColumnVectorProducer.java | 9 +- .../llap/io/encoded/OrcEncodedDataReader.java | 17 ++- .../hive/llap/shufflehandler/DirWatcher.java | 6 +- .../shufflehandler/FadvisedChunkedFile.java | 6 +- .../llap/shufflehandler/FadvisedFileRegion.java | 6 +- .../hive/llap/shufflehandler/IndexCache.java | 6 +- .../llap/shufflehandler/ShuffleHandler.java | 6 +- .../tezplugins/helpers/SourceStateTracker.java | 6 +- .../hive/llap/cache/TestBuddyAllocator.java | 6 +- .../TestIncrementalObjectSizeEstimator.java | 6 +- .../hive/llap/cache/TestLowLevelCacheImpl.java | 6 +- .../llap/cache/TestLowLevelLrfuCachePolicy.java | 6 +- .../hive/llap/cache/TestOrcMetadataCache.java | 4 +- .../hive/llap/daemon/MiniLlapCluster.java | 6 +- metastore/pom.xml | 13 +- .../hive/metastore/AggregateStatsCache.java | 32 ++--- .../apache/hadoop/hive/metastore/Deadline.java | 6 +- .../hadoop/hive/metastore/HiveAlterHandler.java | 12 +- .../hadoop/hive/metastore/HiveMetaStore.java | 20 +-- .../hive/metastore/HiveMetaStoreClient.java | 6 +- .../hive/metastore/HiveMetaStoreFsImpl.java | 8 +- .../hive/metastore/MetaStoreDirectSql.java | 6 +- .../hadoop/hive/metastore/MetaStoreInit.java | 6 +- .../hadoop/hive/metastore/MetaStoreUtils.java | 6 +- .../hadoop/hive/metastore/ObjectStore.java | 12 +- .../hive/metastore/PartFilterExprUtil.java | 6 +- .../hadoop/hive/metastore/RawStoreProxy.java | 6 - .../hive/metastore/RetryingHMSHandler.java | 6 +- .../hive/metastore/RetryingMetaStoreClient.java | 6 +- .../hive/metastore/TUGIBasedProcessor.java | 6 +- .../apache/hadoop/hive/metastore/Warehouse.java | 6 +- .../hive/metastore/events/EventCleanerTask.java | 8 +- .../hbase/AggrStatsInvalidatorFilter.java | 8 +- .../hive/metastore/hbase/HBaseImport.java | 6 +- .../hive/metastore/hbase/HBaseReadWrite.java | 6 +- .../hadoop/hive/metastore/hbase/HBaseStore.java | 6 +- .../hadoop/hive/metastore/hbase/HBaseUtils.java | 6 +- .../metastore/hbase/PartitionKeyComparator.java | 6 +- .../hbase/SharedStorageDescriptor.java | 6 +- .../hadoop/hive/metastore/hbase/StatsCache.java | 6 +- .../metastore/hbase/TephraHBaseConnection.java | 6 +- .../metastore/hbase/VanillaHBaseConnection.java | 6 +- .../spec/CompositePartitionSpecProxy.java | 4 +- .../hive/metastore/tools/HiveMetaTool.java | 6 +- .../metastore/txn/CompactionTxnHandler.java | 6 +- .../hadoop/hive/metastore/txn/TxnDbUtil.java | 6 +- .../hadoop/hive/metastore/txn/TxnHandler.java | 6 +- .../metastore/DummyMetaStoreInitListener.java | 4 +- .../hive/metastore/VerifyingObjectStore.java | 6 +- .../hbase/TestHBaseAggregateStatsCache.java | 6 +- .../hive/metastore/hbase/TestHBaseStore.java | 6 +- .../metastore/hbase/TestHBaseStoreCached.java | 6 +- .../hbase/TestSharedStorageDescriptor.java | 6 +- .../metastore/txn/TestTxnHandlerNegative.java | 6 +- pom.xml | 24 ++-- ql/pom.xml | 10 -- .../org/apache/hadoop/hive/llap/LogLevels.java | 53 ------- .../java/org/apache/hadoop/hive/ql/Context.java | 6 +- .../java/org/apache/hadoop/hive/ql/Driver.java | 6 +- .../apache/hadoop/hive/ql/DriverContext.java | 8 +- .../org/apache/hadoop/hive/ql/QueryPlan.java | 3 - .../hive/ql/exec/AbstractFileMergeOperator.java | 9 +- .../hadoop/hive/ql/exec/ArchiveUtils.java | 6 +- .../hadoop/hive/ql/exec/AutoProgressor.java | 6 +- .../hadoop/hive/ql/exec/ColumnStatsTask.java | 6 +- .../hive/ql/exec/ColumnStatsUpdateTask.java | 10 +- .../hadoop/hive/ql/exec/CommonJoinOperator.java | 6 +- .../hive/ql/exec/CommonMergeJoinOperator.java | 6 +- .../apache/hadoop/hive/ql/exec/CopyTask.java | 6 +- .../org/apache/hadoop/hive/ql/exec/DDLTask.java | 6 +- .../hive/ql/exec/DefaultBucketMatcher.java | 6 +- .../hadoop/hive/ql/exec/DemuxOperator.java | 6 +- .../apache/hadoop/hive/ql/exec/ExplainTask.java | 8 +- .../ql/exec/ExprNodeGenericFuncEvaluator.java | 8 +- .../hadoop/hive/ql/exec/FetchOperator.java | 7 +- .../apache/hadoop/hive/ql/exec/FetchTask.java | 6 +- .../hadoop/hive/ql/exec/FileSinkOperator.java | 9 +- .../hadoop/hive/ql/exec/FunctionRegistry.java | 6 +- .../hadoop/hive/ql/exec/FunctionTask.java | 10 +- .../hive/ql/exec/HashTableSinkOperator.java | 8 +- .../apache/hadoop/hive/ql/exec/Heartbeater.java | 6 +- .../hive/ql/exec/HiveTotalOrderPartitioner.java | 6 +- .../hadoop/hive/ql/exec/JoinOperator.java | 6 +- .../hadoop/hive/ql/exec/MapJoinOperator.java | 6 +- .../hadoop/hive/ql/exec/MapredContext.java | 6 +- .../apache/hadoop/hive/ql/exec/MoveTask.java | 6 +- .../apache/hadoop/hive/ql/exec/MuxOperator.java | 6 +- .../hadoop/hive/ql/exec/ObjectCacheFactory.java | 6 +- .../apache/hadoop/hive/ql/exec/Operator.java | 8 +- .../hadoop/hive/ql/exec/OperatorFactory.java | 6 +- .../hadoop/hive/ql/exec/OperatorUtils.java | 6 +- .../hive/ql/exec/OrcFileMergeOperator.java | 6 +- .../hadoop/hive/ql/exec/PTFPartition.java | 6 +- .../hive/ql/exec/PartitionKeySampler.java | 6 +- .../hive/ql/exec/RCFileMergeOperator.java | 6 +- .../apache/hadoop/hive/ql/exec/Registry.java | 6 +- .../hadoop/hive/ql/exec/SMBMapJoinOperator.java | 8 +- .../hadoop/hive/ql/exec/SkewJoinHandler.java | 8 +- .../ql/exec/SparkHashTableSinkOperator.java | 6 +- .../hadoop/hive/ql/exec/StatsNoJobTask.java | 6 +- .../apache/hadoop/hive/ql/exec/StatsTask.java | 6 +- .../org/apache/hadoop/hive/ql/exec/Task.java | 6 +- .../apache/hadoop/hive/ql/exec/TopNHash.java | 6 +- .../hadoop/hive/ql/exec/UDTFOperator.java | 6 +- .../apache/hadoop/hive/ql/exec/Utilities.java | 11 +- .../hive/ql/exec/errors/TaskLogProcessor.java | 6 +- .../mapjoin/MapJoinMemoryExhaustionHandler.java | 6 +- .../hadoop/hive/ql/exec/mr/ExecDriver.java | 16 +-- .../hadoop/hive/ql/exec/mr/ExecMapper.java | 18 +-- .../hive/ql/exec/mr/ExecMapperContext.java | 3 - .../hadoop/hive/ql/exec/mr/ExecReducer.java | 8 +- .../hadoop/hive/ql/exec/mr/HashTableLoader.java | 6 +- .../hadoop/hive/ql/exec/mr/MapredLocalTask.java | 8 +- .../hadoop/hive/ql/exec/mr/ObjectCache.java | 6 +- .../apache/hadoop/hive/ql/exec/mr/Throttle.java | 4 +- .../persistence/BytesBytesMultiHashMap.java | 6 +- .../ql/exec/persistence/FlatRowContainer.java | 6 +- .../ql/exec/persistence/HashMapWrapper.java | 6 +- .../persistence/HybridHashTableContainer.java | 6 +- .../ql/exec/persistence/KeyValueContainer.java | 6 +- .../persistence/MapJoinBytesTableContainer.java | 6 +- .../hive/ql/exec/persistence/MapJoinKey.java | 4 +- .../ql/exec/persistence/ObjectContainer.java | 6 +- .../hive/ql/exec/persistence/RowContainer.java | 6 +- .../hive/ql/exec/spark/HashTableLoader.java | 6 +- .../hive/ql/exec/spark/HiveKVResultCache.java | 6 +- .../ql/exec/spark/HiveSparkClientFactory.java | 6 +- .../hive/ql/exec/spark/KryoSerializer.java | 6 +- .../ql/exec/spark/LocalHiveSparkClient.java | 16 +-- .../ql/exec/spark/RemoteHiveSparkClient.java | 6 +- .../hive/ql/exec/spark/SmallTableCache.java | 6 +- .../exec/spark/SparkDynamicPartitionPruner.java | 6 +- .../ql/exec/spark/SparkMapRecordHandler.java | 9 +- .../exec/spark/SparkMergeFileRecordHandler.java | 6 +- .../hadoop/hive/ql/exec/spark/SparkPlan.java | 8 +- .../hive/ql/exec/spark/SparkPlanGenerator.java | 6 +- .../hive/ql/exec/spark/SparkRecordHandler.java | 10 +- .../ql/exec/spark/SparkReduceRecordHandler.java | 8 +- .../hadoop/hive/ql/exec/spark/SparkTask.java | 8 +- .../ql/exec/spark/session/SparkSessionImpl.java | 6 +- .../spark/session/SparkSessionManagerImpl.java | 6 +- .../ql/exec/spark/status/SparkJobMonitor.java | 8 +- .../spark/status/impl/JobMetricsListener.java | 6 +- .../spark/status/impl/LocalSparkJobStatus.java | 6 +- .../spark/status/impl/RemoteSparkJobStatus.java | 6 +- .../ql/exec/tez/ColumnarSplitSizeEstimator.java | 6 +- .../hive/ql/exec/tez/CustomPartitionEdge.java | 6 +- .../hive/ql/exec/tez/CustomPartitionVertex.java | 6 +- .../hadoop/hive/ql/exec/tez/DagUtils.java | 6 +- .../ql/exec/tez/DynamicPartitionPruner.java | 6 +- .../hive/ql/exec/tez/HashTableLoader.java | 6 +- .../hive/ql/exec/tez/HivePreWarmProcessor.java | 6 +- .../hive/ql/exec/tez/HiveSplitGenerator.java | 6 +- .../hive/ql/exec/tez/LlapObjectCache.java | 6 +- .../hive/ql/exec/tez/MapRecordProcessor.java | 6 +- .../hive/ql/exec/tez/MapRecordSource.java | 8 +- .../ql/exec/tez/MergeFileRecordProcessor.java | 10 +- .../hadoop/hive/ql/exec/tez/ObjectCache.java | 6 +- .../hive/ql/exec/tez/RecordProcessor.java | 7 +- .../hive/ql/exec/tez/ReduceRecordProcessor.java | 6 +- .../hive/ql/exec/tez/ReduceRecordSource.java | 10 +- .../hadoop/hive/ql/exec/tez/SplitGrouper.java | 6 +- .../hive/ql/exec/tez/TezJobExecHelper.java | 6 +- .../hadoop/hive/ql/exec/tez/TezProcessor.java | 7 +- .../hive/ql/exec/tez/TezSessionPoolManager.java | 6 +- .../hive/ql/exec/tez/TezSessionState.java | 10 +- .../ql/exec/tez/tools/KeyValueInputMerger.java | 6 +- .../ql/exec/tez/tools/KeyValuesInputMerger.java | 6 +- .../hive/ql/exec/vector/VectorAssignRow.java | 8 +- .../ql/exec/vector/VectorColumnOrderedMap.java | 6 +- .../hive/ql/exec/vector/VectorCopyRow.java | 8 +- .../ql/exec/vector/VectorDeserializeRow.java | 8 +- .../exec/vector/VectorExpressionDescriptor.java | 6 +- .../hive/ql/exec/vector/VectorExtractRow.java | 8 +- .../ql/exec/vector/VectorGroupByOperator.java | 6 +- .../exec/vector/VectorMapJoinBaseOperator.java | 8 +- .../ql/exec/vector/VectorMapJoinOperator.java | 6 +- .../exec/vector/VectorSMBMapJoinOperator.java | 6 +- .../exec/vector/VectorSerializeRowNoNulls.java | 8 +- .../ql/exec/vector/VectorizationContext.java | 6 +- .../ql/exec/vector/VectorizedBatchUtil.java | 6 +- .../ql/exec/vector/VectorizedRowBatchCtx.java | 6 +- .../vector/expressions/VectorUDFDateString.java | 6 +- .../mapjoin/VectorMapJoinCommonOperator.java | 8 +- .../VectorMapJoinGenerateResultOperator.java | 8 +- ...pJoinInnerBigOnlyGenerateResultOperator.java | 8 +- .../VectorMapJoinInnerBigOnlyLongOperator.java | 6 +- ...ctorMapJoinInnerBigOnlyMultiKeyOperator.java | 6 +- ...VectorMapJoinInnerBigOnlyStringOperator.java | 6 +- ...ectorMapJoinInnerGenerateResultOperator.java | 8 +- .../mapjoin/VectorMapJoinInnerLongOperator.java | 6 +- .../VectorMapJoinInnerMultiKeyOperator.java | 6 +- .../VectorMapJoinInnerStringOperator.java | 6 +- ...orMapJoinLeftSemiGenerateResultOperator.java | 8 +- .../VectorMapJoinLeftSemiLongOperator.java | 6 +- .../VectorMapJoinLeftSemiMultiKeyOperator.java | 6 +- .../VectorMapJoinLeftSemiStringOperator.java | 6 +- ...ectorMapJoinOuterGenerateResultOperator.java | 8 +- .../mapjoin/VectorMapJoinOuterLongOperator.java | 6 +- .../VectorMapJoinOuterMultiKeyOperator.java | 6 +- .../VectorMapJoinOuterStringOperator.java | 6 +- .../mapjoin/VectorMapJoinRowBytesContainer.java | 6 +- .../fast/VectorMapJoinFastBytesHashMap.java | 8 +- .../VectorMapJoinFastBytesHashMultiSet.java | 8 +- .../fast/VectorMapJoinFastBytesHashSet.java | 8 +- .../fast/VectorMapJoinFastBytesHashTable.java | 8 +- .../fast/VectorMapJoinFastHashTable.java | 8 +- .../fast/VectorMapJoinFastHashTableLoader.java | 8 +- .../mapjoin/fast/VectorMapJoinFastKeyStore.java | 8 +- .../fast/VectorMapJoinFastLongHashMap.java | 8 +- .../fast/VectorMapJoinFastLongHashMultiSet.java | 8 +- .../fast/VectorMapJoinFastLongHashSet.java | 8 +- .../fast/VectorMapJoinFastLongHashTable.java | 8 +- .../fast/VectorMapJoinFastTableContainer.java | 8 +- .../fast/VectorMapJoinFastValueStore.java | 8 +- .../VectorMapJoinOptimizedCreateHashTable.java | 8 +- .../VectorMapJoinOptimizedHashTable.java | 6 +- .../VectorMapJoinOptimizedLongCommon.java | 8 +- .../hadoop/hive/ql/history/HiveHistoryImpl.java | 8 +- .../hive/ql/history/HiveHistoryViewer.java | 6 +- .../apache/hadoop/hive/ql/hooks/ATSHook.java | 6 +- .../hadoop/hive/ql/hooks/LineageLogger.java | 12 +- .../hive/ql/hooks/PostExecOrcFileDump.java | 6 +- .../ql/hooks/PostExecTezSummaryPrinter.java | 6 +- .../hadoop/hive/ql/hooks/WriteEntity.java | 6 +- .../apache/hadoop/hive/ql/index/HiveIndex.java | 6 +- .../hadoop/hive/ql/index/HiveIndexResult.java | 8 +- .../hive/ql/index/HiveIndexedInputFormat.java | 6 +- .../ql/index/bitmap/BitmapIndexHandler.java | 6 +- .../ql/index/compact/CompactIndexHandler.java | 6 +- .../compact/HiveCompactIndexInputFormat.java | 8 +- .../org/apache/hadoop/hive/ql/io/AcidUtils.java | 6 +- .../hive/ql/io/BucketizedHiveInputFormat.java | 8 +- .../org/apache/hadoop/hive/ql/io/CodecPool.java | 6 +- .../hive/ql/io/CombineHiveInputFormat.java | 6 +- .../org/apache/hadoop/hive/ql/io/HdfsUtils.java | 6 +- .../ql/io/HiveContextAwareRecordReader.java | 6 +- .../hadoop/hive/ql/io/HiveFileFormatUtils.java | 6 +- .../hadoop/hive/ql/io/HiveInputFormat.java | 6 +- .../apache/hadoop/hive/ql/io/IOContextMap.java | 6 +- .../hadoop/hive/ql/io/NullRowsInputFormat.java | 6 +- .../org/apache/hadoop/hive/ql/io/RCFile.java | 6 +- .../hadoop/hive/ql/io/StorageFormatFactory.java | 6 +- .../ql/io/avro/AvroContainerOutputFormat.java | 6 +- .../ql/io/avro/AvroGenericRecordReader.java | 6 +- .../hive/ql/io/merge/MergeFileMapper.java | 6 +- .../hadoop/hive/ql/io/merge/MergeFileTask.java | 2 +- .../hadoop/hive/ql/io/merge/MergeFileWork.java | 6 +- .../apache/hadoop/hive/ql/io/orc/InStream.java | 6 +- .../hadoop/hive/ql/io/orc/MemoryManager.java | 6 +- .../hadoop/hive/ql/io/orc/OrcInputFormat.java | 23 +-- .../hive/ql/io/orc/OrcNewInputFormat.java | 6 +- .../hadoop/hive/ql/io/orc/OrcOutputFormat.java | 6 +- .../hive/ql/io/orc/OrcRawRecordMerger.java | 6 +- .../hadoop/hive/ql/io/orc/OrcRecordUpdater.java | 6 +- .../apache/hadoop/hive/ql/io/orc/OrcSerde.java | 6 +- .../apache/hadoop/hive/ql/io/orc/OrcSplit.java | 6 +- .../apache/hadoop/hive/ql/io/orc/OrcUtils.java | 6 +- .../hadoop/hive/ql/io/orc/ReaderImpl.java | 8 +- .../hive/ql/io/orc/RecordReaderFactory.java | 6 +- .../hadoop/hive/ql/io/orc/RecordReaderImpl.java | 6 +- .../ql/io/orc/RunLengthIntegerReaderV2.java | 6 +- .../hadoop/hive/ql/io/orc/WriterImpl.java | 6 +- .../ql/io/orc/encoded/EncodedReaderImpl.java | 6 +- .../hive/ql/io/parquet/LeafFilterFactory.java | 6 +- .../ql/io/parquet/MapredParquetInputFormat.java | 6 +- .../io/parquet/MapredParquetOutputFormat.java | 6 +- .../hive/ql/io/parquet/ProjectionPusher.java | 6 +- .../parquet/VectorizedParquetInputFormat.java | 8 +- .../read/ParquetFilterPredicateConverter.java | 6 +- .../read/ParquetRecordReaderWrapper.java | 6 +- .../ql/io/parquet/write/DataWritableWriter.java | 8 +- .../write/ParquetRecordWriterWrapper.java | 6 +- .../ql/io/rcfile/stats/PartialScanMapper.java | 6 +- .../ql/io/rcfile/stats/PartialScanTask.java | 7 +- .../rcfile/truncate/ColumnTruncateMapper.java | 6 +- .../io/rcfile/truncate/ColumnTruncateTask.java | 5 +- .../hive/ql/io/sarg/ConvertAstToSearchArg.java | 6 +- .../hadoop/hive/ql/lockmgr/DbLockManager.java | 6 +- .../hadoop/hive/ql/lockmgr/DbTxnManager.java | 6 +- .../hadoop/hive/ql/lockmgr/DummyTxnManager.java | 8 +- .../hive/ql/lockmgr/EmbeddedLockManager.java | 19 ++- .../zookeeper/CuratorFrameworkSingleton.java | 6 +- .../zookeeper/ZooKeeperHiveLockManager.java | 16 ++- .../hadoop/hive/ql/metadata/DummyPartition.java | 8 +- .../apache/hadoop/hive/ql/metadata/Hive.java | 10 +- .../hive/ql/metadata/HiveMetaStoreChecker.java | 6 +- .../hadoop/hive/ql/metadata/HiveUtils.java | 6 +- .../hadoop/hive/ql/metadata/Partition.java | 8 +- .../ql/metadata/SessionHiveMetaStoreClient.java | 20 +-- .../apache/hadoop/hive/ql/metadata/Table.java | 6 +- .../formatting/JsonMetaDataFormatter.java | 6 +- .../formatting/TextMetaDataFormatter.java | 6 +- .../ql/optimizer/AbstractBucketJoinProc.java | 4 - ...tionSizeBasedBigTableSelectorForAutoSMJ.java | 8 +- .../hive/ql/optimizer/BucketJoinProcCtx.java | 8 +- .../ql/optimizer/BucketMapJoinOptimizer.java | 6 +- .../ql/optimizer/ColumnPrunerProcFactory.java | 6 +- .../hive/ql/optimizer/ConstantPropagate.java | 6 +- .../ql/optimizer/ConstantPropagateProcCtx.java | 21 +-- .../optimizer/ConstantPropagateProcFactory.java | 6 +- .../hive/ql/optimizer/ConvertJoinMapJoin.java | 6 +- .../DynamicPartitionPruningOptimization.java | 6 +- .../hive/ql/optimizer/GenMRFileSink1.java | 6 +- .../hive/ql/optimizer/GenMapRedUtils.java | 8 +- .../hive/ql/optimizer/GlobalLimitOptimizer.java | 6 +- .../hive/ql/optimizer/GroupByOptimizer.java | 6 +- .../ql/optimizer/IdentityProjectRemover.java | 6 +- .../hadoop/hive/ql/optimizer/IndexUtils.java | 6 +- .../hive/ql/optimizer/MapJoinProcessor.java | 6 +- .../ql/optimizer/OperatorComparatorFactory.java | 8 +- .../hadoop/hive/ql/optimizer/Optimizer.java | 6 +- .../hive/ql/optimizer/PointLookupOptimizer.java | 6 +- .../hadoop/hive/ql/optimizer/PrunerUtils.java | 8 -- .../ql/optimizer/ReduceSinkMapJoinProc.java | 6 +- .../optimizer/RemoveDynamicPruningBySize.java | 6 +- .../hadoop/hive/ql/optimizer/SamplePruner.java | 8 +- .../ql/optimizer/SetReducerParallelism.java | 6 +- .../hive/ql/optimizer/SimpleFetchOptimizer.java | 6 +- .../hive/ql/optimizer/SkewJoinOptimizer.java | 6 +- .../optimizer/SortedDynPartitionOptimizer.java | 6 +- .../SortedMergeBucketMapJoinOptimizer.java | 8 +- .../SparkRemoveDynamicPruningBySize.java | 8 +- .../hive/ql/optimizer/StatsOptimizer.java | 50 +++---- .../ql/optimizer/calcite/HiveCalciteUtil.java | 6 +- .../ql/optimizer/calcite/HiveRelOptUtil.java | 6 +- .../ql/optimizer/calcite/RelOptHiveTable.java | 8 +- .../optimizer/calcite/cost/HiveCostModel.java | 6 +- .../calcite/cost/HiveOnTezCostModel.java | 6 +- .../rules/HiveInsertExchange4JoinRule.java | 8 +- .../calcite/rules/HiveJoinAddNotNullRule.java | 8 +- .../calcite/rules/HiveJoinToMultiJoinRule.java | 6 +- .../calcite/rules/HivePreFilteringRule.java | 10 +- .../optimizer/calcite/rules/PartitionPrune.java | 6 +- .../calcite/stats/HiveRelMdRowCount.java | 20 +-- .../calcite/translator/ASTConverter.java | 6 +- .../calcite/translator/ExprNodeConverter.java | 12 +- .../calcite/translator/HiveOpConverter.java | 6 +- .../translator/HiveOpConverterPostProc.java | 6 +- .../translator/PlanModifierForASTConv.java | 6 +- .../calcite/translator/PlanModifierUtil.java | 6 +- .../calcite/translator/RexNodeConverter.java | 6 +- .../translator/SqlFunctionConverter.java | 6 +- .../correlation/CorrelationOptimizer.java | 6 +- .../QueryPlanTreeTransformation.java | 6 +- .../ql/optimizer/index/RewriteCanApplyCtx.java | 6 +- .../ql/optimizer/index/RewriteGBUsingIndex.java | 6 +- .../index/RewriteParseContextGenerator.java | 6 +- .../RewriteQueryUsingAggregateIndexCtx.java | 6 +- .../LBPartitionProcFactory.java | 6 +- .../ListBucketingPruner.java | 6 +- .../pcr/PartitionConditionRemover.java | 8 +- .../ql/optimizer/pcr/PcrExprProcFactory.java | 6 +- .../hive/ql/optimizer/pcr/PcrOpProcFactory.java | 8 +- .../optimizer/physical/CrossProductCheck.java | 8 +- .../physical/GenSparkSkewJoinProcessor.java | 6 +- .../hive/ql/optimizer/physical/LlapDecider.java | 8 +- .../physical/LocalMapJoinProcFactory.java | 6 +- .../ql/optimizer/physical/MemoryDecider.java | 6 +- .../physical/MetadataOnlyOptimizer.java | 6 +- .../optimizer/physical/NullScanOptimizer.java | 6 +- .../physical/NullScanTaskDispatcher.java | 8 +- .../ql/optimizer/physical/SerializeFilter.java | 6 +- .../hive/ql/optimizer/physical/Vectorizer.java | 6 +- .../physical/index/IndexWhereProcCtx.java | 6 +- .../physical/index/IndexWhereProcessor.java | 6 +- .../ppr/PartitionExpressionForMetastore.java | 6 +- .../hive/ql/optimizer/ppr/PartitionPruner.java | 6 +- .../spark/CombineEquivalentWorkResolver.java | 6 +- .../spark/SetSparkReducerParallelism.java | 6 +- .../optimizer/spark/SparkMapJoinOptimizer.java | 6 +- .../spark/SparkReduceSinkMapJoinProc.java | 6 +- .../stats/annotation/StatsRulesProcFactory.java | 10 +- .../hive/ql/parse/AppMasterEventProcessor.java | 6 +- .../hive/ql/parse/BaseSemanticAnalyzer.java | 13 +- .../hive/ql/parse/ColumnAccessAnalyzer.java | 6 +- .../ql/parse/ColumnStatsSemanticAnalyzer.java | 8 +- .../hive/ql/parse/DDLSemanticAnalyzer.java | 6 +- .../apache/hadoop/hive/ql/parse/EximUtil.java | 6 +- .../hadoop/hive/ql/parse/FileSinkProcessor.java | 8 +- .../hive/ql/parse/FunctionSemanticAnalyzer.java | 10 +- .../hadoop/hive/ql/parse/GenTezUtils.java | 6 +- .../apache/hadoop/hive/ql/parse/GenTezWork.java | 10 +- .../apache/hadoop/hive/ql/parse/HiveParser.g | 5 - .../hadoop/hive/ql/parse/InputSignature.java | 6 +- .../hive/ql/parse/MacroSemanticAnalyzer.java | 8 +- .../hadoop/hive/ql/parse/MapReduceCompiler.java | 6 +- .../hive/ql/parse/MetaDataExportListener.java | 6 +- .../hadoop/hive/ql/parse/PTFTranslator.java | 6 +- .../hadoop/hive/ql/parse/ParseDriver.java | 6 +- .../hive/ql/parse/ProcessAnalyzeTable.java | 6 +- .../org/apache/hadoop/hive/ql/parse/QB.java | 6 +- .../org/apache/hadoop/hive/ql/parse/QBExpr.java | 6 +- .../apache/hadoop/hive/ql/parse/QBMetaData.java | 6 +- .../hadoop/hive/ql/parse/QBParseInfo.java | 6 +- .../hadoop/hive/ql/parse/RowResolver.java | 6 +- .../hadoop/hive/ql/parse/SemanticAnalyzer.java | 16 +-- .../hive/ql/parse/TableAccessAnalyzer.java | 6 +- .../hadoop/hive/ql/parse/TaskCompiler.java | 6 +- .../hadoop/hive/ql/parse/TezCompiler.java | 6 +- .../hadoop/hive/ql/parse/TypeCheckCtx.java | 8 +- .../hive/ql/parse/TypeCheckProcFactory.java | 6 +- .../hadoop/hive/ql/parse/UnionProcessor.java | 6 +- .../hive/ql/parse/spark/GenSparkUtils.java | 6 +- .../hive/ql/parse/spark/GenSparkWork.java | 6 +- .../hive/ql/parse/spark/SparkCompiler.java | 6 +- .../ql/parse/spark/SparkFileSinkProcessor.java | 8 +- .../SparkPartitionPruningSinkOperator.java | 6 +- .../parse/spark/SparkProcessAnalyzeTable.java | 6 +- .../apache/hadoop/hive/ql/plan/BaseWork.java | 10 +- .../ql/plan/ConditionalResolverCommonJoin.java | 6 +- .../hadoop/hive/ql/plan/CreateTableDesc.java | 8 +- .../hive/ql/plan/ExprNodeGenericFuncDesc.java | 8 +- .../org/apache/hadoop/hive/ql/plan/MapWork.java | 6 +- .../org/apache/hadoop/hive/ql/plan/PTFDesc.java | 6 +- .../apache/hadoop/hive/ql/plan/PlanUtils.java | 6 +- .../hadoop/hive/ql/plan/ReduceSinkDesc.java | 6 +- .../apache/hadoop/hive/ql/plan/ReduceWork.java | 6 +- .../org/apache/hadoop/hive/ql/plan/TezWork.java | 6 +- .../hadoop/hive/ql/ppd/ExprWalkerInfo.java | 6 +- .../hive/ql/ppd/ExprWalkerProcFactory.java | 6 +- .../hadoop/hive/ql/ppd/OpProcFactory.java | 6 +- .../hadoop/hive/ql/ppd/PredicatePushDown.java | 6 +- .../hive/ql/ppd/SyntheticJoinPredicate.java | 6 +- .../ql/processors/AddResourceProcessor.java | 6 +- .../ql/processors/CommandProcessorFactory.java | 6 +- .../hadoop/hive/ql/processors/CommandUtil.java | 6 +- .../hive/ql/processors/CompileProcessor.java | 6 +- .../hive/ql/processors/CryptoProcessor.java | 6 +- .../ql/processors/DeleteResourceProcessor.java | 6 +- .../hadoop/hive/ql/processors/DfsProcessor.java | 6 +- .../hive/ql/processors/ReloadProcessor.java | 6 +- .../AuthorizationPreEventListener.java | 6 +- .../HiveAuthorizationProviderBase.java | 6 +- .../StorageBasedAuthorizationProvider.java | 6 +- .../AuthorizationMetaStoreFilterHook.java | 10 +- .../sqlstd/DummyHiveAuthorizationValidator.java | 6 +- .../plugin/sqlstd/SQLAuthorizationUtils.java | 6 +- .../sqlstd/SQLStdHiveAccessController.java | 6 +- .../SQLStdHiveAuthorizationValidator.java | 6 +- .../hive/ql/session/DependencyResolver.java | 8 +- .../hadoop/hive/ql/session/OperationLog.java | 12 +- .../hadoop/hive/ql/session/SessionState.java | 20 +-- .../hive/ql/stats/CounterStatsAggregator.java | 6 +- .../ql/stats/CounterStatsAggregatorSpark.java | 6 +- .../ql/stats/CounterStatsAggregatorTez.java | 6 +- .../hive/ql/stats/CounterStatsPublisher.java | 6 +- .../hadoop/hive/ql/stats/StatsFactory.java | 6 +- .../apache/hadoop/hive/ql/stats/StatsUtils.java | 6 +- .../hive/ql/stats/fs/FSStatsAggregator.java | 10 +- .../hive/ql/stats/fs/FSStatsPublisher.java | 12 +- .../hive/ql/txn/AcidHouseKeeperService.java | 10 +- .../hadoop/hive/ql/txn/compactor/Cleaner.java | 6 +- .../hive/ql/txn/compactor/CompactorMR.java | 6 +- .../hive/ql/txn/compactor/CompactorThread.java | 6 +- .../hadoop/hive/ql/txn/compactor/Initiator.java | 9 +- .../hadoop/hive/ql/txn/compactor/Worker.java | 8 +- .../org/apache/hadoop/hive/ql/udf/UDFE.java | 6 +- .../org/apache/hadoop/hive/ql/udf/UDFPI.java | 6 +- .../hive/ql/udf/generic/GenericUDAFAverage.java | 6 +- .../ql/udf/generic/GenericUDAFComputeStats.java | 22 ++- .../udf/generic/GenericUDAFContextNGrams.java | 6 +- .../ql/udf/generic/GenericUDAFEWAHBitmap.java | 6 +- .../ql/udf/generic/GenericUDAFFirstValue.java | 6 +- .../generic/GenericUDAFHistogramNumeric.java | 6 +- .../hive/ql/udf/generic/GenericUDAFLag.java | 6 +- .../ql/udf/generic/GenericUDAFLastValue.java | 6 +- .../hive/ql/udf/generic/GenericUDAFLead.java | 6 +- .../hive/ql/udf/generic/GenericUDAFLeadLag.java | 6 +- .../hive/ql/udf/generic/GenericUDAFMax.java | 6 +- .../hive/ql/udf/generic/GenericUDAFMin.java | 6 +- .../hive/ql/udf/generic/GenericUDAFNTile.java | 6 +- .../ql/udf/generic/GenericUDAFPercentRank.java | 6 +- .../generic/GenericUDAFPercentileApprox.java | 6 +- .../hive/ql/udf/generic/GenericUDAFRank.java | 6 +- .../ql/udf/generic/GenericUDAFRowNumber.java | 6 +- .../hive/ql/udf/generic/GenericUDAFSum.java | 6 +- .../ql/udf/generic/GenericUDAFVariance.java | 6 +- .../hive/ql/udf/generic/GenericUDAFnGrams.java | 6 +- .../udf/generic/GenericUDFFromUtcTimestamp.java | 6 +- .../hive/ql/udf/generic/GenericUDFRegExp.java | 8 +- .../ql/udf/generic/GenericUDFTimestamp.java | 4 +- .../hive/ql/udf/generic/GenericUDFToChar.java | 6 +- .../ql/udf/generic/GenericUDFToVarchar.java | 6 +- .../ql/udf/generic/GenericUDFUnixTimeStamp.java | 6 +- .../ql/udf/generic/GenericUDTFJSONTuple.java | 6 +- .../udf/generic/GenericUDTFParseUrlTuple.java | 6 +- .../hive/ql/udf/generic/NGramEstimator.java | 4 +- .../udf/generic/NumDistinctValueEstimator.java | 14 +- .../hive/ql/udf/ptf/WindowingTableFunction.java | 6 +- .../hive/ql/util/ZooKeeperHiveHelper.java | 6 +- .../hadoop/hive/ql/exec/TestExecDriver.java | 6 +- .../hive/ql/exec/TestFileSinkOperator.java | 6 +- .../hadoop/hive/ql/exec/TestUtilities.java | 6 +- .../TestMapJoinMemoryExhaustionHandler.java | 6 +- .../session/TestSparkSessionManagerImpl.java | 6 +- .../hive/ql/exec/tez/TestTezSessionPool.java | 6 +- .../exec/vector/TestVectorizationContext.java | 6 +- .../apache/hadoop/hive/ql/io/TestRCFile.java | 6 +- .../hive/ql/io/TestSymlinkTextInputFormat.java | 8 +- .../hive/ql/io/orc/TestOrcRawRecordMerger.java | 6 +- .../hive/ql/lockmgr/TestDbTxnManager.java | 13 +- .../hive/ql/lockmgr/TestDummyTxnManager.java | 10 +- .../hadoop/hive/ql/log/TestLog4j2Appenders.java | 2 +- .../parse/TestUpdateDeleteSemanticAnalyzer.java | 6 +- .../hive/ql/session/TestSessionState.java | 6 +- .../hive/ql/txn/compactor/CompactorTest.java | 6 +- .../hive/ql/txn/compactor/TestCleaner.java | 6 +- .../hive/ql/txn/compactor/TestInitiator.java | 6 +- .../hive/ql/txn/compactor/TestWorker.java | 6 +- serde/pom.xml | 5 - .../hive/serde2/AbstractEncodingAwareSerDe.java | 6 +- .../hive/serde2/ColumnProjectionUtils.java | 7 +- .../hadoop/hive/serde2/DelimitedJSONSerDe.java | 6 +- .../serde2/MetadataTypedColumnsetSerDe.java | 8 +- .../apache/hadoop/hive/serde2/OpenCSVSerde.java | 6 +- .../apache/hadoop/hive/serde2/RegexSerDe.java | 6 +- .../apache/hadoop/hive/serde2/SerDeUtils.java | 9 +- .../hive/serde2/avro/AvroDeserializer.java | 6 +- .../serde2/avro/AvroLazyObjectInspector.java | 8 +- .../hadoop/hive/serde2/avro/AvroSerDe.java | 6 +- .../hadoop/hive/serde2/avro/AvroSerdeUtils.java | 6 +- .../hadoop/hive/serde2/avro/AvroSerializer.java | 4 +- .../hadoop/hive/serde2/avro/InstanceCache.java | 6 +- .../binarysortable/BinarySortableSerDe.java | 6 +- .../fast/BinarySortableDeserializeRead.java | 8 +- .../fast/BinarySortableSerializeWrite.java | 8 +- .../hive/serde2/columnar/ColumnarSerDe.java | 8 +- .../hive/serde2/columnar/ColumnarStruct.java | 6 +- .../hive/serde2/dynamic_type/DynamicSerDe.java | 6 +- .../hadoop/hive/serde2/io/DateWritable.java | 1 + .../serde2/io/HiveIntervalDayTimeWritable.java | 6 +- .../io/HiveIntervalYearMonthWritable.java | 6 +- .../hadoop/hive/serde2/lazy/LazyBinary.java | 8 +- .../hadoop/hive/serde2/lazy/LazyDate.java | 6 +- .../hadoop/hive/serde2/lazy/LazyDouble.java | 6 +- .../hadoop/hive/serde2/lazy/LazyFloat.java | 6 +- .../hadoop/hive/serde2/lazy/LazyHiveChar.java | 6 +- .../hive/serde2/lazy/LazyHiveDecimal.java | 6 +- .../hive/serde2/lazy/LazyHiveVarchar.java | 6 +- .../apache/hadoop/hive/serde2/lazy/LazyMap.java | 6 +- .../hadoop/hive/serde2/lazy/LazyPrimitive.java | 6 +- .../hive/serde2/lazy/LazySerDeParameters.java | 6 +- .../hive/serde2/lazy/LazySimpleSerDe.java | 5 - .../hadoop/hive/serde2/lazy/LazyStruct.java | 6 +- .../hadoop/hive/serde2/lazy/LazyTimestamp.java | 10 +- .../lazy/fast/LazySimpleDeserializeRead.java | 144 ++++--------------- .../lazy/fast/LazySimpleSerializeWrite.java | 8 +- .../LazyListObjectInspector.java | 6 +- .../objectinspector/LazyMapObjectInspector.java | 6 +- .../LazyUnionObjectInspector.java | 8 +- .../hive/serde2/lazybinary/LazyBinaryDate.java | 6 +- .../LazyBinaryHiveIntervalDayTime.java | 6 +- .../LazyBinaryHiveIntervalYearMonth.java | 6 +- .../hive/serde2/lazybinary/LazyBinaryMap.java | 6 +- .../hive/serde2/lazybinary/LazyBinarySerDe.java | 6 +- .../serde2/lazybinary/LazyBinaryStruct.java | 6 +- .../serde2/lazybinary/LazyBinaryTimestamp.java | 6 +- .../hive/serde2/lazybinary/LazyBinaryUnion.java | 6 +- .../hive/serde2/lazybinary/LazyBinaryUtils.java | 2 +- .../fast/LazyBinaryDeserializeRead.java | 6 +- .../fast/LazyBinarySerializeWrite.java | 6 +- .../objectinspector/ObjectInspectorUtils.java | 6 +- .../StandardStructObjectInspector.java | 8 +- .../PrimitiveObjectInspectorUtils.java | 6 +- .../WritableHiveVarcharObjectInspector.java | 6 +- .../serde2/thrift/TBinarySortableProtocol.java | 6 +- .../serde2/thrift/TCTLSeparatedProtocol.java | 6 +- .../hive/serde2/avro/TestTypeInfoToSchema.java | 7 +- service/pom.xml | 5 - .../apache/hive/service/AbstractService.java | 6 +- .../apache/hive/service/CompositeService.java | 6 +- .../org/apache/hive/service/CookieSigner.java | 6 +- .../apache/hive/service/ServiceOperations.java | 6 +- .../org/apache/hive/service/ServiceUtils.java | 25 ++++ .../apache/hive/service/auth/HttpAuthUtils.java | 6 +- .../auth/LdapAuthenticationProviderImpl.java | 6 +- .../org/apache/hive/service/cli/CLIService.java | 8 +- .../cli/operation/HiveCommandOperation.java | 10 +- .../cli/operation/LogDivertAppender.java | 7 +- .../hive/service/cli/operation/Operation.java | 6 +- .../service/cli/operation/OperationManager.java | 9 +- .../service/cli/session/HiveSessionImpl.java | 12 +- .../cli/session/HiveSessionImplwithUGI.java | 6 +- .../service/cli/session/SessionManager.java | 6 +- .../thrift/RetryingThriftCLIServiceClient.java | 6 +- .../cli/thrift/ThriftBinaryCLIService.java | 2 +- .../service/cli/thrift/ThriftCLIService.java | 6 +- .../cli/thrift/ThriftHttpCLIService.java | 3 +- .../service/cli/thrift/ThriftHttpServlet.java | 6 +- .../apache/hive/service/server/HiveServer2.java | 17 ++- .../server/ThreadWithGarbageCleanup.java | 6 +- .../apache/hive/service/cli/CLIServiceTest.java | 6 +- shims/0.23/pom.xml | 5 - .../apache/hadoop/mapred/WebHCatJTShim23.java | 6 +- shims/common/pom.xml | 16 +-- .../org/apache/hadoop/fs/DefaultFileAccess.java | 6 +- .../apache/hadoop/hive/shims/HadoopShims.java | 18 +-- .../hadoop/hive/shims/HadoopShimsSecure.java | 6 +- .../hive/thrift/HadoopThriftAuthBridge.java | 6 +- shims/scheduler/pom.xml | 5 - .../hadoop/hive/schshim/FairSchedulerShim.java | 6 +- .../hive/spark/client/SparkClientUtilities.java | 6 +- .../hive/spark/counter/SparkCounters.java | 6 +- .../hadoop/hive/common/io/DiskRangeList.java | 6 +- .../hive/ql/io/sarg/SearchArgumentImpl.java | 5 - .../hive/serde2/io/HiveDecimalWritable.java | 4 - testutils/ptest2/pom.xml | 5 - 767 files changed, 2577 insertions(+), 2994 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/accumulo-handler/pom.xml ---------------------------------------------------------------------- diff --git a/accumulo-handler/pom.xml b/accumulo-handler/pom.xml index a330e94..329bf66 100644 --- a/accumulo-handler/pom.xml +++ b/accumulo-handler/pom.xml @@ -37,10 +37,6 @@ <artifactId>commons-lang</artifactId> </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-core</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/LazyAccumuloRow.java ---------------------------------------------------------------------- diff --git a/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/LazyAccumuloRow.java b/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/LazyAccumuloRow.java index 4597f5c..d5af7a8 100644 --- a/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/LazyAccumuloRow.java +++ b/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/LazyAccumuloRow.java @@ -35,7 +35,8 @@ import org.apache.hadoop.hive.serde2.lazy.objectinspector.LazyMapObjectInspector import org.apache.hadoop.hive.serde2.lazy.objectinspector.LazySimpleStructObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.StructField; import org.apache.hadoop.io.Text; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @@ -43,7 +44,7 @@ import org.apache.log4j.Logger; * */ public class LazyAccumuloRow extends LazyStruct { - private static final Logger log = Logger.getLogger(LazyAccumuloRow.class); + private static final Logger log = LoggerFactory.getLogger(LazyAccumuloRow.class); private AccumuloHiveRow row; private List<ColumnMapping> columnMappings; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/Utils.java ---------------------------------------------------------------------- diff --git a/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/Utils.java b/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/Utils.java index dc4782a..407ecbd 100644 --- a/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/Utils.java +++ b/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/Utils.java @@ -44,7 +44,8 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.common.JavaUtils; import org.apache.hadoop.util.StringUtils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Preconditions; @@ -53,7 +54,7 @@ import com.google.common.base.Preconditions; * helpful */ public class Utils { - private static final Logger log = Logger.getLogger(Utils.class); + private static final Logger log = LoggerFactory.getLogger(Utils.class); // Thanks, HBase public static void addDependencyJars(Configuration conf, Class<?>... classes) throws IOException { http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/columns/ColumnMapper.java ---------------------------------------------------------------------- diff --git a/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/columns/ColumnMapper.java b/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/columns/ColumnMapper.java index 0498bab..b06b44a 100644 --- a/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/columns/ColumnMapper.java +++ b/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/columns/ColumnMapper.java @@ -25,7 +25,8 @@ import org.apache.hadoop.hive.accumulo.AccumuloHiveConstants; import org.apache.hadoop.hive.accumulo.serde.TooManyAccumuloColumnsException; import org.apache.hadoop.hive.serde.serdeConstants; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Preconditions; @@ -33,7 +34,7 @@ import com.google.common.base.Preconditions; * */ public class ColumnMapper { - private static final Logger log = Logger.getLogger(ColumnMapper.class); + private static final Logger log = LoggerFactory.getLogger(ColumnMapper.class); private List<ColumnMapping> columnMappings; private int rowIdOffset; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/columns/ColumnMappingFactory.java ---------------------------------------------------------------------- diff --git a/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/columns/ColumnMappingFactory.java b/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/columns/ColumnMappingFactory.java index a241882..63d496e 100644 --- a/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/columns/ColumnMappingFactory.java +++ b/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/columns/ColumnMappingFactory.java @@ -20,7 +20,8 @@ import java.util.Map.Entry; import org.apache.hadoop.hive.accumulo.AccumuloHiveConstants; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Preconditions; import com.google.common.collect.Maps; @@ -29,7 +30,7 @@ import com.google.common.collect.Maps; * */ public class ColumnMappingFactory { - private static final Logger log = Logger.getLogger(ColumnMappingFactory.class); + private static final Logger log = LoggerFactory.getLogger(ColumnMappingFactory.class); /** * Generate the proper instance of a ColumnMapping http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/columns/HiveAccumuloColumnMapping.java ---------------------------------------------------------------------- diff --git a/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/columns/HiveAccumuloColumnMapping.java b/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/columns/HiveAccumuloColumnMapping.java index d09ade1..85d883e 100644 --- a/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/columns/HiveAccumuloColumnMapping.java +++ b/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/columns/HiveAccumuloColumnMapping.java @@ -17,7 +17,8 @@ package org.apache.hadoop.hive.accumulo.columns; import org.apache.hadoop.hive.accumulo.AccumuloHiveConstants; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Charsets; @@ -26,7 +27,7 @@ import com.google.common.base.Charsets; */ public class HiveAccumuloColumnMapping extends ColumnMapping { @SuppressWarnings("unused") - private static final Logger log = Logger.getLogger(HiveAccumuloColumnMapping.class); + private static final Logger log = LoggerFactory.getLogger(HiveAccumuloColumnMapping.class); protected String columnFamily, columnQualifier; protected byte[] columnFamilyBytes, columnQualifierBytes; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/mr/HiveAccumuloSplit.java ---------------------------------------------------------------------- diff --git a/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/mr/HiveAccumuloSplit.java b/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/mr/HiveAccumuloSplit.java index 530f232..2a6be86 100644 --- a/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/mr/HiveAccumuloSplit.java +++ b/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/mr/HiveAccumuloSplit.java @@ -28,7 +28,8 @@ import org.apache.hadoop.hive.ql.io.HiveInputFormat.HiveInputSplit; import org.apache.hadoop.mapred.FileSplit; import org.apache.hadoop.mapred.InputSplit; import org.apache.hadoop.util.StringUtils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Wraps RangeInputSplit into a FileSplit so Hadoop won't complain when it tries to make its own @@ -40,7 +41,7 @@ import org.apache.log4j.Logger; * error */ public class HiveAccumuloSplit extends FileSplit implements InputSplit { - private static final Logger log = Logger.getLogger(HiveAccumuloSplit.class); + private static final Logger log = LoggerFactory.getLogger(HiveAccumuloSplit.class); private RangeInputSplit split; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/AccumuloPredicateHandler.java ---------------------------------------------------------------------- diff --git a/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/AccumuloPredicateHandler.java b/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/AccumuloPredicateHandler.java index 534e77f..2c0e3c2 100644 --- a/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/AccumuloPredicateHandler.java +++ b/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/AccumuloPredicateHandler.java @@ -69,7 +69,8 @@ import org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPLessThan; import org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPNotEqual; import org.apache.hadoop.hive.serde.serdeConstants; import org.apache.hadoop.hive.serde2.SerDeException; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -91,7 +92,7 @@ public class AccumuloPredicateHandler { // Want to start sufficiently "high" enough in the iterator stack private static int iteratorCount = 50; - private static final Logger log = Logger.getLogger(AccumuloPredicateHandler.class); + private static final Logger log = LoggerFactory.getLogger(AccumuloPredicateHandler.class); static { compareOps.put(GenericUDFOPEqual.class.getName(), Equal.class); compareOps.put(GenericUDFOPNotEqual.class.getName(), NotEqual.class); http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/PrimitiveComparisonFilter.java ---------------------------------------------------------------------- diff --git a/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/PrimitiveComparisonFilter.java b/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/PrimitiveComparisonFilter.java index 4b5fae6..17d5529 100644 --- a/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/PrimitiveComparisonFilter.java +++ b/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/PrimitiveComparisonFilter.java @@ -39,7 +39,8 @@ import org.apache.hadoop.hive.accumulo.predicate.compare.PrimitiveComparison; import org.apache.hadoop.hive.common.JavaUtils; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory; import org.apache.hadoop.io.Text; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.collect.Lists; @@ -53,7 +54,7 @@ import com.google.common.collect.Lists; */ public class PrimitiveComparisonFilter extends WholeRowIterator { @SuppressWarnings("unused") - private static final Logger log = Logger.getLogger(PrimitiveComparisonFilter.class); + private static final Logger log = LoggerFactory.getLogger(PrimitiveComparisonFilter.class); public static final String FILTER_PREFIX = "accumulo.filter.compare.iterator."; public static final String P_COMPARE_CLASS = "accumulo.filter.iterator.p.compare.class"; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/PushdownTuple.java ---------------------------------------------------------------------- diff --git a/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/PushdownTuple.java b/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/PushdownTuple.java index 32d143a..f326d52 100644 --- a/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/PushdownTuple.java +++ b/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/PushdownTuple.java @@ -33,7 +33,8 @@ import org.apache.hadoop.io.IntWritable; import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.Writable; import org.apache.hadoop.util.StringUtils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * For use in IteratorSetting construction. @@ -41,7 +42,7 @@ import org.apache.log4j.Logger; * encapsulates a constant byte [], PrimitiveCompare instance, and CompareOp instance. */ public class PushdownTuple { - private static final Logger log = Logger.getLogger(PushdownTuple.class); + private static final Logger log = LoggerFactory.getLogger(PushdownTuple.class); private byte[] constVal; private PrimitiveComparison pCompare; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/compare/StringCompare.java ---------------------------------------------------------------------- diff --git a/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/compare/StringCompare.java b/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/compare/StringCompare.java index 0e038ad..3d6d55c 100644 --- a/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/compare/StringCompare.java +++ b/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/compare/StringCompare.java @@ -19,8 +19,6 @@ package org.apache.hadoop.hive.accumulo.predicate.compare; import java.util.regex.Pattern; -import org.apache.log4j.Logger; - /** * Set of comparison operations over a string constant. Used for Hive predicates involving string * comparison. @@ -29,7 +27,6 @@ import org.apache.log4j.Logger; */ public class StringCompare implements PrimitiveComparison { @SuppressWarnings("unused") - private static final Logger log = Logger.getLogger(StringCompare.class); private String constant; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloRowSerializer.java ---------------------------------------------------------------------- diff --git a/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloRowSerializer.java b/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloRowSerializer.java index 14facff..7ad6a45 100644 --- a/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloRowSerializer.java +++ b/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloRowSerializer.java @@ -42,7 +42,8 @@ import org.apache.hadoop.hive.serde2.objectinspector.StructObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoUtils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Charsets; import com.google.common.base.Preconditions; @@ -52,7 +53,7 @@ import com.google.common.base.Preconditions; * {@link ColumnMapping}s */ public class AccumuloRowSerializer { - private static final Logger log = Logger.getLogger(AccumuloRowSerializer.class); + private static final Logger log = LoggerFactory.getLogger(AccumuloRowSerializer.class); private final int rowIdOffset; private final ByteStream.Output output; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloSerDeParameters.java ---------------------------------------------------------------------- diff --git a/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloSerDeParameters.java b/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloSerDeParameters.java index 4dac675..09c5f24 100644 --- a/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloSerDeParameters.java +++ b/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloSerDeParameters.java @@ -34,7 +34,8 @@ import org.apache.hadoop.hive.serde2.SerDeException; import org.apache.hadoop.hive.serde2.lazy.LazySerDeParameters; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo; import org.apache.hadoop.util.ReflectionUtils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Preconditions; @@ -42,7 +43,7 @@ import com.google.common.base.Preconditions; * */ public class AccumuloSerDeParameters extends AccumuloConnectionParameters { - private static final Logger log = Logger.getLogger(AccumuloSerDeParameters.class); + private static final Logger log = LoggerFactory.getLogger(AccumuloSerDeParameters.class); public static final String COLUMN_MAPPINGS = "accumulo.columns.mapping"; public static final String ITERATOR_PUSHDOWN_KEY = "accumulo.iterator.pushdown"; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/CompositeAccumuloRowIdFactory.java ---------------------------------------------------------------------- diff --git a/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/CompositeAccumuloRowIdFactory.java b/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/CompositeAccumuloRowIdFactory.java index 574a8aa..02d9736 100644 --- a/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/CompositeAccumuloRowIdFactory.java +++ b/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/CompositeAccumuloRowIdFactory.java @@ -27,7 +27,8 @@ import org.apache.hadoop.hive.accumulo.Utils; import org.apache.hadoop.hive.serde2.SerDeException; import org.apache.hadoop.hive.serde2.lazy.objectinspector.LazySimpleStructObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * {@link AccumuloRowIdFactory} designed for injection of the {@link AccumuloCompositeRowId} to be @@ -39,7 +40,7 @@ import org.apache.log4j.Logger; public class CompositeAccumuloRowIdFactory<T extends AccumuloCompositeRowId> extends DefaultAccumuloRowIdFactory { - public static final Logger log = Logger.getLogger(CompositeAccumuloRowIdFactory.class); + public static final Logger log = LoggerFactory.getLogger(CompositeAccumuloRowIdFactory.class); private final Class<T> keyClass; private final Constructor<T> constructor; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/predicate/TestAccumuloPredicateHandler.java ---------------------------------------------------------------------- diff --git a/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/predicate/TestAccumuloPredicateHandler.java b/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/predicate/TestAccumuloPredicateHandler.java index 97e14a2..15ccda7 100644 --- a/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/predicate/TestAccumuloPredicateHandler.java +++ b/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/predicate/TestAccumuloPredicateHandler.java @@ -77,7 +77,6 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapred.JobConf; import org.apache.hadoop.util.StringUtils; -import org.apache.log4j.Logger; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -87,8 +86,6 @@ import com.google.common.base.Joiner; import com.google.common.collect.Lists; public class TestAccumuloPredicateHandler { - @SuppressWarnings("unused") - private static final Logger log = Logger.getLogger(TestAccumuloPredicateHandler.class); private AccumuloPredicateHandler handler = AccumuloPredicateHandler.getInstance(); private JobConf conf; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/DelimitedAccumuloRowIdFactory.java ---------------------------------------------------------------------- diff --git a/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/DelimitedAccumuloRowIdFactory.java b/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/DelimitedAccumuloRowIdFactory.java index 4bb5419..f885eba 100644 --- a/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/DelimitedAccumuloRowIdFactory.java +++ b/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/DelimitedAccumuloRowIdFactory.java @@ -29,14 +29,15 @@ import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.StructField; import org.apache.hadoop.hive.serde2.objectinspector.StructObjectInspector; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Example AccumuloRowIdFactory which accepts a delimiter that is used to separate the components of * some struct to place in the rowId. */ public class DelimitedAccumuloRowIdFactory extends DefaultAccumuloRowIdFactory { - private static final Logger log = Logger.getLogger(DelimitedAccumuloRowIdFactory.class); + private static final Logger log = LoggerFactory.getLogger(DelimitedAccumuloRowIdFactory.class); public static final String ACCUMULO_COMPOSITE_DELIMITER = "accumulo.composite.delimiter"; private byte separator; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/FirstCharAccumuloCompositeRowId.java ---------------------------------------------------------------------- diff --git a/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/FirstCharAccumuloCompositeRowId.java b/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/FirstCharAccumuloCompositeRowId.java index f835a96..ed28e18 100644 --- a/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/FirstCharAccumuloCompositeRowId.java +++ b/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/FirstCharAccumuloCompositeRowId.java @@ -22,13 +22,14 @@ import java.util.Properties; import org.apache.commons.lang.StringUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.serde2.lazy.objectinspector.LazySimpleStructObjectInspector; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Gets the first character of each string in a struct */ public class FirstCharAccumuloCompositeRowId extends AccumuloCompositeRowId { - private static final Logger log = Logger.getLogger(FirstCharAccumuloCompositeRowId.class); + private static final Logger log = LoggerFactory.getLogger(FirstCharAccumuloCompositeRowId.class); private Properties tbl; private Configuration conf; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/TestAccumuloSerDe.java ---------------------------------------------------------------------- diff --git a/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/TestAccumuloSerDe.java b/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/TestAccumuloSerDe.java index fb4f82b..58cac88 100644 --- a/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/TestAccumuloSerDe.java +++ b/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/TestAccumuloSerDe.java @@ -55,7 +55,6 @@ import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory; import org.apache.hadoop.io.Text; -import org.apache.log4j.Logger; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -63,8 +62,6 @@ import org.junit.Test; import com.google.common.base.Joiner; public class TestAccumuloSerDe { - @SuppressWarnings("unused") - private static final Logger log = Logger.getLogger(TestAccumuloSerDe.class); protected AccumuloSerDe serde; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/beeline/pom.xml ---------------------------------------------------------------------- diff --git a/beeline/pom.xml b/beeline/pom.xml index 391d589..a99fd54 100644 --- a/beeline/pom.xml +++ b/beeline/pom.xml @@ -66,11 +66,6 @@ <version>${commons-lang.version}</version> </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>${commons-logging.version}</version> - </dependency> - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> <version>${commons-io.version}</version> http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/beeline/src/java/org/apache/hive/beeline/ClassNameCompleter.java ---------------------------------------------------------------------- diff --git a/beeline/src/java/org/apache/hive/beeline/ClassNameCompleter.java b/beeline/src/java/org/apache/hive/beeline/ClassNameCompleter.java index d630e46..1483a71 100644 --- a/beeline/src/java/org/apache/hive/beeline/ClassNameCompleter.java +++ b/beeline/src/java/org/apache/hive/beeline/ClassNameCompleter.java @@ -52,8 +52,8 @@ package org.apache.hive.beeline; import jline.console.completer.StringsCompleter; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.File; import java.io.IOException; @@ -81,7 +81,7 @@ import java.util.zip.ZipEntry; */ public class ClassNameCompleter extends StringsCompleter { - private static final Log LOG = LogFactory.getLog(ClassNameCompleter.class.getName()); + private static final Logger LOG = LoggerFactory.getLogger(ClassNameCompleter.class.getName()); public final static String clazzFileNameExtension = ".class"; public final static String jarFileNameExtension = ".jar"; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/beeline/src/java/org/apache/hive/beeline/SQLCompleter.java ---------------------------------------------------------------------- diff --git a/beeline/src/java/org/apache/hive/beeline/SQLCompleter.java b/beeline/src/java/org/apache/hive/beeline/SQLCompleter.java index 56bf6e1..7d3e3e0 100644 --- a/beeline/src/java/org/apache/hive/beeline/SQLCompleter.java +++ b/beeline/src/java/org/apache/hive/beeline/SQLCompleter.java @@ -31,11 +31,11 @@ import java.util.StringTokenizer; import java.util.TreeSet; import jline.console.completer.StringsCompleter; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class SQLCompleter extends StringsCompleter { - private static final Log LOG = LogFactory.getLog(SQLCompleter.class.getName()); + private static final Logger LOG = LoggerFactory.getLogger(SQLCompleter.class.getName()); public SQLCompleter(Set<String> completions){ http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/beeline/src/java/org/apache/hive/beeline/util/QFileClient.java ---------------------------------------------------------------------- diff --git a/beeline/src/java/org/apache/hive/beeline/util/QFileClient.java b/beeline/src/java/org/apache/hive/beeline/util/QFileClient.java index b62a883..81f1b0e 100644 --- a/beeline/src/java/org/apache/hive/beeline/util/QFileClient.java +++ b/beeline/src/java/org/apache/hive/beeline/util/QFileClient.java @@ -27,8 +27,8 @@ import java.util.regex.Pattern; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.conf.HiveConf.ConfVars; import org.apache.hive.beeline.BeeLine; @@ -68,8 +68,8 @@ public class QFileClient { private boolean hasErrors = false; - private static Log LOG = LogFactory - .getLog(QFileClient.class.getName()); + private static final Logger LOG = LoggerFactory + .getLogger(QFileClient.class.getName()); public QFileClient(HiveConf hiveConf, String hiveRootDirectory, String qFileDirectory, String outputDirectory, http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/beeline/src/test/org/apache/hive/beeline/TestBeelineArgParsing.java ---------------------------------------------------------------------- diff --git a/beeline/src/test/org/apache/hive/beeline/TestBeelineArgParsing.java b/beeline/src/test/org/apache/hive/beeline/TestBeelineArgParsing.java index e529057..06d6ffe 100644 --- a/beeline/src/test/org/apache/hive/beeline/TestBeelineArgParsing.java +++ b/beeline/src/test/org/apache/hive/beeline/TestBeelineArgParsing.java @@ -27,8 +27,8 @@ import java.util.List; import java.io.File; import java.io.FileOutputStream; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hive.common.util.HiveTestUtils; import org.junit.Assert; import org.junit.Before; @@ -42,7 +42,7 @@ import org.junit.runners.Parameterized.Parameters; */ @RunWith(Parameterized.class) public class TestBeelineArgParsing { - private static final Log LOG = LogFactory.getLog(TestBeelineArgParsing.class.getName()); + private static final Logger LOG = LoggerFactory.getLogger(TestBeelineArgParsing.class.getName()); private static final String dummyDriverClazzName = "DummyDriver"; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/beeline/src/test/org/apache/hive/beeline/cli/TestHiveCli.java ---------------------------------------------------------------------- diff --git a/beeline/src/test/org/apache/hive/beeline/cli/TestHiveCli.java b/beeline/src/test/org/apache/hive/beeline/cli/TestHiveCli.java index 953ba5f..e1a565b 100644 --- a/beeline/src/test/org/apache/hive/beeline/cli/TestHiveCli.java +++ b/beeline/src/test/org/apache/hive/beeline/cli/TestHiveCli.java @@ -19,8 +19,8 @@ package org.apache.hive.beeline.cli; import junit.framework.Assert; import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -35,7 +35,7 @@ import java.io.OutputStream; import java.io.PrintStream; public class TestHiveCli { - private static final Log LOG = LogFactory.getLog(TestHiveCli.class.getName()); + private static final Logger LOG = LoggerFactory.getLogger(TestHiveCli.class.getName()); private static final int ERRNO_OK = 0; private static final int ERRNO_ARGS = 1; private static final int ERRNO_OTHER = 2; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/cli/pom.xml ---------------------------------------------------------------------- diff --git a/cli/pom.xml b/cli/pom.xml index a2b9551..fd89813 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -76,11 +76,6 @@ <version>${commons-lang.version}</version> </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>${commons-logging.version}</version> - </dependency> - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> <version>${commons-io.version}</version> http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java ---------------------------------------------------------------------- diff --git a/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java b/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java index 3a80f99..30ec14b 100644 --- a/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java +++ b/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java @@ -49,11 +49,11 @@ import jline.console.completer.ArgumentCompleter.ArgumentDelimiter; import jline.console.completer.ArgumentCompleter.AbstractArgumentDelimiter; import org.apache.commons.lang.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.hive.cli.CliSessionState; +import org.apache.hadoop.hive.cli.OptionsProcessor; import org.apache.hadoop.hive.common.HiveInterruptUtils; import org.apache.hadoop.hive.common.LogUtils; import org.apache.hadoop.hive.common.LogUtils.LogInitializationException; @@ -78,6 +78,8 @@ import org.apache.hadoop.hive.ql.processors.CommandProcessorResponse; import org.apache.hadoop.hive.ql.session.SessionState; import org.apache.hadoop.hive.ql.session.SessionState.LogHelper; import org.apache.hadoop.io.IOUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import sun.misc.Signal; import sun.misc.SignalHandler; @@ -103,10 +105,8 @@ public class CliDriver { public CliDriver() { SessionState ss = SessionState.get(); conf = (ss != null) ? ss.getConf() : new Configuration(); - Log LOG = LogFactory.getLog("CliDriver"); - if (LOG.isDebugEnabled()) { - LOG.debug("CliDriver inited with classpath " + System.getProperty("java.class.path")); - } + Logger LOG = LoggerFactory.getLogger("CliDriver"); + LOG.debug("CliDriver inited with classpath {}", System.getProperty("java.class.path")); console = new LogHelper(LOG); } @@ -342,7 +342,6 @@ public class CliDriver { // Hook up the custom Ctrl+C handler while processing this line interruptSignal = new Signal("INT"); oldSignal = Signal.handle(interruptSignal, new SignalHandler() { - private final Thread cliThread = Thread.currentThread(); private boolean interruptRequested; @Override http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/cli/src/java/org/apache/hadoop/hive/cli/OptionsProcessor.java ---------------------------------------------------------------------- diff --git a/cli/src/java/org/apache/hadoop/hive/cli/OptionsProcessor.java b/cli/src/java/org/apache/hadoop/hive/cli/OptionsProcessor.java index 65725b9..3dee11a 100644 --- a/cli/src/java/org/apache/hadoop/hive/cli/OptionsProcessor.java +++ b/cli/src/java/org/apache/hadoop/hive/cli/OptionsProcessor.java @@ -29,15 +29,15 @@ import org.apache.commons.cli.Option; import org.apache.commons.cli.OptionBuilder; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * OptionsProcessor. * */ public class OptionsProcessor { - protected static final Log l4j = LogFactory.getLog(OptionsProcessor.class.getName()); + protected static final Logger l4j = LoggerFactory.getLogger(OptionsProcessor.class.getName()); private final Options options = new Options(); private org.apache.commons.cli.CommandLine commandLine; Map<String, String> hiveVariables = new HashMap<String, String>(); http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/common/pom.xml ---------------------------------------------------------------------- diff --git a/common/pom.xml b/common/pom.xml index 1ab4c57..f9c5629 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -56,11 +56,6 @@ <version>${commons-lang.version}</version> </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>${commons-logging.version}</version> - </dependency> - <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> <version>${joda.version}</version> @@ -81,11 +76,6 @@ <version>${log4j2.version}</version> </dependency> <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jcl</artifactId> - <version>${log4j2.version}</version> - </dependency> - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> <version>${commons-compress.version}</version> http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/common/src/java/org/apache/hadoop/hive/common/CallableWithNdc.java ---------------------------------------------------------------------- diff --git a/common/src/java/org/apache/hadoop/hive/common/CallableWithNdc.java b/common/src/java/org/apache/hadoop/hive/common/CallableWithNdc.java deleted file mode 100644 index 2b78884..0000000 --- a/common/src/java/org/apache/hadoop/hive/common/CallableWithNdc.java +++ /dev/null @@ -1,44 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.hive.common; - -import java.util.Stack; -import java.util.concurrent.Callable; - -import org.apache.log4j.NDC; - -// TODO: cloned from TEZ-2003; replace when that's in a release. -public abstract class CallableWithNdc<T> implements Callable<T> { - private final Stack ndcStack; - - public CallableWithNdc() { - ndcStack = NDC.cloneStack(); - } - - @Override - public final T call() throws Exception { - NDC.inherit(ndcStack); - try { - return callInternal(); - } finally { - NDC.clear(); - } - } - - protected abstract T callInternal() throws Exception; -} http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/common/src/java/org/apache/hadoop/hive/common/CompressionUtils.java ---------------------------------------------------------------------- diff --git a/common/src/java/org/apache/hadoop/hive/common/CompressionUtils.java b/common/src/java/org/apache/hadoop/hive/common/CompressionUtils.java index 521a35a..d26207d 100644 --- a/common/src/java/org/apache/hadoop/hive/common/CompressionUtils.java +++ b/common/src/java/org/apache/hadoop/hive/common/CompressionUtils.java @@ -37,10 +37,10 @@ import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream; import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream; import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream; import org.apache.commons.compress.utils.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.tools.zip.ZipEntry; import org.apache.tools.zip.ZipOutputStream; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This class contains methods used for the purposes of compression, this class @@ -48,7 +48,7 @@ import org.apache.tools.zip.ZipOutputStream; */ public class CompressionUtils { - static final Log LOG = LogFactory.getLog(CompressionUtils.class); + static final Logger LOG = LoggerFactory.getLogger(CompressionUtils.class); /** * Archive all the files in the inputFiles into outputFile @@ -108,15 +108,15 @@ public class CompressionUtils { /** * Untar an input file into an output file. - * + * * The output file is created in the output folder, having the same name as the input file, minus * the '.tar' extension. - * + * * @param inputFile the input .tar file * @param outputDir the output directory file. * @throws IOException * @throws FileNotFoundException - * + * * @return The {@link List} of {@link File}s with the untared content. * @throws ArchiveException */ @@ -124,18 +124,18 @@ public class CompressionUtils { throws FileNotFoundException, IOException, ArchiveException { return unTar(inputFileName, outputDirName, false); } - + /** * Untar an input file into an output file. - * + * * The output file is created in the output folder, having the same name as the input file, minus * the '.tar' extension. - * + * * @param inputFile the input .tar file * @param outputDir the output directory file. * @throws IOException * @throws FileNotFoundException - * + * * @return The {@link List} of {@link File}s with the untared content. * @throws ArchiveException */ @@ -173,7 +173,7 @@ public class CompressionUtils { throw new IllegalStateException(String.format("Couldn't create directory %s.", outputFile.getAbsolutePath())); } - } + } } else { final OutputStream outputFileStream; if (flatten) { http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/common/src/java/org/apache/hadoop/hive/common/FileUtils.java ---------------------------------------------------------------------- diff --git a/common/src/java/org/apache/hadoop/hive/common/FileUtils.java b/common/src/java/org/apache/hadoop/hive/common/FileUtils.java index d781f08..f943781 100644 --- a/common/src/java/org/apache/hadoop/hive/common/FileUtils.java +++ b/common/src/java/org/apache/hadoop/hive/common/FileUtils.java @@ -28,8 +28,6 @@ import java.security.PrivilegedExceptionAction; import java.util.BitSet; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; @@ -46,15 +44,18 @@ import org.apache.hadoop.hive.shims.Utils; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.util.Shell; import org.apache.hive.common.util.ShutdownHookManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Collection of file manipulation utilities common across Hive. */ public final class FileUtils { - private static final Log LOG = LogFactory.getLog(FileUtils.class.getName()); + private static final Logger LOG = LoggerFactory.getLogger(FileUtils.class.getName()); public static final PathFilter HIDDEN_FILES_PATH_FILTER = new PathFilter() { + @Override public boolean accept(Path p) { String name = p.getName(); return !name.startsWith("_") && !name.startsWith("."); @@ -62,6 +63,7 @@ public final class FileUtils { }; public static final PathFilter STAGING_DIR_PATH_FILTER = new PathFilter() { + @Override public boolean accept(Path p) { String name = p.getName(); return !name.startsWith(".");
