You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2017/12/16 00:17:02 UTC
[4/4] hbase git commit: HBASE-19497 Fix findbugs and error-prone
warnings in hbase-common (branch-2) Signed-off-by: Apekshit Sharma
HBASE-19497 Fix findbugs and error-prone warnings in hbase-common (branch-2)
Signed-off-by: Apekshit Sharma <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f9f869f6
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f9f869f6
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f9f869f6
Branch: refs/heads/master
Commit: f9f869f60a334982b739420a614b5d44adf26af0
Parents: 59529a7
Author: Peter Somogyi <ps...@cloudera.com>
Authored: Mon Dec 11 13:38:44 2017 +0100
Committer: Michael Stack <st...@apache.org>
Committed: Fri Dec 15 16:16:34 2017 -0800
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/ArrayBackedTag.java | 6 +-
.../hadoop/hbase/AsyncConsoleAppender.java | 3 +-
.../java/org/apache/hadoop/hbase/AuthUtil.java | 2 +-
.../apache/hadoop/hbase/BaseConfigurable.java | 2 +-
.../hadoop/hbase/ByteBufferKeyOnlyKeyValue.java | 2 +-
.../apache/hadoop/hbase/ByteBufferKeyValue.java | 3 +-
.../org/apache/hadoop/hbase/ByteBufferTag.java | 2 +-
.../apache/hadoop/hbase/CellComparatorImpl.java | 4 +-
.../org/apache/hadoop/hbase/CellScanner.java | 1 -
.../java/org/apache/hadoop/hbase/CellUtil.java | 1 +
.../org/apache/hadoop/hbase/ChoreService.java | 3 +-
.../hadoop/hbase/CompoundConfiguration.java | 2 +-
.../org/apache/hadoop/hbase/ExtendedCell.java | 1 +
.../apache/hadoop/hbase/HBaseConfiguration.java | 2 +-
.../JitterScheduledThreadPoolExecutorImpl.java | 7 +-
.../java/org/apache/hadoop/hbase/KeyValue.java | 19 +--
.../apache/hadoop/hbase/KeyValueTestUtil.java | 2 +-
.../org/apache/hadoop/hbase/KeyValueUtil.java | 4 +-
.../hadoop/hbase/NamespaceDescriptor.java | 2 +-
.../hadoop/hbase/NoTagsByteBufferKeyValue.java | 2 +-
.../org/apache/hadoop/hbase/NoTagsKeyValue.java | 4 +-
.../apache/hadoop/hbase/PrivateCellUtil.java | 8 +-
.../org/apache/hadoop/hbase/ServerName.java | 2 +-
.../apache/hadoop/hbase/SizeCachedKeyValue.java | 2 +-
.../java/org/apache/hadoop/hbase/TableName.java | 2 +-
.../apache/hadoop/hbase/codec/CellCodec.java | 2 +-
.../hadoop/hbase/codec/CellCodecWithTags.java | 3 +-
.../org/apache/hadoop/hbase/codec/Codec.java | 2 +-
.../hadoop/hbase/codec/KeyValueCodec.java | 5 +-
.../hbase/codec/KeyValueCodecWithTags.java | 5 +-
.../exceptions/UnexpectedStateException.java | 2 +-
.../hbase/filter/ByteArrayComparable.java | 2 +-
.../hadoop/hbase/io/ByteArrayOutputStream.java | 2 +-
.../hadoop/hbase/io/ByteBuffInputStream.java | 6 +-
.../hadoop/hbase/io/ByteBufferInputStream.java | 2 +-
.../hbase/io/ByteBufferListOutputStream.java | 2 +-
.../hadoop/hbase/io/ByteBufferOutputStream.java | 4 +-
.../apache/hadoop/hbase/io/ByteBufferPool.java | 4 +-
.../io/ByteBufferWriterDataOutputStream.java | 2 +-
.../hbase/io/ByteBufferWriterOutputStream.java | 3 +-
.../hadoop/hbase/io/ImmutableBytesWritable.java | 5 +-
.../hadoop/hbase/io/TagCompressionContext.java | 2 +-
.../org/apache/hadoop/hbase/io/TimeRange.java | 2 +-
.../hadoop/hbase/io/compress/Compression.java | 14 +-
.../io/compress/ReusableStreamGzipCodec.java | 2 +-
.../apache/hadoop/hbase/io/crypto/Context.java | 2 +-
.../hbase/io/crypto/CryptoCipherProvider.java | 2 +-
.../hbase/io/crypto/DefaultCipherProvider.java | 2 +-
.../hadoop/hbase/io/crypto/Encryption.java | 3 +-
.../apache/hadoop/hbase/io/crypto/aes/AES.java | 5 +-
.../hbase/io/crypto/aes/AESDecryptor.java | 3 +-
.../hbase/io/crypto/aes/AESEncryptor.java | 3 +-
.../hbase/io/crypto/aes/CommonsCryptoAES.java | 5 +-
.../crypto/aes/CommonsCryptoAESDecryptor.java | 15 +-
.../crypto/aes/CommonsCryptoAESEncryptor.java | 15 +-
.../hadoop/hbase/io/crypto/aes/CryptoAES.java | 22 +--
.../io/encoding/AbstractDataBlockEncoder.java | 2 +-
.../io/encoding/BufferedDataBlockEncoder.java | 1 +
.../hbase/io/encoding/CompressionState.java | 2 +-
.../io/encoding/CopyKeyDataBlockEncoder.java | 2 +-
.../hbase/io/encoding/DataBlockEncoder.java | 2 +-
.../hbase/io/encoding/DataBlockEncoding.java | 19 +--
.../hbase/io/encoding/DiffKeyDeltaEncoder.java | 6 +-
.../hbase/io/encoding/EncodedDataBlock.java | 10 +-
.../hbase/io/encoding/FastDiffDeltaEncoder.java | 6 +-
.../io/encoding/HFileBlockDecodingContext.java | 2 +-
.../HFileBlockDefaultDecodingContext.java | 2 +-
.../HFileBlockDefaultEncodingContext.java | 2 +-
.../io/encoding/HFileBlockEncodingContext.java | 2 +-
.../hadoop/hbase/io/encoding/NoneEncoder.java | 4 +-
.../io/encoding/PrefixKeyDeltaEncoder.java | 4 +-
.../hbase/io/encoding/RowIndexCodecV1.java | 2 +-
.../hbase/io/encoding/RowIndexEncoderV1.java | 3 +-
.../hbase/io/encoding/RowIndexSeekerV1.java | 8 +-
.../io/hadoopbackport/ThrottledInputStream.java | 5 +-
.../apache/hadoop/hbase/io/hfile/BlockType.java | 2 +-
.../hadoop/hbase/io/hfile/HFileContext.java | 3 +-
.../hbase/io/hfile/HFileContextBuilder.java | 2 +-
.../apache/hadoop/hbase/io/util/Dictionary.java | 2 +-
.../hadoop/hbase/io/util/LRUDictionary.java | 2 +-
.../hadoop/hbase/io/util/StreamUtils.java | 2 +-
.../org/apache/hadoop/hbase/nio/ByteBuff.java | 2 +-
.../apache/hadoop/hbase/nio/MultiByteBuff.java | 25 ++--
.../apache/hadoop/hbase/nio/SingleByteBuff.java | 7 +-
.../hadoop/hbase/rsgroup/RSGroupInfo.java | 2 +-
.../hadoop/hbase/security/Superusers.java | 8 +-
.../org/apache/hadoop/hbase/security/User.java | 6 +-
.../hadoop/hbase/security/UserProvider.java | 21 +--
.../hadoop/hbase/trace/SpanReceiverHost.java | 2 +-
.../hadoop/hbase/types/CopyOnWriteArrayMap.java | 15 +-
.../org/apache/hadoop/hbase/types/DataType.java | 2 +-
.../hadoop/hbase/types/FixedLengthWrapper.java | 34 +++--
.../apache/hadoop/hbase/types/OrderedBlob.java | 14 +-
.../hadoop/hbase/types/OrderedBlobVar.java | 10 +-
.../hadoop/hbase/types/OrderedBytesBase.java | 22 ++-
.../hadoop/hbase/types/OrderedFloat32.java | 23 ++-
.../hadoop/hbase/types/OrderedFloat64.java | 23 ++-
.../apache/hadoop/hbase/types/OrderedInt16.java | 23 ++-
.../apache/hadoop/hbase/types/OrderedInt32.java | 23 ++-
.../apache/hadoop/hbase/types/OrderedInt64.java | 23 ++-
.../apache/hadoop/hbase/types/OrderedInt8.java | 23 ++-
.../hadoop/hbase/types/OrderedNumeric.java | 10 +-
.../hadoop/hbase/types/OrderedString.java | 10 +-
.../org/apache/hadoop/hbase/types/PBType.java | 7 +-
.../org/apache/hadoop/hbase/types/RawByte.java | 26 +++-
.../org/apache/hadoop/hbase/types/RawBytes.java | 35 +++--
.../hadoop/hbase/types/RawBytesFixedLength.java | 2 +-
.../hadoop/hbase/types/RawBytesTerminated.java | 2 +-
.../apache/hadoop/hbase/types/RawDouble.java | 26 +++-
.../org/apache/hadoop/hbase/types/RawFloat.java | 26 +++-
.../apache/hadoop/hbase/types/RawInteger.java | 26 +++-
.../org/apache/hadoop/hbase/types/RawLong.java | 26 +++-
.../org/apache/hadoop/hbase/types/RawShort.java | 26 +++-
.../apache/hadoop/hbase/types/RawString.java | 35 +++--
.../hbase/types/RawStringFixedLength.java | 2 +-
.../hadoop/hbase/types/RawStringTerminated.java | 2 +-
.../org/apache/hadoop/hbase/types/Struct.java | 50 +++++--
.../hadoop/hbase/types/StructBuilder.java | 14 +-
.../hadoop/hbase/types/StructIterator.java | 22 ++-
.../hadoop/hbase/types/TerminatedWrapper.java | 45 ++++--
.../org/apache/hadoop/hbase/types/Union2.java | 6 +-
.../org/apache/hadoop/hbase/types/Union3.java | 6 +-
.../org/apache/hadoop/hbase/types/Union4.java | 6 +-
.../hadoop/hbase/util/AbstractByteRange.java | 6 +-
.../hadoop/hbase/util/AbstractHBaseTool.java | 2 +-
.../org/apache/hadoop/hbase/util/Base64.java | 9 +-
.../hadoop/hbase/util/ByteBufferArray.java | 9 +-
.../hadoop/hbase/util/ByteBufferUtils.java | 30 ++--
.../org/apache/hadoop/hbase/util/Bytes.java | 16 +-
.../apache/hadoop/hbase/util/ChecksumType.java | 2 +-
.../hadoop/hbase/util/ClassLoaderBase.java | 3 +-
.../apache/hadoop/hbase/util/CommonFSUtils.java | 9 +-
.../hbase/util/CoprocessorClassLoader.java | 6 +-
.../org/apache/hadoop/hbase/util/HasThread.java | 3 +-
.../java/org/apache/hadoop/hbase/util/Hash.java | 18 +--
.../apache/hadoop/hbase/util/JRubyFormat.java | 1 +
.../org/apache/hadoop/hbase/util/JSONBean.java | 8 +-
.../hadoop/hbase/util/JSONMetricUtil.java | 1 -
.../java/org/apache/hadoop/hbase/util/JVM.java | 7 +-
.../apache/hadoop/hbase/util/OrderedBytes.java | 26 ++--
.../apache/hadoop/hbase/util/PrettyPrinter.java | 2 +-
.../hadoop/hbase/util/ReflectionUtils.java | 4 +-
.../hadoop/hbase/util/RetryCounterFactory.java | 2 +-
.../hadoop/hbase/util/RowBloomHashKey.java | 1 -
.../hadoop/hbase/util/RowColBloomHashKey.java | 3 +-
.../hadoop/hbase/util/SoftObjectPool.java | 3 +-
.../org/apache/hadoop/hbase/util/Threads.java | 7 +-
.../org/apache/hadoop/hbase/util/Triple.java | 6 +-
.../apache/hadoop/hbase/util/UnsafeAccess.java | 9 +-
.../hadoop/hbase/util/WeakObjectPool.java | 1 -
.../apache/hadoop/hbase/zookeeper/ZKConfig.java | 3 +-
.../org/apache/hadoop/hbase/ClassFinder.java | 2 +-
.../hadoop/hbase/HBaseCommonTestingUtility.java | 3 +-
.../hbase/ResourceCheckerJUnitListener.java | 24 ++-
.../hadoop/hbase/TestByteBufferKeyValue.java | 14 +-
.../apache/hadoop/hbase/TestCellBuilder.java | 4 +-
.../apache/hadoop/hbase/TestCellComparator.java | 24 +--
.../org/apache/hadoop/hbase/TestCellUtil.java | 44 +++---
.../apache/hadoop/hbase/TestChoreService.java | 49 +++---
.../apache/hadoop/hbase/TestClassFinder.java | 6 +-
.../hadoop/hbase/TestCompoundConfiguration.java | 47 ++++--
.../hadoop/hbase/TestHBaseConfiguration.java | 7 +-
.../hbase/TestIndividualBytesFieldCell.java | 28 ++--
.../org/apache/hadoop/hbase/TestKeyValue.java | 7 +-
.../org/apache/hadoop/hbase/TestTableName.java | 77 +++++-----
.../org/apache/hadoop/hbase/TestTimeout.java | 2 +-
.../java/org/apache/hadoop/hbase/Waiter.java | 4 +-
.../hbase/codec/TestCellCodecWithTags.java | 5 +-
.../hadoop/hbase/codec/TestKeyValueCodec.java | 4 +-
.../hbase/codec/TestKeyValueCodecWithTags.java | 5 +-
.../io/TestByteBufferListOutputStream.java | 1 +
.../hadoop/hbase/io/TestByteBufferPool.java | 4 +-
.../hbase/io/TestTagCompressionContext.java | 6 +-
.../hbase/io/crypto/KeyProviderForTesting.java | 1 -
.../hbase/io/crypto/TestCipherProvider.java | 6 +-
.../hadoop/hbase/io/crypto/TestEncryption.java | 1 -
.../hadoop/hbase/io/crypto/TestKeyProvider.java | 6 +-
.../io/crypto/TestKeyStoreKeyProvider.java | 4 +-
.../hadoop/hbase/io/crypto/aes/TestAES.java | 9 +-
.../hbase/io/crypto/aes/TestCommonsAES.java | 32 ++--
.../TestThrottledInputStream.java | 3 +-
.../hadoop/hbase/io/util/TestLRUDictionary.java | 2 +-
.../hadoop/hbase/nio/TestMultiByteBuff.java | 17 ++-
.../hadoop/hbase/types/TestCopyOnWriteMaps.java | 34 +++--
.../apache/hadoop/hbase/types/TestStruct.java | 149 +++++++++++++++----
.../hbase/util/AbstractHBaseToolTest.java | 19 ++-
.../hbase/util/ClassLoaderTestHelper.java | 6 +-
.../hadoop/hbase/util/RedundantKVGenerator.java | 4 +-
.../apache/hadoop/hbase/util/TestAvlUtil.java | 18 +--
.../apache/hadoop/hbase/util/TestBase64.java | 1 -
.../hadoop/hbase/util/TestByteBufferArray.java | 8 +-
.../hadoop/hbase/util/TestByteBufferUtils.java | 4 +-
.../util/TestByteRangeWithKVSerialization.java | 2 +-
.../org/apache/hadoop/hbase/util/TestBytes.java | 38 +++--
.../hadoop/hbase/util/TestCommonFSUtils.java | 14 +-
.../hbase/util/TestConcatenatedLists.java | 2 +
.../hbase/util/TestCoprocessorClassLoader.java | 20 ++-
.../hbase/util/TestDynamicClassLoader.java | 2 +-
.../hadoop/hbase/util/TestJRubyFormat.java | 3 +-
.../hbase/util/TestLoadTestKVGenerator.java | 9 +-
.../hadoop/hbase/util/TestOrderedBytes.java | 56 ++++---
.../hadoop/hbase/util/TestVersionInfo.java | 3 +-
.../hadoop/hbase/zookeeper/TestZKConfig.java | 6 +-
203 files changed, 1286 insertions(+), 808 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/ArrayBackedTag.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/ArrayBackedTag.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/ArrayBackedTag.java
index 12f7a15..142fc4f 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/ArrayBackedTag.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/ArrayBackedTag.java
@@ -21,9 +21,9 @@ package org.apache.hadoop.hbase;
import java.nio.ByteBuffer;
+import org.apache.hadoop.hbase.util.Bytes;
import org.apache.yetus.audience.InterfaceAudience;
import org.apache.yetus.audience.InterfaceStability;
-import org.apache.hadoop.hbase.util.Bytes;
/**
* This is a {@link Tag} implementation in which value is backed by an on heap byte array.
@@ -100,6 +100,7 @@ public class ArrayBackedTag implements Tag {
/**
* @return The byte array backing this Tag.
*/
+ @Override
public byte[] getValueArray() {
return this.bytes;
}
@@ -107,6 +108,7 @@ public class ArrayBackedTag implements Tag {
/**
* @return the tag type
*/
+ @Override
public byte getType() {
return this.type;
}
@@ -114,6 +116,7 @@ public class ArrayBackedTag implements Tag {
/**
* @return Length of actual tag bytes within the backed buffer
*/
+ @Override
public int getValueLength() {
return this.length - INFRASTRUCTURE_SIZE;
}
@@ -121,6 +124,7 @@ public class ArrayBackedTag implements Tag {
/**
* @return Offset of actual tag bytes within the backed buffer
*/
+ @Override
public int getValueOffset() {
return this.offset + INFRASTRUCTURE_SIZE;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/AsyncConsoleAppender.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/AsyncConsoleAppender.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/AsyncConsoleAppender.java
index c194c80..22f5ec2 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/AsyncConsoleAppender.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/AsyncConsoleAppender.java
@@ -17,10 +17,10 @@
*/
package org.apache.hadoop.hbase;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.log4j.AsyncAppender;
import org.apache.log4j.ConsoleAppender;
import org.apache.log4j.PatternLayout;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* Logger class that buffers before trying to log to the specified console.
@@ -40,6 +40,7 @@ public class AsyncConsoleAppender extends AsyncAppender {
consoleAppender.setTarget(value);
}
+ @Override
public void activateOptions() {
consoleAppender.activateOptions();
super.activateOptions();
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/AuthUtil.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/AuthUtil.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/AuthUtil.java
index 7c9578c..fcfdee8 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/AuthUtil.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/AuthUtil.java
@@ -24,11 +24,11 @@ import java.net.UnknownHostException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.security.UserProvider;
import org.apache.hadoop.hbase.util.DNS;
import org.apache.hadoop.hbase.util.Strings;
import org.apache.hadoop.security.UserGroupInformation;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* Utility methods for helping with security tasks. Downstream users
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/BaseConfigurable.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/BaseConfigurable.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/BaseConfigurable.java
index 51e4684..28cda20 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/BaseConfigurable.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/BaseConfigurable.java
@@ -17,9 +17,9 @@
*/
package org.apache.hadoop.hbase;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.conf.Configurable;
import org.apache.hadoop.conf.Configuration;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* HBase version of Hadoop's Configured class that doesn't initialize the
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/ByteBufferKeyOnlyKeyValue.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/ByteBufferKeyOnlyKeyValue.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/ByteBufferKeyOnlyKeyValue.java
index 8a4b720..3522e2d 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/ByteBufferKeyOnlyKeyValue.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/ByteBufferKeyOnlyKeyValue.java
@@ -20,9 +20,9 @@ package org.apache.hadoop.hbase;
import java.nio.ByteBuffer;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.util.ByteBufferUtils;
import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* This is a key only Cell implementation which is identical to {@link KeyValue.KeyOnlyKeyValue}
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/ByteBufferKeyValue.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/ByteBufferKeyValue.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/ByteBufferKeyValue.java
index cd66312..beadaf6 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/ByteBufferKeyValue.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/ByteBufferKeyValue.java
@@ -21,10 +21,10 @@ import java.io.IOException;
import java.io.OutputStream;
import java.nio.ByteBuffer;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.util.ByteBufferUtils;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.ClassSize;
+import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
@@ -154,6 +154,7 @@ public class ByteBufferKeyValue extends ByteBufferCell implements ExtendedCell {
return this.seqId;
}
+ @Override
public void setSequenceId(long seqId) {
this.seqId = seqId;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/ByteBufferTag.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/ByteBufferTag.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/ByteBufferTag.java
index 3b27fc0..21289d1 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/ByteBufferTag.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/ByteBufferTag.java
@@ -21,9 +21,9 @@ package org.apache.hadoop.hbase;
import java.nio.ByteBuffer;
+import org.apache.hadoop.hbase.util.ByteBufferUtils;
import org.apache.yetus.audience.InterfaceAudience;
import org.apache.yetus.audience.InterfaceStability;
-import org.apache.hadoop.hbase.util.ByteBufferUtils;
/**
* This is a {@link Tag} implementation in which value is backed by
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparatorImpl.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparatorImpl.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparatorImpl.java
index 264984a..2dd1bdb 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparatorImpl.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparatorImpl.java
@@ -21,10 +21,10 @@ package org.apache.hadoop.hbase;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.KeyValue.Type;
-import org.apache.yetus.audience.InterfaceAudience;
-import org.apache.yetus.audience.InterfaceStability;
import org.apache.hadoop.hbase.util.ByteBufferUtils;
import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.yetus.audience.InterfaceAudience;
+import org.apache.yetus.audience.InterfaceStability;
import org.apache.hadoop.hbase.shaded.com.google.common.primitives.Longs;
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/CellScanner.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/CellScanner.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/CellScanner.java
index 2aabb83..9d0b8d8 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/CellScanner.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/CellScanner.java
@@ -21,7 +21,6 @@ package org.apache.hadoop.hbase;
import java.io.IOException;
import org.apache.yetus.audience.InterfaceAudience;
-import org.apache.yetus.audience.InterfaceStability;
/**
* An interface for iterating through a sequence of cells. Similar to Java's Iterator, but without
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/CellUtil.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/CellUtil.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/CellUtil.java
index 0940e63..3a8307c 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/CellUtil.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/CellUtil.java
@@ -34,6 +34,7 @@ import java.util.List;
import java.util.Map.Entry;
import java.util.NavigableMap;
import java.util.Optional;
+
import org.apache.hadoop.hbase.KeyValue.Type;
import org.apache.hadoop.hbase.io.HeapSize;
import org.apache.hadoop.hbase.util.ByteBufferUtils;
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/ChoreService.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/ChoreService.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/ChoreService.java
index 052c728..ff437db 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/ChoreService.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/ChoreService.java
@@ -27,12 +27,13 @@ import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.ScheduledChore.ChoreServicer;
import org.apache.yetus.audience.InterfaceAudience;
+import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
+
/**
* ChoreService is a service that can be used to schedule instances of {@link ScheduledChore} to run
* periodically while sharing threads. The ChoreService is backed by a
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/CompoundConfiguration.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/CompoundConfiguration.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/CompoundConfiguration.java
index b597fe6..b9d4a3e 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/CompoundConfiguration.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/CompoundConfiguration.java
@@ -30,8 +30,8 @@ import java.util.Map;
import org.apache.commons.collections4.iterators.UnmodifiableIterator;
import org.apache.hadoop.conf.Configuration;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* Do a shallow merge of multiple KV configuration pools. This is a very useful
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/ExtendedCell.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/ExtendedCell.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/ExtendedCell.java
index 36b07a8..81ca018 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/ExtendedCell.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/ExtendedCell.java
@@ -20,6 +20,7 @@ package org.apache.hadoop.hbase;
import java.io.IOException;
import java.io.OutputStream;
import java.nio.ByteBuffer;
+
import org.apache.hadoop.hbase.io.HeapSize;
import org.apache.hadoop.hbase.util.ByteBufferUtils;
import org.apache.yetus.audience.InterfaceAudience;
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
index 4ac76c5..6012fe8 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
@@ -25,9 +25,9 @@ import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.util.VersionInfo;
import org.apache.hadoop.hbase.zookeeper.ZKConfig;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* Adds HBase configuration files to a Configuration
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/JitterScheduledThreadPoolExecutorImpl.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/JitterScheduledThreadPoolExecutorImpl.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/JitterScheduledThreadPoolExecutorImpl.java
index 0f7cd7a..f9cdf1e 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/JitterScheduledThreadPoolExecutorImpl.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/JitterScheduledThreadPoolExecutorImpl.java
@@ -19,8 +19,6 @@
package org.apache.hadoop.hbase;
-import org.apache.yetus.audience.InterfaceAudience;
-
import java.util.concurrent.Callable;
import java.util.concurrent.Delayed;
import java.util.concurrent.ExecutionException;
@@ -31,6 +29,8 @@ import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
+import org.apache.yetus.audience.InterfaceAudience;
+
/**
* ScheduledThreadPoolExecutor that will add some jitter to the RunnableScheduledFuture.getDelay.
*
@@ -51,12 +51,13 @@ public class JitterScheduledThreadPoolExecutorImpl extends ScheduledThreadPoolEx
this.spread = spread;
}
+ @Override
protected <V> java.util.concurrent.RunnableScheduledFuture<V> decorateTask(
Runnable runnable, java.util.concurrent.RunnableScheduledFuture<V> task) {
return new JitteredRunnableScheduledFuture<>(task);
}
-
+ @Override
protected <V> java.util.concurrent.RunnableScheduledFuture<V> decorateTask(
Callable<V> callable, java.util.concurrent.RunnableScheduledFuture<V> task) {
return new JitteredRunnableScheduledFuture<>(task);
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java
index 727eede..7093650 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java
@@ -34,12 +34,13 @@ import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.hbase.util.ByteBufferUtils;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.ClassSize;
import org.apache.hadoop.io.RawComparator;
import org.apache.yetus.audience.InterfaceAudience;
+
+import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
/**
* An HBase Key/Value. This is the fundamental HBase Type.
* <p>
@@ -79,7 +80,7 @@ public class KeyValue implements ExtendedCell {
private static final Log LOG = LogFactory.getLog(KeyValue.class);
- public static final long FIXED_OVERHEAD = ClassSize.OBJECT + // the KeyValue object itself
+ public static final int FIXED_OVERHEAD = ClassSize.OBJECT + // the KeyValue object itself
ClassSize.REFERENCE + // pointer to "bytes"
2 * Bytes.SIZEOF_INT + // offset, length
Bytes.SIZEOF_LONG;// memstoreTS
@@ -195,9 +196,9 @@ public class KeyValue implements ExtendedCell {
*/
public static long getKeyValueDataStructureSize(int klength, int vlength, int tagsLength) {
if (tagsLength == 0) {
- return KeyValue.KEYVALUE_INFRASTRUCTURE_SIZE + klength + vlength;
+ return (long) KeyValue.KEYVALUE_INFRASTRUCTURE_SIZE + klength + vlength;
}
- return KeyValue.KEYVALUE_WITH_TAGS_INFRASTRUCTURE_SIZE + klength + vlength + tagsLength;
+ return (long) KeyValue.KEYVALUE_WITH_TAGS_INFRASTRUCTURE_SIZE + klength + vlength + tagsLength;
}
/**
@@ -211,7 +212,7 @@ public class KeyValue implements ExtendedCell {
* @return the key data structure length
*/
public static long getKeyDataStructureSize(int rlength, int flength, int qlength) {
- return KeyValue.KEY_INFRASTRUCTURE_SIZE + rlength + flength + qlength;
+ return (long) KeyValue.KEY_INFRASTRUCTURE_SIZE + rlength + flength + qlength;
}
/**
@@ -1524,6 +1525,7 @@ public class KeyValue implements ExtendedCell {
* Returns any tags embedded in the KeyValue. Used in testcases.
* @return The tags
*/
+ @Override
public List<Tag> getTags() {
int tagsLength = getTagsLength();
if (tagsLength == 0) {
@@ -2282,7 +2284,7 @@ public class KeyValue implements ExtendedCell {
int length = kv.getLength();
out.writeInt(length);
out.write(kv.getBuffer(), kv.getOffset(), length);
- return length + Bytes.SIZEOF_INT;
+ return (long) length + Bytes.SIZEOF_INT;
}
/**
@@ -2304,7 +2306,7 @@ public class KeyValue implements ExtendedCell {
public static long oswrite(final KeyValue kv, final OutputStream out, final boolean withTags)
throws IOException {
ByteBufferUtils.putInt(out, kv.getSerializedSize(withTags));
- return kv.write(out, withTags) + Bytes.SIZEOF_INT;
+ return (long) kv.write(out, withTags) + Bytes.SIZEOF_INT;
}
@Override
@@ -2350,13 +2352,12 @@ public class KeyValue implements ExtendedCell {
*/
@Override
public long heapSize() {
- long sum = FIXED_OVERHEAD;
/*
* Deep object overhead for this KV consists of two parts. The first part is the KV object
* itself, while the second part is the backing byte[]. We will only count the array overhead
* from the byte[] only if this is the first KV in there.
*/
- return ClassSize.align(sum) +
+ return ClassSize.align(FIXED_OVERHEAD) +
(offset == 0
? ClassSize.sizeOfByteArray(length) // count both length and object overhead
: length); // only count the number of bytes
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValueTestUtil.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValueTestUtil.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValueTestUtil.java
index 7467d67..3d9b4f9 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValueTestUtil.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValueTestUtil.java
@@ -22,10 +22,10 @@ import java.nio.ByteBuffer;
import java.util.Collection;
import java.util.List;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.IterableUtils;
import org.apache.hadoop.hbase.util.Strings;
+import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValueUtil.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValueUtil.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValueUtil.java
index 6fd37c0..60e4049 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValueUtil.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValueUtil.java
@@ -29,13 +29,13 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.hadoop.hbase.KeyValue.Type;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.io.util.StreamUtils;
import org.apache.hadoop.hbase.util.ByteBufferUtils;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.IterableUtils;
import org.apache.hadoop.io.IOUtils;
import org.apache.hadoop.io.WritableUtils;
+import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.shaded.com.google.common.base.Function;
import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
@@ -515,7 +515,7 @@ public class KeyValueUtil {
int length = kv.getLength();
out.writeInt(length);
out.write(kv.getBuffer(), kv.getOffset(), length);
- return length + Bytes.SIZEOF_INT;
+ return (long) length + Bytes.SIZEOF_INT;
}
/**
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/NamespaceDescriptor.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/NamespaceDescriptor.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/NamespaceDescriptor.java
index 94b719c..d1b69ba 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/NamespaceDescriptor.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/NamespaceDescriptor.java
@@ -26,8 +26,8 @@ import java.util.Set;
import java.util.TreeMap;
import java.util.TreeSet;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* Namespace POJO class. Used to represent and define namespaces.
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/NoTagsByteBufferKeyValue.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/NoTagsByteBufferKeyValue.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/NoTagsByteBufferKeyValue.java
index 82b243b..f00961f 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/NoTagsByteBufferKeyValue.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/NoTagsByteBufferKeyValue.java
@@ -19,8 +19,8 @@ package org.apache.hadoop.hbase;
import java.nio.ByteBuffer;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.util.ByteBufferUtils;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* An extension of the ByteBufferKeyValue where the tags length is always 0
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/NoTagsKeyValue.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/NoTagsKeyValue.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/NoTagsKeyValue.java
index 088aff5..3f8ef54 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/NoTagsKeyValue.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/NoTagsKeyValue.java
@@ -22,11 +22,11 @@ package org.apache.hadoop.hbase;
import java.io.IOException;
import java.io.OutputStream;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.yetus.audience.InterfaceAudience;
/**
- * An extension of the KeyValue where the tags length is always 0
+ * An extension of the KeyValue where the tags length is always 0
*/
@InterfaceAudience.Private
public class NoTagsKeyValue extends KeyValue {
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/PrivateCellUtil.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/PrivateCellUtil.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/PrivateCellUtil.java
index 79b8b31..df080f3 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/PrivateCellUtil.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/PrivateCellUtil.java
@@ -135,7 +135,7 @@ public final class PrivateCellUtil {
static class TagRewriteCell implements ExtendedCell {
protected Cell cell;
protected byte[] tags;
- private static final long HEAP_SIZE_OVERHEAD = ClassSize.OBJECT + 2 * ClassSize.REFERENCE;
+ private static final int HEAP_SIZE_OVERHEAD = ClassSize.OBJECT + 2 * ClassSize.REFERENCE;
/**
* @param cell The original Cell which it rewrites
@@ -317,7 +317,7 @@ public final class PrivateCellUtil {
protected ByteBufferCell cell;
protected byte[] tags;
- private static final long HEAP_SIZE_OVERHEAD = ClassSize.OBJECT + 2 * ClassSize.REFERENCE;
+ private static final int HEAP_SIZE_OVERHEAD = ClassSize.OBJECT + 2 * ClassSize.REFERENCE;
/**
* @param cell The original ByteBufferCell which it rewrites
@@ -1501,7 +1501,7 @@ public final class PrivateCellUtil {
}
private static class FirstOnRowCell extends EmptyCell {
- private static final long FIXED_HEAPSIZE =
+ private static final int FIXED_HEAPSIZE =
ClassSize.OBJECT // object
+ ClassSize.REFERENCE // row array
+ Bytes.SIZEOF_INT // row offset
@@ -1829,7 +1829,7 @@ public final class PrivateCellUtil {
}
private static class LastOnRowCell extends EmptyCell {
- private static final long FIXED_OVERHEAD =
+ private static final int FIXED_OVERHEAD =
ClassSize.OBJECT // object
+ ClassSize.REFERENCE // row array
+ Bytes.SIZEOF_INT // row offset
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/ServerName.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/ServerName.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/ServerName.java
index b00b707..10f658c 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/ServerName.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/ServerName.java
@@ -24,10 +24,10 @@ import java.util.List;
import java.util.Locale;
import java.util.regex.Pattern;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.net.Address;
import org.apache.hadoop.hbase.util.Addressing;
import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.shaded.com.google.common.net.InetAddresses;
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/SizeCachedKeyValue.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/SizeCachedKeyValue.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/SizeCachedKeyValue.java
index 383446c..aa649c7 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/SizeCachedKeyValue.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/SizeCachedKeyValue.java
@@ -19,8 +19,8 @@
*/
package org.apache.hadoop.hbase;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* This class is an extension to KeyValue where rowLen and keyLen are cached.
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java
index 74a4c8a..5a43794 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java
@@ -24,8 +24,8 @@ import java.util.Arrays;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArraySet;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* Immutable POJO class for representing a table name.
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/CellCodec.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/CellCodec.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/CellCodec.java
index ef7df27..8a1b9af 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/CellCodec.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/CellCodec.java
@@ -27,10 +27,10 @@ import org.apache.hadoop.hbase.CellBuilderType;
import org.apache.hadoop.hbase.ExtendedCellBuilder;
import org.apache.hadoop.hbase.ExtendedCellBuilderFactory;
import org.apache.hadoop.hbase.HBaseInterfaceAudience;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.io.ByteBuffInputStream;
import org.apache.hadoop.hbase.nio.ByteBuff;
import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* Basic Cell codec that just writes out all the individual elements of a Cell. Uses ints
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/CellCodecWithTags.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/CellCodecWithTags.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/CellCodecWithTags.java
index 95b7fe8..f33c45c 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/CellCodecWithTags.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/CellCodecWithTags.java
@@ -27,10 +27,10 @@ import org.apache.hadoop.hbase.CellBuilderType;
import org.apache.hadoop.hbase.ExtendedCellBuilder;
import org.apache.hadoop.hbase.ExtendedCellBuilderFactory;
import org.apache.hadoop.hbase.HBaseInterfaceAudience;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.io.ByteBuffInputStream;
import org.apache.hadoop.hbase.nio.ByteBuff;
import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* Basic Cell codec that just writes out all the individual elements of a Cell including the tags.
@@ -85,6 +85,7 @@ public class CellCodecWithTags implements Codec {
super(in);
}
+ @Override
protected Cell parseCell() throws IOException {
byte[] row = readByteArray(this.in);
byte[] family = readByteArray(in);
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/Codec.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/Codec.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/Codec.java
index bbbdcf6..01359ea 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/Codec.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/Codec.java
@@ -22,9 +22,9 @@ import java.io.OutputStream;
import org.apache.hadoop.hbase.CellScanner;
import org.apache.hadoop.hbase.HBaseInterfaceAudience;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.io.CellOutputStream;
import org.apache.hadoop.hbase.nio.ByteBuff;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* Encoder/Decoder for Cell.
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/KeyValueCodec.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/KeyValueCodec.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/KeyValueCodec.java
index d2de331..9a5db3c 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/KeyValueCodec.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/KeyValueCodec.java
@@ -27,13 +27,13 @@ import org.apache.hadoop.hbase.HBaseInterfaceAudience;
import org.apache.hadoop.hbase.KeyValueUtil;
import org.apache.hadoop.hbase.NoTagsByteBufferKeyValue;
import org.apache.hadoop.hbase.NoTagsKeyValue;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.nio.ByteBuff;
import org.apache.hadoop.hbase.util.ByteBufferUtils;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* Codec that does KeyValue version 1 serialization.
- *
+ *
* <p>Encodes Cell as serialized in KeyValue with total length prefix.
* This is how KVs were serialized in Puts, Deletes and Results pre-0.96. Its what would
* happen if you called the Writable#write KeyValue implementation. This encoder will fail
@@ -69,6 +69,7 @@ public class KeyValueCodec implements Codec {
super(in);
}
+ @Override
protected Cell parseCell() throws IOException {
// No tags here
return KeyValueUtil.iscreate(in, false);
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/KeyValueCodecWithTags.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/KeyValueCodecWithTags.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/KeyValueCodecWithTags.java
index fe5ad5a..bf9b375 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/KeyValueCodecWithTags.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/KeyValueCodecWithTags.java
@@ -22,14 +22,14 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.nio.ByteBuffer;
+import org.apache.hadoop.hbase.ByteBufferKeyValue;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.HBaseInterfaceAudience;
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.KeyValueUtil;
-import org.apache.hadoop.hbase.ByteBufferKeyValue;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.nio.ByteBuff;
import org.apache.hadoop.hbase.util.ByteBufferUtils;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* Codec that does KeyValue version 1 serialization with serializing tags also.
@@ -75,6 +75,7 @@ public class KeyValueCodecWithTags implements Codec {
super(in);
}
+ @Override
protected Cell parseCell() throws IOException {
// create KeyValue with tags
return KeyValueUtil.iscreate(in, true);
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/exceptions/UnexpectedStateException.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/exceptions/UnexpectedStateException.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/exceptions/UnexpectedStateException.java
index 575b961..e776acc 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/exceptions/UnexpectedStateException.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/exceptions/UnexpectedStateException.java
@@ -17,8 +17,8 @@
*/
package org.apache.hadoop.hbase.exceptions;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.HBaseIOException;
+import org.apache.yetus.audience.InterfaceAudience;
@InterfaceAudience.Private
public class UnexpectedStateException extends HBaseIOException {
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/filter/ByteArrayComparable.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/filter/ByteArrayComparable.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/filter/ByteArrayComparable.java
index 82841fe..f0258f5 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/filter/ByteArrayComparable.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/filter/ByteArrayComparable.java
@@ -20,10 +20,10 @@ package org.apache.hadoop.hbase.filter;
import java.nio.ByteBuffer;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.exceptions.DeserializationException;
import org.apache.hadoop.hbase.util.ByteBufferUtils;
import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.yetus.audience.InterfaceAudience;
/** Base class for byte array comparators */
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteArrayOutputStream.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteArrayOutputStream.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteArrayOutputStream.java
index bd371da..38c986a 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteArrayOutputStream.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteArrayOutputStream.java
@@ -22,9 +22,9 @@ import java.nio.BufferOverflowException;
import java.nio.ByteBuffer;
import java.util.Arrays;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.util.ByteBufferUtils;
import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* Our own implementation of ByteArrayOutputStream where all methods are NOT synchronized and
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBuffInputStream.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBuffInputStream.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBuffInputStream.java
index d792339..152d0db 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBuffInputStream.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBuffInputStream.java
@@ -19,8 +19,8 @@ package org.apache.hadoop.hbase.io;
import java.io.InputStream;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.nio.ByteBuff;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* Not thread safe!
@@ -42,6 +42,7 @@ public class ByteBuffInputStream extends InputStream {
* because the end of the stream has been reached, the value <code>-1</code> is returned.
* @return the next byte of data, or <code>-1</code> if the end of the stream has been reached.
*/
+ @Override
public int read() {
if (this.buf.hasRemaining()) {
return (this.buf.get() & 0xff);
@@ -58,6 +59,7 @@ public class ByteBuffInputStream extends InputStream {
* @return the total number of bytes actually read into the buffer, or <code>-1</code> if not even
* 1 byte can be read because the end of the stream has been reached.
*/
+ @Override
public int read (byte b[], int off, int len) {
int avail = available();
if (avail <= 0) {
@@ -81,6 +83,7 @@ public class ByteBuffInputStream extends InputStream {
* @param n the number of bytes to be skipped.
* @return the actual number of bytes skipped.
*/
+ @Override
public long skip(long n) {
long k = Math.min(n, available());
if (k <= 0) {
@@ -94,6 +97,7 @@ public class ByteBuffInputStream extends InputStream {
* @return the number of remaining bytes that can be read (or skipped
* over) from this input stream.
*/
+ @Override
public int available() {
return this.buf.remaining();
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBufferInputStream.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBufferInputStream.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBufferInputStream.java
index acb8a1c..2811b1b 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBufferInputStream.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBufferInputStream.java
@@ -20,8 +20,8 @@ package org.apache.hadoop.hbase.io;
import java.io.InputStream;
import java.nio.ByteBuffer;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.util.ByteBufferUtils;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* Not thread safe!
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBufferListOutputStream.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBufferListOutputStream.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBufferListOutputStream.java
index 08b4eea..61cc170 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBufferListOutputStream.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBufferListOutputStream.java
@@ -25,8 +25,8 @@ import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.util.ByteBufferUtils;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* An OutputStream which writes data into ByteBuffers. It will try to get ByteBuffer, as and when
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBufferOutputStream.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBufferOutputStream.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBufferOutputStream.java
index c72394e..9bdad53 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBufferOutputStream.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBufferOutputStream.java
@@ -27,9 +27,9 @@ import java.nio.ByteOrder;
import java.nio.channels.Channels;
import java.nio.channels.WritableByteChannel;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.util.ByteBufferUtils;
import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* Not thread safe!
@@ -142,6 +142,7 @@ public class ByteBufferOutputStream extends OutputStream
ByteBufferUtils.copyFromArrayToBuffer(curBuf, b, off, len);
}
+ @Override
public void write(ByteBuffer b, int off, int len) throws IOException {
checkSizeAndGrow(len);
ByteBufferUtils.copyFromBufferToBuffer(b, curBuf, off, len);
@@ -153,6 +154,7 @@ public class ByteBufferOutputStream extends OutputStream
* @param i the <code>int</code> to write
* @throws IOException if an I/O error occurs.
*/
+ @Override
public void writeInt(int i) throws IOException {
checkSizeAndGrow(Bytes.SIZEOF_INT);
ByteBufferUtils.putInt(this.curBuf, i);
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBufferPool.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBufferPool.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBufferPool.java
index 82ce52d..784c88f 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBufferPool.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBufferPool.java
@@ -22,12 +22,12 @@ import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.yetus.audience.InterfaceAudience;
+import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
+
/**
* Like Hadoops' ByteBufferPool only you do not specify desired size when getting a ByteBuffer. This
* pool keeps an upper bound on the count of ByteBuffers in the pool and a fixed size of ByteBuffer
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBufferWriterDataOutputStream.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBufferWriterDataOutputStream.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBufferWriterDataOutputStream.java
index 83635d6..c085abc 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBufferWriterDataOutputStream.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBufferWriterDataOutputStream.java
@@ -22,8 +22,8 @@ import java.io.IOException;
import java.io.OutputStream;
import java.nio.ByteBuffer;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.util.ByteBufferUtils;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* Our extension of DataOutputStream which implements ByteBufferWriter
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBufferWriterOutputStream.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBufferWriterOutputStream.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBufferWriterOutputStream.java
index 537e4bd..6d46fa8 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBufferWriterOutputStream.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBufferWriterOutputStream.java
@@ -21,9 +21,9 @@ import java.io.IOException;
import java.io.OutputStream;
import java.nio.ByteBuffer;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.io.util.StreamUtils;
import org.apache.hadoop.hbase.util.ByteBufferUtils;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* When deal with OutputStream which is not ByteBufferWriter type, wrap it with this class. We will
@@ -74,6 +74,7 @@ public class ByteBufferWriterOutputStream extends OutputStream
this.os.write(b);
}
+ @Override
public void write(byte b[], int off, int len) throws IOException {
this.os.write(b, off, len);
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ImmutableBytesWritable.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ImmutableBytesWritable.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ImmutableBytesWritable.java
index 1384e81..949e905 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ImmutableBytesWritable.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ImmutableBytesWritable.java
@@ -24,10 +24,10 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.List;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.io.BytesWritable;
import org.apache.hadoop.io.WritableComparable;
import org.apache.hadoop.io.WritableComparator;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* A byte sequence that is usable as a key or value. Based on
@@ -146,6 +146,7 @@ implements WritableComparable<ImmutableBytesWritable> {
return this.offset;
}
+ @Override
public void readFields(final DataInput in) throws IOException {
this.length = in.readInt();
this.bytes = new byte[this.length];
@@ -153,6 +154,7 @@ implements WritableComparable<ImmutableBytesWritable> {
this.offset = 0;
}
+ @Override
public void write(final DataOutput out) throws IOException {
out.writeInt(this.length);
out.write(this.bytes, this.offset, this.length);
@@ -173,6 +175,7 @@ implements WritableComparable<ImmutableBytesWritable> {
* @return Positive if left is bigger than right, 0 if they are equal, and
* negative if left is smaller than right.
*/
+ @Override
public int compareTo(ImmutableBytesWritable that) {
return WritableComparator.compareBytes(
this.bytes, this.offset, this.length,
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/TagCompressionContext.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/TagCompressionContext.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/TagCompressionContext.java
index 32997e0..d646250 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/TagCompressionContext.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/TagCompressionContext.java
@@ -26,13 +26,13 @@ import java.lang.reflect.InvocationTargetException;
import java.nio.ByteBuffer;
import org.apache.hadoop.hbase.Tag;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.io.util.Dictionary;
import org.apache.hadoop.hbase.io.util.StreamUtils;
import org.apache.hadoop.hbase.nio.ByteBuff;
import org.apache.hadoop.hbase.util.ByteBufferUtils;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.io.IOUtils;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* Context that holds the dictionary for Tag compression and doing the compress/uncompress. This
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/TimeRange.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/TimeRange.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/TimeRange.java
index fee652a..e450346 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/TimeRange.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/TimeRange.java
@@ -18,8 +18,8 @@
package org.apache.hadoop.hbase.io;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* Represents an interval of version timestamps. Presumes timestamps between
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/compress/Compression.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/compress/Compression.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/compress/Compression.java
index 41f4fb8..ec4ce38 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/compress/Compression.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/compress/Compression.java
@@ -27,7 +27,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configurable;
import org.apache.hadoop.conf.Configuration;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.io.IOUtils;
import org.apache.hadoop.io.compress.CodecPool;
import org.apache.hadoop.io.compress.CompressionCodec;
@@ -39,6 +38,7 @@ import org.apache.hadoop.io.compress.DefaultCodec;
import org.apache.hadoop.io.compress.DoNotPool;
import org.apache.hadoop.io.compress.GzipCodec;
import org.apache.hadoop.util.ReflectionUtils;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* Compression related stuff.
@@ -104,7 +104,7 @@ public final class Compression {
LZO("lzo") {
// Use base type to avoid compile-time dependencies.
private volatile transient CompressionCodec lzoCodec;
- private transient Object lock = new Object();
+ private final transient Object lock = new Object();
@Override
CompressionCodec getCodec(Configuration conf) {
@@ -131,7 +131,7 @@ public final class Compression {
},
GZ("gz") {
private volatile transient GzipCodec codec;
- private transient Object lock = new Object();
+ private final transient Object lock = new Object();
@Override
DefaultCodec getCodec(Configuration conf) {
@@ -183,7 +183,7 @@ public final class Compression {
SNAPPY("snappy") {
// Use base type to avoid compile-time dependencies.
private volatile transient CompressionCodec snappyCodec;
- private transient Object lock = new Object();
+ private final transient Object lock = new Object();
@Override
CompressionCodec getCodec(Configuration conf) {
@@ -210,7 +210,7 @@ public final class Compression {
LZ4("lz4") {
// Use base type to avoid compile-time dependencies.
private volatile transient CompressionCodec lz4Codec;
- private transient Object lock = new Object();
+ private final transient Object lock = new Object();
@Override
CompressionCodec getCodec(Configuration conf) {
@@ -237,7 +237,7 @@ public final class Compression {
BZIP2("bzip2") {
// Use base type to avoid compile-time dependencies.
private volatile transient CompressionCodec bzipCodec;
- private transient Object lock = new Object();
+ private final transient Object lock = new Object();
@Override
CompressionCodec getCodec(Configuration conf) {
@@ -264,7 +264,7 @@ public final class Compression {
ZSTD("zstd") {
// Use base type to avoid compile-time dependencies.
private volatile transient CompressionCodec zStandardCodec;
- private transient Object lock = new Object();
+ private final transient Object lock = new Object();
@Override
CompressionCodec getCodec(Configuration conf) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/compress/ReusableStreamGzipCodec.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/compress/ReusableStreamGzipCodec.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/compress/ReusableStreamGzipCodec.java
index 39a7662..3db9d7e 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/compress/ReusableStreamGzipCodec.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/compress/ReusableStreamGzipCodec.java
@@ -24,12 +24,12 @@ import java.util.zip.GZIPOutputStream;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.util.JVM;
import org.apache.hadoop.io.compress.CompressionOutputStream;
import org.apache.hadoop.io.compress.CompressorStream;
import org.apache.hadoop.io.compress.GzipCodec;
import org.apache.hadoop.io.compress.zlib.ZlibFactory;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* Fixes an inefficiency in Hadoop's Gzip codec, allowing to reuse compression
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/Context.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/Context.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/Context.java
index cbbe9f6..4cc4302 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/Context.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/Context.java
@@ -21,8 +21,8 @@ import java.security.Key;
import org.apache.hadoop.conf.Configurable;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.util.MD5Hash;
+import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/CryptoCipherProvider.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/CryptoCipherProvider.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/CryptoCipherProvider.java
index 3bc66fb..2ed422c 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/CryptoCipherProvider.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/CryptoCipherProvider.java
@@ -18,8 +18,8 @@ package org.apache.hadoop.hbase.io.crypto;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.io.crypto.aes.CommonsCryptoAES;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* The default cipher provider. Supports AES via the Commons Crypto.
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/DefaultCipherProvider.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/DefaultCipherProvider.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/DefaultCipherProvider.java
index 896e20f..6e36d5a 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/DefaultCipherProvider.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/DefaultCipherProvider.java
@@ -18,8 +18,8 @@ package org.apache.hadoop.hbase.io.crypto;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.io.crypto.aes.AES;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* The default cipher provider. Supports AES via the JCE.
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/Encryption.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/Encryption.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/Encryption.java
index 5fb9c47..49cc61f 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/Encryption.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/Encryption.java
@@ -27,7 +27,6 @@ import java.security.spec.InvalidKeySpecException;
import java.util.Arrays;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-
import javax.crypto.SecretKeyFactory;
import javax.crypto.spec.PBEKeySpec;
import javax.crypto.spec.SecretKeySpec;
@@ -38,10 +37,10 @@ import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HConstants;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.Pair;
import org.apache.hadoop.util.ReflectionUtils;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* A facade for encryption algorithms and related support.
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/AES.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/AES.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/AES.java
index bc57deb..6c73bb4 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/AES.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/AES.java
@@ -23,18 +23,17 @@ import java.io.OutputStream;
import java.security.GeneralSecurityException;
import java.security.Key;
import java.security.SecureRandom;
-
import javax.crypto.spec.SecretKeySpec;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.yetus.audience.InterfaceAudience;
-import org.apache.yetus.audience.InterfaceStability;
import org.apache.hadoop.hbase.io.crypto.Cipher;
import org.apache.hadoop.hbase.io.crypto.CipherProvider;
import org.apache.hadoop.hbase.io.crypto.Context;
import org.apache.hadoop.hbase.io.crypto.Decryptor;
import org.apache.hadoop.hbase.io.crypto.Encryptor;
+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.hadoop.hbase.shaded.com.google.common.base.Preconditions;
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/AESDecryptor.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/AESDecryptor.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/AESDecryptor.java
index 79d2c9b..5ad3e80 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/AESDecryptor.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/AESDecryptor.java
@@ -21,12 +21,11 @@ import java.io.InputStream;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
import java.security.Key;
-
import javax.crypto.spec.IvParameterSpec;
+import org.apache.hadoop.hbase.io.crypto.Decryptor;
import org.apache.yetus.audience.InterfaceAudience;
import org.apache.yetus.audience.InterfaceStability;
-import org.apache.hadoop.hbase.io.crypto.Decryptor;
import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/AESEncryptor.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/AESEncryptor.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/AESEncryptor.java
index f3f993c..fe79c8f 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/AESEncryptor.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/AESEncryptor.java
@@ -22,12 +22,11 @@ import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
import java.security.Key;
import java.security.SecureRandom;
-
import javax.crypto.spec.IvParameterSpec;
+import org.apache.hadoop.hbase.io.crypto.Encryptor;
import org.apache.yetus.audience.InterfaceAudience;
import org.apache.yetus.audience.InterfaceStability;
-import org.apache.hadoop.hbase.io.crypto.Encryptor;
import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/CommonsCryptoAES.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/CommonsCryptoAES.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/CommonsCryptoAES.java
index e79d631..412ea79 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/CommonsCryptoAES.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/CommonsCryptoAES.java
@@ -24,20 +24,19 @@ import java.security.GeneralSecurityException;
import java.security.Key;
import java.security.SecureRandom;
import java.util.Properties;
-
import javax.crypto.spec.SecretKeySpec;
import org.apache.commons.crypto.cipher.CryptoCipherFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
-import org.apache.yetus.audience.InterfaceAudience;
-import org.apache.yetus.audience.InterfaceStability;
import org.apache.hadoop.hbase.io.crypto.Cipher;
import org.apache.hadoop.hbase.io.crypto.CipherProvider;
import org.apache.hadoop.hbase.io.crypto.Context;
import org.apache.hadoop.hbase.io.crypto.Decryptor;
import org.apache.hadoop.hbase.io.crypto.Encryptor;
+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.hadoop.hbase.shaded.com.google.common.base.Preconditions;
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/CommonsCryptoAESDecryptor.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/CommonsCryptoAESDecryptor.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/CommonsCryptoAESDecryptor.java
index 82e68f3..bb2290f 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/CommonsCryptoAESDecryptor.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/CommonsCryptoAESDecryptor.java
@@ -17,17 +17,18 @@
*/
package org.apache.hadoop.hbase.io.crypto.aes;
-import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;
-import org.apache.commons.crypto.stream.CryptoInputStream;
-import org.apache.yetus.audience.InterfaceAudience;
-import org.apache.yetus.audience.InterfaceStability;
-import org.apache.hadoop.hbase.io.crypto.Decryptor;
-
-import javax.crypto.spec.IvParameterSpec;
import java.io.IOException;
import java.io.InputStream;
import java.security.Key;
import java.util.Properties;
+import javax.crypto.spec.IvParameterSpec;
+
+import org.apache.commons.crypto.stream.CryptoInputStream;
+import org.apache.hadoop.hbase.io.crypto.Decryptor;
+import org.apache.yetus.audience.InterfaceAudience;
+import org.apache.yetus.audience.InterfaceStability;
+
+import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;
@InterfaceAudience.Private
@InterfaceStability.Evolving
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/CommonsCryptoAESEncryptor.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/CommonsCryptoAESEncryptor.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/CommonsCryptoAESEncryptor.java
index dc4a6ad..1b2f23f 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/CommonsCryptoAESEncryptor.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/CommonsCryptoAESEncryptor.java
@@ -17,18 +17,19 @@
*/
package org.apache.hadoop.hbase.io.crypto.aes;
-import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;
-import org.apache.commons.crypto.stream.CryptoOutputStream;
-import org.apache.yetus.audience.InterfaceAudience;
-import org.apache.yetus.audience.InterfaceStability;
-import org.apache.hadoop.hbase.io.crypto.Encryptor;
-
-import javax.crypto.spec.IvParameterSpec;
import java.io.IOException;
import java.io.OutputStream;
import java.security.Key;
import java.security.SecureRandom;
import java.util.Properties;
+import javax.crypto.spec.IvParameterSpec;
+
+import org.apache.commons.crypto.stream.CryptoOutputStream;
+import org.apache.hadoop.hbase.io.crypto.Encryptor;
+import org.apache.yetus.audience.InterfaceAudience;
+import org.apache.yetus.audience.InterfaceStability;
+
+import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;
@InterfaceAudience.Private
@InterfaceStability.Evolving
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/CryptoAES.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/CryptoAES.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/CryptoAES.java
index 0bc23f7..f0f41b9 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/CryptoAES.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/CryptoAES.java
@@ -18,11 +18,12 @@
package org.apache.hadoop.hbase.io.crypto.aes;
-import org.apache.commons.crypto.cipher.CryptoCipher;
-import org.apache.commons.crypto.utils.Utils;
-import org.apache.yetus.audience.InterfaceAudience;
-import org.apache.yetus.audience.InterfaceStability;
-
+import java.io.IOException;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
+import java.util.Properties;
import javax.crypto.Cipher;
import javax.crypto.Mac;
import javax.crypto.SecretKey;
@@ -30,12 +31,11 @@ import javax.crypto.ShortBufferException;
import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec;
import javax.security.sasl.SaslException;
-import java.io.IOException;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.util.Arrays;
-import java.util.Properties;
+
+import org.apache.commons.crypto.cipher.CryptoCipher;
+import org.apache.commons.crypto.utils.Utils;
+import org.apache.yetus.audience.InterfaceAudience;
+import org.apache.yetus.audience.InterfaceStability;
/**
* AES encryption and decryption.
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/AbstractDataBlockEncoder.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/AbstractDataBlockEncoder.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/AbstractDataBlockEncoder.java
index d3c622a..ab95717 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/AbstractDataBlockEncoder.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/AbstractDataBlockEncoder.java
@@ -23,9 +23,9 @@ import org.apache.hadoop.hbase.ByteBufferKeyOnlyKeyValue;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellComparator;
import org.apache.hadoop.hbase.KeyValue;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.io.hfile.BlockType;
import org.apache.hadoop.hbase.io.hfile.HFileContext;
+import org.apache.yetus.audience.InterfaceAudience;
@InterfaceAudience.Private
public abstract class AbstractDataBlockEncoder implements DataBlockEncoder {
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/BufferedDataBlockEncoder.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/BufferedDataBlockEncoder.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/BufferedDataBlockEncoder.java
index 67a337d..9bcda01 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/BufferedDataBlockEncoder.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/BufferedDataBlockEncoder.java
@@ -21,6 +21,7 @@ import java.io.DataOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.nio.ByteBuffer;
+
import org.apache.hadoop.hbase.ByteBufferCell;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellComparator;
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/CompressionState.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/CompressionState.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/CompressionState.java
index e3513fa..3a5806e 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/CompressionState.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/CompressionState.java
@@ -19,8 +19,8 @@ package org.apache.hadoop.hbase.io.encoding;
import java.nio.ByteBuffer;
import org.apache.hadoop.hbase.KeyValue;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.util.ByteBufferUtils;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* Stores the state of data block encoder at the beginning of new key.