http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/CopyKeyDataBlockEncoder.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/CopyKeyDataBlockEncoder.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/CopyKeyDataBlockEncoder.java index 1547310..8bc7974 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/CopyKeyDataBlockEncoder.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/CopyKeyDataBlockEncoder.java @@ -23,10 +23,10 @@ import java.nio.ByteBuffer; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellComparator; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.nio.ByteBuff; import org.apache.hadoop.hbase.util.ByteBufferUtils; import org.apache.hadoop.hbase.util.Bytes; +import org.apache.yetus.audience.InterfaceAudience; /** * Just copy data, do not do any kind of compression. Use for comparison and
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/DataBlockEncoder.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/DataBlockEncoder.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/DataBlockEncoder.java index 7b4036c..e6f339d 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/DataBlockEncoder.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/DataBlockEncoder.java @@ -23,9 +23,9 @@ import java.nio.ByteBuffer; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellComparator; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.io.hfile.HFileContext; import org.apache.hadoop.hbase.nio.ByteBuff; +import org.apache.yetus.audience.InterfaceAudience; /** * Encoding of KeyValue. It aims to be fast and efficient using assumptions: http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/DataBlockEncoding.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/DataBlockEncoding.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/DataBlockEncoding.java index f3b5b25..335488b 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/DataBlockEncoding.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/DataBlockEncoding.java @@ -19,8 +19,8 @@ package org.apache.hadoop.hbase.io.encoding; 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; /** * Provide access to all data block encoding algorithms. All of the algorithms @@ -172,16 +172,13 @@ public enum DataBlockEncoding { return algorithm; } - protected static DataBlockEncoder createEncoder(String fullyQualifiedClassName){ - try { - return (DataBlockEncoder)Class.forName(fullyQualifiedClassName).newInstance(); - } catch (InstantiationException e) { - throw new RuntimeException(e); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } catch (ClassNotFoundException e) { - throw new IllegalArgumentException(e); - } + protected static DataBlockEncoder createEncoder(String fullyQualifiedClassName) { + try { + return (DataBlockEncoder) Class.forName(fullyQualifiedClassName).getDeclaredConstructor() + .newInstance(); + } catch (Exception e) { + throw new RuntimeException(e); + } } } http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/DiffKeyDeltaEncoder.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/DiffKeyDeltaEncoder.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/DiffKeyDeltaEncoder.java index 6762bb8..01f0a9d 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/DiffKeyDeltaEncoder.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/DiffKeyDeltaEncoder.java @@ -23,14 +23,14 @@ import java.nio.ByteBuffer; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellComparator; -import org.apache.hadoop.hbase.PrivateCellUtil; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueUtil; -import org.apache.yetus.audience.InterfaceAudience; +import org.apache.hadoop.hbase.PrivateCellUtil; 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.hbase.util.ObjectIntPair; +import org.apache.yetus.audience.InterfaceAudience; /** * Compress using: @@ -208,7 +208,7 @@ public class DiffKeyDeltaEncoder extends BufferedDataBlockEncoder { private int compressSingleKeyValue(DataOutputStream out, Cell cell, Cell prevCell) throws IOException { - byte flag = 0; + int flag = 0; // Do not use more bits that can fit into a byte int kLength = KeyValueUtil.keyLength(cell); int vLength = cell.getValueLength(); http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/EncodedDataBlock.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/EncodedDataBlock.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/EncodedDataBlock.java index b9f7d77..d7e8a9b 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/EncodedDataBlock.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/EncodedDataBlock.java @@ -29,13 +29,13 @@ import org.apache.commons.lang3.NotImplementedException; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.io.compress.Compression.Algorithm; import org.apache.hadoop.hbase.io.hfile.HFileContext; import org.apache.hadoop.hbase.util.ByteBufferUtils; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.io.IOUtils; import org.apache.hadoop.io.compress.Compressor; +import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting; import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions; @@ -257,7 +257,7 @@ public class EncodedDataBlock { } BufferGrabbingByteArrayOutputStream stream = new BufferGrabbingByteArrayOutputStream(); baos.writeTo(stream); - this.dataBlockEncoder.endBlockEncoding(encodingCtx, out, stream.buf); + this.dataBlockEncoder.endBlockEncoding(encodingCtx, out, stream.ourBytes); } catch (IOException e) { throw new RuntimeException(String.format( "Bug in encoding part of algorithm %s. " + @@ -268,11 +268,11 @@ public class EncodedDataBlock { } private static class BufferGrabbingByteArrayOutputStream extends ByteArrayOutputStream { - private byte[] buf; + private byte[] ourBytes; @Override - public void write(byte[] b, int off, int len) { - this.buf = b; + public synchronized void write(byte[] b, int off, int len) { + this.ourBytes = b; } } http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/FastDiffDeltaEncoder.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/FastDiffDeltaEncoder.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/FastDiffDeltaEncoder.java index a337776..baa1856 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/FastDiffDeltaEncoder.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/FastDiffDeltaEncoder.java @@ -24,14 +24,14 @@ import java.nio.ByteBuffer; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellComparator; -import org.apache.hadoop.hbase.PrivateCellUtil; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueUtil; -import org.apache.yetus.audience.InterfaceAudience; +import org.apache.hadoop.hbase.PrivateCellUtil; 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.hbase.util.ObjectIntPair; +import org.apache.yetus.audience.InterfaceAudience; /** * Encoder similar to {@link DiffKeyDeltaEncoder} but supposedly faster. @@ -253,7 +253,7 @@ public class FastDiffDeltaEncoder extends BufferedDataBlockEncoder { private int compressSingleKeyValue(DataOutputStream out, Cell cell, Cell prevCell) throws IOException { - byte flag = 0; + int flag = 0; // Do not use more bits than will fit into a byte int kLength = KeyValueUtil.keyLength(cell); int vLength = cell.getValueLength(); http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/HFileBlockDecodingContext.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/HFileBlockDecodingContext.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/HFileBlockDecodingContext.java index d6972d3..7f29302 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/HFileBlockDecodingContext.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/HFileBlockDecodingContext.java @@ -18,9 +18,9 @@ package org.apache.hadoop.hbase.io.encoding; import java.io.IOException; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.io.hfile.HFileContext; import org.apache.hadoop.hbase.nio.ByteBuff; +import org.apache.yetus.audience.InterfaceAudience; /** * A decoding context that is created by a reader's encoder, and is shared http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultDecodingContext.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultDecodingContext.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultDecodingContext.java index 107f319..d5bf58c 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultDecodingContext.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultDecodingContext.java @@ -21,7 +21,6 @@ import java.io.IOException; import java.io.InputStream; import org.apache.commons.io.IOUtils; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.io.ByteBuffInputStream; import org.apache.hadoop.hbase.io.TagCompressionContext; import org.apache.hadoop.hbase.io.compress.Compression; @@ -31,6 +30,7 @@ import org.apache.hadoop.hbase.io.crypto.Encryption; import org.apache.hadoop.hbase.io.hfile.HFileContext; import org.apache.hadoop.hbase.nio.ByteBuff; import org.apache.hadoop.hbase.util.Bytes; +import org.apache.yetus.audience.InterfaceAudience; /** * A default implementation of {@link HFileBlockDecodingContext}. It assumes the http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultEncodingContext.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultEncodingContext.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultEncodingContext.java index d5168d2..2193037 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultEncodingContext.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultEncodingContext.java @@ -24,7 +24,6 @@ import java.io.IOException; import java.io.InputStream; import java.security.SecureRandom; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.io.ByteArrayOutputStream; import org.apache.hadoop.hbase.io.TagCompressionContext; import org.apache.hadoop.hbase.io.compress.Compression; @@ -36,6 +35,7 @@ import org.apache.hadoop.hbase.io.hfile.HFileContext; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.io.compress.CompressionOutputStream; import org.apache.hadoop.io.compress.Compressor; +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/encoding/HFileBlockEncodingContext.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/HFileBlockEncodingContext.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/HFileBlockEncodingContext.java index e3f261a..9602229 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/HFileBlockEncodingContext.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/HFileBlockEncodingContext.java @@ -18,10 +18,10 @@ package org.apache.hadoop.hbase.io.encoding; import java.io.IOException; -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.hadoop.hbase.util.Bytes; +import org.apache.yetus.audience.InterfaceAudience; /** * An encoding context that is created by a writer's encoder, and is shared http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/NoneEncoder.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/NoneEncoder.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/NoneEncoder.java index 29b855a..e3092fe 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/NoneEncoder.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/NoneEncoder.java @@ -22,11 +22,11 @@ import java.io.DataOutputStream; import java.io.IOException; import org.apache.hadoop.hbase.Cell; -import org.apache.hadoop.hbase.PrivateCellUtil; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueUtil; -import org.apache.yetus.audience.InterfaceAudience; +import org.apache.hadoop.hbase.PrivateCellUtil; import org.apache.hadoop.io.WritableUtils; +import org.apache.yetus.audience.InterfaceAudience; @InterfaceAudience.Private public class NoneEncoder { http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/PrefixKeyDeltaEncoder.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/PrefixKeyDeltaEncoder.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/PrefixKeyDeltaEncoder.java index a488e48..63da7e7 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/PrefixKeyDeltaEncoder.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/PrefixKeyDeltaEncoder.java @@ -24,13 +24,13 @@ import java.nio.ByteBuffer; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellComparator; -import org.apache.hadoop.hbase.PrivateCellUtil; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueUtil; -import org.apache.yetus.audience.InterfaceAudience; +import org.apache.hadoop.hbase.PrivateCellUtil; import org.apache.hadoop.hbase.nio.ByteBuff; import org.apache.hadoop.hbase.util.ByteBufferUtils; import org.apache.hadoop.hbase.util.Bytes; +import org.apache.yetus.audience.InterfaceAudience; /** * Compress key by storing size of common prefix with previous KeyValue http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/RowIndexCodecV1.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/RowIndexCodecV1.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/RowIndexCodecV1.java index 530e673..3293389 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/RowIndexCodecV1.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/RowIndexCodecV1.java @@ -28,13 +28,13 @@ import org.apache.hadoop.hbase.CellComparator; import org.apache.hadoop.hbase.CellComparatorImpl; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueUtil; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.io.ByteArrayOutputStream; import org.apache.hadoop.hbase.nio.ByteBuff; import org.apache.hadoop.hbase.nio.SingleByteBuff; import org.apache.hadoop.hbase.util.ByteBufferUtils; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.io.WritableUtils; +import org.apache.yetus.audience.InterfaceAudience; /** * Store cells following every row's start offset, so we can binary search to a row's cells. http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/RowIndexEncoderV1.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/RowIndexEncoderV1.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/RowIndexEncoderV1.java index fded0f6..92a3a4f 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/RowIndexEncoderV1.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/RowIndexEncoderV1.java @@ -16,10 +16,9 @@ import java.io.IOException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.Cell; -import org.apache.hadoop.hbase.CellComparator; import org.apache.hadoop.hbase.CellComparatorImpl; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.io.ByteArrayOutputStream; +import org.apache.yetus.audience.InterfaceAudience; @InterfaceAudience.Private public class RowIndexEncoderV1 { http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/RowIndexSeekerV1.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/RowIndexSeekerV1.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/RowIndexSeekerV1.java index 0ebcae0..02ed721 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/RowIndexSeekerV1.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/RowIndexSeekerV1.java @@ -20,21 +20,21 @@ import java.nio.ByteBuffer; import org.apache.hadoop.hbase.ByteBufferCell; import org.apache.hadoop.hbase.ByteBufferKeyOnlyKeyValue; +import org.apache.hadoop.hbase.ByteBufferKeyValue; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellComparator; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.PrivateCellUtil; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.ByteBufferKeyValue; +import org.apache.hadoop.hbase.PrivateCellUtil; import org.apache.hadoop.hbase.SizeCachedKeyValue; import org.apache.hadoop.hbase.SizeCachedNoTagsKeyValue; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.io.encoding.AbstractDataBlockEncoder.AbstractEncodedSeeker; 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.hbase.util.ObjectIntPair; +import org.apache.yetus.audience.InterfaceAudience; @InterfaceAudience.Private public class RowIndexSeekerV1 extends AbstractEncodedSeeker { @@ -365,7 +365,7 @@ public class RowIndexSeekerV1 extends AbstractEncodedSeeker { public Cell toCell() { Cell ret; int cellBufSize = getCellBufSize(); - long seqId = 0l; + long seqId = 0L; if (includesMvcc()) { seqId = memstoreTS; } http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/hadoopbackport/ThrottledInputStream.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/hadoopbackport/ThrottledInputStream.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/hadoopbackport/ThrottledInputStream.java index 305f5cd..f5e28b7 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/hadoopbackport/ThrottledInputStream.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/hadoopbackport/ThrottledInputStream.java @@ -18,15 +18,16 @@ package org.apache.hadoop.hbase.io.hadoopbackport; -import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting; import java.io.IOException; import java.io.InputStream; import java.io.InterruptedIOException; import java.util.concurrent.TimeUnit; import org.apache.hadoop.fs.PositionedReadable; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; +import org.apache.yetus.audience.InterfaceAudience; + +import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting; /** * The ThrottleInputStream provides bandwidth throttling on a specified http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockType.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockType.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockType.java index d8e98d9..4753813 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockType.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockType.java @@ -25,9 +25,9 @@ import java.io.IOException; import java.io.OutputStream; import java.nio.ByteBuffer; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.nio.ByteBuff; import org.apache.hadoop.hbase.util.Bytes; +import org.apache.yetus.audience.InterfaceAudience; /** * Various types of HFile blocks. Ordinal values of these enum constants must not be relied upon. http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileContext.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileContext.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileContext.java index 9fc5b6a..b5ccda2 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileContext.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileContext.java @@ -16,8 +16,8 @@ * limitations under the License. */ package org.apache.hadoop.hbase.io.hfile; + import org.apache.hadoop.hbase.HConstants; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.io.HeapSize; import org.apache.hadoop.hbase.io.compress.Compression; import org.apache.hadoop.hbase.io.crypto.Encryption; @@ -25,6 +25,7 @@ import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.ChecksumType; import org.apache.hadoop.hbase.util.ClassSize; +import org.apache.yetus.audience.InterfaceAudience; /** * This carries the information on some of the meta data about the HFile. This http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileContextBuilder.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileContextBuilder.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileContextBuilder.java index 0f94f34..24e23e8 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileContextBuilder.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileContextBuilder.java @@ -18,11 +18,11 @@ package org.apache.hadoop.hbase.io.hfile; import org.apache.hadoop.hbase.HConstants; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.io.compress.Compression.Algorithm; import org.apache.hadoop.hbase.io.crypto.Encryption; import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding; import org.apache.hadoop.hbase.util.ChecksumType; +import org.apache.yetus.audience.InterfaceAudience; /** * A builder that helps in building up the HFileContext http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/util/Dictionary.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/util/Dictionary.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/util/Dictionary.java index 243e8a4..a67dd57 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/util/Dictionary.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/util/Dictionary.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; /** * Dictionary interface http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/io/util/LRUDictionary.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/util/LRUDictionary.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/util/LRUDictionary.java index 0b682b0..b0dcc86 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/util/LRUDictionary.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/util/LRUDictionary.java @@ -21,9 +21,9 @@ package org.apache.hadoop.hbase.io.util; import java.nio.ByteBuffer; import java.util.HashMap; -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; 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/util/StreamUtils.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/util/StreamUtils.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/util/StreamUtils.java index a420891..02f6a6d 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/util/StreamUtils.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/util/StreamUtils.java @@ -23,9 +23,9 @@ import java.io.InputStream; import java.io.OutputStream; import java.nio.ByteBuffer; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.nio.ByteBuff; import org.apache.hadoop.hbase.util.Pair; +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/nio/ByteBuff.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/nio/ByteBuff.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/nio/ByteBuff.java index ef502ca..17b2a7c 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/nio/ByteBuff.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/nio/ByteBuff.java @@ -21,11 +21,11 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.ReadableByteChannel; -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.ObjectIntPair; import org.apache.hadoop.io.WritableUtils; +import org.apache.yetus.audience.InterfaceAudience; /** * An abstract class that abstracts out as to how the byte buffers are used, http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/nio/MultiByteBuff.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/nio/MultiByteBuff.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/nio/MultiByteBuff.java index 12051c8..5274e95 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/nio/MultiByteBuff.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/nio/MultiByteBuff.java @@ -24,10 +24,10 @@ import java.nio.ByteBuffer; import java.nio.InvalidMarkException; import java.nio.channels.ReadableByteChannel; -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.ObjectIntPair; +import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting; @@ -177,6 +177,7 @@ public class MultiByteBuff extends ByteBuff { * @param index * @return the int value at the given index */ + @Override public int getInt(int index) { // Mostly the index specified will land within this current item. Short circuit for that int itemIndex; @@ -207,6 +208,7 @@ public class MultiByteBuff extends ByteBuff { * @param index * @return the short value at the given index */ + @Override public short getShort(int index) { // Mostly the index specified will land within this current item. Short circuit for that int itemIndex; @@ -228,9 +230,9 @@ public class MultiByteBuff extends ByteBuff { ByteBuffer nextItem = items[itemIndex + 1]; // Get available one byte from this item and remaining one from next short n = 0; - n ^= ByteBufferUtils.toByte(item, offsetInItem) & 0xFF; - n <<= 8; - n ^= ByteBufferUtils.toByte(nextItem, 0) & 0xFF; + n = (short) (n ^ (ByteBufferUtils.toByte(item, offsetInItem) & 0xFF)); + n = (short) (n << 8); + n = (short) (n ^ (ByteBufferUtils.toByte(nextItem, 0) & 0xFF)); return n; } @@ -287,12 +289,12 @@ public class MultiByteBuff extends ByteBuff { // Get available bytes from this item and remaining from next short l = 0; for (int i = offsetInItem; i < item.capacity(); i++) { - l <<= 8; - l ^= ByteBufferUtils.toByte(item, i) & 0xFF; + l = (short) (l << 8); + l = (short) (l ^ (ByteBufferUtils.toByte(item, i) & 0xFF)); } for (int i = 0; i < Bytes.SIZEOF_SHORT - remainingLen; i++) { - l <<= 8; - l ^= ByteBufferUtils.toByte(nextItem, i) & 0xFF; + l = (short) (l << 8); + l = (short) (l ^ (ByteBufferUtils.toByte(item, i) & 0xFF)); } return l; } @@ -327,6 +329,7 @@ public class MultiByteBuff extends ByteBuff { * @param index * @return the long value at the given index */ + @Override public long getLong(int index) { // Mostly the index specified will land within this current item. Short circuit for that int itemIndex; @@ -520,9 +523,9 @@ public class MultiByteBuff extends ByteBuff { return this.curItem.getShort(); } short n = 0; - n ^= get() & 0xFF; - n <<= 8; - n ^= get() & 0xFF; + n = (short) (n ^ (get() & 0xFF)); + n = (short) (n << 8); + n = (short) (n ^ (get() & 0xFF)); return n; } http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/nio/SingleByteBuff.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/nio/SingleByteBuff.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/nio/SingleByteBuff.java index 674507e..ad95b3e 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/nio/SingleByteBuff.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/nio/SingleByteBuff.java @@ -17,20 +17,19 @@ */ package org.apache.hadoop.hbase.nio; -import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting; - import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.ReadableByteChannel; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.util.ByteBufferUtils; import org.apache.hadoop.hbase.util.ObjectIntPair; import org.apache.hadoop.hbase.util.UnsafeAccess; import org.apache.hadoop.hbase.util.UnsafeAvailChecker; - +import org.apache.yetus.audience.InterfaceAudience; import sun.nio.ch.DirectBuffer; +import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting; + /** * An implementation of ByteBuff where a single BB backs the BBI. This just acts * as a wrapper over a normal BB - offheap or onheap http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfo.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfo.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfo.java index 5408083..f87ec71 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfo.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfo.java @@ -24,8 +24,8 @@ import java.util.SortedSet; import java.util.TreeSet; import org.apache.hadoop.hbase.TableName; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.net.Address; +import org.apache.yetus.audience.InterfaceAudience; /** * Stores the group information of region server groups. http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/security/Superusers.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/security/Superusers.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/security/Superusers.java index db08100..dceafbd 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/security/Superusers.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/security/Superusers.java @@ -19,16 +19,16 @@ package org.apache.hadoop.hbase.security; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.AuthUtil; import org.apache.yetus.audience.InterfaceAudience; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - /** * Keeps lists of superusers and super groups loaded from HBase configuration, * checks if certain user is regarded as superuser. http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/security/User.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/security/User.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/security/User.java index 1b6f57c..2c743b6 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/security/User.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/security/User.java @@ -28,15 +28,17 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.ExecutionException; -import org.apache.hadoop.hbase.shaded.com.google.common.cache.LoadingCache; + import org.apache.hadoop.conf.Configuration; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.util.Methods; import org.apache.hadoop.security.Groups; import org.apache.hadoop.security.SecurityUtil; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.token.Token; import org.apache.hadoop.security.token.TokenIdentifier; +import org.apache.yetus.audience.InterfaceAudience; + +import org.apache.hadoop.hbase.shaded.com.google.common.cache.LoadingCache; /** * Wrapper to abstract out usage of user and group information in HBase. http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/security/UserProvider.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/security/UserProvider.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/security/UserProvider.java index a231cfa..290eb68 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/security/UserProvider.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/security/UserProvider.java @@ -24,6 +24,14 @@ import java.util.concurrent.Callable; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.CommonConfigurationKeys; +import org.apache.hadoop.hbase.BaseConfigurable; +import org.apache.hadoop.security.Groups; +import org.apache.hadoop.security.UserGroupInformation; +import org.apache.hadoop.util.ReflectionUtils; +import org.apache.yetus.audience.InterfaceAudience; + import org.apache.hadoop.hbase.shaded.com.google.common.cache.CacheBuilder; import org.apache.hadoop.hbase.shaded.com.google.common.cache.CacheLoader; import org.apache.hadoop.hbase.shaded.com.google.common.cache.LoadingCache; @@ -31,13 +39,6 @@ import org.apache.hadoop.hbase.shaded.com.google.common.util.concurrent.Listenab import org.apache.hadoop.hbase.shaded.com.google.common.util.concurrent.ListeningExecutorService; import org.apache.hadoop.hbase.shaded.com.google.common.util.concurrent.MoreExecutors; import org.apache.hadoop.hbase.shaded.com.google.common.util.concurrent.ThreadFactoryBuilder; -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.fs.CommonConfigurationKeys; -import org.apache.hadoop.hbase.BaseConfigurable; -import org.apache.yetus.audience.InterfaceAudience; -import org.apache.hadoop.security.Groups; -import org.apache.hadoop.security.UserGroupInformation; -import org.apache.hadoop.util.ReflectionUtils; /** * Provide an instance of a user. Allows custom {@link User} creation. @@ -98,11 +99,11 @@ public class UserProvider extends BaseConfigurable { } // Provide the reload function that uses the executor thread. - public ListenableFuture<String[]> reload(final String k, - String[] oldValue) throws Exception { + @Override + public ListenableFuture<String[]> reload(final String k, String[] oldValue) + throws Exception { return executor.submit(new Callable<String[]>() { - @Override public String[] call() throws Exception { return getGroupStrings(k); http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/trace/SpanReceiverHost.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/trace/SpanReceiverHost.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/trace/SpanReceiverHost.java index 93a5fff..89339c5 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/trace/SpanReceiverHost.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/trace/SpanReceiverHost.java @@ -42,7 +42,7 @@ public class SpanReceiverHost { private static enum SingletonHolder { INSTANCE; - transient Object lock = new Object(); + final transient Object lock = new Object(); transient SpanReceiverHost host = null; } http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/types/CopyOnWriteArrayMap.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/CopyOnWriteArrayMap.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/CopyOnWriteArrayMap.java index 55a804b..4184d34 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/CopyOnWriteArrayMap.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/CopyOnWriteArrayMap.java @@ -18,9 +18,6 @@ package org.apache.hadoop.hbase.types; -import org.apache.yetus.audience.InterfaceAudience; -import org.apache.yetus.audience.InterfaceStability; - import java.util.AbstractMap; import java.util.Collection; import java.util.Comparator; @@ -32,6 +29,9 @@ import java.util.Set; import java.util.SortedSet; import java.util.concurrent.ConcurrentNavigableMap; +import org.apache.yetus.audience.InterfaceAudience; +import org.apache.yetus.audience.InterfaceStability; + /** * A Map that keeps a sorted array in order to provide the concurrent map interface. * Keeping a sorted array means that it's much more cache line friendly, making reads faster @@ -706,7 +706,7 @@ public class CopyOnWriteArrayMap<K, V> extends AbstractMap<K, V> } } - private final class ArrayKeyIterator<K, V> implements Iterator<K> { + private static final class ArrayKeyIterator<K, V> implements Iterator<K> { int index; private final ArrayHolder<K, V> holder; @@ -732,7 +732,7 @@ public class CopyOnWriteArrayMap<K, V> extends AbstractMap<K, V> } } - private final class ArrayValueIterator<K, V> implements Iterator<V> { + private static final class ArrayValueIterator<K, V> implements Iterator<V> { int index; private final ArrayHolder<K, V> holder; @@ -758,7 +758,7 @@ public class CopyOnWriteArrayMap<K, V> extends AbstractMap<K, V> } } - private final class ArrayEntryIterator<K, V> implements Iterator<Map.Entry<K, V>> { + private static final class ArrayEntryIterator<K, V> implements Iterator<Map.Entry<K, V>> { int index; private final ArrayHolder<K, V> holder; @@ -879,8 +879,7 @@ public class CopyOnWriteArrayMap<K, V> extends AbstractMap<K, V> * Binary search for a given key * @param needle The key to look for in all of the entries * @return Same return value as Arrays.binarySearch. - * Positive numbers mean the index. - * Otherwise (-1 * insertion point) - 1 + * Positive numbers mean the index. Otherwise (-1 * insertion point) - 1 */ int find(K needle) { int begin = startIndex; http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/types/DataType.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/DataType.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/DataType.java index 6ffec70..eb37498 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/DataType.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/DataType.java @@ -17,9 +17,9 @@ */ package org.apache.hadoop.hbase.types; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.util.Order; import org.apache.hadoop.hbase.util.PositionedByteRange; +import org.apache.yetus.audience.InterfaceAudience; /** * <p> http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/types/FixedLengthWrapper.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/FixedLengthWrapper.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/FixedLengthWrapper.java index 9aa00ae..2667041 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/FixedLengthWrapper.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/FixedLengthWrapper.java @@ -17,10 +17,10 @@ */ package org.apache.hadoop.hbase.types; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.util.Order; import org.apache.hadoop.hbase.util.PositionedByteRange; import org.apache.hadoop.hbase.util.SimplePositionedMutableByteRange; +import org.apache.yetus.audience.InterfaceAudience; /** * Wraps an existing {@link DataType} implementation as a fixed-length @@ -47,25 +47,39 @@ public class FixedLengthWrapper<T> implements DataType<T> { /** * Retrieve the maximum length (in bytes) of encoded values. */ - public int getLength() { return length; } + public int getLength() { + return length; + } @Override - public boolean isOrderPreserving() { return base.isOrderPreserving(); } + public boolean isOrderPreserving() { + return base.isOrderPreserving(); + } @Override - public Order getOrder() { return base.getOrder(); } + public Order getOrder() { + return base.getOrder(); + } @Override - public boolean isNullable() { return base.isNullable(); } + public boolean isNullable() { + return base.isNullable(); + } @Override - public boolean isSkippable() { return true; } + public boolean isSkippable() { + return true; + } @Override - public int encodedLength(T val) { return length; } + public int encodedLength(T val) { + return length; + } @Override - public Class<T> encodedClass() { return base.encodedClass(); } + public Class<T> encodedClass() { + return base.encodedClass(); + } @Override public int skip(PositionedByteRange src) { @@ -99,7 +113,9 @@ public class FixedLengthWrapper<T> implements DataType<T> { + ") exceeds max length (" + length + ")."); } // TODO: is the zero-padding appropriate? - for (; written < length; written++) { dst.put((byte) 0x00); } + for (; written < length; written++) { + dst.put((byte) 0x00); + } return written; } } http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedBlob.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedBlob.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedBlob.java index c4e5687..cdb1173 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedBlob.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedBlob.java @@ -17,10 +17,10 @@ */ package org.apache.hadoop.hbase.types; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.util.Order; import org.apache.hadoop.hbase.util.OrderedBytes; import org.apache.hadoop.hbase.util.PositionedByteRange; +import org.apache.yetus.audience.InterfaceAudience; /** * A {@code byte[]} of variable-length. Build on @@ -32,10 +32,14 @@ public class OrderedBlob extends OrderedBytesBase<byte[]> { public static final OrderedBlob ASCENDING = new OrderedBlob(Order.ASCENDING); public static final OrderedBlob DESCENDING = new OrderedBlob(Order.DESCENDING); - protected OrderedBlob(Order order) { super(order); } + protected OrderedBlob(Order order) { + super(order); + } @Override - public boolean isSkippable() { return false; } + public boolean isSkippable() { + return false; + } @Override public int encodedLength(byte[] val) { @@ -45,7 +49,9 @@ public class OrderedBlob extends OrderedBytesBase<byte[]> { } @Override - public Class<byte[]> encodedClass() { return byte[].class; } + public Class<byte[]> encodedClass() { + return byte[].class; + } @Override public byte[] decode(PositionedByteRange src) { http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedBlobVar.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedBlobVar.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedBlobVar.java index 7c31e16..44621bf 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedBlobVar.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedBlobVar.java @@ -17,10 +17,10 @@ */ package org.apache.hadoop.hbase.types; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.util.Order; import org.apache.hadoop.hbase.util.OrderedBytes; import org.apache.hadoop.hbase.util.PositionedByteRange; +import org.apache.yetus.audience.InterfaceAudience; /** * An alternative to {@link OrderedBlob} for use by {@link Struct} fields that @@ -33,7 +33,9 @@ public class OrderedBlobVar extends OrderedBytesBase<byte[]> { public static final OrderedBlobVar ASCENDING = new OrderedBlobVar(Order.ASCENDING); public static final OrderedBlobVar DESCENDING = new OrderedBlobVar(Order.DESCENDING); - protected OrderedBlobVar(Order order) { super(order); } + protected OrderedBlobVar(Order order) { + super(order); + } @Override public int encodedLength(byte[] val) { @@ -41,7 +43,9 @@ public class OrderedBlobVar extends OrderedBytesBase<byte[]> { } @Override - public Class<byte[]> encodedClass() { return byte[].class; } + public Class<byte[]> encodedClass() { + return byte[].class; + } @Override public byte[] decode(PositionedByteRange src) { http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedBytesBase.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedBytesBase.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedBytesBase.java index 9a00b2f..a4b63de 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedBytesBase.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedBytesBase.java @@ -17,10 +17,10 @@ */ package org.apache.hadoop.hbase.types; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.util.Order; import org.apache.hadoop.hbase.util.OrderedBytes; import org.apache.hadoop.hbase.util.PositionedByteRange; +import org.apache.yetus.audience.InterfaceAudience; /** * Base class for data types backed by the {@link OrderedBytes} encoding @@ -31,21 +31,31 @@ public abstract class OrderedBytesBase<T> implements DataType<T> { protected final Order order; - protected OrderedBytesBase(Order order) { this.order = order; } + protected OrderedBytesBase(Order order) { + this.order = order; + } @Override - public boolean isOrderPreserving() { return true; } + public boolean isOrderPreserving() { + return true; + } @Override - public Order getOrder() { return order; } + public Order getOrder() { + return order; + } // almost all OrderedBytes implementations are nullable. @Override - public boolean isNullable() { return true; } + public boolean isNullable() { + return true; + } // almost all OrderedBytes implementations are skippable. @Override - public boolean isSkippable() { return true; } + public boolean isSkippable() { + return true; + } @Override public int skip(PositionedByteRange src) { http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedFloat32.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedFloat32.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedFloat32.java index a43c130..966b60d 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedFloat32.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedFloat32.java @@ -17,11 +17,10 @@ */ package org.apache.hadoop.hbase.types; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.util.Order; import org.apache.hadoop.hbase.util.OrderedBytes; import org.apache.hadoop.hbase.util.PositionedByteRange; - +import org.apache.yetus.audience.InterfaceAudience; /** * A {@code float} of 32-bits using a fixed-length encoding. Based on @@ -33,16 +32,24 @@ public class OrderedFloat32 extends OrderedBytesBase<Float> { public static final OrderedFloat32 ASCENDING = new OrderedFloat32(Order.ASCENDING); public static final OrderedFloat32 DESCENDING = new OrderedFloat32(Order.DESCENDING); - protected OrderedFloat32(Order order) { super(order); } + protected OrderedFloat32(Order order) { + super(order); + } @Override - public boolean isNullable() { return false; } + public boolean isNullable() { + return false; + } @Override - public int encodedLength(Float val) { return 5; } + public int encodedLength(Float val) { + return 5; + } @Override - public Class<Float> encodedClass() { return Float.class; } + public Class<Float> encodedClass() { + return Float.class; + } @Override public Float decode(PositionedByteRange src) { @@ -51,7 +58,9 @@ public class OrderedFloat32 extends OrderedBytesBase<Float> { @Override public int encode(PositionedByteRange dst, Float val) { - if (null == val) throw new IllegalArgumentException("Null values not supported."); + if (null == val) { + throw new IllegalArgumentException("Null values not supported."); + } return OrderedBytes.encodeFloat32(dst, val, order); } http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedFloat64.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedFloat64.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedFloat64.java index 573e15d..2c0eb71 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedFloat64.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedFloat64.java @@ -17,11 +17,10 @@ */ package org.apache.hadoop.hbase.types; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.util.Order; import org.apache.hadoop.hbase.util.OrderedBytes; import org.apache.hadoop.hbase.util.PositionedByteRange; - +import org.apache.yetus.audience.InterfaceAudience; /** * A {@code double} of 64-bits using a fixed-length encoding. Built on @@ -33,16 +32,24 @@ public class OrderedFloat64 extends OrderedBytesBase<Double> { public static final OrderedFloat64 ASCENDING = new OrderedFloat64(Order.ASCENDING); public static final OrderedFloat64 DESCENDING = new OrderedFloat64(Order.DESCENDING); - protected OrderedFloat64(Order order) { super(order); } + protected OrderedFloat64(Order order) { + super(order); + } @Override - public boolean isNullable() { return false; } + public boolean isNullable() { + return false; + } @Override - public int encodedLength(Double val) { return 9; } + public int encodedLength(Double val) { + return 9; + } @Override - public Class<Double> encodedClass() { return Double.class; } + public Class<Double> encodedClass() { + return Double.class; + } @Override public Double decode(PositionedByteRange src) { @@ -51,7 +58,9 @@ public class OrderedFloat64 extends OrderedBytesBase<Double> { @Override public int encode(PositionedByteRange dst, Double val) { - if (null == val) throw new IllegalArgumentException("Null values not supported."); + if (null == val) { + throw new IllegalArgumentException("Null values not supported."); + } return OrderedBytes.encodeFloat64(dst, val, order); } http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedInt16.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedInt16.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedInt16.java index 6556c37..1840fbc 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedInt16.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedInt16.java @@ -17,11 +17,10 @@ */ package org.apache.hadoop.hbase.types; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.util.Order; import org.apache.hadoop.hbase.util.OrderedBytes; import org.apache.hadoop.hbase.util.PositionedByteRange; - +import org.apache.yetus.audience.InterfaceAudience; /** * A {@code short} of 16-bits using a fixed-length encoding. Built on @@ -33,16 +32,24 @@ public class OrderedInt16 extends OrderedBytesBase<Short> { public static final OrderedInt16 ASCENDING = new OrderedInt16(Order.ASCENDING); public static final OrderedInt16 DESCENDING = new OrderedInt16(Order.DESCENDING); - protected OrderedInt16(Order order) { super(order); } + protected OrderedInt16(Order order) { + super(order); + } @Override - public boolean isNullable() { return false; } + public boolean isNullable() { + return false; + } @Override - public int encodedLength(Short val) { return 3; } + public int encodedLength(Short val) { + return 3; + } @Override - public Class<Short> encodedClass() { return Short.class; } + public Class<Short> encodedClass() { + return Short.class; + } @Override public Short decode(PositionedByteRange src) { @@ -51,7 +58,9 @@ public class OrderedInt16 extends OrderedBytesBase<Short> { @Override public int encode(PositionedByteRange dst, Short val) { - if (null == val) throw new IllegalArgumentException("Null values not supported."); + if (null == val) { + throw new IllegalArgumentException("Null values not supported."); + } return OrderedBytes.encodeInt16(dst, val, order); } http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedInt32.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedInt32.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedInt32.java index ce4d0fb..e45aa5b 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedInt32.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedInt32.java @@ -17,11 +17,10 @@ */ package org.apache.hadoop.hbase.types; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.util.Order; import org.apache.hadoop.hbase.util.OrderedBytes; import org.apache.hadoop.hbase.util.PositionedByteRange; - +import org.apache.yetus.audience.InterfaceAudience; /** * An {@code int} of 32-bits using a fixed-length encoding. Built on @@ -33,16 +32,24 @@ public class OrderedInt32 extends OrderedBytesBase<Integer> { public static final OrderedInt32 ASCENDING = new OrderedInt32(Order.ASCENDING); public static final OrderedInt32 DESCENDING = new OrderedInt32(Order.DESCENDING); - protected OrderedInt32(Order order) { super(order); } + protected OrderedInt32(Order order) { + super(order); + } @Override - public boolean isNullable() { return false; } + public boolean isNullable() { + return false; + } @Override - public int encodedLength(Integer val) { return 5; } + public int encodedLength(Integer val) { + return 5; + } @Override - public Class<Integer> encodedClass() { return Integer.class; } + public Class<Integer> encodedClass() { + return Integer.class; + } @Override public Integer decode(PositionedByteRange src) { @@ -51,7 +58,9 @@ public class OrderedInt32 extends OrderedBytesBase<Integer> { @Override public int encode(PositionedByteRange dst, Integer val) { - if (null == val) throw new IllegalArgumentException("Null values not supported."); + if (null == val) { + throw new IllegalArgumentException("Null values not supported."); + } return OrderedBytes.encodeInt32(dst, val, order); } http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedInt64.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedInt64.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedInt64.java index c0dd565..3a409d3 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedInt64.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedInt64.java @@ -17,11 +17,10 @@ */ package org.apache.hadoop.hbase.types; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.util.Order; import org.apache.hadoop.hbase.util.OrderedBytes; import org.apache.hadoop.hbase.util.PositionedByteRange; - +import org.apache.yetus.audience.InterfaceAudience; /** * A {@code long} of 64-bits using a fixed-length encoding. Built on @@ -33,16 +32,24 @@ public class OrderedInt64 extends OrderedBytesBase<Long> { public static final OrderedInt64 ASCENDING = new OrderedInt64(Order.ASCENDING); public static final OrderedInt64 DESCENDING = new OrderedInt64(Order.DESCENDING); - protected OrderedInt64(Order order) { super(order); } + protected OrderedInt64(Order order) { + super(order); + } @Override - public boolean isNullable() { return false; } + public boolean isNullable() { + return false; + } @Override - public int encodedLength(Long val) { return 9; } + public int encodedLength(Long val) { + return 9; + } @Override - public Class<Long> encodedClass() { return Long.class; } + public Class<Long> encodedClass() { + return Long.class; + } @Override public Long decode(PositionedByteRange src) { @@ -51,7 +58,9 @@ public class OrderedInt64 extends OrderedBytesBase<Long> { @Override public int encode(PositionedByteRange dst, Long val) { - if (null == val) throw new IllegalArgumentException("Null values not supported."); + if (null == val) { + throw new IllegalArgumentException("Null values not supported."); + } return OrderedBytes.encodeInt64(dst, val, order); } http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedInt8.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedInt8.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedInt8.java index 82d0716..4a7b47b 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedInt8.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedInt8.java @@ -17,11 +17,10 @@ */ package org.apache.hadoop.hbase.types; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.util.Order; import org.apache.hadoop.hbase.util.OrderedBytes; import org.apache.hadoop.hbase.util.PositionedByteRange; - +import org.apache.yetus.audience.InterfaceAudience; /** * A {@code byte} of 8-bits using a fixed-length encoding. Built on @@ -33,16 +32,24 @@ public class OrderedInt8 extends OrderedBytesBase<Byte> { public static final OrderedInt8 ASCENDING = new OrderedInt8(Order.ASCENDING); public static final OrderedInt8 DESCENDING = new OrderedInt8(Order.DESCENDING); - protected OrderedInt8(Order order) { super(order); } + protected OrderedInt8(Order order) { + super(order); + } @Override - public boolean isNullable() { return false; } + public boolean isNullable() { + return false; + } @Override - public int encodedLength(Byte val) { return 2; } + public int encodedLength(Byte val) { + return 2; + } @Override - public Class<Byte> encodedClass() { return Byte.class; } + public Class<Byte> encodedClass() { + return Byte.class; + } @Override public Byte decode(PositionedByteRange src) { @@ -51,7 +58,9 @@ public class OrderedInt8 extends OrderedBytesBase<Byte> { @Override public int encode(PositionedByteRange dst, Byte val) { - if (null == val) throw new IllegalArgumentException("Null values not supported."); + if (null == val) { + throw new IllegalArgumentException("Null values not supported."); + } return OrderedBytes.encodeInt8(dst, val, order); } http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedNumeric.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedNumeric.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedNumeric.java index aec3e63..3cdb7cc 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedNumeric.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedNumeric.java @@ -20,11 +20,11 @@ package org.apache.hadoop.hbase.types; import java.math.BigDecimal; import java.math.BigInteger; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.util.Order; import org.apache.hadoop.hbase.util.OrderedBytes; import org.apache.hadoop.hbase.util.PositionedByteRange; import org.apache.hadoop.hbase.util.SimplePositionedMutableByteRange; +import org.apache.yetus.audience.InterfaceAudience; /** * An {@link Number} of arbitrary precision and variable-length encoding. The @@ -40,7 +40,9 @@ public class OrderedNumeric extends OrderedBytesBase<Number> { public static final OrderedNumeric ASCENDING = new OrderedNumeric(Order.ASCENDING); public static final OrderedNumeric DESCENDING = new OrderedNumeric(Order.DESCENDING); - protected OrderedNumeric(Order order) { super(order); } + protected OrderedNumeric(Order order) { + super(order); + } @Override public int encodedLength(Number val) { @@ -50,7 +52,9 @@ public class OrderedNumeric extends OrderedBytesBase<Number> { } @Override - public Class<Number> encodedClass() { return Number.class; } + public Class<Number> encodedClass() { + return Number.class; + } @Override public Number decode(PositionedByteRange src) { http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedString.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedString.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedString.java index 44657cd..e687f39 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedString.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/OrderedString.java @@ -17,10 +17,10 @@ */ package org.apache.hadoop.hbase.types; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.util.Order; import org.apache.hadoop.hbase.util.OrderedBytes; import org.apache.hadoop.hbase.util.PositionedByteRange; +import org.apache.yetus.audience.InterfaceAudience; /** * A {@code String} of variable-length. Built on @@ -32,7 +32,9 @@ public class OrderedString extends OrderedBytesBase<String> { public static final OrderedString ASCENDING = new OrderedString(Order.ASCENDING); public static final OrderedString DESCENDING = new OrderedString(Order.DESCENDING); - protected OrderedString(Order order) { super(order); } + protected OrderedString(Order order) { + super(order); + } @Override public int encodedLength(String val) { @@ -41,7 +43,9 @@ public class OrderedString extends OrderedBytesBase<String> { } @Override - public Class<String> encodedClass() { return String.class; } + public Class<String> encodedClass() { + return String.class; + } @Override public String decode(PositionedByteRange src) { http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/types/PBType.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/PBType.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/PBType.java index 63489cd..eb67e71 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/PBType.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/PBType.java @@ -17,13 +17,12 @@ */ package org.apache.hadoop.hbase.types; -import org.apache.yetus.audience.InterfaceAudience; -import org.apache.hadoop.hbase.util.Order; -import org.apache.hadoop.hbase.util.PositionedByteRange; - import com.google.protobuf.CodedInputStream; import com.google.protobuf.CodedOutputStream; import com.google.protobuf.Message; +import org.apache.hadoop.hbase.util.Order; +import org.apache.hadoop.hbase.util.PositionedByteRange; +import org.apache.yetus.audience.InterfaceAudience; /** * A base-class for {@link DataType} implementations backed by protobuf. See http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawByte.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawByte.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawByte.java index 3882da8..b29a49d 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawByte.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawByte.java @@ -17,10 +17,10 @@ */ package org.apache.hadoop.hbase.types; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Order; import org.apache.hadoop.hbase.util.PositionedByteRange; +import org.apache.yetus.audience.InterfaceAudience; /** * An {@code DataType} for interacting with values encoded using @@ -32,22 +32,34 @@ import org.apache.hadoop.hbase.util.PositionedByteRange; public class RawByte implements DataType<Byte> { @Override - public boolean isOrderPreserving() { return false; } + public boolean isOrderPreserving() { + return false; + } @Override - public Order getOrder() { return null; } + public Order getOrder() { + return null; + } @Override - public boolean isNullable() { return false; } + public boolean isNullable() { + return false; + } @Override - public boolean isSkippable() { return true; } + public boolean isSkippable() { + return true; + } @Override - public int encodedLength(Byte val) { return Bytes.SIZEOF_BYTE; } + public int encodedLength(Byte val) { + return Bytes.SIZEOF_BYTE; + } @Override - public Class<Byte> encodedClass() { return Byte.class; } + public Class<Byte> encodedClass() { + return Byte.class; + } @Override public int skip(PositionedByteRange src) { http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawBytes.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawBytes.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawBytes.java index d8c83c2..5f308ed 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawBytes.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawBytes.java @@ -17,10 +17,10 @@ */ package org.apache.hadoop.hbase.types; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Order; import org.apache.hadoop.hbase.util.PositionedByteRange; +import org.apache.yetus.audience.InterfaceAudience; /** * An {@code DataType} for interacting with variable-length values @@ -41,20 +41,33 @@ public class RawBytes implements DataType<byte[]> { protected final Order order; - protected RawBytes() { this.order = Order.ASCENDING; } - protected RawBytes(Order order) { this.order = order; } + protected RawBytes() { + this.order = Order.ASCENDING; + } + + protected RawBytes(Order order) { + this.order = order; + } @Override - public boolean isOrderPreserving() { return true; } + public boolean isOrderPreserving() { + return true; + } @Override - public Order getOrder() { return order; } + public Order getOrder() { + return order; + } @Override - public boolean isNullable() { return false; } + public boolean isNullable() { + return false; + } @Override - public boolean isSkippable() { return false; } + public boolean isSkippable() { + return false; + } @Override public int skip(PositionedByteRange src) { @@ -64,10 +77,14 @@ public class RawBytes implements DataType<byte[]> { } @Override - public int encodedLength(byte[] val) { return val.length; } + public int encodedLength(byte[] val) { + return val.length; + } @Override - public Class<byte[]> encodedClass() { return byte[].class; } + public Class<byte[]> encodedClass() { + return byte[].class; + } @Override public byte[] decode(PositionedByteRange src) { http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawBytesFixedLength.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawBytesFixedLength.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawBytesFixedLength.java index 121e49d..3de9ee5 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawBytesFixedLength.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawBytesFixedLength.java @@ -17,9 +17,9 @@ */ package org.apache.hadoop.hbase.types; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.util.Order; import org.apache.hadoop.hbase.util.PositionedByteRange; +import org.apache.yetus.audience.InterfaceAudience; /** * An {@code DataType} that encodes fixed-length values encoded using http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawBytesTerminated.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawBytesTerminated.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawBytesTerminated.java index ef327d3..49f9fff 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawBytesTerminated.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawBytesTerminated.java @@ -17,9 +17,9 @@ */ package org.apache.hadoop.hbase.types; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.util.Order; import org.apache.hadoop.hbase.util.PositionedByteRange; +import org.apache.yetus.audience.InterfaceAudience; /** * An {@code DataType} that encodes variable-length values encoded using http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawDouble.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawDouble.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawDouble.java index 8057b4a..76d3913 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawDouble.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawDouble.java @@ -17,10 +17,10 @@ */ package org.apache.hadoop.hbase.types; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Order; import org.apache.hadoop.hbase.util.PositionedByteRange; +import org.apache.yetus.audience.InterfaceAudience; /** * An {@code DataType} for interacting with values encoded using @@ -33,22 +33,34 @@ import org.apache.hadoop.hbase.util.PositionedByteRange; public class RawDouble implements DataType<Double> { @Override - public boolean isOrderPreserving() { return false; } + public boolean isOrderPreserving() { + return false; + } @Override - public Order getOrder() { return null; } + public Order getOrder() { + return null; + } @Override - public boolean isNullable() { return false; } + public boolean isNullable() { + return false; + } @Override - public boolean isSkippable() { return true; } + public boolean isSkippable() { + return true; + } @Override - public int encodedLength(Double val) { return Bytes.SIZEOF_DOUBLE; } + public int encodedLength(Double val) { + return Bytes.SIZEOF_DOUBLE; + } @Override - public Class<Double> encodedClass() { return Double.class; } + public Class<Double> encodedClass() { + return Double.class; + } @Override public int skip(PositionedByteRange src) { http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawFloat.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawFloat.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawFloat.java index 9bf6400..4f96535 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawFloat.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawFloat.java @@ -17,10 +17,10 @@ */ package org.apache.hadoop.hbase.types; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Order; import org.apache.hadoop.hbase.util.PositionedByteRange; +import org.apache.yetus.audience.InterfaceAudience; /** * An {@code DataType} for interacting with values encoded using @@ -33,22 +33,34 @@ import org.apache.hadoop.hbase.util.PositionedByteRange; public class RawFloat implements DataType<Float> { @Override - public boolean isOrderPreserving() { return false; } + public boolean isOrderPreserving() { + return false; + } @Override - public Order getOrder() { return null; } + public Order getOrder() { + return null; + } @Override - public boolean isNullable() { return false; } + public boolean isNullable() { + return false; + } @Override - public boolean isSkippable() { return true; } + public boolean isSkippable() { + return true; + } @Override - public int encodedLength(Float val) { return Bytes.SIZEOF_FLOAT; } + public int encodedLength(Float val) { + return Bytes.SIZEOF_FLOAT; + } @Override - public Class<Float> encodedClass() { return Float.class; } + public Class<Float> encodedClass() { + return Float.class; + } @Override public int skip(PositionedByteRange src) { http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawInteger.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawInteger.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawInteger.java index 21bf212..9bdc9cc 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawInteger.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawInteger.java @@ -17,10 +17,10 @@ */ package org.apache.hadoop.hbase.types; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Order; import org.apache.hadoop.hbase.util.PositionedByteRange; +import org.apache.yetus.audience.InterfaceAudience; /** * An {@code DataType} for interacting with values encoded using @@ -33,22 +33,34 @@ import org.apache.hadoop.hbase.util.PositionedByteRange; public class RawInteger implements DataType<Integer> { @Override - public boolean isOrderPreserving() { return false; } + public boolean isOrderPreserving() { + return false; + } @Override - public Order getOrder() { return null; } + public Order getOrder() { + return null; + } @Override - public boolean isNullable() { return false; } + public boolean isNullable() { + return false; + } @Override - public boolean isSkippable() { return true; } + public boolean isSkippable() { + return true; + } @Override - public int encodedLength(Integer val) { return Bytes.SIZEOF_INT; } + public int encodedLength(Integer val) { + return Bytes.SIZEOF_INT; + } @Override - public Class<Integer> encodedClass() { return Integer.class; } + public Class<Integer> encodedClass() { + return Integer.class; + } @Override public int skip(PositionedByteRange src) { http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawLong.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawLong.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawLong.java index 3a235f4..8a9d4ee 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawLong.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawLong.java @@ -17,10 +17,10 @@ */ package org.apache.hadoop.hbase.types; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Order; import org.apache.hadoop.hbase.util.PositionedByteRange; +import org.apache.yetus.audience.InterfaceAudience; /** * An {@code DataType} for interacting with values encoded using @@ -33,22 +33,34 @@ import org.apache.hadoop.hbase.util.PositionedByteRange; public class RawLong implements DataType<Long> { @Override - public boolean isOrderPreserving() { return false; } + public boolean isOrderPreserving() { + return false; + } @Override - public Order getOrder() { return null; } + public Order getOrder() { + return null; + } @Override - public boolean isNullable() { return false; } + public boolean isNullable() { + return false; + } @Override - public boolean isSkippable() { return true; } + public boolean isSkippable() { + return true; + } @Override - public int encodedLength(Long val) { return Bytes.SIZEOF_LONG; } + public int encodedLength(Long val) { + return Bytes.SIZEOF_LONG; + } @Override - public Class<Long> encodedClass() { return Long.class; } + public Class<Long> encodedClass() { + return Long.class; + } @Override public int skip(PositionedByteRange src) { http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawShort.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawShort.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawShort.java index a14fdfa..6387f3b 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawShort.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawShort.java @@ -17,10 +17,10 @@ */ package org.apache.hadoop.hbase.types; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Order; import org.apache.hadoop.hbase.util.PositionedByteRange; +import org.apache.yetus.audience.InterfaceAudience; /** * An {@code DataType} for interacting with values encoded using @@ -33,22 +33,34 @@ import org.apache.hadoop.hbase.util.PositionedByteRange; public class RawShort implements DataType<Short> { @Override - public boolean isOrderPreserving() { return false; } + public boolean isOrderPreserving() { + return false; + } @Override - public Order getOrder() { return null; } + public Order getOrder() { + return null; + } @Override - public boolean isNullable() { return false; } + public boolean isNullable() { + return false; + } @Override - public boolean isSkippable() { return true; } + public boolean isSkippable() { + return true; + } @Override - public int encodedLength(Short val) { return Bytes.SIZEOF_SHORT; } + public int encodedLength(Short val) { + return Bytes.SIZEOF_SHORT; + } @Override - public Class<Short> encodedClass() { return Short.class; } + public Class<Short> encodedClass() { + return Short.class; + } @Override public int skip(PositionedByteRange src) { http://git-wip-us.apache.org/repos/asf/hbase/blob/f9f869f6/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawString.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawString.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawString.java index 33361b7..69034ce 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawString.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/RawString.java @@ -17,10 +17,10 @@ */ package org.apache.hadoop.hbase.types; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Order; import org.apache.hadoop.hbase.util.PositionedByteRange; +import org.apache.yetus.audience.InterfaceAudience; /** * An {@code DataType} for interacting with values encoded using @@ -38,20 +38,33 @@ public class RawString implements DataType<String> { protected final Order order; - protected RawString() { this.order = Order.ASCENDING; } - protected RawString(Order order) { this.order = order; } + protected RawString() { + this.order = Order.ASCENDING; + } + + protected RawString(Order order) { + this.order = order; + } @Override - public boolean isOrderPreserving() { return true; } + public boolean isOrderPreserving() { + return true; + } @Override - public Order getOrder() { return order; } + public Order getOrder() { + return order; + } @Override - public boolean isNullable() { return false; } + public boolean isNullable() { + return false; + } @Override - public boolean isSkippable() { return false; } + public boolean isSkippable() { + return false; + } @Override public int skip(PositionedByteRange src) { @@ -61,10 +74,14 @@ public class RawString implements DataType<String> { } @Override - public int encodedLength(String val) { return Bytes.toBytes(val).length; } + public int encodedLength(String val) { + return Bytes.toBytes(val).length; + } @Override - public Class<String> encodedClass() { return String.class; } + public Class<String> encodedClass() { + return String.class; + } @Override public String decode(PositionedByteRange src) {
