HBASE-19552 find-and-replace thirdparty offset
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/64cb777a Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/64cb777a Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/64cb777a Branch: refs/heads/branch-2 Commit: 64cb777a8a97bf25e1fecadb2b95484b4f26e835 Parents: 968b938 Author: Mike Drob <md...@apache.org> Authored: Thu Dec 28 12:01:25 2017 -0600 Committer: Mike Drob <md...@apache.org> Committed: Thu Dec 28 12:01:25 2017 -0600 ---------------------------------------------------------------------- .../hadoop/hbase/errorprone/AlwaysPasses.java | 2 +- .../hadoop/hbase/ClusterMetricsBuilder.java | 4 +- .../org/apache/hadoop/hbase/ClusterStatus.java | 2 +- .../apache/hadoop/hbase/MetaTableAccessor.java | 2 +- .../org/apache/hadoop/hbase/RegionLoad.java | 2 +- .../hadoop/hbase/RegionMetricsBuilder.java | 4 +- .../org/apache/hadoop/hbase/ServerLoad.java | 2 +- .../hadoop/hbase/ServerMetricsBuilder.java | 2 +- .../main/java/org/apache/hadoop/hbase/Size.java | 2 +- .../org/apache/hadoop/hbase/client/Admin.java | 2 +- .../client/AsyncAdminRequestRetryingCaller.java | 2 +- .../client/AsyncBatchRpcRetryingCaller.java | 2 +- .../client/AsyncBufferedMutatorBuilderImpl.java | 2 +- .../hbase/client/AsyncConnectionImpl.java | 6 +-- .../AsyncMasterRequestRpcRetryingCaller.java | 2 +- .../hadoop/hbase/client/AsyncProcess.java | 2 +- .../hadoop/hbase/client/AsyncRegionLocator.java | 4 +- .../hbase/client/AsyncRequestFutureImpl.java | 2 +- .../hbase/client/AsyncRpcRetryingCaller.java | 2 +- .../client/AsyncRpcRetryingCallerFactory.java | 6 +-- .../AsyncScanSingleRegionRpcRetryingCaller.java | 6 +-- .../AsyncServerRequestRpcRetryingCaller.java | 2 +- .../AsyncSingleRequestRpcRetryingCaller.java | 2 +- .../apache/hadoop/hbase/client/AsyncTable.java | 2 +- .../hbase/client/AsyncTableResultScanner.java | 4 +- .../hbase/client/BufferedMutatorImpl.java | 2 +- .../client/CancellableRegionServerCallable.java | 12 ++--- .../client/ClientAsyncPrefetchScanner.java | 2 +- .../hadoop/hbase/client/ClientScanner.java | 2 +- .../hbase/client/ClientServiceCallable.java | 6 +-- .../hbase/client/ClusterStatusListener.java | 20 ++++---- .../client/ColumnFamilyDescriptorBuilder.java | 2 +- .../hbase/client/ConnectionConfiguration.java | 2 +- .../hbase/client/ConnectionImplementation.java | 10 ++-- .../hadoop/hbase/client/ConnectionUtils.java | 6 +-- .../apache/hadoop/hbase/client/HBaseAdmin.java | 4 +- .../hadoop/hbase/client/HRegionLocator.java | 2 +- .../org/apache/hadoop/hbase/client/HTable.java | 4 +- .../hadoop/hbase/client/HTableMultiplexer.java | 4 +- .../client/MasterCoprocessorRpcChannelImpl.java | 2 +- .../hadoop/hbase/client/MetricsConnection.java | 6 +-- .../hbase/client/MultiServerCallable.java | 4 +- .../apache/hadoop/hbase/client/Mutation.java | 12 ++--- .../client/PreemptiveFastFailInterceptor.java | 2 +- .../org/apache/hadoop/hbase/client/Query.java | 6 +-- .../hadoop/hbase/client/RawAsyncHBaseAdmin.java | 12 ++--- .../hadoop/hbase/client/RawAsyncTableImpl.java | 4 +- .../client/RegionCoprocessorRpcChannelImpl.java | 2 +- .../client/RegionCoprocessorServiceExec.java | 2 +- .../apache/hadoop/hbase/client/RegionInfo.java | 2 +- .../hadoop/hbase/client/RegionInfoBuilder.java | 2 +- .../hbase/client/RegionServerCallable.java | 2 +- .../RegionServerCoprocessorRpcChannelImpl.java | 2 +- .../apache/hadoop/hbase/client/RowAccess.java | 2 +- .../hbase/client/RpcRetryingCallerImpl.java | 2 +- .../client/ScannerCallableWithReplicas.java | 2 +- .../hbase/client/ServerStatisticTracker.java | 2 +- .../hadoop/hbase/client/ServiceCaller.java | 2 +- .../client/ShortCircuitMasterConnection.java | 4 +- .../hbase/client/SimpleRequestController.java | 2 +- .../apache/hadoop/hbase/client/TableState.java | 2 +- .../hadoop/hbase/client/ZKAsyncRegistry.java | 2 +- .../backoff/ExponentialClientBackoffPolicy.java | 2 +- .../client/metrics/ServerSideScanMetrics.java | 2 +- .../client/replication/ReplicationAdmin.java | 4 +- .../replication/ReplicationPeerConfigUtil.java | 6 +-- .../hbase/filter/BigDecimalComparator.java | 2 +- .../hadoop/hbase/filter/BinaryComparator.java | 2 +- .../hbase/filter/BinaryPrefixComparator.java | 2 +- .../hadoop/hbase/filter/BitComparator.java | 2 +- .../hbase/filter/ColumnCountGetFilter.java | 4 +- .../hbase/filter/ColumnPaginationFilter.java | 6 +-- .../hadoop/hbase/filter/ColumnPrefixFilter.java | 6 +-- .../hadoop/hbase/filter/ColumnRangeFilter.java | 6 +-- .../hadoop/hbase/filter/CompareFilter.java | 2 +- .../hbase/filter/DependentColumnFilter.java | 6 +-- .../hadoop/hbase/filter/FamilyFilter.java | 2 +- .../apache/hadoop/hbase/filter/FilterList.java | 2 +- .../hadoop/hbase/filter/FirstKeyOnlyFilter.java | 4 +- .../FirstKeyValueMatchingQualifiersFilter.java | 6 +-- .../hadoop/hbase/filter/FuzzyRowFilter.java | 6 +-- .../hbase/filter/InclusiveStopFilter.java | 6 +-- .../hadoop/hbase/filter/KeyOnlyFilter.java | 4 +- .../hadoop/hbase/filter/LongComparator.java | 2 +- .../hbase/filter/MultiRowRangeFilter.java | 4 +- .../filter/MultipleColumnPrefixFilter.java | 4 +- .../hadoop/hbase/filter/NullComparator.java | 2 +- .../apache/hadoop/hbase/filter/PageFilter.java | 4 +- .../hadoop/hbase/filter/PrefixFilter.java | 6 +-- .../hadoop/hbase/filter/QualifierFilter.java | 2 +- .../hadoop/hbase/filter/RandomRowFilter.java | 2 +- .../hbase/filter/RegexStringComparator.java | 2 +- .../apache/hadoop/hbase/filter/RowFilter.java | 2 +- .../filter/SingleColumnValueExcludeFilter.java | 2 +- .../hbase/filter/SingleColumnValueFilter.java | 6 +-- .../apache/hadoop/hbase/filter/SkipFilter.java | 2 +- .../hbase/filter/SubstringComparator.java | 2 +- .../hadoop/hbase/filter/TimestampsFilter.java | 4 +- .../apache/hadoop/hbase/filter/ValueFilter.java | 2 +- .../hadoop/hbase/filter/WhileMatchFilter.java | 2 +- .../hadoop/hbase/ipc/AbstractRpcClient.java | 28 +++++------ .../hadoop/hbase/ipc/BlockingRpcCallback.java | 2 +- .../hadoop/hbase/ipc/BlockingRpcClient.java | 2 +- .../hadoop/hbase/ipc/BlockingRpcConnection.java | 6 +-- .../hbase/ipc/BufferCallBeforeInitHandler.java | 6 +-- .../java/org/apache/hadoop/hbase/ipc/Call.java | 8 +-- .../hadoop/hbase/ipc/CellBlockBuilder.java | 6 +-- .../hadoop/hbase/ipc/CoprocessorRpcUtils.java | 10 ++-- .../hbase/ipc/DefaultNettyEventLoopConfig.java | 10 ++-- .../hbase/ipc/DelegatingHBaseRpcController.java | 2 +- .../hadoop/hbase/ipc/HBaseRpcController.java | 4 +- .../hbase/ipc/HBaseRpcControllerImpl.java | 2 +- .../org/apache/hadoop/hbase/ipc/IPCUtil.java | 6 +-- .../apache/hadoop/hbase/ipc/NettyRpcClient.java | 10 ++-- .../hbase/ipc/NettyRpcClientConfigHelper.java | 6 +-- .../hadoop/hbase/ipc/NettyRpcConnection.java | 38 +++++++------- .../hadoop/hbase/ipc/NettyRpcDuplexHandler.java | 24 ++++----- .../org/apache/hadoop/hbase/ipc/RpcClient.java | 4 +- .../hadoop/hbase/ipc/RpcClientFactory.java | 4 +- .../apache/hadoop/hbase/ipc/RpcConnection.java | 6 +-- .../apache/hadoop/hbase/master/RegionState.java | 2 +- .../protobuf/ProtobufMessageConverter.java | 20 ++++---- .../hadoop/hbase/protobuf/ProtobufUtil.java | 4 +- .../hadoop/hbase/quotas/QuotaSettings.java | 2 +- .../hadoop/hbase/quotas/QuotaTableUtil.java | 8 +-- .../ReplicationPeerConfigBuilder.java | 2 +- .../security/AbstractHBaseSaslRpcClient.java | 2 +- .../hbase/security/CryptoAESUnwrapHandler.java | 8 +-- .../hbase/security/CryptoAESWrapHandler.java | 16 +++--- .../hadoop/hbase/security/EncryptionUtil.java | 2 +- .../NettyHBaseRpcConnectionHeaderHandler.java | 12 ++--- .../hbase/security/NettyHBaseSaslRpcClient.java | 4 +- .../NettyHBaseSaslRpcClientHandler.java | 8 +-- .../hbase/security/SaslChallengeDecoder.java | 6 +-- .../hbase/security/SaslUnwrapHandler.java | 8 +-- .../hadoop/hbase/security/SaslWrapHandler.java | 16 +++--- .../security/access/AccessControlUtil.java | 6 +-- .../hbase/security/access/Permission.java | 2 +- .../access/ShadedAccessControlUtil.java | 8 +-- .../hbase/shaded/protobuf/ProtobufUtil.java | 24 ++++----- .../hbase/shaded/protobuf/RequestConverter.java | 12 ++--- .../shaded/protobuf/ResponseConverter.java | 4 +- .../hbase/zookeeper/ReadOnlyZKClient.java | 2 +- .../hadoop/hbase/zookeeper/ZNodePaths.java | 2 +- .../hbase/TestInterfaceAudienceAnnotations.java | 2 +- .../hbase/client/TestClientNoCluster.java | 10 ++-- .../hbase/client/TestMetricsConnection.java | 2 +- .../hbase/client/TestSnapshotFromAdmin.java | 2 +- .../exceptions/TestClientExceptionsUtil.java | 2 +- .../hbase/security/TestHBaseSaslRpcClient.java | 2 +- .../hbase/shaded/protobuf/TestProtobufUtil.java | 8 +-- .../apache/hadoop/hbase/ByteBufferKeyValue.java | 2 +- .../apache/hadoop/hbase/CellComparatorImpl.java | 2 +- .../java/org/apache/hadoop/hbase/CellUtil.java | 2 +- .../org/apache/hadoop/hbase/ChoreService.java | 2 +- .../java/org/apache/hadoop/hbase/KeyValue.java | 2 +- .../apache/hadoop/hbase/KeyValueTestUtil.java | 2 +- .../org/apache/hadoop/hbase/KeyValueUtil.java | 4 +- .../apache/hadoop/hbase/PrivateCellUtil.java | 2 +- .../org/apache/hadoop/hbase/ScheduledChore.java | 2 +- .../org/apache/hadoop/hbase/ServerName.java | 2 +- .../java/org/apache/hadoop/hbase/TableName.java | 4 +- .../apache/hadoop/hbase/io/ByteBufferPool.java | 2 +- .../hadoop/hbase/io/LimitInputStream.java | 4 +- .../apache/hadoop/hbase/io/crypto/Context.java | 2 +- .../apache/hadoop/hbase/io/crypto/aes/AES.java | 4 +- .../hbase/io/crypto/aes/AESDecryptor.java | 2 +- .../hbase/io/crypto/aes/AESEncryptor.java | 2 +- .../hbase/io/crypto/aes/CommonsCryptoAES.java | 4 +- .../crypto/aes/CommonsCryptoAESDecryptor.java | 2 +- .../crypto/aes/CommonsCryptoAESEncryptor.java | 2 +- .../hbase/io/encoding/EncodedDataBlock.java | 4 +- .../HFileBlockDefaultEncodingContext.java | 2 +- .../io/hadoopbackport/ThrottledInputStream.java | 2 +- .../hadoop/hbase/io/util/LRUDictionary.java | 2 +- .../hadoop/hbase/io/util/StreamUtils.java | 2 +- .../org/apache/hadoop/hbase/net/Address.java | 2 +- .../apache/hadoop/hbase/nio/MultiByteBuff.java | 2 +- .../apache/hadoop/hbase/nio/SingleByteBuff.java | 2 +- .../org/apache/hadoop/hbase/security/User.java | 2 +- .../hadoop/hbase/security/UserProvider.java | 14 +++--- .../hbase/util/AbstractPositionedByteRange.java | 2 +- .../hadoop/hbase/util/ByteBufferArray.java | 2 +- .../hadoop/hbase/util/ByteBufferUtils.java | 2 +- .../hadoop/hbase/util/ByteRangeUtils.java | 2 +- .../org/apache/hadoop/hbase/util/Bytes.java | 8 +-- .../hadoop/hbase/util/ClassLoaderBase.java | 2 +- .../org/apache/hadoop/hbase/util/ClassSize.java | 2 +- .../apache/hadoop/hbase/util/CommonFSUtils.java | 4 +- .../hbase/util/CoprocessorClassLoader.java | 4 +- .../apache/hadoop/hbase/util/JRubyFormat.java | 4 +- .../apache/hadoop/hbase/util/OrderedBytes.java | 2 +- .../org/apache/hadoop/hbase/util/Threads.java | 2 +- .../apache/hadoop/hbase/zookeeper/ZKConfig.java | 2 +- .../hadoop/hbase/TestHBaseConfiguration.java | 2 +- .../hadoop/hbase/codec/TestCellCodec.java | 4 +- .../hbase/codec/TestCellCodecWithTags.java | 4 +- .../hadoop/hbase/codec/TestKeyValueCodec.java | 4 +- .../hbase/codec/TestKeyValueCodecWithTags.java | 4 +- .../hadoop/hbase/util/RedundantKVGenerator.java | 2 +- .../hadoop/hbase/util/TestJRubyFormat.java | 2 +- .../apache/hadoop/hbase/coprocessor/Export.java | 2 +- .../security/access/SecureBulkLoadEndpoint.java | 8 +-- .../hbase/client/TestRpcControllerFactory.java | 6 +-- ...gionServerBulkLoadWithOldSecureEndpoint.java | 2 +- .../hbase/client/example/HttpProxyExample.java | 48 +++++++++--------- .../example/MultiThreadedClientExample.java | 2 +- .../ExampleMasterObserverWithMetrics.java | 2 +- .../example/WriteHeavyIncrementObserver.java | 2 +- .../example/ZooKeeperScanPolicyObserver.java | 2 +- .../client/example/TestHttpProxyExample.java | 2 +- .../hadoop/hbase/metrics/OperationMetrics.java | 2 +- .../apache/hadoop/hbase/metrics/Interns.java | 6 +-- .../hadoop/hbase/metrics/MetricsInfoImpl.java | 6 +-- .../impl/GlobalMetricRegistriesAdapter.java | 2 +- .../regionserver/MetricsTableLatenciesImpl.java | 2 +- .../hadoop/metrics2/impl/JmxCacheBuster.java | 2 +- .../metrics2/lib/DynamicMetricsRegistry.java | 4 +- .../metrics2/util/MetricSampleQuantiles.java | 2 +- .../apache/hadoop/hbase/http/HttpServer.java | 6 +-- .../hbase/IntegrationTestAcidGuarantees.java | 2 +- .../hadoop/hbase/IntegrationTestIngest.java | 2 +- .../hbase/IntegrationTestRegionReplicaPerf.java | 4 +- ...IntegrationTestRegionReplicaReplication.java | 2 +- .../hbase/chaos/factories/MonkeyFactory.java | 2 +- .../hbase/chaos/util/ChaosMonkeyRunner.java | 2 +- .../apache/hadoop/hbase/chaos/util/Monkeys.java | 4 +- .../hbase/ipc/IntegrationTestRpcClient.java | 2 +- .../mapreduce/IntegrationTestBulkLoad.java | 4 +- .../hadoop/hbase/mttr/IntegrationTestMTTR.java | 2 +- .../test/IntegrationTestBigLinkedList.java | 2 +- .../test/IntegrationTestLoadAndVerify.java | 2 +- .../hbase/test/IntegrationTestReplication.java | 2 +- ...undedMultiGetRequestsWithRegionReplicas.java | 2 +- ...stTimeBoundedRequestsWithRegionReplicas.java | 2 +- .../org/apache/hadoop/hbase/mapred/Driver.java | 2 +- .../hadoop/hbase/mapreduce/CellCounter.java | 2 +- .../hadoop/hbase/mapreduce/ExportUtils.java | 2 +- .../hbase/mapreduce/HFileOutputFormat2.java | 2 +- .../hadoop/hbase/mapreduce/HashTable.java | 6 +-- .../apache/hadoop/hbase/mapreduce/Import.java | 4 +- .../hadoop/hbase/mapreduce/ImportTsv.java | 8 +-- .../hadoop/hbase/mapreduce/JarFinder.java | 2 +- .../mapreduce/MultiTableHFileOutputFormat.java | 2 +- .../MultiTableSnapshotInputFormat.java | 2 +- .../MultiTableSnapshotInputFormatImpl.java | 4 +- .../hbase/mapreduce/RegionSizeCalculator.java | 2 +- .../hadoop/hbase/mapreduce/SyncTable.java | 2 +- .../hbase/mapreduce/TableInputFormatBase.java | 2 +- .../hbase/mapreduce/TableMapReduceUtil.java | 6 +-- .../hbase/mapreduce/TableRecordReaderImpl.java | 2 +- .../mapreduce/TableSnapshotInputFormat.java | 2 +- .../mapreduce/TableSnapshotInputFormatImpl.java | 2 +- .../hadoop/hbase/mapreduce/WALPlayer.java | 2 +- .../replication/VerifyReplication.java | 2 +- .../hadoop/hbase/PerformanceEvaluation.java | 4 +- .../hadoop/hbase/ScanPerformanceEvaluation.java | 2 +- .../hbase/mapred/TestGroupingTableMap.java | 6 +-- .../TestMultiTableSnapshotInputFormat.java | 2 +- .../hadoop/hbase/mapred/TestRowCounter.java | 2 +- .../hbase/mapred/TestTableMapReduceUtil.java | 4 +- .../MultiTableInputFormatTestBase.java | 2 +- .../hadoop/hbase/mapreduce/TestHashTable.java | 4 +- .../hbase/mapreduce/TestImportTsvParser.java | 6 +-- .../TestMultiTableSnapshotInputFormat.java | 6 +-- .../TestMultiTableSnapshotInputFormatImpl.java | 10 ++-- .../hadoop/hbase/mapreduce/TestSyncTable.java | 2 +- .../mapreduce/TestTableSnapshotInputFormat.java | 2 +- .../replication/TestReplicationSmallTests.java | 2 +- .../hbase/metrics/MetricRegistriesLoader.java | 2 +- .../metrics/TestMetricRegistriesLoader.java | 2 +- .../hbase/metrics/impl/TestRefCountingMap.java | 2 +- .../hadoop/hbase/procedure2/LockStatus.java | 2 +- .../hadoop/hbase/procedure2/Procedure.java | 2 +- .../hadoop/hbase/procedure2/ProcedureEvent.java | 2 +- .../hbase/procedure2/ProcedureExecutor.java | 4 +- .../hbase/procedure2/ProcedureScheduler.java | 2 +- .../procedure2/ProcedureStateSerializer.java | 2 +- .../hadoop/hbase/procedure2/ProcedureUtil.java | 14 +++--- .../procedure2/RemoteProcedureDispatcher.java | 2 +- .../procedure2/SimpleProcedureScheduler.java | 2 +- .../store/wal/ProcedureWALFormat.java | 2 +- .../store/wal/ProcedureWALFormatReader.java | 2 +- .../procedure2/store/wal/WALProcedureStore.java | 2 +- .../procedure2/ProcedureTestingUtility.java | 4 +- .../hbase/procedure2/TestProcedureEvents.java | 2 +- .../hbase/procedure2/TestProcedureRecovery.java | 2 +- .../procedure2/TestProcedureReplayOrder.java | 2 +- .../store/wal/TestWALProcedureStore.java | 2 +- .../ReplicationQueuesClientZKImpl.java | 4 +- .../replication/ReplicationStateZKBase.java | 4 +- .../hbase/replication/ReplicationTableBase.java | 2 +- .../apache/hadoop/hbase/rest/RESTServer.java | 2 +- .../hadoop/hbase/rest/client/RemoteHTable.java | 2 +- .../hbase/rsgroup/RSGroupAdminClient.java | 2 +- .../hbase/rsgroup/RSGroupAdminEndpoint.java | 2 +- .../hbase/rsgroup/RSGroupAdminServer.java | 4 +- .../hbase/rsgroup/RSGroupBasedLoadBalancer.java | 12 ++--- .../hbase/rsgroup/RSGroupInfoManagerImpl.java | 6 +-- .../balancer/TestRSGroupBasedLoadBalancer.java | 4 +- .../hadoop/hbase/rsgroup/TestRSGroups.java | 2 +- .../hadoop/hbase/rsgroup/TestRSGroupsBase.java | 8 +-- .../hbase/rsgroup/TestRSGroupsOfflineMode.java | 2 +- .../rsgroup/VerifyingRSGroupAdminClient.java | 4 +- .../apache/hadoop/hbase/SharedConnection.java | 2 +- .../apache/hadoop/hbase/ZKNamespaceManager.java | 2 +- .../hadoop/hbase/backup/HFileArchiver.java | 8 +-- .../hadoop/hbase/client/locking/EntityLock.java | 2 +- .../hbase/client/locking/LockServiceClient.java | 2 +- .../apache/hadoop/hbase/codec/MessageCodec.java | 2 +- .../SplitLogManagerCoordination.java | 2 +- .../SplitLogWorkerCoordination.java | 2 +- .../ZKSplitLogManagerCoordination.java | 2 +- .../hbase/coprocessor/CoprocessorHost.java | 2 +- .../coprocessor/HasRegionServerServices.java | 2 +- .../hbase/coprocessor/MetricsCoprocessor.java | 2 +- .../hbase/coprocessor/ObserverContextImpl.java | 2 +- .../hbase/errorhandling/ForeignException.java | 2 +- .../hadoop/hbase/executor/ExecutorService.java | 8 +-- .../favored/FavoredNodeAssignmentHelper.java | 4 +- .../hbase/favored/FavoredNodeLoadBalancer.java | 6 +-- .../hbase/favored/FavoredNodesManager.java | 8 +-- .../favored/StartcodeAgnosticServerName.java | 2 +- .../hadoop/hbase/filter/FilterWrapper.java | 2 +- .../hbase/io/FSDataInputStreamWrapper.java | 2 +- .../org/apache/hadoop/hbase/io/MetricsIO.java | 2 +- .../org/apache/hadoop/hbase/io/Reference.java | 2 +- .../hbase/io/asyncfs/AsyncFSOutputHelper.java | 4 +- .../asyncfs/FanOutOneBlockAsyncDFSOutput.java | 30 +++++------ .../FanOutOneBlockAsyncDFSOutputHelper.java | 52 ++++++++++---------- .../FanOutOneBlockAsyncDFSOutputSaslHelper.java | 46 ++++++++--------- .../hbase/io/asyncfs/WrapperAsyncFSOutput.java | 4 +- .../hadoop/hbase/io/hfile/CacheConfig.java | 2 +- .../hbase/io/hfile/CombinedBlockCache.java | 2 +- .../hadoop/hbase/io/hfile/FixedFileTrailer.java | 2 +- .../org/apache/hadoop/hbase/io/hfile/HFile.java | 6 +-- .../hadoop/hbase/io/hfile/HFileBlock.java | 4 +- .../hadoop/hbase/io/hfile/HFileReaderImpl.java | 2 +- .../hadoop/hbase/io/hfile/LruBlockCache.java | 8 +-- .../hbase/io/hfile/LruCachedBlockQueue.java | 2 +- .../hbase/io/hfile/bucket/BucketAllocator.java | 8 +-- .../hbase/io/hfile/bucket/BucketCache.java | 6 +-- .../hbase/io/hfile/bucket/CachedEntryQueue.java | 2 +- .../hbase/io/hfile/bucket/FileIOEngine.java | 4 +- .../org/apache/hadoop/hbase/ipc/CallRunner.java | 2 +- .../hadoop/hbase/ipc/FifoRpcScheduler.java | 2 +- .../hadoop/hbase/ipc/NettyRpcFrameDecoder.java | 10 ++-- .../apache/hadoop/hbase/ipc/NettyRpcServer.java | 36 +++++++------- .../ipc/NettyRpcServerPreambleHandler.java | 12 ++--- .../hbase/ipc/NettyRpcServerRequestDecoder.java | 8 +-- .../ipc/NettyRpcServerResponseEncoder.java | 8 +-- .../hadoop/hbase/ipc/NettyServerCall.java | 6 +-- .../hbase/ipc/NettyServerRpcConnection.java | 10 ++-- .../hadoop/hbase/ipc/PriorityFunction.java | 2 +- .../hadoop/hbase/ipc/RWQueueRpcExecutor.java | 2 +- .../org/apache/hadoop/hbase/ipc/RpcCall.java | 6 +-- .../apache/hadoop/hbase/ipc/RpcExecutor.java | 6 +-- .../org/apache/hadoop/hbase/ipc/RpcServer.java | 12 ++--- .../hadoop/hbase/ipc/RpcServerFactory.java | 2 +- .../hadoop/hbase/ipc/RpcServerInterface.java | 8 +-- .../org/apache/hadoop/hbase/ipc/ServerCall.java | 8 +-- .../hadoop/hbase/ipc/ServerRpcConnection.java | 16 +++--- .../hadoop/hbase/ipc/SimpleRpcServer.java | 8 +-- .../hadoop/hbase/ipc/SimpleServerCall.java | 6 +-- .../hbase/ipc/SimpleServerRpcConnection.java | 8 +-- .../hbase/master/ClusterSchemaService.java | 2 +- .../hbase/master/ClusterSchemaServiceImpl.java | 2 +- .../hbase/master/ClusterStatusPublisher.java | 30 +++++------ .../org/apache/hadoop/hbase/master/HMaster.java | 6 +-- ...MasterAnnotationReadingPriorityFunction.java | 2 +- .../hadoop/hbase/master/MasterRpcServices.java | 6 +-- .../hadoop/hbase/master/MasterServices.java | 2 +- .../hadoop/hbase/master/MasterWalManager.java | 2 +- .../hadoop/hbase/master/ServerManager.java | 4 +- .../hadoop/hbase/master/SplitLogManager.java | 2 +- .../hbase/master/TableNamespaceManager.java | 2 +- .../hadoop/hbase/master/TableStateManager.java | 2 +- .../master/assignment/AssignmentManager.java | 2 +- .../master/assignment/GCRegionProcedure.java | 2 +- .../assignment/MergeTableRegionsProcedure.java | 2 +- .../master/assignment/RegionStateStore.java | 4 +- .../hbase/master/assignment/RegionStates.java | 2 +- .../assignment/RegionTransitionProcedure.java | 2 +- .../assignment/SplitTableRegionProcedure.java | 2 +- .../hadoop/hbase/master/assignment/Util.java | 2 +- .../hbase/master/balancer/BaseLoadBalancer.java | 10 ++-- .../balancer/FavoredStochasticBalancer.java | 6 +-- .../master/balancer/RegionLocationFinder.java | 18 +++---- .../master/balancer/SimpleLoadBalancer.java | 2 +- .../master/balancer/StochasticLoadBalancer.java | 6 +-- .../master/cleaner/BaseFileCleanerDelegate.java | 2 +- .../hbase/master/cleaner/CleanerChore.java | 10 ++-- .../master/cleaner/FileCleanerDelegate.java | 2 +- .../hbase/master/cleaner/HFileCleaner.java | 2 +- .../hadoop/hbase/master/cleaner/LogCleaner.java | 2 +- .../hbase/master/locking/LockManager.java | 2 +- .../normalizer/SimpleRegionNormalizer.java | 4 +- .../procedure/CloneSnapshotProcedure.java | 2 +- .../master/procedure/CreateTableProcedure.java | 2 +- .../procedure/MasterProcedureScheduler.java | 2 +- .../master/procedure/ProcedureDescriber.java | 2 +- .../master/procedure/RSProcedureDispatcher.java | 8 +-- .../master/procedure/RecoverMetaProcedure.java | 2 +- .../snapshot/EnabledTableSnapshotHandler.java | 2 +- .../master/snapshot/SnapshotFileCache.java | 4 +- .../apache/hadoop/hbase/mob/MobFileCache.java | 2 +- .../compactions/PartitionedMobCompactor.java | 2 +- .../hadoop/hbase/monitoring/LogMonitoring.java | 2 +- .../MemoryBoundedLogMessageBuffer.java | 6 +-- .../hbase/monitoring/MonitoredRPCHandler.java | 2 +- .../monitoring/MonitoredRPCHandlerImpl.java | 2 +- .../hadoop/hbase/monitoring/TaskMonitor.java | 2 +- .../namespace/NamespaceTableAndRegionInfo.java | 2 +- .../hadoop/hbase/procedure/Procedure.java | 2 +- .../hbase/procedure/ProcedureCoordinator.java | 2 +- .../hadoop/hbase/procedure/ProcedureMember.java | 2 +- .../flush/MasterFlushTableProcedureManager.java | 2 +- .../hbase/protobuf/ReplicationProtbufUtil.java | 4 +- .../quotas/AverageIntervalRateLimiter.java | 2 +- .../hbase/quotas/FixedIntervalRateLimiter.java | 2 +- .../hadoop/hbase/quotas/MasterQuotaManager.java | 4 +- .../quotas/NamespaceQuotaSnapshotStore.java | 4 +- .../apache/hadoop/hbase/quotas/QuotaCache.java | 2 +- .../hadoop/hbase/quotas/QuotaObserverChore.java | 8 +-- .../apache/hadoop/hbase/quotas/RateLimiter.java | 2 +- .../quotas/RegionServerRpcQuotaManager.java | 2 +- .../quotas/RegionServerSpaceQuotaManager.java | 2 +- .../quotas/SnapshotQuotaObserverChore.java | 4 +- .../hbase/quotas/TableQuotaSnapshotStore.java | 6 +-- .../hbase/regionserver/AbstractMemStore.java | 2 +- .../AnnotationReadingPriorityFunction.java | 6 +-- .../hadoop/hbase/regionserver/CellSet.java | 2 +- .../apache/hadoop/hbase/regionserver/Chunk.java | 4 +- .../hadoop/hbase/regionserver/CompactSplit.java | 4 +- .../regionserver/CompactedHFilesDischarger.java | 2 +- .../hbase/regionserver/CompactingMemStore.java | 2 +- .../regionserver/CompositeImmutableSegment.java | 2 +- .../ConstantSizeRegionSplitPolicy.java | 2 +- .../regionserver/DefaultStoreFileManager.java | 6 +-- .../DelimitedKeyPrefixRegionSplitPolicy.java | 2 +- .../hadoop/hbase/regionserver/HRegion.java | 16 +++--- .../hbase/regionserver/HRegionFileSystem.java | 2 +- .../hbase/regionserver/HRegionServer.java | 16 +++--- .../hadoop/hbase/regionserver/HStore.java | 12 ++--- .../hadoop/hbase/regionserver/HStoreFile.java | 2 +- .../hbase/regionserver/HeapMemoryManager.java | 2 +- .../hadoop/hbase/regionserver/KeyValueHeap.java | 2 +- .../hadoop/hbase/regionserver/LogRoller.java | 2 +- .../hbase/regionserver/MemStoreCompactor.java | 2 +- .../MemStoreCompactorSegmentsIterator.java | 2 +- .../hbase/regionserver/MemStoreFlusher.java | 2 +- .../hbase/regionserver/MemStoreLABImpl.java | 4 +- .../hbase/regionserver/MetricsRegionServer.java | 2 +- .../MetricsTableWrapperAggregateImpl.java | 2 +- .../MiniBatchOperationInProgress.java | 2 +- .../MultiVersionConcurrencyControl.java | 4 +- .../hbase/regionserver/MutableSegment.java | 2 +- .../hbase/regionserver/RSRpcServices.java | 24 ++++----- .../regionserver/RegionCoprocessorHost.java | 2 +- .../regionserver/RegionServicesForStores.java | 2 +- .../hbase/regionserver/RegionSplitPolicy.java | 2 +- .../hadoop/hbase/regionserver/ScanInfo.java | 2 +- .../hbase/regionserver/ScannerIdGenerator.java | 2 +- .../hadoop/hbase/regionserver/Segment.java | 2 +- .../hbase/regionserver/ServerNonceManager.java | 2 +- .../hbase/regionserver/SplitLogWorker.java | 2 +- .../hadoop/hbase/regionserver/SplitRequest.java | 2 +- .../regionserver/StoreFileComparators.java | 6 +-- .../hbase/regionserver/StoreFileManager.java | 2 +- .../hbase/regionserver/StoreFileReader.java | 2 +- .../hbase/regionserver/StoreFileWriter.java | 2 +- .../hadoop/hbase/regionserver/StoreScanner.java | 4 +- .../hbase/regionserver/StripeStoreEngine.java | 2 +- .../regionserver/StripeStoreFileManager.java | 4 +- .../hbase/regionserver/StripeStoreFlusher.java | 2 +- .../hbase/regionserver/TimeRangeTracker.java | 4 +- .../regionserver/VersionedSegmentsList.java | 2 +- .../compactions/CompactionRequestImpl.java | 2 +- .../regionserver/compactions/Compactor.java | 2 +- .../compactions/DateTieredCompactionPolicy.java | 10 ++-- .../compactions/DefaultCompactor.java | 2 +- .../ExponentialCompactionWindowFactory.java | 2 +- .../compactions/SortedCompactionPolicy.java | 8 +-- .../compactions/StripeCompactionPolicy.java | 2 +- .../hbase/regionserver/wal/AbstractFSWAL.java | 6 +-- .../wal/AbstractProtobufLogWriter.java | 2 +- .../hbase/regionserver/wal/AsyncFSWAL.java | 10 ++-- .../wal/AsyncProtobufLogWriter.java | 6 +-- .../hbase/regionserver/wal/Compressor.java | 2 +- .../hadoop/hbase/regionserver/wal/FSHLog.java | 2 +- .../hbase/regionserver/wal/FSWALEntry.java | 2 +- .../hbase/regionserver/wal/MetricsWAL.java | 2 +- .../regionserver/wal/ProtobufLogReader.java | 4 +- .../wal/SecureAsyncProtobufLogWriter.java | 4 +- .../regionserver/wal/SequenceIdAccounting.java | 2 +- .../hbase/regionserver/wal/WALCellCodec.java | 2 +- .../hadoop/hbase/regionserver/wal/WALUtil.java | 2 +- .../replication/BaseReplicationEndpoint.java | 4 +- .../hbase/replication/BulkLoadCellFilter.java | 2 +- .../hbase/replication/ReplicationEndpoint.java | 2 +- .../hbase/replication/ScopeWALEntryFilter.java | 2 +- .../master/ReplicationHFileCleaner.java | 10 ++-- .../master/ReplicationLogCleaner.java | 6 +-- .../regionserver/DumpReplicationQueues.java | 2 +- .../HBaseInterClusterReplicationEndpoint.java | 2 +- .../regionserver/HFileReplicator.java | 2 +- .../RegionReplicaReplicationEndpoint.java | 4 +- .../replication/regionserver/Replication.java | 2 +- .../regionserver/ReplicationSinkManager.java | 6 +-- .../regionserver/ReplicationSource.java | 2 +- .../regionserver/ReplicationSourceManager.java | 4 +- .../regionserver/ReplicationSourceShipper.java | 6 +-- .../security/access/AccessControlLists.java | 6 +-- .../hbase/security/access/AccessController.java | 14 +++--- .../hbase/security/access/AuthResult.java | 2 +- .../hbase/security/access/TableAuthManager.java | 8 +-- .../hbase/security/token/ZKSecretWatcher.java | 2 +- .../security/visibility/ExpressionParser.java | 2 +- .../visibility/VisibilityController.java | 4 +- .../hbase/snapshot/RestoreSnapshotHelper.java | 2 +- .../snapshot/SnapshotDescriptionUtils.java | 2 +- .../hadoop/hbase/snapshot/SnapshotManifest.java | 6 +-- .../hbase/snapshot/SnapshotManifestV1.java | 2 +- .../hbase/snapshot/SnapshotManifestV2.java | 6 +-- .../org/apache/hadoop/hbase/tool/Canary.java | 4 +- .../hbase/tool/LoadIncrementalHFiles.java | 10 ++-- .../hadoop/hbase/util/ConfigurationUtil.java | 2 +- .../hadoop/hbase/util/DirectMemoryUtils.java | 2 +- .../apache/hadoop/hbase/util/FSHDFSUtils.java | 2 +- .../hadoop/hbase/util/FSTableDescriptors.java | 4 +- .../org/apache/hadoop/hbase/util/FSUtils.java | 8 +-- .../org/apache/hadoop/hbase/util/HBaseFsck.java | 14 +++--- .../org/apache/hadoop/hbase/util/IdLock.java | 2 +- .../hadoop/hbase/util/IdReadWriteLock.java | 2 +- .../hadoop/hbase/util/JvmPauseMonitor.java | 12 ++--- .../hbase/util/NettyEventLoopGroupConfig.java | 20 ++++---- .../hbase/util/RegionSplitCalculator.java | 6 +-- .../hadoop/hbase/util/RegionSplitter.java | 8 +-- .../hadoop/hbase/wal/AbstractFSWALProvider.java | 2 +- .../hadoop/hbase/wal/AsyncFSWALProvider.java | 12 ++--- .../hbase/wal/NettyAsyncFSWALConfigHelper.java | 6 +-- .../java/org/apache/hadoop/hbase/wal/WAL.java | 2 +- .../org/apache/hadoop/hbase/wal/WALEdit.java | 2 +- .../org/apache/hadoop/hbase/wal/WALFactory.java | 2 +- .../org/apache/hadoop/hbase/wal/WALKeyImpl.java | 6 +-- .../apache/hadoop/hbase/wal/WALSplitter.java | 8 +-- .../resources/hbase-webapps/master/footer.jsp | 2 +- .../resources/hbase-webapps/master/header.jsp | 2 +- .../resources/hbase-webapps/master/table.jsp | 2 +- .../hbase-webapps/regionserver/footer.jsp | 2 +- .../hbase-webapps/regionserver/header.jsp | 2 +- .../hadoop/hbase/AcidGuaranteesTestTool.java | 2 +- .../apache/hadoop/hbase/GenericTestUtils.java | 6 +-- .../org/apache/hadoop/hbase/QosTestHelper.java | 2 +- ...TestAcidGuaranteesWithNoInMemCompaction.java | 2 +- .../org/apache/hadoop/hbase/TestIOFencing.java | 2 +- .../hadoop/hbase/TestMetaTableAccessor.java | 2 +- .../hbase/TestMetaTableAccessorNoCluster.java | 4 +- .../hadoop/hbase/TestMetaTableLocator.java | 4 +- .../org/apache/hadoop/hbase/TestNamespace.java | 2 +- .../org/apache/hadoop/hbase/TestRegionLoad.java | 4 +- .../apache/hadoop/hbase/TestRegionMetrics.java | 2 +- .../org/apache/hadoop/hbase/TestServerLoad.java | 2 +- .../apache/hadoop/hbase/TestServerMetrics.java | 2 +- .../client/BufferingScanResultConsumer.java | 2 +- .../hbase/client/SimpleScanResultConsumer.java | 2 +- .../apache/hadoop/hbase/client/TestAdmin1.java | 2 +- .../hbase/client/TestAlwaysSetScannerId.java | 2 +- .../hbase/client/TestAsyncClusterAdminApi.java | 4 +- ...estAvoidCellReferencesIntoShippedBlocks.java | 2 +- .../client/TestClientScannerRPCTimeout.java | 4 +- .../hadoop/hbase/client/TestClientTimeouts.java | 10 ++-- .../hadoop/hbase/client/TestEnableTable.java | 6 +-- .../hbase/client/TestHBaseAdminNoCluster.java | 6 +-- .../org/apache/hadoop/hbase/client/TestHCM.java | 2 +- .../hadoop/hbase/client/TestMetaCache.java | 4 +- .../client/TestScanWithoutFetchingData.java | 2 +- .../hadoop/hbase/client/TestSizeFailures.java | 2 +- .../hbase/client/TestSnapshotFromClient.java | 2 +- .../hbase/client/TestTableFavoredNodes.java | 4 +- .../hbase/client/locking/TestEntityLocks.java | 2 +- .../replication/TestReplicationAdmin.java | 2 +- .../hbase/codec/TestCellMessageCodec.java | 4 +- .../coprocessor/TestCoprocessorMetrics.java | 2 +- ...erverForAddingMutationsFromCoprocessors.java | 2 +- ...gionServerCoprocessorExceptionWithAbort.java | 2 +- .../TestFavoredNodeAssignmentHelper.java | 4 +- .../apache/hadoop/hbase/filter/TestFilter.java | 2 +- .../hadoop/hbase/filter/TestFilterList.java | 2 +- .../TestFuzzyRowAndColumnRangeFilter.java | 2 +- .../filter/TestFuzzyRowFilterEndToEnd.java | 2 +- .../TestFanOutOneBlockAsyncDFSOutput.java | 10 ++-- .../hbase/io/asyncfs/TestLocalAsyncOutput.java | 8 +-- .../TestSaslFanOutOneBlockAsyncDFSOutput.java | 10 ++-- .../hadoop/hbase/io/hfile/CacheTestUtils.java | 2 +- .../hadoop/hbase/io/hfile/TestCacheOnWrite.java | 2 +- .../hfile/TestLazyDataBlockDecompression.java | 2 +- .../hbase/io/hfile/bucket/TestBucketCache.java | 2 +- .../hadoop/hbase/ipc/AbstractTestIPC.java | 6 +-- .../hadoop/hbase/ipc/TestBufferChain.java | 4 +- .../hadoop/hbase/ipc/TestFifoRpcScheduler.java | 2 +- .../apache/hadoop/hbase/ipc/TestNettyIPC.java | 10 ++-- .../hadoop/hbase/ipc/TestProtoBufRpc.java | 4 +- .../hbase/ipc/TestProtobufRpcServiceImpl.java | 6 +-- .../hadoop/hbase/ipc/TestRpcClientLeaks.java | 2 +- .../hbase/ipc/TestRpcHandlerException.java | 4 +- .../ipc/TestRpcServerSlowConnectionSetup.java | 2 +- .../hbase/ipc/TestSimpleRpcScheduler.java | 8 +-- .../hbase/master/MockNoopMasterServices.java | 2 +- .../hadoop/hbase/master/MockRegionServer.java | 4 +- .../hbase/master/TestHMasterRPCException.java | 4 +- .../apache/hadoop/hbase/master/TestMaster.java | 2 +- .../hbase/master/TestMasterNoCluster.java | 2 +- .../hbase/master/TestMasterStatusServlet.java | 2 +- .../master/assignment/MockMasterServices.java | 2 +- .../assignment/TestRogueRSAssignment.java | 4 +- .../LoadBalancerPerformanceEvaluation.java | 4 +- .../LoadOnlyFavoredStochasticBalancer.java | 2 +- .../master/balancer/TestBaseLoadBalancer.java | 2 +- .../balancer/TestFavoredNodeTableImport.java | 2 +- .../TestFavoredStochasticBalancerPickers.java | 4 +- .../TestFavoredStochasticLoadBalancer.java | 6 +-- .../hbase/master/cleaner/TestLogsCleaner.java | 2 +- .../cleaner/TestReplicationHFileCleaner.java | 2 +- .../master/cleaner/TestSnapshotFromMaster.java | 4 +- .../hbase/master/locking/TestLockProcedure.java | 2 +- .../normalizer/TestSimpleRegionNormalizer.java | 2 +- .../master/snapshot/TestSnapshotFileCache.java | 4 +- .../procedure/TestProcedureCoordinator.java | 2 +- .../hbase/procedure/TestProcedureDescriber.java | 4 +- .../hadoop/hbase/procedure/TestZKProcedure.java | 2 +- .../procedure/TestZKProcedureControllers.java | 2 +- .../hbase/quotas/SpaceQuotaHelperForTests.java | 6 +-- .../TestNamespaceQuotaViolationStore.java | 2 +- .../hadoop/hbase/quotas/TestQuotaAdmin.java | 2 +- .../hbase/quotas/TestQuotaObserverChore.java | 2 +- .../TestQuotaObserverChoreWithMiniCluster.java | 4 +- .../hadoop/hbase/quotas/TestQuotaTableUtil.java | 2 +- .../quotas/TestSnapshotQuotaObserverChore.java | 6 +-- .../quotas/TestSpaceQuotasWithSnapshots.java | 4 +- .../quotas/TestTableQuotaViolationStore.java | 2 +- .../hbase/quotas/TestTablesWithQuotas.java | 2 +- .../AbstractTestDateTieredCompactionPolicy.java | 4 +- .../hbase/regionserver/OOMERegionServer.java | 2 +- .../TestCompactionArchiveIOException.java | 2 +- .../regionserver/TestCompactionPolicy.java | 2 +- .../hbase/regionserver/TestDefaultMemStore.java | 6 +-- .../TestEndToEndSplitTransaction.java | 2 +- .../hadoop/hbase/regionserver/TestHRegion.java | 4 +- .../hbase/regionserver/TestHRegionInfo.java | 2 +- .../regionserver/TestHRegionReplayEvents.java | 4 +- .../regionserver/TestHRegionServerBulkLoad.java | 2 +- .../TestHRegionServerBulkLoadWithOldClient.java | 2 +- .../hadoop/hbase/regionserver/TestHStore.java | 2 +- .../hbase/regionserver/TestHStoreFile.java | 6 +-- .../hbase/regionserver/TestMemStoreLAB.java | 8 +-- .../regionserver/TestMetricsTableLatencies.java | 2 +- .../regionserver/TestMultiLogThreshold.java | 4 +- .../regionserver/TestPerColumnFamilyFlush.java | 2 +- .../hbase/regionserver/TestPriorityRpc.java | 4 +- .../hbase/regionserver/TestRSStatusServlet.java | 6 +-- .../regionserver/TestRegionInfoBuilder.java | 4 +- .../TestRegionMergeTransactionOnCluster.java | 6 +-- .../hbase/regionserver/TestRegionReplicas.java | 2 +- .../regionserver/TestRegionServerNoMaster.java | 8 +-- .../regionserver/TestReversibleScanners.java | 2 +- .../TestScannerHeartbeatMessages.java | 4 +- .../TestSplitTransactionOnCluster.java | 4 +- .../TestTimestampFilterSeekHint.java | 2 +- .../compactions/MockStoreFileGenerator.java | 2 +- .../compactions/TestStripeCompactionPolicy.java | 4 +- .../hbase/regionserver/wal/TestAsyncFSWAL.java | 8 +-- .../regionserver/wal/TestAsyncProtobufLog.java | 10 ++-- .../regionserver/wal/TestAsyncWALReplay.java | 8 +-- .../TestReplicationWALEntryFilters.java | 2 +- .../TestRegionReplicaReplicationEndpoint.java | 2 +- ...egionReplicaReplicationEndpointNoMaster.java | 2 +- .../regionserver/TestReplicationSink.java | 2 +- .../TestReplicationSinkManager.java | 2 +- .../TestReplicationSourceManager.java | 4 +- .../regionserver/TestReplicator.java | 4 +- .../regionserver/TestWALEntrySinkFilter.java | 2 +- .../hbase/security/HBaseKerberosUtils.java | 2 +- .../hadoop/hbase/security/TestSecureIPC.java | 6 +-- .../apache/hadoop/hbase/security/TestUser.java | 2 +- .../hbase/security/access/SecureTestUtil.java | 4 +- .../hbase/security/access/TestCellACLs.java | 2 +- .../security/access/TestNamespaceCommands.java | 2 +- .../security/access/TestTablePermissions.java | 4 +- .../access/TestWithDisabledAuthorization.java | 2 +- .../security/token/TestTokenAuthentication.java | 20 ++++---- .../hbase/snapshot/SnapshotTestingUtils.java | 8 +-- .../hbase/snapshot/TestSnapshotManifest.java | 2 +- .../hadoop/hbase/tool/TestCanaryTool.java | 2 +- .../TestLoadIncrementalHFilesSplitRecovery.java | 8 +-- .../hadoop/hbase/trace/TestHTraceHooks.java | 2 +- .../hadoop/hbase/util/MultiThreadedAction.java | 2 +- .../hadoop/hbase/util/MultiThreadedUpdater.java | 2 +- .../hbase/util/TestConfigurationUtil.java | 4 +- .../hbase/util/TestRegionSplitCalculator.java | 4 +- .../hadoop/hbase/util/TestSortedList.java | 2 +- .../hadoop/hbase/util/hbck/HbckTestingUtil.java | 2 +- .../hadoop/hbase/wal/TestWALFiltering.java | 6 +-- .../apache/hadoop/hbase/wal/TestWALSplit.java | 8 +-- .../client/procedure/ShellTestProcedure.java | 2 +- .../hbase/thrift/TBoundedThreadPoolServer.java | 2 +- .../hadoop/hbase/thrift/ThriftServerRunner.java | 6 +-- .../hadoop/hbase/thrift2/ThriftServer.java | 2 +- .../hbase/thrift/TestThriftHttpServer.java | 2 +- .../hbase/thrift/TestThriftServerCmdLine.java | 2 +- .../thrift2/TestThriftHBaseServiceHandler.java | 2 +- ...stThriftHBaseServiceHandlerWithReadOnly.java | 2 +- .../hbase/zookeeper/MasterAddressTracker.java | 2 +- .../hbase/zookeeper/MetaTableLocator.java | 2 +- .../hbase/zookeeper/MiniZooKeeperCluster.java | 2 +- .../hadoop/hbase/zookeeper/ZKMainServer.java | 2 +- .../hadoop/hbase/zookeeper/ZKMetrics.java | 2 +- .../apache/hadoop/hbase/zookeeper/ZKUtil.java | 2 +- 718 files changed, 1517 insertions(+), 1517 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-build-support/hbase-error-prone/src/main/java/org/apache/hadoop/hbase/errorprone/AlwaysPasses.java ---------------------------------------------------------------------- diff --git a/hbase-build-support/hbase-error-prone/src/main/java/org/apache/hadoop/hbase/errorprone/AlwaysPasses.java b/hbase-build-support/hbase-error-prone/src/main/java/org/apache/hadoop/hbase/errorprone/AlwaysPasses.java index 26c6269..926fa54 100644 --- a/hbase-build-support/hbase-error-prone/src/main/java/org/apache/hadoop/hbase/errorprone/AlwaysPasses.java +++ b/hbase-build-support/hbase-error-prone/src/main/java/org/apache/hadoop/hbase/errorprone/AlwaysPasses.java @@ -37,4 +37,4 @@ public class AlwaysPasses extends BugChecker implements BugChecker.CompilationUn public Description matchCompilationUnit(CompilationUnitTree tree, VisitorState state) { return Description.NO_MATCH; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterMetricsBuilder.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterMetricsBuilder.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterMetricsBuilder.java index ed669a5..ab6d353 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterMetricsBuilder.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterMetricsBuilder.java @@ -29,8 +29,8 @@ import java.util.stream.Collectors; import org.apache.hadoop.hbase.master.RegionState; import org.apache.yetus.audience.InterfaceAudience; -import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions; -import org.apache.hadoop.hbase.shaded.com.google.protobuf.UnsafeByteOperations; +import org.apache.hbase.thirdparty.com.google.common.base.Preconditions; +import org.apache.hbase.thirdparty.com.google.protobuf.UnsafeByteOperations; import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.shaded.protobuf.generated.ClusterStatusProtos; import org.apache.hadoop.hbase.shaded.protobuf.generated.FSProtos; http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java index 8cbf302..f13de1e 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java @@ -29,7 +29,7 @@ import java.util.stream.Collectors; import org.apache.hadoop.hbase.master.RegionState; import org.apache.yetus.audience.InterfaceAudience; -import org.apache.hadoop.hbase.shaded.com.google.common.base.Objects; +import org.apache.hbase.thirdparty.com.google.common.base.Objects; /** * Status information on the HBase cluster. http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java index c53e2ac..938874a 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java @@ -71,7 +71,7 @@ import org.apache.hadoop.hbase.util.PairOfSameType; import org.apache.yetus.audience.InterfaceAudience; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting; +import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/RegionLoad.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/RegionLoad.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/RegionLoad.java index 811f83c..242e5ea 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/RegionLoad.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/RegionLoad.java @@ -26,7 +26,7 @@ import java.util.stream.Collectors; import org.apache.hadoop.hbase.util.Strings; import org.apache.yetus.audience.InterfaceAudience; -import org.apache.hadoop.hbase.shaded.com.google.protobuf.UnsafeByteOperations; +import org.apache.hbase.thirdparty.com.google.protobuf.UnsafeByteOperations; import org.apache.hadoop.hbase.shaded.protobuf.generated.ClusterStatusProtos; /** http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/RegionMetricsBuilder.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/RegionMetricsBuilder.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/RegionMetricsBuilder.java index 0fb6d3d..b5d8048 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/RegionMetricsBuilder.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/RegionMetricsBuilder.java @@ -27,8 +27,8 @@ import java.util.stream.Collectors; import org.apache.hadoop.hbase.util.Strings; import org.apache.yetus.audience.InterfaceAudience; -import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions; -import org.apache.hadoop.hbase.shaded.com.google.protobuf.UnsafeByteOperations; +import org.apache.hbase.thirdparty.com.google.common.base.Preconditions; +import org.apache.hbase.thirdparty.com.google.protobuf.UnsafeByteOperations; import org.apache.hadoop.hbase.shaded.protobuf.generated.ClusterStatusProtos; import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos; http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java index 7509a85..f1665ae 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java @@ -32,7 +32,7 @@ import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Strings; import org.apache.yetus.audience.InterfaceAudience; -import org.apache.hadoop.hbase.shaded.com.google.common.base.Objects; +import org.apache.hbase.thirdparty.com.google.common.base.Objects; import org.apache.hadoop.hbase.shaded.protobuf.generated.ClusterStatusProtos; /** http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerMetricsBuilder.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerMetricsBuilder.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerMetricsBuilder.java index 2d71f80..da9e724 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerMetricsBuilder.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerMetricsBuilder.java @@ -32,7 +32,7 @@ import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Strings; import org.apache.yetus.audience.InterfaceAudience; -import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions; +import org.apache.hbase.thirdparty.com.google.common.base.Preconditions; import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.shaded.protobuf.generated.ClusterStatusProtos; import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos; http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/Size.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/Size.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/Size.java index 87d7554..0e7716a 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/Size.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/Size.java @@ -21,7 +21,7 @@ import java.math.BigDecimal; import java.util.Objects; import org.apache.yetus.audience.InterfaceAudience; -import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions; +import org.apache.hbase.thirdparty.com.google.common.base.Preconditions; /** * It is used to represent the size with different units. http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java index ff2722e..a94593c 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java @@ -2627,4 +2627,4 @@ public interface Admin extends Abortable, Closeable { * @return List of servers that are not cleared */ List<ServerName> clearDeadServers(final List<ServerName> servers) throws IOException; -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncAdminRequestRetryingCaller.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncAdminRequestRetryingCaller.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncAdminRequestRetryingCaller.java index a320c66..2d634b9 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncAdminRequestRetryingCaller.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncAdminRequestRetryingCaller.java @@ -20,7 +20,7 @@ package org.apache.hadoop.hbase.client; import java.io.IOException; import java.util.concurrent.CompletableFuture; -import org.apache.hadoop.hbase.shaded.io.netty.util.HashedWheelTimer; +import org.apache.hbase.thirdparty.io.netty.util.HashedWheelTimer; import org.apache.hadoop.hbase.ServerName; import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.ipc.HBaseRpcController; http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncBatchRpcRetryingCaller.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncBatchRpcRetryingCaller.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncBatchRpcRetryingCaller.java index 8d59130..62ee0ab 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncBatchRpcRetryingCaller.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncBatchRpcRetryingCaller.java @@ -24,7 +24,7 @@ import static org.apache.hadoop.hbase.client.ConnectionUtils.resetController; import static org.apache.hadoop.hbase.client.ConnectionUtils.translateException; import static org.apache.hadoop.hbase.util.CollectionUtils.computeIfAbsent; -import org.apache.hadoop.hbase.shaded.io.netty.util.HashedWheelTimer; +import org.apache.hbase.thirdparty.io.netty.util.HashedWheelTimer; import java.io.IOException; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncBufferedMutatorBuilderImpl.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncBufferedMutatorBuilderImpl.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncBufferedMutatorBuilderImpl.java index 9880ba5..227d02b 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncBufferedMutatorBuilderImpl.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncBufferedMutatorBuilderImpl.java @@ -20,7 +20,7 @@ package org.apache.hadoop.hbase.client; import java.util.concurrent.TimeUnit; import org.apache.yetus.audience.InterfaceAudience; -import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions; +import org.apache.hbase.thirdparty.com.google.common.base.Preconditions; /** * The implementation of {@link AsyncBufferedMutatorBuilder}. http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncConnectionImpl.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncConnectionImpl.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncConnectionImpl.java index c1d84ec..cf26756 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncConnectionImpl.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncConnectionImpl.java @@ -21,9 +21,9 @@ import static org.apache.hadoop.hbase.client.ConnectionUtils.NO_NONCE_GENERATOR; import static org.apache.hadoop.hbase.client.ConnectionUtils.getStubKey; import static org.apache.hadoop.hbase.client.NonceGenerator.CLIENT_NONCES_ENABLED_KEY; -import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting; +import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting; -import org.apache.hadoop.hbase.shaded.io.netty.util.HashedWheelTimer; +import org.apache.hbase.thirdparty.io.netty.util.HashedWheelTimer; import java.io.IOException; import java.util.concurrent.CompletableFuture; @@ -46,7 +46,7 @@ import org.apache.hadoop.hbase.ipc.RpcClient; import org.apache.hadoop.hbase.ipc.RpcClientFactory; import org.apache.hadoop.hbase.ipc.RpcControllerFactory; import org.apache.hadoop.hbase.security.User; -import org.apache.hadoop.hbase.shaded.com.google.protobuf.RpcCallback; +import org.apache.hbase.thirdparty.com.google.protobuf.RpcCallback; import org.apache.hadoop.hbase.shaded.protobuf.RequestConverter; import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.AdminService; import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.ClientService; http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncMasterRequestRpcRetryingCaller.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncMasterRequestRpcRetryingCaller.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncMasterRequestRpcRetryingCaller.java index c6a2335..1c8a0e1 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncMasterRequestRpcRetryingCaller.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncMasterRequestRpcRetryingCaller.java @@ -17,7 +17,7 @@ */ package org.apache.hadoop.hbase.client; -import org.apache.hadoop.hbase.shaded.io.netty.util.HashedWheelTimer; +import org.apache.hbase.thirdparty.io.netty.util.HashedWheelTimer; import java.util.concurrent.CompletableFuture; http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java index 2a93f59..6c4118c 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java @@ -20,7 +20,7 @@ package org.apache.hadoop.hbase.client; -import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting; +import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting; import java.io.IOException; import java.io.InterruptedIOException; http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRegionLocator.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRegionLocator.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRegionLocator.java index 1463894..56228ab 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRegionLocator.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRegionLocator.java @@ -21,8 +21,8 @@ import static org.apache.hadoop.hbase.TableName.META_TABLE_NAME; import static org.apache.hadoop.hbase.exceptions.ClientExceptionsUtil.findException; import static org.apache.hadoop.hbase.exceptions.ClientExceptionsUtil.isMetaClearingException; -import org.apache.hadoop.hbase.shaded.io.netty.util.HashedWheelTimer; -import org.apache.hadoop.hbase.shaded.io.netty.util.Timeout; +import org.apache.hbase.thirdparty.io.netty.util.HashedWheelTimer; +import org.apache.hbase.thirdparty.io.netty.util.Timeout; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.java index d214dca..3ab94c5 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.java @@ -19,7 +19,7 @@ package org.apache.hadoop.hbase.client; -import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting; +import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting; import java.io.IOException; import java.io.InterruptedIOException; http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCaller.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCaller.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCaller.java index 15045af..d30012f 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCaller.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCaller.java @@ -23,7 +23,7 @@ import static org.apache.hadoop.hbase.client.ConnectionUtils.SLEEP_DELTA_NS; import static org.apache.hadoop.hbase.client.ConnectionUtils.getPauseTime; import static org.apache.hadoop.hbase.client.ConnectionUtils.resetController; import static org.apache.hadoop.hbase.client.ConnectionUtils.translateException; -import org.apache.hadoop.hbase.shaded.io.netty.util.HashedWheelTimer; +import org.apache.hbase.thirdparty.io.netty.util.HashedWheelTimer; import java.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.java index 5eceb2d..f80b4e5 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.java @@ -17,11 +17,11 @@ */ package org.apache.hadoop.hbase.client; -import static org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions.checkArgument; -import static org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions.checkNotNull; +import static org.apache.hbase.thirdparty.com.google.common.base.Preconditions.checkArgument; +import static org.apache.hbase.thirdparty.com.google.common.base.Preconditions.checkNotNull; import static org.apache.hadoop.hbase.client.ConnectionUtils.retries2Attempts; -import org.apache.hadoop.hbase.shaded.io.netty.util.HashedWheelTimer; +import org.apache.hbase.thirdparty.io.netty.util.HashedWheelTimer; import java.util.List; import java.util.concurrent.CompletableFuture; http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.java index 0dcab38..9fdb284 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.java @@ -49,9 +49,9 @@ import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.yetus.audience.InterfaceAudience; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions; -import org.apache.hadoop.hbase.shaded.io.netty.util.HashedWheelTimer; -import org.apache.hadoop.hbase.shaded.io.netty.util.Timeout; +import org.apache.hbase.thirdparty.com.google.common.base.Preconditions; +import org.apache.hbase.thirdparty.io.netty.util.HashedWheelTimer; +import org.apache.hbase.thirdparty.io.netty.util.Timeout; import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.shaded.protobuf.RequestConverter; import org.apache.hadoop.hbase.shaded.protobuf.ResponseConverter; http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncServerRequestRpcRetryingCaller.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncServerRequestRpcRetryingCaller.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncServerRequestRpcRetryingCaller.java index dbbe999..20b7c31 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncServerRequestRpcRetryingCaller.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncServerRequestRpcRetryingCaller.java @@ -17,7 +17,7 @@ */ package org.apache.hadoop.hbase.client; -import org.apache.hadoop.hbase.shaded.io.netty.util.HashedWheelTimer; +import org.apache.hbase.thirdparty.io.netty.util.HashedWheelTimer; import java.io.IOException; import java.util.concurrent.CompletableFuture; http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncSingleRequestRpcRetryingCaller.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncSingleRequestRpcRetryingCaller.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncSingleRequestRpcRetryingCaller.java index ddedc3b..56c82fb 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncSingleRequestRpcRetryingCaller.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncSingleRequestRpcRetryingCaller.java @@ -17,7 +17,7 @@ */ package org.apache.hadoop.hbase.client; -import org.apache.hadoop.hbase.shaded.io.netty.util.HashedWheelTimer; +import org.apache.hbase.thirdparty.io.netty.util.HashedWheelTimer; import java.io.IOException; import java.util.concurrent.CompletableFuture; http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncTable.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncTable.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncTable.java index 44aa31d..37c80b3 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncTable.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncTable.java @@ -34,7 +34,7 @@ import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.util.Bytes; import org.apache.yetus.audience.InterfaceAudience; -import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions; +import org.apache.hbase.thirdparty.com.google.common.base.Preconditions; /** * The interface for asynchronous version of Table. Obtain an instance from a http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncTableResultScanner.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncTableResultScanner.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncTableResultScanner.java index c91c217..9b97e93 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncTableResultScanner.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncTableResultScanner.java @@ -28,8 +28,8 @@ import org.apache.yetus.audience.InterfaceAudience; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.hadoop.hbase.client.metrics.ScanMetrics; -import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting; -import org.apache.hadoop.hbase.shaded.com.google.common.base.Throwables; +import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting; +import org.apache.hbase.thirdparty.com.google.common.base.Throwables; /** * The {@link ResultScanner} implementation for {@link AsyncTable}. It will fetch data automatically http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutatorImpl.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutatorImpl.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutatorImpl.java index d201372..cf85f57 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutatorImpl.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutatorImpl.java @@ -35,7 +35,7 @@ import org.apache.yetus.audience.InterfaceStability; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting; +import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting; /** * <p> http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/CancellableRegionServerCallable.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/CancellableRegionServerCallable.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/CancellableRegionServerCallable.java index b278619..6ad9254 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/CancellableRegionServerCallable.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/CancellableRegionServerCallable.java @@ -24,7 +24,7 @@ import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos; -import org.apache.hadoop.hbase.shaded.com.google.protobuf.RpcController; +import org.apache.hbase.thirdparty.com.google.protobuf.RpcController; /** * This class is used to unify HTable calls with AsyncProcess Framework. HTable can use @@ -92,30 +92,30 @@ abstract class CancellableRegionServerCallable<T> extends ClientServiceCallable< } protected ClientProtos.MultiResponse doMulti(ClientProtos.MultiRequest request) - throws org.apache.hadoop.hbase.shaded.com.google.protobuf.ServiceException { + throws org.apache.hbase.thirdparty.com.google.protobuf.ServiceException { return getStub().multi(getRpcController(), request); } protected ClientProtos.ScanResponse doScan(ClientProtos.ScanRequest request) - throws org.apache.hadoop.hbase.shaded.com.google.protobuf.ServiceException { + throws org.apache.hbase.thirdparty.com.google.protobuf.ServiceException { return getStub().scan(getRpcController(), request); } protected ClientProtos.PrepareBulkLoadResponse doPrepareBulkLoad( ClientProtos.PrepareBulkLoadRequest request) - throws org.apache.hadoop.hbase.shaded.com.google.protobuf.ServiceException { + throws org.apache.hbase.thirdparty.com.google.protobuf.ServiceException { return getStub().prepareBulkLoad(getRpcController(), request); } protected ClientProtos.BulkLoadHFileResponse doBulkLoadHFile( ClientProtos.BulkLoadHFileRequest request) - throws org.apache.hadoop.hbase.shaded.com.google.protobuf.ServiceException { + throws org.apache.hbase.thirdparty.com.google.protobuf.ServiceException { return getStub().bulkLoadHFile(getRpcController(), request); } protected ClientProtos.CleanupBulkLoadResponse doCleanupBulkLoad( ClientProtos.CleanupBulkLoadRequest request) - throws org.apache.hadoop.hbase.shaded.com.google.protobuf.ServiceException { + throws org.apache.hbase.thirdparty.com.google.protobuf.ServiceException { return getStub().cleanupBulkLoad(getRpcController(), request); } } http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.java index abca485..4529cf5 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.java @@ -17,7 +17,7 @@ */ package org.apache.hadoop.hbase.client; -import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting; +import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting; import static org.apache.hadoop.hbase.client.ConnectionUtils.calcEstimatedSize; http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java index a0f7ad8..42597ff 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java @@ -21,7 +21,7 @@ import static org.apache.hadoop.hbase.client.ConnectionUtils.calcEstimatedSize; import static org.apache.hadoop.hbase.client.ConnectionUtils.createScanResultCache; import static org.apache.hadoop.hbase.client.ConnectionUtils.incRegionCountMetrics; -import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting; +import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting; import java.io.IOException; import java.io.InterruptedIOException; http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientServiceCallable.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientServiceCallable.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientServiceCallable.java index 2555add..f118e7a 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientServiceCallable.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientServiceCallable.java @@ -22,7 +22,7 @@ import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos; -import org.apache.hadoop.hbase.shaded.com.google.protobuf.RpcController; +import org.apache.hbase.thirdparty.com.google.protobuf.RpcController; /** * A RegionServerCallable set to use the Client protocol. @@ -46,12 +46,12 @@ public abstract class ClientServiceCallable<T> extends // Below here are simple methods that contain the stub and the rpcController. protected ClientProtos.GetResponse doGet(ClientProtos.GetRequest request) - throws org.apache.hadoop.hbase.shaded.com.google.protobuf.ServiceException { + throws org.apache.hbase.thirdparty.com.google.protobuf.ServiceException { return getStub().get(getRpcController(), request); } protected ClientProtos.MutateResponse doMutate(ClientProtos.MutateRequest request) - throws org.apache.hadoop.hbase.shaded.com.google.protobuf.ServiceException { + throws org.apache.hbase.thirdparty.com.google.protobuf.ServiceException { return getStub().mutate(getRpcController(), request); } } http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClusterStatusListener.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClusterStatusListener.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClusterStatusListener.java index 0c53ee4..f2dae7a 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClusterStatusListener.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClusterStatusListener.java @@ -42,16 +42,16 @@ import org.apache.hadoop.hbase.util.Threads; import org.apache.yetus.audience.InterfaceAudience; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.hadoop.hbase.shaded.io.netty.bootstrap.Bootstrap; -import org.apache.hadoop.hbase.shaded.io.netty.buffer.ByteBufInputStream; -import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelHandlerContext; -import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelOption; -import org.apache.hadoop.hbase.shaded.io.netty.channel.EventLoopGroup; -import org.apache.hadoop.hbase.shaded.io.netty.channel.SimpleChannelInboundHandler; -import org.apache.hadoop.hbase.shaded.io.netty.channel.nio.NioEventLoopGroup; -import org.apache.hadoop.hbase.shaded.io.netty.channel.socket.DatagramChannel; -import org.apache.hadoop.hbase.shaded.io.netty.channel.socket.DatagramPacket; -import org.apache.hadoop.hbase.shaded.io.netty.channel.socket.nio.NioDatagramChannel; +import org.apache.hbase.thirdparty.io.netty.bootstrap.Bootstrap; +import org.apache.hbase.thirdparty.io.netty.buffer.ByteBufInputStream; +import org.apache.hbase.thirdparty.io.netty.channel.ChannelHandlerContext; +import org.apache.hbase.thirdparty.io.netty.channel.ChannelOption; +import org.apache.hbase.thirdparty.io.netty.channel.EventLoopGroup; +import org.apache.hbase.thirdparty.io.netty.channel.SimpleChannelInboundHandler; +import org.apache.hbase.thirdparty.io.netty.channel.nio.NioEventLoopGroup; +import org.apache.hbase.thirdparty.io.netty.channel.socket.DatagramChannel; +import org.apache.hbase.thirdparty.io.netty.channel.socket.DatagramPacket; +import org.apache.hbase.thirdparty.io.netty.channel.socket.nio.NioDatagramChannel; import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.shaded.protobuf.generated.ClusterStatusProtos; http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.java index 6a30de5..aaa460b 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.java @@ -17,7 +17,7 @@ */ package org.apache.hadoop.hbase.client; -import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions; +import org.apache.hbase.thirdparty.com.google.common.base.Preconditions; import java.io.IOException; import java.util.Collections; import java.util.HashMap; http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionConfiguration.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionConfiguration.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionConfiguration.java index e4d4911..a582405 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionConfiguration.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionConfiguration.java @@ -15,7 +15,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HConstants; import org.apache.yetus.audience.InterfaceAudience; -import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting; +import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting; /** * Configuration parameters for the connection. http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java index f6c207a..653fbfd 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java @@ -80,11 +80,11 @@ import org.apache.zookeeper.KeeperException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting; -import org.apache.hadoop.hbase.shaded.com.google.common.base.Throwables; -import org.apache.hadoop.hbase.shaded.com.google.protobuf.BlockingRpcChannel; -import org.apache.hadoop.hbase.shaded.com.google.protobuf.RpcController; -import org.apache.hadoop.hbase.shaded.com.google.protobuf.ServiceException; +import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting; +import org.apache.hbase.thirdparty.com.google.common.base.Throwables; +import org.apache.hbase.thirdparty.com.google.protobuf.BlockingRpcChannel; +import org.apache.hbase.thirdparty.com.google.protobuf.RpcController; +import org.apache.hbase.thirdparty.com.google.protobuf.ServiceException; import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.shaded.protobuf.RequestConverter; import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos; http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionUtils.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionUtils.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionUtils.java index f3489e1..1a093f8 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionUtils.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionUtils.java @@ -51,9 +51,9 @@ import org.apache.hadoop.net.DNS; import org.apache.yetus.audience.InterfaceAudience; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting; -import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions; -import org.apache.hadoop.hbase.shaded.com.google.protobuf.ServiceException; +import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting; +import org.apache.hbase.thirdparty.com.google.common.base.Preconditions; +import org.apache.hbase.thirdparty.com.google.protobuf.ServiceException; import org.apache.hadoop.hbase.shaded.protobuf.ResponseConverter; import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.AdminService; import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.ClientService; http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java index 63310e6..9937adf 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java @@ -100,8 +100,8 @@ import org.apache.yetus.audience.InterfaceStability; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting; -import org.apache.hadoop.hbase.shaded.com.google.protobuf.ServiceException; +import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting; +import org.apache.hbase.thirdparty.com.google.protobuf.ServiceException; import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.shaded.protobuf.RequestConverter; import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos; http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HRegionLocator.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HRegionLocator.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HRegionLocator.java index 71d8b6f..0231370 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HRegionLocator.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HRegionLocator.java @@ -33,7 +33,7 @@ import org.apache.hadoop.hbase.util.Pair; import org.apache.yetus.audience.InterfaceAudience; import org.apache.yetus.audience.InterfaceStability; -import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting; +import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting; /** * An implementation of {@link RegionLocator}. Used to view region location information for a single http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java index 8d15140..855005e 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java @@ -44,8 +44,8 @@ import org.apache.hadoop.hbase.filter.BinaryComparator; import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp; import org.apache.hadoop.hbase.ipc.CoprocessorRpcChannel; import org.apache.hadoop.hbase.ipc.RpcControllerFactory; -import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting; -import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions; +import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting; +import org.apache.hbase.thirdparty.com.google.common.base.Preconditions; import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.shaded.protobuf.RequestConverter; import org.apache.hadoop.hbase.shaded.protobuf.ResponseConverter; http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableMultiplexer.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableMultiplexer.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableMultiplexer.java index a33fd1d..4be39a9 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableMultiplexer.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableMultiplexer.java @@ -46,8 +46,8 @@ import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.yetus.audience.InterfaceAudience; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting; -import org.apache.hadoop.hbase.shaded.com.google.common.util.concurrent.ThreadFactoryBuilder; +import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting; +import org.apache.hbase.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder; /** * HTableMultiplexer provides a thread-safe non blocking PUT API across all the tables.
