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 676ffc3bb48..4db0b7fd2a1 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 @@ -41,7 +41,7 @@ public enum DataBlockEncoding { FAST_DIFF(4, "org.apache.hadoop.hbase.io.encoding.FastDiffDeltaEncoder"), // id 5 is reserved for the COPY_KEY algorithm for benchmarking // COPY_KEY(5, "org.apache.hadoop.hbase.io.encoding.CopyKeyDataBlockEncoder"), - PREFIX_TREE(6, "org.apache.hbase.codec.prefixtree.PrefixTreeCodec"); + PREFIX_TREE(6, "org.apache.hadoop.hbase.codec.prefixtree.PrefixTreeCodec"); private final short id; private final byte[] idInBytes; diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/PrefixTreeBlockMeta.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/PrefixTreeBlockMeta.java similarity index 99% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/PrefixTreeBlockMeta.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/PrefixTreeBlockMeta.java index a6961211fbe..016430686aa 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/PrefixTreeBlockMeta.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/PrefixTreeBlockMeta.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree; +package org.apache.hadoop.hbase.codec.prefixtree; import java.io.IOException; import java.io.InputStream; @@ -24,10 +24,10 @@ import java.io.OutputStream; import java.nio.ByteBuffer; import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.hbase.codec.prefixtree.encode.other.LongEncoder; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hbase.codec.prefixtree.encode.other.LongEncoder; -import org.apache.hbase.util.vint.UVIntTool; -import org.apache.hbase.util.vint.UVLongTool; +import org.apache.hadoop.hbase.util.vint.UVIntTool; +import org.apache.hadoop.hbase.util.vint.UVLongTool; /** * Information about the block. Stored at the beginning of the byte[]. Contains things diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/PrefixTreeCodec.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/PrefixTreeCodec.java similarity index 93% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/PrefixTreeCodec.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/PrefixTreeCodec.java index d6a80b29b6a..2aa5a2b3496 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/PrefixTreeCodec.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/PrefixTreeCodec.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree; +package org.apache.hadoop.hbase.codec.prefixtree; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -29,6 +29,11 @@ import org.apache.hadoop.hbase.KeyValue.KeyComparator; import org.apache.hadoop.hbase.KeyValue.MetaKeyComparator; import org.apache.hadoop.hbase.KeyValue.RootKeyComparator; import org.apache.hadoop.hbase.KeyValueUtil; +import org.apache.hadoop.hbase.codec.prefixtree.decode.DecoderFactory; +import org.apache.hadoop.hbase.codec.prefixtree.decode.PrefixTreeArraySearcher; +import org.apache.hadoop.hbase.codec.prefixtree.encode.EncoderFactory; +import org.apache.hadoop.hbase.codec.prefixtree.encode.PrefixTreeEncoder; +import org.apache.hadoop.hbase.codec.prefixtree.scanner.CellSearcher; import org.apache.hadoop.hbase.io.compress.Compression.Algorithm; import org.apache.hadoop.hbase.io.encoding.DataBlockEncoder; import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding; @@ -39,11 +44,6 @@ import org.apache.hadoop.hbase.io.encoding.HFileBlockEncodingContext; import org.apache.hadoop.hbase.io.hfile.BlockType; import org.apache.hadoop.hbase.util.ByteBufferUtils; import org.apache.hadoop.io.RawComparator; -import org.apache.hbase.codec.prefixtree.decode.DecoderFactory; -import org.apache.hbase.codec.prefixtree.decode.PrefixTreeArraySearcher; -import org.apache.hbase.codec.prefixtree.encode.EncoderFactory; -import org.apache.hbase.codec.prefixtree.encode.PrefixTreeEncoder; -import org.apache.hbase.codec.prefixtree.scanner.CellSearcher; /** * This class is created via reflection in DataBlockEncoding enum. Update the enum if class name or @@ -52,7 +52,7 @@ import org.apache.hbase.codec.prefixtree.scanner.CellSearcher; * PrefixTreeDataBlockEncoder implementation of DataBlockEncoder. This is the primary entry point * for PrefixTree encoding and decoding. Encoding is delegated to instances of * {@link PrefixTreeEncoder}, and decoding is delegated to instances of - * {@link org.apache.hbase.codec.prefixtree.scanner.CellSearcher}. Encoder and decoder instances are + * {@link org.apache.hadoop.hbase.codec.prefixtree.scanner.CellSearcher}. Encoder and decoder instances are * created and recycled by static PtEncoderFactory and PtDecoderFactory. */ @InterfaceAudience.Private diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/PrefixTreeSeeker.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/PrefixTreeSeeker.java similarity index 96% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/PrefixTreeSeeker.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/PrefixTreeSeeker.java index 85c6484e2bd..a46a34a52bf 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/PrefixTreeSeeker.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/PrefixTreeSeeker.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree; +package org.apache.hadoop.hbase.codec.prefixtree; import java.nio.ByteBuffer; @@ -25,10 +25,10 @@ import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueUtil; +import org.apache.hadoop.hbase.codec.prefixtree.decode.DecoderFactory; +import org.apache.hadoop.hbase.codec.prefixtree.decode.PrefixTreeArraySearcher; +import org.apache.hadoop.hbase.codec.prefixtree.scanner.CellScannerPosition; import org.apache.hadoop.hbase.io.encoding.DataBlockEncoder.EncodedSeeker; -import org.apache.hbase.codec.prefixtree.decode.DecoderFactory; -import org.apache.hbase.codec.prefixtree.decode.PrefixTreeArraySearcher; -import org.apache.hbase.codec.prefixtree.scanner.CellScannerPosition; /** * These methods have the same definition as any implementation of the EncodedSeeker. diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/ArraySearcherPool.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/ArraySearcherPool.java similarity index 97% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/ArraySearcherPool.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/ArraySearcherPool.java index 8f49ec15e5b..e1a92e0ea3e 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/ArraySearcherPool.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/ArraySearcherPool.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.decode; +package org.apache.hadoop.hbase.codec.prefixtree.decode; import java.nio.ByteBuffer; import java.util.Queue; diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/DecoderFactory.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/DecoderFactory.java similarity index 94% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/DecoderFactory.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/DecoderFactory.java index 7d98fdec9ec..90c22b700e8 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/DecoderFactory.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/DecoderFactory.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.decode; +package org.apache.hadoop.hbase.codec.prefixtree.decode; import java.nio.ByteBuffer; import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hbase.codec.prefixtree.PrefixTreeBlockMeta; -import org.apache.hbase.codec.prefixtree.scanner.CellSearcher; +import org.apache.hadoop.hbase.codec.prefixtree.PrefixTreeBlockMeta; +import org.apache.hadoop.hbase.codec.prefixtree.scanner.CellSearcher; /** * Static wrapper class for the ArraySearcherPool. diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/PrefixTreeArrayReversibleScanner.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/PrefixTreeArrayReversibleScanner.java similarity index 95% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/PrefixTreeArrayReversibleScanner.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/PrefixTreeArrayReversibleScanner.java index 1ce90e60738..5e1f48b08d6 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/PrefixTreeArrayReversibleScanner.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/PrefixTreeArrayReversibleScanner.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.decode; +package org.apache.hadoop.hbase.codec.prefixtree.decode; import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hbase.codec.prefixtree.PrefixTreeBlockMeta; -import org.apache.hbase.codec.prefixtree.scanner.ReversibleCellScanner; +import org.apache.hadoop.hbase.codec.prefixtree.PrefixTreeBlockMeta; +import org.apache.hadoop.hbase.codec.prefixtree.scanner.ReversibleCellScanner; /** * Methods for going backwards through a PrefixTree block. This class is split out on its own to diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/PrefixTreeArrayScanner.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/PrefixTreeArrayScanner.java similarity index 96% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/PrefixTreeArrayScanner.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/PrefixTreeArrayScanner.java index 398bd5d8d70..6cb670f2ef1 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/PrefixTreeArrayScanner.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/PrefixTreeArrayScanner.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.decode; +package org.apache.hadoop.hbase.codec.prefixtree.decode; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellComparator; import org.apache.hadoop.hbase.CellScanner; -import org.apache.hbase.codec.prefixtree.PrefixTreeBlockMeta; -import org.apache.hbase.codec.prefixtree.decode.column.ColumnReader; -import org.apache.hbase.codec.prefixtree.decode.row.RowNodeReader; -import org.apache.hbase.codec.prefixtree.decode.timestamp.MvccVersionDecoder; -import org.apache.hbase.codec.prefixtree.decode.timestamp.TimestampDecoder; +import org.apache.hadoop.hbase.codec.prefixtree.PrefixTreeBlockMeta; +import org.apache.hadoop.hbase.codec.prefixtree.decode.column.ColumnReader; +import org.apache.hadoop.hbase.codec.prefixtree.decode.row.RowNodeReader; +import org.apache.hadoop.hbase.codec.prefixtree.decode.timestamp.MvccVersionDecoder; +import org.apache.hadoop.hbase.codec.prefixtree.decode.timestamp.TimestampDecoder; /** * Extends PtCell and manipulates its protected fields. Could alternatively contain a PtCell and diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/PrefixTreeArraySearcher.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/PrefixTreeArraySearcher.java similarity index 97% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/PrefixTreeArraySearcher.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/PrefixTreeArraySearcher.java index 5201b6d27c5..097a99757b8 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/PrefixTreeArraySearcher.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/PrefixTreeArraySearcher.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.decode; +package org.apache.hadoop.hbase.codec.prefixtree.decode; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; -import org.apache.hbase.codec.prefixtree.PrefixTreeBlockMeta; -import org.apache.hbase.codec.prefixtree.scanner.CellScannerPosition; -import org.apache.hbase.codec.prefixtree.scanner.CellSearcher; +import org.apache.hadoop.hbase.codec.prefixtree.PrefixTreeBlockMeta; +import org.apache.hadoop.hbase.codec.prefixtree.scanner.CellScannerPosition; +import org.apache.hadoop.hbase.codec.prefixtree.scanner.CellSearcher; import com.google.common.primitives.UnsignedBytes; diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/PrefixTreeCell.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/PrefixTreeCell.java similarity index 98% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/PrefixTreeCell.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/PrefixTreeCell.java index 5573c02158e..b4ce25fedd4 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/PrefixTreeCell.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/PrefixTreeCell.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.decode; +package org.apache.hadoop.hbase.codec.prefixtree.decode; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.hbase.Cell; diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/column/ColumnNodeReader.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/column/ColumnNodeReader.java similarity index 92% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/column/ColumnNodeReader.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/column/ColumnNodeReader.java index 1623876e79a..e9cf05d2b92 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/column/ColumnNodeReader.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/column/ColumnNodeReader.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.decode.column; +package org.apache.hadoop.hbase.codec.prefixtree.decode.column; import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hbase.codec.prefixtree.PrefixTreeBlockMeta; -import org.apache.hbase.util.vint.UFIntTool; -import org.apache.hbase.util.vint.UVIntTool; +import org.apache.hadoop.hbase.codec.prefixtree.PrefixTreeBlockMeta; +import org.apache.hadoop.hbase.util.vint.UFIntTool; +import org.apache.hadoop.hbase.util.vint.UVIntTool; @InterfaceAudience.Private public class ColumnNodeReader { diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/column/ColumnReader.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/column/ColumnReader.java similarity index 96% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/column/ColumnReader.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/column/ColumnReader.java index 593031e5e20..2b04a4be840 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/column/ColumnReader.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/column/ColumnReader.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.decode.column; +package org.apache.hadoop.hbase.codec.prefixtree.decode.column; import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hbase.codec.prefixtree.PrefixTreeBlockMeta; +import org.apache.hadoop.hbase.codec.prefixtree.PrefixTreeBlockMeta; /** * Position one of these appropriately in the data block and you can call its methods to retrieve diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/row/RowNodeReader.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/row/RowNodeReader.java similarity index 97% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/row/RowNodeReader.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/row/RowNodeReader.java index 1adc8385169..ffe1e1a28cf 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/row/RowNodeReader.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/row/RowNodeReader.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.decode.row; +package org.apache.hadoop.hbase.codec.prefixtree.decode.row; import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.hbase.codec.prefixtree.PrefixTreeBlockMeta; import org.apache.hadoop.hbase.util.ByteRange; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hbase.codec.prefixtree.PrefixTreeBlockMeta; -import org.apache.hbase.util.vint.UFIntTool; -import org.apache.hbase.util.vint.UVIntTool; +import org.apache.hadoop.hbase.util.vint.UFIntTool; +import org.apache.hadoop.hbase.util.vint.UVIntTool; /** * Position one of these appropriately in the data block and you can call its methods to retrieve diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/timestamp/MvccVersionDecoder.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/timestamp/MvccVersionDecoder.java similarity index 90% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/timestamp/MvccVersionDecoder.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/timestamp/MvccVersionDecoder.java index 5a88fdfdfa8..4a53510c652 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/timestamp/MvccVersionDecoder.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/timestamp/MvccVersionDecoder.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.decode.timestamp; +package org.apache.hadoop.hbase.codec.prefixtree.decode.timestamp; import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hbase.codec.prefixtree.PrefixTreeBlockMeta; -import org.apache.hbase.util.vint.UFIntTool; +import org.apache.hadoop.hbase.codec.prefixtree.PrefixTreeBlockMeta; +import org.apache.hadoop.hbase.util.vint.UFIntTool; /** * Given a block and its blockMeta, this will decode the MvccVersion for the i-th Cell in the block. diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/timestamp/TimestampDecoder.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/timestamp/TimestampDecoder.java similarity index 90% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/timestamp/TimestampDecoder.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/timestamp/TimestampDecoder.java index b3e122a88ad..cb7f4129839 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/timestamp/TimestampDecoder.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/timestamp/TimestampDecoder.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.decode.timestamp; +package org.apache.hadoop.hbase.codec.prefixtree.decode.timestamp; import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hbase.codec.prefixtree.PrefixTreeBlockMeta; -import org.apache.hbase.util.vint.UFIntTool; +import org.apache.hadoop.hbase.codec.prefixtree.PrefixTreeBlockMeta; +import org.apache.hadoop.hbase.util.vint.UFIntTool; /** * Given a block and its blockMeta, this will decode the timestamp for the i-th Cell in the block. diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/EncoderFactory.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/EncoderFactory.java similarity index 97% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/EncoderFactory.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/EncoderFactory.java index b26607f29f1..ba5340d267e 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/EncoderFactory.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/EncoderFactory.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.encode; +package org.apache.hadoop.hbase.codec.prefixtree.encode; import java.io.OutputStream; diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/EncoderPool.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/EncoderPool.java similarity index 95% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/EncoderPool.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/EncoderPool.java index ca73f91124e..3b9df91f868 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/EncoderPool.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/EncoderPool.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.encode; +package org.apache.hadoop.hbase.codec.prefixtree.encode; import java.io.OutputStream; diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/PrefixTreeEncoder.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/PrefixTreeEncoder.java similarity index 95% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/PrefixTreeEncoder.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/PrefixTreeEncoder.java index 46cb7072622..7817c38ce6e 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/PrefixTreeEncoder.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/PrefixTreeEncoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.encode; +package org.apache.hadoop.hbase.codec.prefixtree.encode; import java.io.IOException; import java.io.OutputStream; @@ -27,20 +27,20 @@ import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.KeyValueUtil; +import org.apache.hadoop.hbase.codec.prefixtree.PrefixTreeBlockMeta; +import org.apache.hadoop.hbase.codec.prefixtree.encode.column.ColumnSectionWriter; +import org.apache.hadoop.hbase.codec.prefixtree.encode.other.CellTypeEncoder; +import org.apache.hadoop.hbase.codec.prefixtree.encode.other.LongEncoder; +import org.apache.hadoop.hbase.codec.prefixtree.encode.row.RowSectionWriter; +import org.apache.hadoop.hbase.codec.prefixtree.encode.tokenize.Tokenizer; import org.apache.hadoop.hbase.io.CellOutputStream; import org.apache.hadoop.hbase.util.ArrayUtils; import org.apache.hadoop.hbase.util.ByteRange; +import org.apache.hadoop.hbase.util.byterange.ByteRangeSet; +import org.apache.hadoop.hbase.util.byterange.impl.ByteRangeHashSet; +import org.apache.hadoop.hbase.util.byterange.impl.ByteRangeTreeSet; +import org.apache.hadoop.hbase.util.vint.UFIntTool; import org.apache.hadoop.io.WritableUtils; -import org.apache.hbase.codec.prefixtree.PrefixTreeBlockMeta; -import org.apache.hbase.codec.prefixtree.encode.column.ColumnSectionWriter; -import org.apache.hbase.codec.prefixtree.encode.other.CellTypeEncoder; -import org.apache.hbase.codec.prefixtree.encode.other.LongEncoder; -import org.apache.hbase.codec.prefixtree.encode.row.RowSectionWriter; -import org.apache.hbase.codec.prefixtree.encode.tokenize.Tokenizer; -import org.apache.hbase.util.byterange.ByteRangeSet; -import org.apache.hbase.util.byterange.impl.ByteRangeHashSet; -import org.apache.hbase.util.byterange.impl.ByteRangeTreeSet; -import org.apache.hbase.util.vint.UFIntTool; /** * This is the primary class for converting a CellOutputStream into an encoded byte[]. As Cells are diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/ThreadLocalEncoderPool.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/ThreadLocalEncoderPool.java similarity index 97% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/ThreadLocalEncoderPool.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/ThreadLocalEncoderPool.java index 3f9a00b23e3..6cbe0c28bba 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/ThreadLocalEncoderPool.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/ThreadLocalEncoderPool.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.encode; +package org.apache.hadoop.hbase.codec.prefixtree.encode; import java.io.OutputStream; diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/column/ColumnNodeWriter.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/column/ColumnNodeWriter.java similarity index 92% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/column/ColumnNodeWriter.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/column/ColumnNodeWriter.java index b84e15a342d..0105f8f0f92 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/column/ColumnNodeWriter.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/column/ColumnNodeWriter.java @@ -16,19 +16,19 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.encode.column; +package org.apache.hadoop.hbase.codec.prefixtree.encode.column; import java.io.IOException; import java.io.OutputStream; import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.hbase.codec.prefixtree.PrefixTreeBlockMeta; +import org.apache.hadoop.hbase.codec.prefixtree.encode.tokenize.TokenizerNode; import org.apache.hadoop.hbase.util.ByteRange; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Strings; -import org.apache.hbase.codec.prefixtree.PrefixTreeBlockMeta; -import org.apache.hbase.codec.prefixtree.encode.tokenize.TokenizerNode; -import org.apache.hbase.util.vint.UFIntTool; -import org.apache.hbase.util.vint.UVIntTool; +import org.apache.hadoop.hbase.util.vint.UFIntTool; +import org.apache.hadoop.hbase.util.vint.UVIntTool; /** * Column nodes can be either family nodes or qualifier nodes, as both sections encode similarly. diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/column/ColumnSectionWriter.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/column/ColumnSectionWriter.java similarity index 95% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/column/ColumnSectionWriter.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/column/ColumnSectionWriter.java index 3d2457d5216..122ffb4828d 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/column/ColumnSectionWriter.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/column/ColumnSectionWriter.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.encode.column; +package org.apache.hadoop.hbase.codec.prefixtree.encode.column; import java.io.IOException; import java.io.OutputStream; @@ -24,11 +24,11 @@ import java.util.ArrayList; import java.util.List; import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.hbase.codec.prefixtree.PrefixTreeBlockMeta; +import org.apache.hadoop.hbase.codec.prefixtree.encode.tokenize.Tokenizer; +import org.apache.hadoop.hbase.codec.prefixtree.encode.tokenize.TokenizerNode; import org.apache.hadoop.hbase.util.CollectionUtils; -import org.apache.hbase.codec.prefixtree.PrefixTreeBlockMeta; -import org.apache.hbase.codec.prefixtree.encode.tokenize.Tokenizer; -import org.apache.hbase.codec.prefixtree.encode.tokenize.TokenizerNode; -import org.apache.hbase.util.vint.UFIntTool; +import org.apache.hadoop.hbase.util.vint.UFIntTool; import com.google.common.collect.Lists; diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/other/CellTypeEncoder.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/other/CellTypeEncoder.java similarity index 96% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/other/CellTypeEncoder.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/other/CellTypeEncoder.java index 963c30723e0..c8d67073905 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/other/CellTypeEncoder.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/other/CellTypeEncoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.encode.other; +package org.apache.hadoop.hbase.codec.prefixtree.encode.other; import org.apache.hadoop.classification.InterfaceAudience; diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/other/LongEncoder.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/other/LongEncoder.java similarity index 97% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/other/LongEncoder.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/other/LongEncoder.java index baf20f658df..553d6cbcc45 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/other/LongEncoder.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/other/LongEncoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.encode.other; +package org.apache.hadoop.hbase.codec.prefixtree.encode.other; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -27,7 +27,7 @@ import java.util.HashSet; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.hbase.util.ArrayUtils; import org.apache.hadoop.hbase.util.CollectionUtils; -import org.apache.hbase.util.vint.UFIntTool; +import org.apache.hadoop.hbase.util.vint.UFIntTool; import com.google.common.base.Joiner; diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/row/RowNodeWriter.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/row/RowNodeWriter.java similarity index 96% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/row/RowNodeWriter.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/row/RowNodeWriter.java index 748a7f6b8e1..29ebafa4a26 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/row/RowNodeWriter.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/row/RowNodeWriter.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.encode.row; +package org.apache.hadoop.hbase.codec.prefixtree.encode.row; import java.io.IOException; import java.io.OutputStream; @@ -25,13 +25,13 @@ import java.util.ArrayList; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.hbase.codec.prefixtree.PrefixTreeBlockMeta; +import org.apache.hadoop.hbase.codec.prefixtree.encode.PrefixTreeEncoder; +import org.apache.hadoop.hbase.codec.prefixtree.encode.tokenize.TokenizerNode; import org.apache.hadoop.hbase.util.ByteRangeTool; import org.apache.hadoop.hbase.util.CollectionUtils; -import org.apache.hbase.codec.prefixtree.PrefixTreeBlockMeta; -import org.apache.hbase.codec.prefixtree.encode.PrefixTreeEncoder; -import org.apache.hbase.codec.prefixtree.encode.tokenize.TokenizerNode; -import org.apache.hbase.util.vint.UFIntTool; -import org.apache.hbase.util.vint.UVIntTool; +import org.apache.hadoop.hbase.util.vint.UFIntTool; +import org.apache.hadoop.hbase.util.vint.UVIntTool; /** * Serializes the fields comprising one node of the row trie, which can be a branch, nub, or leaf. diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/row/RowSectionWriter.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/row/RowSectionWriter.java similarity index 95% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/row/RowSectionWriter.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/row/RowSectionWriter.java index f1dca8dbc5e..f5d4eba4dfa 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/row/RowSectionWriter.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/row/RowSectionWriter.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.encode.row; +package org.apache.hadoop.hbase.codec.prefixtree.encode.row; import java.io.IOException; import java.io.OutputStream; @@ -24,10 +24,10 @@ import java.util.ArrayList; import java.util.List; import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hbase.codec.prefixtree.PrefixTreeBlockMeta; -import org.apache.hbase.codec.prefixtree.encode.PrefixTreeEncoder; -import org.apache.hbase.codec.prefixtree.encode.tokenize.TokenizerNode; -import org.apache.hbase.util.vint.UFIntTool; +import org.apache.hadoop.hbase.codec.prefixtree.PrefixTreeBlockMeta; +import org.apache.hadoop.hbase.codec.prefixtree.encode.PrefixTreeEncoder; +import org.apache.hadoop.hbase.codec.prefixtree.encode.tokenize.TokenizerNode; +import org.apache.hadoop.hbase.util.vint.UFIntTool; import com.google.common.collect.Lists; diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/tokenize/TokenDepthComparator.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/tokenize/TokenDepthComparator.java similarity index 96% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/tokenize/TokenDepthComparator.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/tokenize/TokenDepthComparator.java index e1082e0af69..e10db3ac0f8 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/tokenize/TokenDepthComparator.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/tokenize/TokenDepthComparator.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.encode.tokenize; +package org.apache.hadoop.hbase.codec.prefixtree.encode.tokenize; import java.util.Comparator; diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/tokenize/Tokenizer.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/tokenize/Tokenizer.java similarity index 99% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/tokenize/Tokenizer.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/tokenize/Tokenizer.java index 9b43c476dc2..a21bd12361b 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/tokenize/Tokenizer.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/tokenize/Tokenizer.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.encode.tokenize; +package org.apache.hadoop.hbase.codec.prefixtree.encode.tokenize; import java.util.ArrayList; import java.util.List; diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/tokenize/TokenizerNode.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/tokenize/TokenizerNode.java similarity index 99% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/tokenize/TokenizerNode.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/tokenize/TokenizerNode.java index 2b8a86c07f7..077b5f56ee3 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/tokenize/TokenizerNode.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/tokenize/TokenizerNode.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.encode.tokenize; +package org.apache.hadoop.hbase.codec.prefixtree.encode.tokenize; import java.util.ArrayList; import java.util.List; diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/tokenize/TokenizerRowSearchPosition.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/tokenize/TokenizerRowSearchPosition.java similarity index 95% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/tokenize/TokenizerRowSearchPosition.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/tokenize/TokenizerRowSearchPosition.java index 6494ba1e5e0..37909d9154f 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/tokenize/TokenizerRowSearchPosition.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/tokenize/TokenizerRowSearchPosition.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.encode.tokenize; +package org.apache.hadoop.hbase.codec.prefixtree.encode.tokenize; import org.apache.hadoop.classification.InterfaceAudience; diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/tokenize/TokenizerRowSearchResult.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/tokenize/TokenizerRowSearchResult.java similarity index 96% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/tokenize/TokenizerRowSearchResult.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/tokenize/TokenizerRowSearchResult.java index e7f5433697f..2d22c5082eb 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/tokenize/TokenizerRowSearchResult.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/tokenize/TokenizerRowSearchResult.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.encode.tokenize; +package org.apache.hadoop.hbase.codec.prefixtree.encode.tokenize; import org.apache.hadoop.classification.InterfaceAudience; diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/scanner/CellScannerPosition.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/scanner/CellScannerPosition.java similarity index 97% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/scanner/CellScannerPosition.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/scanner/CellScannerPosition.java index a8f05419a5e..f820258917d 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/scanner/CellScannerPosition.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/scanner/CellScannerPosition.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.scanner; +package org.apache.hadoop.hbase.codec.prefixtree.scanner; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/scanner/CellSearcher.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/scanner/CellSearcher.java similarity index 98% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/scanner/CellSearcher.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/scanner/CellSearcher.java index e55c5591686..b0f1e27f670 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/scanner/CellSearcher.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/scanner/CellSearcher.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.scanner; +package org.apache.hadoop.hbase.codec.prefixtree.scanner; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.hbase.Cell; diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/scanner/ReversibleCellScanner.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/scanner/ReversibleCellScanner.java similarity index 89% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/scanner/ReversibleCellScanner.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/scanner/ReversibleCellScanner.java index b4463d8afa0..bb83ac5bdcb 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/scanner/ReversibleCellScanner.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/scanner/ReversibleCellScanner.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.scanner; +package org.apache.hadoop.hbase.codec.prefixtree.scanner; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.hbase.CellScanner; @@ -38,7 +38,7 @@ public interface ReversibleCellScanner extends CellScanner { * Cell.
* false if there were no previous cells, meaning getCurrentCell() will return null. * Scanner position will be - * {@link org.apache.hbase.codec.prefixtree.scanner.CellScannerPosition#BEFORE_FIRST} + * {@link org.apache.hadoop.hbase.codec.prefixtree.scanner.CellScannerPosition#BEFORE_FIRST} */ boolean previous(); @@ -49,7 +49,7 @@ public interface ReversibleCellScanner extends CellScanner { * Cell.
* false if there were no previous cells, meaning getCurrentCell() will return null. * Scanner position will be - * {@link org.apache.hbase.codec.prefixtree.scanner.CellScannerPosition#BEFORE_FIRST} + * {@link org.apache.hadoop.hbase.codec.prefixtree.scanner.CellScannerPosition#BEFORE_FIRST} */ boolean previousRow(boolean endOfRow); } \ No newline at end of file diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/util/byterange/ByteRangeSet.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/byterange/ByteRangeSet.java similarity index 95% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/util/byterange/ByteRangeSet.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/byterange/ByteRangeSet.java index b2d1526c16e..570d4890608 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/util/byterange/ByteRangeSet.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/byterange/ByteRangeSet.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.util.byterange; +package org.apache.hadoop.hbase.util.byterange; import java.util.ArrayList; import java.util.List; @@ -33,8 +33,8 @@ import com.google.common.collect.Lists; * Performance oriented class for de-duping and storing arbitrary byte[]'s arriving in non-sorted * order. Appends individual byte[]'s to a single big byte[] to avoid overhead and garbage. *

- * Current implementations are {@link org.apache.hbase.util.byterange.impl.ByteRangeHashSet} and - * {@link org.apache.hbase.util.byterange.impl.ByteRangeTreeSet}, but other options might be a + * Current implementations are {@link org.apache.hadoop.hbase.util.byterange.impl.ByteRangeHashSet} and + * {@link org.apache.hadoop.hbase.util.byterange.impl.ByteRangeTreeSet}, but other options might be a * trie-oriented ByteRangeTrieSet, etc */ @InterfaceAudience.Private diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/util/byterange/impl/ByteRangeHashSet.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/byterange/impl/ByteRangeHashSet.java similarity index 94% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/util/byterange/impl/ByteRangeHashSet.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/byterange/impl/ByteRangeHashSet.java index 8787f39df53..ef14a68c99b 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/util/byterange/impl/ByteRangeHashSet.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/byterange/impl/ByteRangeHashSet.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.util.byterange.impl; +package org.apache.hadoop.hbase.util.byterange.impl; import java.util.Collections; import java.util.HashMap; @@ -26,7 +26,7 @@ import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.hbase.util.ByteRange; import org.apache.hadoop.hbase.util.CollectionUtils; import org.apache.hadoop.hbase.util.IterableUtils; -import org.apache.hbase.util.byterange.ByteRangeSet; +import org.apache.hadoop.hbase.util.byterange.ByteRangeSet; /** * This is probably the best implementation of ByteRangeSet at the moment, though a HashMap produces diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/util/byterange/impl/ByteRangeTreeSet.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/byterange/impl/ByteRangeTreeSet.java similarity index 93% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/util/byterange/impl/ByteRangeTreeSet.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/byterange/impl/ByteRangeTreeSet.java index 9499e560fd6..eb86bc98adf 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/util/byterange/impl/ByteRangeTreeSet.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/byterange/impl/ByteRangeTreeSet.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.util.byterange.impl; +package org.apache.hadoop.hbase.util.byterange.impl; import java.util.List; import java.util.TreeMap; @@ -25,7 +25,7 @@ import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.hbase.util.ByteRange; import org.apache.hadoop.hbase.util.CollectionUtils; import org.apache.hadoop.hbase.util.IterableUtils; -import org.apache.hbase.util.byterange.ByteRangeSet; +import org.apache.hadoop.hbase.util.byterange.ByteRangeSet; /** * Not currently used in production, but here as a benchmark comparison against ByteRangeHashSet. diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/util/vint/UFIntTool.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/vint/UFIntTool.java similarity index 98% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/util/vint/UFIntTool.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/vint/UFIntTool.java index 278ac55b4b5..bec5debcc6f 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/util/vint/UFIntTool.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/vint/UFIntTool.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.util.vint; +package org.apache.hadoop.hbase.util.vint; import java.io.IOException; import java.io.OutputStream; diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/util/vint/UVIntTool.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/vint/UVIntTool.java similarity index 98% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/util/vint/UVIntTool.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/vint/UVIntTool.java index c0d29e42726..ac22684ce42 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/util/vint/UVIntTool.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/vint/UVIntTool.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.util.vint; +package org.apache.hadoop.hbase.util.vint; import java.io.IOException; import java.io.InputStream; diff --git a/hbase-prefix-tree/src/main/java/org/apache/hbase/util/vint/UVLongTool.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/vint/UVLongTool.java similarity index 98% rename from hbase-prefix-tree/src/main/java/org/apache/hbase/util/vint/UVLongTool.java rename to hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/vint/UVLongTool.java index ec95ae8034b..57dba17413a 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hbase/util/vint/UVLongTool.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/vint/UVLongTool.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.util.vint; +package org.apache.hadoop.hbase.util.vint; import java.io.IOException; import java.io.InputStream; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/keyvalue/TestKeyValueTool.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/keyvalue/TestKeyValueTool.java similarity index 94% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/codec/keyvalue/TestKeyValueTool.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/keyvalue/TestKeyValueTool.java index e2e97a1d41a..5bc418618ab 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/keyvalue/TestKeyValueTool.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/keyvalue/TestKeyValueTool.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.codec.keyvalue; +package org.apache.hadoop.hbase.codec.keyvalue; import java.nio.ByteBuffer; import java.util.Collection; @@ -24,7 +24,7 @@ import java.util.List; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueTestUtil; -import org.apache.hbase.codec.prefixtree.row.TestRowData; +import org.apache.hadoop.hbase.codec.prefixtree.row.TestRowData; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/PrefixTreeTestConstants.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/PrefixTreeTestConstants.java similarity index 95% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/PrefixTreeTestConstants.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/PrefixTreeTestConstants.java index 04087eaecbe..aabc0f0190b 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/PrefixTreeTestConstants.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/PrefixTreeTestConstants.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree; +package org.apache.hadoop.hbase.codec.prefixtree; import org.apache.hadoop.hbase.util.Bytes; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/blockmeta/TestBlockMeta.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/blockmeta/TestBlockMeta.java similarity index 95% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/blockmeta/TestBlockMeta.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/blockmeta/TestBlockMeta.java index 688b65a897f..57f66309e5f 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/blockmeta/TestBlockMeta.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/blockmeta/TestBlockMeta.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.blockmeta; +package org.apache.hadoop.hbase.codec.prefixtree.blockmeta; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.nio.ByteBuffer; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hbase.codec.prefixtree.PrefixTreeBlockMeta; +import org.apache.hadoop.hbase.codec.prefixtree.PrefixTreeBlockMeta; import org.junit.Assert; import org.junit.Test; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/builder/TestTokenizer.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/TestTokenizer.java similarity index 88% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/builder/TestTokenizer.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/TestTokenizer.java index 36f43258b2e..12bd4048a9b 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/builder/TestTokenizer.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/TestTokenizer.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.builder; +package org.apache.hadoop.hbase.codec.prefixtree.builder; import java.util.Collection; import java.util.List; +import org.apache.hadoop.hbase.codec.prefixtree.encode.tokenize.Tokenizer; +import org.apache.hadoop.hbase.codec.prefixtree.encode.tokenize.TokenizerNode; +import org.apache.hadoop.hbase.codec.prefixtree.encode.tokenize.TokenizerRowSearchResult; import org.apache.hadoop.hbase.util.ByteRange; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hbase.codec.prefixtree.encode.tokenize.Tokenizer; -import org.apache.hbase.codec.prefixtree.encode.tokenize.TokenizerNode; -import org.apache.hbase.codec.prefixtree.encode.tokenize.TokenizerRowSearchResult; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/builder/TestTokenizerData.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/TestTokenizerData.java similarity index 84% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/builder/TestTokenizerData.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/TestTokenizerData.java index b6db64a361f..9576bb534c2 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/builder/TestTokenizerData.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/TestTokenizerData.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.builder; +package org.apache.hadoop.hbase.codec.prefixtree.builder; import java.util.Collection; import java.util.List; -import org.apache.hbase.codec.prefixtree.builder.data.TestTokenizerDataBasic; -import org.apache.hbase.codec.prefixtree.builder.data.TestTokenizerDataEdgeCase; +import org.apache.hadoop.hbase.codec.prefixtree.builder.data.TestTokenizerDataBasic; +import org.apache.hadoop.hbase.codec.prefixtree.builder.data.TestTokenizerDataEdgeCase; import com.google.common.collect.Lists; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/builder/TestTreeDepth.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/TestTreeDepth.java similarity index 94% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/builder/TestTreeDepth.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/TestTreeDepth.java index 28ea6d73ef1..d0a47b9a2e8 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/builder/TestTreeDepth.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/TestTreeDepth.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.builder; +package org.apache.hadoop.hbase.codec.prefixtree.builder; import java.util.List; +import org.apache.hadoop.hbase.codec.prefixtree.encode.tokenize.Tokenizer; import org.apache.hadoop.hbase.util.ByteRange; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hbase.codec.prefixtree.encode.tokenize.Tokenizer; import org.junit.Assert; import org.junit.Test; import org.mortbay.log.Log; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/builder/data/TestTokenizerDataBasic.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/data/TestTokenizerDataBasic.java similarity index 91% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/builder/data/TestTokenizerDataBasic.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/data/TestTokenizerDataBasic.java index d717999ba6d..f925115cee2 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/builder/data/TestTokenizerDataBasic.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/data/TestTokenizerDataBasic.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.builder.data; +package org.apache.hadoop.hbase.codec.prefixtree.builder.data; import java.util.List; +import org.apache.hadoop.hbase.codec.prefixtree.builder.TestTokenizerData; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hbase.codec.prefixtree.builder.TestTokenizerData; import com.google.common.collect.Lists; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/builder/data/TestTokenizerDataEdgeCase.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/data/TestTokenizerDataEdgeCase.java similarity index 91% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/builder/data/TestTokenizerDataEdgeCase.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/data/TestTokenizerDataEdgeCase.java index 4c26649a8f3..87457d0f835 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/builder/data/TestTokenizerDataEdgeCase.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/data/TestTokenizerDataEdgeCase.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.builder.data; +package org.apache.hadoop.hbase.codec.prefixtree.builder.data; import java.util.List; +import org.apache.hadoop.hbase.codec.prefixtree.builder.TestTokenizerData; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hbase.codec.prefixtree.builder.TestTokenizerData; import com.google.common.collect.Lists; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/column/TestColumnBuilder.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/column/TestColumnBuilder.java similarity index 89% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/column/TestColumnBuilder.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/column/TestColumnBuilder.java index 4dcb0a1b578..f1d0456bb61 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/column/TestColumnBuilder.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/column/TestColumnBuilder.java @@ -16,22 +16,22 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.column; +package org.apache.hadoop.hbase.codec.prefixtree.column; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.Collection; import java.util.List; +import org.apache.hadoop.hbase.codec.prefixtree.PrefixTreeBlockMeta; +import org.apache.hadoop.hbase.codec.prefixtree.decode.column.ColumnReader; +import org.apache.hadoop.hbase.codec.prefixtree.encode.column.ColumnSectionWriter; +import org.apache.hadoop.hbase.codec.prefixtree.encode.tokenize.Tokenizer; +import org.apache.hadoop.hbase.codec.prefixtree.encode.tokenize.TokenizerNode; import org.apache.hadoop.hbase.util.ByteRange; import org.apache.hadoop.hbase.util.ByteRangeTool; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hbase.codec.prefixtree.PrefixTreeBlockMeta; -import org.apache.hbase.codec.prefixtree.decode.column.ColumnReader; -import org.apache.hbase.codec.prefixtree.encode.column.ColumnSectionWriter; -import org.apache.hbase.codec.prefixtree.encode.tokenize.Tokenizer; -import org.apache.hbase.codec.prefixtree.encode.tokenize.TokenizerNode; -import org.apache.hbase.util.byterange.impl.ByteRangeTreeSet; +import org.apache.hadoop.hbase.util.byterange.impl.ByteRangeTreeSet; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/column/TestColumnData.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/column/TestColumnData.java similarity index 86% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/column/TestColumnData.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/column/TestColumnData.java index 522a8ad492b..47773cb25f3 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/column/TestColumnData.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/column/TestColumnData.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.column; +package org.apache.hadoop.hbase.codec.prefixtree.column; import java.util.Collection; import java.util.List; +import org.apache.hadoop.hbase.codec.prefixtree.column.data.TestColumnDataRandom; +import org.apache.hadoop.hbase.codec.prefixtree.column.data.TestColumnDataSimple; import org.apache.hadoop.hbase.util.ByteRange; -import org.apache.hbase.codec.prefixtree.column.data.TestColumnDataRandom; -import org.apache.hbase.codec.prefixtree.column.data.TestColumnDataSimple; import com.google.common.collect.Lists; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/column/data/TestColumnDataRandom.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/column/data/TestColumnDataRandom.java similarity index 87% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/column/data/TestColumnDataRandom.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/column/data/TestColumnDataRandom.java index 7a66a7326dd..f245405c40e 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/column/data/TestColumnDataRandom.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/column/data/TestColumnDataRandom.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.column.data; +package org.apache.hadoop.hbase.codec.prefixtree.column.data; import java.util.List; import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.codec.prefixtree.column.TestColumnData; import org.apache.hadoop.hbase.util.ByteRange; +import org.apache.hadoop.hbase.util.byterange.ByteRangeSet; +import org.apache.hadoop.hbase.util.byterange.impl.ByteRangeTreeSet; import org.apache.hadoop.hbase.util.test.RedundantKVGenerator; -import org.apache.hbase.codec.prefixtree.column.TestColumnData; -import org.apache.hbase.util.byterange.ByteRangeSet; -import org.apache.hbase.util.byterange.impl.ByteRangeTreeSet; import com.google.common.collect.Lists; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/column/data/TestColumnDataSimple.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/column/data/TestColumnDataSimple.java similarity index 92% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/column/data/TestColumnDataSimple.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/column/data/TestColumnDataSimple.java index ad5a2cd8724..5921116b5d9 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/column/data/TestColumnDataSimple.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/column/data/TestColumnDataSimple.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.column.data; +package org.apache.hadoop.hbase.codec.prefixtree.column.data; import java.util.List; +import org.apache.hadoop.hbase.codec.prefixtree.column.TestColumnData; import org.apache.hadoop.hbase.util.ByteRange; import org.apache.hadoop.hbase.util.ByteRangeTool; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hbase.codec.prefixtree.column.TestColumnData; import com.google.common.collect.Lists; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/BaseTestRowData.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/BaseTestRowData.java similarity index 89% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/BaseTestRowData.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/BaseTestRowData.java index 9c3fcf9043c..a895f9f1048 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/BaseTestRowData.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/BaseTestRowData.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.row; +package org.apache.hadoop.hbase.codec.prefixtree.row; import java.util.List; import org.apache.hadoop.hbase.CellComparator; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hbase.codec.prefixtree.PrefixTreeBlockMeta; -import org.apache.hbase.codec.prefixtree.scanner.CellSearcher; +import org.apache.hadoop.hbase.codec.prefixtree.PrefixTreeBlockMeta; +import org.apache.hadoop.hbase.codec.prefixtree.scanner.CellSearcher; import com.google.common.collect.Lists; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/TestPrefixTreeSearcher.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/TestPrefixTreeSearcher.java similarity index 94% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/TestPrefixTreeSearcher.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/TestPrefixTreeSearcher.java index b138d1ea01a..02d599b5976 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/TestPrefixTreeSearcher.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/TestPrefixTreeSearcher.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.row; +package org.apache.hadoop.hbase.codec.prefixtree.row; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -28,11 +28,11 @@ import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellComparator; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueUtil; +import org.apache.hadoop.hbase.codec.prefixtree.decode.DecoderFactory; +import org.apache.hadoop.hbase.codec.prefixtree.encode.PrefixTreeEncoder; +import org.apache.hadoop.hbase.codec.prefixtree.scanner.CellScannerPosition; +import org.apache.hadoop.hbase.codec.prefixtree.scanner.CellSearcher; import org.apache.hadoop.hbase.util.CollectionUtils; -import org.apache.hbase.codec.prefixtree.decode.DecoderFactory; -import org.apache.hbase.codec.prefixtree.encode.PrefixTreeEncoder; -import org.apache.hbase.codec.prefixtree.scanner.CellScannerPosition; -import org.apache.hbase.codec.prefixtree.scanner.CellSearcher; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/TestRowData.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/TestRowData.java similarity index 65% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/TestRowData.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/TestRowData.java index d3a2fa8bef0..b0cb43f4342 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/TestRowData.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/TestRowData.java @@ -16,29 +16,29 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.row; +package org.apache.hadoop.hbase.codec.prefixtree.row; import java.util.Collection; import java.util.List; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hbase.codec.prefixtree.PrefixTreeBlockMeta; -import org.apache.hbase.codec.prefixtree.row.data.TestRowDataComplexQualifiers; -import org.apache.hbase.codec.prefixtree.row.data.TestRowDataDeeper; -import org.apache.hbase.codec.prefixtree.row.data.TestRowDataDifferentTimestamps; -import org.apache.hbase.codec.prefixtree.row.data.TestRowDataEmpty; -import org.apache.hbase.codec.prefixtree.row.data.TestRowDataExerciseFInts; -import org.apache.hbase.codec.prefixtree.row.data.TestRowDataNub; -import org.apache.hbase.codec.prefixtree.row.data.TestRowDataNumberStrings; -import org.apache.hbase.codec.prefixtree.row.data.TestRowDataQualifierByteOrdering; -import org.apache.hbase.codec.prefixtree.row.data.TestRowDataRandomKeyValues; -import org.apache.hbase.codec.prefixtree.row.data.TestRowDataSearcherRowMiss; -import org.apache.hbase.codec.prefixtree.row.data.TestRowDataSimple; -import org.apache.hbase.codec.prefixtree.row.data.TestRowDataSingleQualifier; -import org.apache.hbase.codec.prefixtree.row.data.TestRowDataTrivial; -import org.apache.hbase.codec.prefixtree.row.data.TestRowDataUrls; -import org.apache.hbase.codec.prefixtree.row.data.TestRowDataUrlsExample; -import org.apache.hbase.codec.prefixtree.scanner.CellSearcher; +import org.apache.hadoop.hbase.codec.prefixtree.PrefixTreeBlockMeta; +import org.apache.hadoop.hbase.codec.prefixtree.row.data.TestRowDataComplexQualifiers; +import org.apache.hadoop.hbase.codec.prefixtree.row.data.TestRowDataDeeper; +import org.apache.hadoop.hbase.codec.prefixtree.row.data.TestRowDataDifferentTimestamps; +import org.apache.hadoop.hbase.codec.prefixtree.row.data.TestRowDataEmpty; +import org.apache.hadoop.hbase.codec.prefixtree.row.data.TestRowDataExerciseFInts; +import org.apache.hadoop.hbase.codec.prefixtree.row.data.TestRowDataNub; +import org.apache.hadoop.hbase.codec.prefixtree.row.data.TestRowDataNumberStrings; +import org.apache.hadoop.hbase.codec.prefixtree.row.data.TestRowDataQualifierByteOrdering; +import org.apache.hadoop.hbase.codec.prefixtree.row.data.TestRowDataRandomKeyValues; +import org.apache.hadoop.hbase.codec.prefixtree.row.data.TestRowDataSearcherRowMiss; +import org.apache.hadoop.hbase.codec.prefixtree.row.data.TestRowDataSimple; +import org.apache.hadoop.hbase.codec.prefixtree.row.data.TestRowDataSingleQualifier; +import org.apache.hadoop.hbase.codec.prefixtree.row.data.TestRowDataTrivial; +import org.apache.hadoop.hbase.codec.prefixtree.row.data.TestRowDataUrls; +import org.apache.hadoop.hbase.codec.prefixtree.row.data.TestRowDataUrlsExample; +import org.apache.hadoop.hbase.codec.prefixtree.scanner.CellSearcher; import com.google.common.collect.Lists; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/TestRowEncoder.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/TestRowEncoder.java similarity index 95% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/TestRowEncoder.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/TestRowEncoder.java index b2e81b94ba6..2bbba8bfe73 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/TestRowEncoder.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/TestRowEncoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.row; +package org.apache.hadoop.hbase.codec.prefixtree.row; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -28,10 +28,10 @@ import java.util.List; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueUtil; +import org.apache.hadoop.hbase.codec.prefixtree.PrefixTreeBlockMeta; +import org.apache.hadoop.hbase.codec.prefixtree.decode.PrefixTreeArraySearcher; +import org.apache.hadoop.hbase.codec.prefixtree.encode.PrefixTreeEncoder; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hbase.codec.prefixtree.PrefixTreeBlockMeta; -import org.apache.hbase.codec.prefixtree.decode.PrefixTreeArraySearcher; -import org.apache.hbase.codec.prefixtree.encode.PrefixTreeEncoder; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataComplexQualifiers.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataComplexQualifiers.java similarity index 90% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataComplexQualifiers.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataComplexQualifiers.java index 8f9fa33c212..bd6f02b4458 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataComplexQualifiers.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataComplexQualifiers.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.row.data; +package org.apache.hadoop.hbase.codec.prefixtree.row.data; import java.util.List; import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.codec.prefixtree.PrefixTreeTestConstants; +import org.apache.hadoop.hbase.codec.prefixtree.row.BaseTestRowData; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hbase.codec.prefixtree.PrefixTreeTestConstants; -import org.apache.hbase.codec.prefixtree.row.BaseTestRowData; import com.google.common.collect.Lists; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataDeeper.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataDeeper.java similarity index 87% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataDeeper.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataDeeper.java index 4a8050778a1..11cd10afa89 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataDeeper.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataDeeper.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.row.data; +package org.apache.hadoop.hbase.codec.prefixtree.row.data; import java.util.List; import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.codec.prefixtree.PrefixTreeBlockMeta; +import org.apache.hadoop.hbase.codec.prefixtree.row.BaseTestRowData; +import org.apache.hadoop.hbase.codec.prefixtree.scanner.CellScannerPosition; +import org.apache.hadoop.hbase.codec.prefixtree.scanner.CellSearcher; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hbase.codec.prefixtree.PrefixTreeBlockMeta; -import org.apache.hbase.codec.prefixtree.row.BaseTestRowData; -import org.apache.hbase.codec.prefixtree.scanner.CellScannerPosition; -import org.apache.hbase.codec.prefixtree.scanner.CellSearcher; import org.junit.Assert; import com.google.common.collect.Lists; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataDifferentTimestamps.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataDifferentTimestamps.java similarity index 93% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataDifferentTimestamps.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataDifferentTimestamps.java index 5ef79e69931..8b729bc93fb 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataDifferentTimestamps.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataDifferentTimestamps.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.row.data; +package org.apache.hadoop.hbase.codec.prefixtree.row.data; import java.util.List; import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.codec.prefixtree.PrefixTreeBlockMeta; +import org.apache.hadoop.hbase.codec.prefixtree.row.BaseTestRowData; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hbase.codec.prefixtree.PrefixTreeBlockMeta; -import org.apache.hbase.codec.prefixtree.row.BaseTestRowData; import org.junit.Assert; import com.google.common.collect.Lists; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataEmpty.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataEmpty.java similarity index 90% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataEmpty.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataEmpty.java index ace18b3d866..3bb23fa5c97 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataEmpty.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataEmpty.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.row.data; +package org.apache.hadoop.hbase.codec.prefixtree.row.data; import java.util.List; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValue.Type; -import org.apache.hbase.codec.prefixtree.row.BaseTestRowData; +import org.apache.hadoop.hbase.codec.prefixtree.row.BaseTestRowData; import com.google.common.collect.Lists; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataExerciseFInts.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataExerciseFInts.java similarity index 92% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataExerciseFInts.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataExerciseFInts.java index d586884bbd7..9b7353d8b71 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataExerciseFInts.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataExerciseFInts.java @@ -16,18 +16,18 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.row.data; +package org.apache.hadoop.hbase.codec.prefixtree.row.data; import java.util.ArrayList; import java.util.List; import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.codec.prefixtree.PrefixTreeBlockMeta; +import org.apache.hadoop.hbase.codec.prefixtree.PrefixTreeTestConstants; +import org.apache.hadoop.hbase.codec.prefixtree.row.BaseTestRowData; import org.apache.hadoop.hbase.util.ByteRange; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hbase.codec.prefixtree.PrefixTreeBlockMeta; -import org.apache.hbase.codec.prefixtree.PrefixTreeTestConstants; -import org.apache.hbase.codec.prefixtree.row.BaseTestRowData; -import org.apache.hbase.util.byterange.impl.ByteRangeTreeSet; +import org.apache.hadoop.hbase.util.byterange.impl.ByteRangeTreeSet; import org.junit.Assert; import com.google.common.collect.Lists; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataMultiFamilies.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataMultiFamilies.java similarity index 93% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataMultiFamilies.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataMultiFamilies.java index 00c03754f8c..ab848d696ac 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataMultiFamilies.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataMultiFamilies.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.row.data; +package org.apache.hadoop.hbase.codec.prefixtree.row.data; import java.util.List; import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.codec.prefixtree.row.BaseTestRowData; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hbase.codec.prefixtree.row.BaseTestRowData; import com.google.common.collect.Lists; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataNub.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataNub.java similarity index 89% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataNub.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataNub.java index b4250dd5848..ad19cd40603 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataNub.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataNub.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.row.data; +package org.apache.hadoop.hbase.codec.prefixtree.row.data; import java.util.List; import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.codec.prefixtree.PrefixTreeTestConstants; +import org.apache.hadoop.hbase.codec.prefixtree.row.BaseTestRowData; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hbase.codec.prefixtree.PrefixTreeTestConstants; -import org.apache.hbase.codec.prefixtree.row.BaseTestRowData; import com.google.common.collect.Lists; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataNumberStrings.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataNumberStrings.java similarity index 94% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataNumberStrings.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataNumberStrings.java index 37afc5463d2..e508c2c69d3 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataNumberStrings.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataNumberStrings.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.row.data; +package org.apache.hadoop.hbase.codec.prefixtree.row.data; import java.util.Collections; import java.util.List; @@ -24,8 +24,8 @@ import java.util.List; import org.apache.hadoop.hbase.CellComparator; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValue.Type; +import org.apache.hadoop.hbase.codec.prefixtree.row.BaseTestRowData; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hbase.codec.prefixtree.row.BaseTestRowData; import com.google.common.collect.Lists; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataQualifierByteOrdering.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataQualifierByteOrdering.java similarity index 93% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataQualifierByteOrdering.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataQualifierByteOrdering.java index cacca64d20c..a8c4646eb91 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataQualifierByteOrdering.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataQualifierByteOrdering.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.row.data; +package org.apache.hadoop.hbase.codec.prefixtree.row.data; import java.util.List; import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.codec.prefixtree.row.BaseTestRowData; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hbase.codec.prefixtree.row.BaseTestRowData; import com.google.common.collect.Lists; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataRandomKeyValues.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataRandomKeyValues.java similarity index 91% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataRandomKeyValues.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataRandomKeyValues.java index 0fb7a5bf25f..5834d1b28e8 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataRandomKeyValues.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataRandomKeyValues.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.row.data; +package org.apache.hadoop.hbase.codec.prefixtree.row.data; import java.util.List; import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.codec.prefixtree.row.BaseTestRowData; import org.apache.hadoop.hbase.util.test.RedundantKVGenerator; -import org.apache.hbase.codec.prefixtree.row.BaseTestRowData; import com.google.common.collect.Lists; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataSearcherRowMiss.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataSearcherRowMiss.java similarity index 93% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataSearcherRowMiss.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataSearcherRowMiss.java index fd16a7b28da..aad32d889cb 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataSearcherRowMiss.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataSearcherRowMiss.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.row.data; +package org.apache.hadoop.hbase.codec.prefixtree.row.data; import java.util.List; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellComparator; import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.codec.prefixtree.row.BaseTestRowData; +import org.apache.hadoop.hbase.codec.prefixtree.scanner.CellScannerPosition; +import org.apache.hadoop.hbase.codec.prefixtree.scanner.CellSearcher; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hbase.codec.prefixtree.row.BaseTestRowData; -import org.apache.hbase.codec.prefixtree.scanner.CellScannerPosition; -import org.apache.hbase.codec.prefixtree.scanner.CellSearcher; import org.junit.Assert; import com.google.common.collect.Lists; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataSimple.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataSimple.java similarity index 93% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataSimple.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataSimple.java index 64c60efd4e5..7fbde65cc58 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataSimple.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataSimple.java @@ -16,18 +16,18 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.row.data; +package org.apache.hadoop.hbase.codec.prefixtree.row.data; import java.util.List; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellComparator; import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.codec.prefixtree.row.BaseTestRowData; +import org.apache.hadoop.hbase.codec.prefixtree.scanner.CellScannerPosition; +import org.apache.hadoop.hbase.codec.prefixtree.scanner.CellSearcher; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.CollectionUtils; -import org.apache.hbase.codec.prefixtree.row.BaseTestRowData; -import org.apache.hbase.codec.prefixtree.scanner.CellScannerPosition; -import org.apache.hbase.codec.prefixtree.scanner.CellSearcher; import org.junit.Assert; import com.google.common.collect.Lists; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataSingleQualifier.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataSingleQualifier.java similarity index 88% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataSingleQualifier.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataSingleQualifier.java index 21f6083f370..9944057176c 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataSingleQualifier.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataSingleQualifier.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.row.data; +package org.apache.hadoop.hbase.codec.prefixtree.row.data; import java.util.List; import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.codec.prefixtree.PrefixTreeTestConstants; +import org.apache.hadoop.hbase.codec.prefixtree.row.BaseTestRowData; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hbase.codec.prefixtree.PrefixTreeTestConstants; -import org.apache.hbase.codec.prefixtree.row.BaseTestRowData; import com.google.common.collect.Lists; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataTrivial.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataTrivial.java similarity index 86% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataTrivial.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataTrivial.java index 108d2d7eb92..1e86b789aa6 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataTrivial.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataTrivial.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.row.data; +package org.apache.hadoop.hbase.codec.prefixtree.row.data; import java.util.List; import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.codec.prefixtree.PrefixTreeBlockMeta; +import org.apache.hadoop.hbase.codec.prefixtree.row.BaseTestRowData; +import org.apache.hadoop.hbase.codec.prefixtree.scanner.CellScannerPosition; +import org.apache.hadoop.hbase.codec.prefixtree.scanner.CellSearcher; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hbase.codec.prefixtree.PrefixTreeBlockMeta; -import org.apache.hbase.codec.prefixtree.row.BaseTestRowData; -import org.apache.hbase.codec.prefixtree.scanner.CellScannerPosition; -import org.apache.hbase.codec.prefixtree.scanner.CellSearcher; import org.junit.Assert; import com.google.common.collect.Lists; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataUrls.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataUrls.java similarity index 92% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataUrls.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataUrls.java index 4d9b7a3601f..692e700a585 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataUrls.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataUrls.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.row.data; +package org.apache.hadoop.hbase.codec.prefixtree.row.data; import java.util.ArrayList; import java.util.List; import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.codec.prefixtree.PrefixTreeTestConstants; +import org.apache.hadoop.hbase.codec.prefixtree.row.BaseTestRowData; import org.apache.hadoop.hbase.util.ByteRange; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hbase.codec.prefixtree.PrefixTreeTestConstants; -import org.apache.hbase.codec.prefixtree.row.BaseTestRowData; -import org.apache.hbase.util.byterange.impl.ByteRangeTreeSet; +import org.apache.hadoop.hbase.util.byterange.impl.ByteRangeTreeSet; import com.google.common.collect.Lists; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataUrlsExample.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataUrlsExample.java similarity index 89% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataUrlsExample.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataUrlsExample.java index d03bac9940a..543afb60eee 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataUrlsExample.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataUrlsExample.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.row.data; +package org.apache.hadoop.hbase.codec.prefixtree.row.data; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -24,12 +24,12 @@ import java.util.List; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueTestUtil; +import org.apache.hadoop.hbase.codec.prefixtree.encode.PrefixTreeEncoder; +import org.apache.hadoop.hbase.codec.prefixtree.encode.column.ColumnNodeWriter; +import org.apache.hadoop.hbase.codec.prefixtree.encode.row.RowNodeWriter; +import org.apache.hadoop.hbase.codec.prefixtree.encode.tokenize.TokenizerNode; +import org.apache.hadoop.hbase.codec.prefixtree.row.BaseTestRowData; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hbase.codec.prefixtree.encode.PrefixTreeEncoder; -import org.apache.hbase.codec.prefixtree.encode.column.ColumnNodeWriter; -import org.apache.hbase.codec.prefixtree.encode.row.RowNodeWriter; -import org.apache.hbase.codec.prefixtree.encode.tokenize.TokenizerNode; -import org.apache.hbase.codec.prefixtree.row.BaseTestRowData; import com.google.common.collect.Lists; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/timestamp/TestTimestampData.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/timestamp/TestTimestampData.java similarity index 80% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/timestamp/TestTimestampData.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/timestamp/TestTimestampData.java index 6db1a80f5d0..f26c5b8c40e 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/timestamp/TestTimestampData.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/timestamp/TestTimestampData.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.timestamp; +package org.apache.hadoop.hbase.codec.prefixtree.timestamp; import java.util.Collection; import java.util.List; -import org.apache.hbase.codec.prefixtree.timestamp.data.TestTimestampDataBasic; -import org.apache.hbase.codec.prefixtree.timestamp.data.TestTimestampDataNumbers; -import org.apache.hbase.codec.prefixtree.timestamp.data.TestTimestampDataRepeats; +import org.apache.hadoop.hbase.codec.prefixtree.timestamp.data.TestTimestampDataBasic; +import org.apache.hadoop.hbase.codec.prefixtree.timestamp.data.TestTimestampDataNumbers; +import org.apache.hadoop.hbase.codec.prefixtree.timestamp.data.TestTimestampDataRepeats; import com.google.common.collect.Lists; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/timestamp/TestTimestampEncoder.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/timestamp/TestTimestampEncoder.java similarity index 90% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/timestamp/TestTimestampEncoder.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/timestamp/TestTimestampEncoder.java index 183eba27fc3..da41cbc2d35 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/timestamp/TestTimestampEncoder.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/timestamp/TestTimestampEncoder.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.timestamp; +package org.apache.hadoop.hbase.codec.prefixtree.timestamp; import java.io.IOException; import java.util.Collection; -import org.apache.hbase.codec.prefixtree.PrefixTreeBlockMeta; -import org.apache.hbase.codec.prefixtree.decode.timestamp.TimestampDecoder; -import org.apache.hbase.codec.prefixtree.encode.other.LongEncoder; +import org.apache.hadoop.hbase.codec.prefixtree.PrefixTreeBlockMeta; +import org.apache.hadoop.hbase.codec.prefixtree.decode.timestamp.TimestampDecoder; +import org.apache.hadoop.hbase.codec.prefixtree.encode.other.LongEncoder; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/timestamp/data/TestTimestampDataBasic.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/timestamp/data/TestTimestampDataBasic.java similarity index 90% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/timestamp/data/TestTimestampDataBasic.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/timestamp/data/TestTimestampDataBasic.java index 5c0da9467b8..f11fab4dcbb 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/timestamp/data/TestTimestampDataBasic.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/timestamp/data/TestTimestampDataBasic.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.timestamp.data; +package org.apache.hadoop.hbase.codec.prefixtree.timestamp.data; import java.util.ArrayList; import java.util.List; -import org.apache.hbase.codec.prefixtree.timestamp.TestTimestampData; +import org.apache.hadoop.hbase.codec.prefixtree.timestamp.TestTimestampData; public class TestTimestampDataBasic implements TestTimestampData { diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/timestamp/data/TestTimestampDataNumbers.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/timestamp/data/TestTimestampDataNumbers.java similarity index 91% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/timestamp/data/TestTimestampDataNumbers.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/timestamp/data/TestTimestampDataNumbers.java index 4c1cbd52f6b..f5ed89db41c 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/timestamp/data/TestTimestampDataNumbers.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/timestamp/data/TestTimestampDataNumbers.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.timestamp.data; +package org.apache.hadoop.hbase.codec.prefixtree.timestamp.data; import java.util.ArrayList; import java.util.List; -import org.apache.hbase.codec.prefixtree.timestamp.TestTimestampData; +import org.apache.hadoop.hbase.codec.prefixtree.timestamp.TestTimestampData; public class TestTimestampDataNumbers implements TestTimestampData { diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/timestamp/data/TestTimestampDataRepeats.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/timestamp/data/TestTimestampDataRepeats.java similarity index 90% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/timestamp/data/TestTimestampDataRepeats.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/timestamp/data/TestTimestampDataRepeats.java index 985d584cb13..69548d2ebdb 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/timestamp/data/TestTimestampDataRepeats.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/timestamp/data/TestTimestampDataRepeats.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.hbase.codec.prefixtree.timestamp.data; +package org.apache.hadoop.hbase.codec.prefixtree.timestamp.data; import java.util.ArrayList; import java.util.List; -import org.apache.hbase.codec.prefixtree.timestamp.TestTimestampData; +import org.apache.hadoop.hbase.codec.prefixtree.timestamp.TestTimestampData; public class TestTimestampDataRepeats implements TestTimestampData { diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/util/bytes/TestByteRange.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/bytes/TestByteRange.java similarity index 96% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/util/bytes/TestByteRange.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/bytes/TestByteRange.java index 41bbb6a3bec..e8c1d9001d5 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/util/bytes/TestByteRange.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/bytes/TestByteRange.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.util.bytes; +package org.apache.hadoop.hbase.util.bytes; import junit.framework.Assert; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/util/comparator/ByteArrayComparator.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/comparator/ByteArrayComparator.java similarity index 95% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/util/comparator/ByteArrayComparator.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/comparator/ByteArrayComparator.java index 8cf7bd9915e..9a81d903efc 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/util/comparator/ByteArrayComparator.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/comparator/ByteArrayComparator.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.util.comparator; +package org.apache.hadoop.hbase.util.comparator; import java.util.Comparator; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/util/number/NumberFormatter.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/number/NumberFormatter.java similarity index 96% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/util/number/NumberFormatter.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/number/NumberFormatter.java index 05f9c02aaef..4aaea61615b 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/util/number/NumberFormatter.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/number/NumberFormatter.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.util.number; +package org.apache.hadoop.hbase.util.number; import java.text.DecimalFormat; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/util/number/RandomNumberUtils.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/number/RandomNumberUtils.java similarity index 95% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/util/number/RandomNumberUtils.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/number/RandomNumberUtils.java index 57fd8f559f3..f2f06e60dba 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/util/number/RandomNumberUtils.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/number/RandomNumberUtils.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hbase.util.number; +package org.apache.hadoop.hbase.util.number; import java.util.Random; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/util/vint/TestFIntTool.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/vint/TestFIntTool.java similarity index 98% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/util/vint/TestFIntTool.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/vint/TestFIntTool.java index 579af343ce2..03ba0183d51 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/util/vint/TestFIntTool.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/vint/TestFIntTool.java @@ -16,11 +16,12 @@ * limitations under the License. */ -package org.apache.hbase.util.vint; +package org.apache.hadoop.hbase.util.vint; import java.io.ByteArrayOutputStream; import java.io.IOException; +import org.apache.hadoop.hbase.util.vint.UFIntTool; import org.junit.Assert; import org.junit.Test; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/util/vint/TestVIntTool.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/vint/TestVIntTool.java similarity index 97% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/util/vint/TestVIntTool.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/vint/TestVIntTool.java index 1fc40643f4b..9d78d7f246d 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/util/vint/TestVIntTool.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/vint/TestVIntTool.java @@ -16,13 +16,14 @@ * limitations under the License. */ -package org.apache.hbase.util.vint; +package org.apache.hadoop.hbase.util.vint; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.Random; +import org.apache.hadoop.hbase.util.vint.UVIntTool; import org.junit.Assert; import org.junit.Test; diff --git a/hbase-prefix-tree/src/test/java/org/apache/hbase/util/vint/TestVLongTool.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/vint/TestVLongTool.java similarity index 96% rename from hbase-prefix-tree/src/test/java/org/apache/hbase/util/vint/TestVLongTool.java rename to hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/vint/TestVLongTool.java index e294abdd0c1..8d4c4c8f3cb 100644 --- a/hbase-prefix-tree/src/test/java/org/apache/hbase/util/vint/TestVLongTool.java +++ b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/vint/TestVLongTool.java @@ -16,13 +16,14 @@ * limitations under the License. */ -package org.apache.hbase.util.vint; +package org.apache.hadoop.hbase.util.vint; import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.Random; -import org.apache.hbase.util.number.RandomNumberUtils; +import org.apache.hadoop.hbase.util.number.RandomNumberUtils; +import org.apache.hadoop.hbase.util.vint.UVLongTool; import org.junit.Assert; import org.junit.Test;