children = tokenizerNode.getChildren();
- for (int i = 0; i < children.size(); ++i) {
- TokenizerNode child = children.get(i);
- int distanceToChild = tokenizerNode.getNegativeIndex() - child.getNegativeIndex();
- UFIntTool.writeBytes(blockMeta.getNextNodeOffsetWidth(), distanceToChild, os);
- }
- }
-}
diff --git a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/row/RowSectionWriter.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/row/RowSectionWriter.java
deleted file mode 100644
index 3d9fa138458..00000000000
--- a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/row/RowSectionWriter.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.codec.prefixtree.encode.row;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.yetus.audience.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.vint.UFIntTool;
-
-import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
-
-/**
- * Most of the complexity of the PrefixTree is contained in the "row section". It contains the row
- * key trie structure used to search and recreate all the row keys. Each nub and leaf in this trie
- * also contains references to offsets in the other sections of the data block that enable the
- * decoder to match a row key with its qualifier, timestamp, type, value, etc.
- *
- * The row section is a concatenated collection of {@link RowNodeWriter}s. See that class for the
- * internals of each row node.
- */
-@InterfaceAudience.Private
-public class RowSectionWriter {
-
- /***************** fields **************************/
-
- protected PrefixTreeEncoder prefixTreeEncoder;
-
- protected PrefixTreeBlockMeta blockMeta;
-
- protected int numBytes;
-
- protected ArrayList nonLeaves;
- protected ArrayList leaves;
-
- protected ArrayList leafWriters;
- protected ArrayList nonLeafWriters;
-
- protected int numLeafWriters;
- protected int numNonLeafWriters;
-
-
- /********************* construct **********************/
-
- public RowSectionWriter() {
- this.nonLeaves = Lists.newArrayList();
- this.leaves = Lists.newArrayList();
- this.leafWriters = Lists.newArrayList();
- this.nonLeafWriters = Lists.newArrayList();
- }
-
- public RowSectionWriter(PrefixTreeEncoder prefixTreeEncoder) {
- reconstruct(prefixTreeEncoder);
- }
-
- public void reconstruct(PrefixTreeEncoder prefixTreeEncoder) {
- this.prefixTreeEncoder = prefixTreeEncoder;
- this.blockMeta = prefixTreeEncoder.getBlockMeta();
- reset();
- }
-
- public void reset() {
- numBytes = 0;
- nonLeaves.clear();
- leaves.clear();
- numLeafWriters = 0;
- numNonLeafWriters = 0;
- }
-
-
- /****************** methods *******************************/
-
- public RowSectionWriter compile() {
- blockMeta.setMaxRowLength(prefixTreeEncoder.getRowTokenizer().getMaxElementLength());
- prefixTreeEncoder.getRowTokenizer().setNodeFirstInsertionIndexes();
-
- prefixTreeEncoder.getRowTokenizer().appendNodes(nonLeaves, true, false);
- prefixTreeEncoder.getRowTokenizer().appendNodes(leaves, false, true);
-
- // track the starting position of each node in final output
- int negativeIndex = 0;
-
- // create leaf writer nodes
- // leaf widths are known at this point, so add them up
- int totalLeafBytes = 0;
- for (int i = leaves.size() - 1; i >= 0; --i) {
- TokenizerNode leaf = leaves.get(i);
- RowNodeWriter leafWriter = initializeWriter(leafWriters, numLeafWriters, leaf);
- ++numLeafWriters;
- // leaves store all but their first token byte
- int leafNodeWidth = leafWriter.calculateWidthOverrideOffsetWidth(0);
- totalLeafBytes += leafNodeWidth;
- negativeIndex += leafNodeWidth;
- leaf.setNegativeIndex(negativeIndex);
- }
-
- int totalNonLeafBytesWithoutOffsets = 0;
- int totalChildPointers = 0;
- for (int i = nonLeaves.size() - 1; i >= 0; --i) {
- TokenizerNode nonLeaf = nonLeaves.get(i);
- RowNodeWriter nonLeafWriter = initializeWriter(nonLeafWriters, numNonLeafWriters, nonLeaf);
- ++numNonLeafWriters;
- totalNonLeafBytesWithoutOffsets += nonLeafWriter.calculateWidthOverrideOffsetWidth(0);
- totalChildPointers += nonLeaf.getNumChildren();
- }
-
- // figure out how wide our offset FInts are
- int offsetWidth = 0;
- while (true) {
- ++offsetWidth;
- int offsetBytes = totalChildPointers * offsetWidth;
- int totalRowBytes = totalNonLeafBytesWithoutOffsets + offsetBytes + totalLeafBytes;
- if (totalRowBytes < UFIntTool.maxValueForNumBytes(offsetWidth)) {
- // it fits
- numBytes = totalRowBytes;
- break;
- }
- }
- blockMeta.setNextNodeOffsetWidth(offsetWidth);
-
- // populate negativeIndexes
- for (int i = nonLeaves.size() - 1; i >= 0; --i) {
- TokenizerNode nonLeaf = nonLeaves.get(i);
- int writerIndex = nonLeaves.size() - i - 1;
- RowNodeWriter nonLeafWriter = nonLeafWriters.get(writerIndex);
- int nodeWidth = nonLeafWriter.calculateWidth();
- negativeIndex += nodeWidth;
- nonLeaf.setNegativeIndex(negativeIndex);
- }
-
- return this;
- }
-
- protected RowNodeWriter initializeWriter(List list, int index,
- TokenizerNode builderNode) {
- RowNodeWriter rowNodeWriter = null;
- //check if there is an existing node we can recycle
- if (index >= list.size()) {
- //there are not enough existing nodes, so add a new one which will be retrieved below
- list.add(new RowNodeWriter(prefixTreeEncoder, builderNode));
- }
- rowNodeWriter = list.get(index);
- rowNodeWriter.reset(builderNode);
- return rowNodeWriter;
- }
-
-
- public void writeBytes(OutputStream os) throws IOException {
- for (int i = numNonLeafWriters - 1; i >= 0; --i) {
- RowNodeWriter nonLeafWriter = nonLeafWriters.get(i);
- nonLeafWriter.write(os);
- }
- // duplicates above... written more for clarity right now
- for (int i = numLeafWriters - 1; i >= 0; --i) {
- RowNodeWriter leafWriter = leafWriters.get(i);
- leafWriter.write(os);
- }
- }
-
-
- /***************** static ******************************/
-
- protected static ArrayList filterByLeafAndReverse(
- ArrayList ins, boolean leaves) {
- ArrayList outs = Lists.newArrayList();
- for (int i = ins.size() - 1; i >= 0; --i) {
- TokenizerNode n = ins.get(i);
- if (n.isLeaf() && leaves || (!n.isLeaf() && !leaves)) {
- outs.add(ins.get(i));
- }
- }
- return outs;
- }
-
-
- /************* get/set **************************/
-
- public int getNumBytes() {
- return numBytes;
- }
-
- public ArrayList getNonLeaves() {
- return nonLeaves;
- }
-
- public ArrayList getLeaves() {
- return leaves;
- }
-
- public ArrayList getNonLeafWriters() {
- return nonLeafWriters;
- }
-
- public ArrayList getLeafWriters() {
- return leafWriters;
- }
-
-}
diff --git a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/tokenize/Tokenizer.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/tokenize/Tokenizer.java
deleted file mode 100644
index 870409c3c69..00000000000
--- a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/tokenize/Tokenizer.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.codec.prefixtree.encode.tokenize;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.yetus.audience.InterfaceAudience;
-import org.apache.hadoop.hbase.util.ArrayUtils;
-import org.apache.hadoop.hbase.util.ByteRange;
-import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.hadoop.hbase.util.CollectionUtils;
-
-import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
-
-/**
- * Data structure used in the first stage of PrefixTree encoding:
- *
- * - accepts a sorted stream of ByteRanges
- *
- splits them into a set of tokens, each held by a {@link TokenizerNode}
- *
- connects the TokenizerNodes via standard java references
- *
- keeps a pool of TokenizerNodes and a reusable byte[] for holding all token content
- *
- *
- * Mainly used for turning Cell rowKeys into a trie, but also used for family and qualifier
- * encoding.
- */
-@InterfaceAudience.Private
-public class Tokenizer{
-
- /***************** fields **************************/
-
- protected int numArraysAdded = 0;
- protected long lastNodeId = -1;
- protected ArrayList nodes;
- protected int numNodes;
- protected TokenizerNode root;
- protected byte[] tokens;
- protected int tokensLength;
-
- protected int maxElementLength = 0;
- // number of levels in the tree assuming root level is 0
- protected int treeDepth = 0;
-
-
- /******************* construct *******************/
-
- public Tokenizer() {
- this.nodes = Lists.newArrayList();
- this.tokens = new byte[0];
- }
-
- public void reset() {
- numArraysAdded = 0;
- lastNodeId = -1;
- numNodes = 0;
- tokensLength = 0;
- root = null;
- maxElementLength = 0;
- treeDepth = 0;
- }
-
-
- /***************** building *************************/
-
- public void addAll(ArrayList sortedByteRanges) {
- for (int i = 0; i < sortedByteRanges.size(); ++i) {
- ByteRange byteRange = sortedByteRanges.get(i);
- addSorted(byteRange);
- }
- }
-
- public void addSorted(final ByteRange bytes) {
- ++numArraysAdded;
- if (bytes.getLength() > maxElementLength) {
- maxElementLength = bytes.getLength();
- }
- if (root == null) {
- // nodeDepth of firstNode (non-root) is 1
- root = addNode(null, 1, 0, bytes, 0);
- } else {
- root.addSorted(bytes);
- }
- }
-
- public void incrementNumOccurrencesOfLatestValue(){
- CollectionUtils.getLast(nodes).incrementNumOccurrences(1);
- }
-
- protected long nextNodeId() {
- return ++lastNodeId;
- }
-
- protected TokenizerNode addNode(TokenizerNode parent, int nodeDepth, int tokenStartOffset,
- final ByteRange token, int inputTokenOffset) {
- int inputTokenLength = token.getLength() - inputTokenOffset;
- int tokenOffset = appendTokenAndRepointByteRange(token, inputTokenOffset);
- TokenizerNode node = null;
- if (nodes.size() <= numNodes) {
- node = new TokenizerNode(this, parent, nodeDepth, tokenStartOffset, tokenOffset,
- inputTokenLength);
- nodes.add(node);
- } else {
- node = nodes.get(numNodes);
- node.reset();
- node.reconstruct(this, parent, nodeDepth, tokenStartOffset, tokenOffset, inputTokenLength);
- }
- ++numNodes;
- return node;
- }
-
- protected int appendTokenAndRepointByteRange(final ByteRange token, int inputTokenOffset) {
- int newOffset = tokensLength;
- int inputTokenLength = token.getLength() - inputTokenOffset;
- int newMinimum = tokensLength + inputTokenLength;
- tokens = ArrayUtils.growIfNecessary(tokens, newMinimum, 2 * newMinimum);
- token.deepCopySubRangeTo(inputTokenOffset, inputTokenLength, tokens, tokensLength);
- tokensLength += inputTokenLength;
- return newOffset;
- }
-
- protected void submitMaxNodeDepthCandidate(int nodeDepth) {
- if (nodeDepth > treeDepth) {
- treeDepth = nodeDepth;
- }
- }
-
-
- /********************* read ********************/
-
- public int getNumAdded(){
- return numArraysAdded;
- }
-
- // for debugging
- public ArrayList getNodes(boolean includeNonLeaves, boolean includeLeaves) {
- ArrayList nodes = Lists.newArrayList();
- root.appendNodesToExternalList(nodes, includeNonLeaves, includeLeaves);
- return nodes;
- }
-
- public void appendNodes(List appendTo, boolean includeNonLeaves,
- boolean includeLeaves) {
- root.appendNodesToExternalList(appendTo, includeNonLeaves, includeLeaves);
- }
-
- public List getArrays() {
- List nodes = new ArrayList<>();
- root.appendNodesToExternalList(nodes, true, true);
- List byteArrays = Lists.newArrayListWithCapacity(CollectionUtils.nullSafeSize(nodes));
- for (int i = 0; i < nodes.size(); ++i) {
- TokenizerNode node = nodes.get(i);
- for (int j = 0; j < node.getNumOccurrences(); ++j) {
- byte[] byteArray = node.getNewByteArray();
- byteArrays.add(byteArray);
- }
- }
- return byteArrays;
- }
-
- //currently unused, but working and possibly useful in the future
- public void getNode(TokenizerRowSearchResult resultHolder, byte[] key, int keyOffset,
- int keyLength) {
- root.getNode(resultHolder, key, keyOffset, keyLength);
- }
-
-
- /********************** write ***************************/
-
- public Tokenizer setNodeFirstInsertionIndexes() {
- root.setInsertionIndexes(0);
- return this;
- }
-
- public Tokenizer appendOutputArrayOffsets(List offsets) {
- root.appendOutputArrayOffsets(offsets);
- return this;
- }
-
-
- /********************* print/debug ********************/
-
- protected static final Boolean INCLUDE_FULL_TREE_IN_TO_STRING = false;
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append(getStructuralString());
- if (INCLUDE_FULL_TREE_IN_TO_STRING) {
- for (byte[] bytes : getArrays()) {
- if (sb.length() > 0) {
- sb.append("\n");
- }
- sb.append(Bytes.toString(bytes));
- }
- }
- return sb.toString();
- }
-
- public String getStructuralString() {
- List nodes = getNodes(true, true);
- StringBuilder sb = new StringBuilder();
- for (TokenizerNode node : nodes) {
- String line = node.getPaddedTokenAndOccurrenceString();
- sb.append(line + "\n");
- }
- return sb.toString();
- }
-
-
- /****************** get/set ************************/
-
- public TokenizerNode getRoot() {
- return root;
- }
-
- public int getMaxElementLength() {
- return maxElementLength;
- }
-
- public int getTreeDepth() {
- return treeDepth;
- }
-
-}
diff --git a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/tokenize/TokenizerNode.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/tokenize/TokenizerNode.java
deleted file mode 100644
index 2c855902dbb..00000000000
--- a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/tokenize/TokenizerNode.java
+++ /dev/null
@@ -1,639 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.codec.prefixtree.encode.tokenize;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.yetus.audience.InterfaceAudience;
-import org.apache.hadoop.hbase.util.ByteRange;
-import org.apache.hadoop.hbase.util.ByteRangeUtils;
-import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.hadoop.hbase.util.CollectionUtils;
-import org.apache.hadoop.hbase.util.SimpleMutableByteRange;
-import org.apache.hadoop.hbase.util.Strings;
-
-import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
-
-/**
- * Individual node in a Trie structure. Each node is one of 3 types:
- *
- * - Branch: an internal trie node that may have a token and must have multiple children, but does
- * not represent an actual input byte[], hence its numOccurrences is 0
- *
- Leaf: a node with no children and where numOccurrences is >= 1. It's token represents the
- * last bytes in the input byte[]s.
- *
- Nub: a combination of a branch and leaf. Its token represents the last bytes of input
- * byte[]s and has numOccurrences >= 1, but it also has child nodes which represent input byte[]s
- * that add bytes to this nodes input byte[].
- *
- *
- * Example inputs (numInputs=7):
- * 0: AAA
- * 1: AAA
- * 2: AAB
- * 3: AAB
- * 4: AAB
- * 5: AABQQ
- * 6: AABQQ
- *
- * Resulting TokenizerNodes:
- * AA <- branch, numOccurrences=0, tokenStartOffset=0, token.length=2
- * A <- leaf, numOccurrences=2, tokenStartOffset=2, token.length=1
- * B <- nub, numOccurrences=3, tokenStartOffset=2, token.length=1
- * QQ <- leaf, numOccurrences=2, tokenStartOffset=3, token.length=2
- *
- * numInputs == 7 == sum(numOccurrences) == 0 + 2 + 3 + 2
- */
-@InterfaceAudience.Private
-public class TokenizerNode{
-
- /*
- * Ref to data structure wrapper
- */
- protected Tokenizer builder;
-
- /******************************************************************
- * Tree content/structure used during tokenization
- * ****************************************************************/
-
- /*
- * ref to parent trie node
- */
- protected TokenizerNode parent;
-
- /*
- * node depth in trie, irrespective of each node's token length
- */
- protected int nodeDepth;
-
- /*
- * start index of this token in original byte[]
- */
- protected int tokenStartOffset;
-
- /*
- * bytes for this trie node. can be length 0 in root node
- */
- protected ByteRange token;
-
- /*
- * A count of occurrences in the input byte[]s, not the trie structure. 0 for branch nodes, 1+ for
- * nubs and leaves. If the same byte[] is added to the trie multiple times, this is the only thing
- * that changes in the tokenizer. As a result, duplicate byte[]s are very inexpensive to encode.
- */
- protected int numOccurrences;
-
- /*
- * The maximum fan-out of a byte[] trie is 256, so there are a maximum of 256
- * child nodes.
- */
- protected ArrayList children;
-
-
- /*
- * Fields used later in the encoding process for sorting the nodes into the order they'll be
- * written to the output byte[]. With these fields, the TokenizerNode and therefore Tokenizer
- * are not generic data structures but instead are specific to HBase PrefixTree encoding.
- */
-
- /*
- * unique id assigned to each TokenizerNode
- */
- protected long id;
-
- /*
- * set >=0 for nubs and leaves
- */
- protected int firstInsertionIndex = -1;
-
- /*
- * A positive value indicating how many bytes before the end of the block this node will start. If
- * the section is 55 bytes and negativeOffset is 9, then the node will start at 46.
- */
- protected int negativeIndex = 0;
-
- /*
- * The offset in the output array at which to start writing this node's token bytes. Influenced
- * by the lengths of all tokens sorted before this one.
- */
- protected int outputArrayOffset = -1;
-
-
- /*********************** construct *****************************/
-
- public TokenizerNode(Tokenizer builder, TokenizerNode parent, int nodeDepth,
- int tokenStartOffset, int tokenOffset, int tokenLength) {
- this.token = new SimpleMutableByteRange();
- reconstruct(builder, parent, nodeDepth, tokenStartOffset, tokenOffset, tokenLength);
- this.children = Lists.newArrayList();
- }
-
- /*
- * Sub-constructor for initializing all fields without allocating a new object. Used by the
- * regular constructor.
- */
- public void reconstruct(Tokenizer builder, TokenizerNode parent, int nodeDepth,
- int tokenStartOffset, int tokenOffset, int tokenLength) {
- this.builder = builder;
- this.id = builder.nextNodeId();
- this.parent = parent;
- this.nodeDepth = nodeDepth;
- builder.submitMaxNodeDepthCandidate(nodeDepth);
- this.tokenStartOffset = tokenStartOffset;
- this.token.set(builder.tokens, tokenOffset, tokenLength);
- this.numOccurrences = 1;
- }
-
- /*
- * Clear the state of this node so that it looks like it was just allocated.
- */
- public void reset() {
- builder = null;
- parent = null;
- nodeDepth = 0;
- tokenStartOffset = 0;
- token.unset();
- numOccurrences = 0;
- children.clear();// branches & nubs
-
- // ids/offsets. used during writing to byte[]
- id = 0;
- firstInsertionIndex = -1;// set >=0 for nubs and leaves
- negativeIndex = 0;
- outputArrayOffset = -1;
- }
-
-
- /************************* building *********************************/
-
- /*
- * Only public method used during the tokenization process
- * Requires that the input ByteRange sort after the previous, and therefore after all previous
- * inputs
- * Only looks at bytes of the input array that align with this node's token
- */
- public void addSorted(final ByteRange bytes) {// recursively build the tree
-
- /*
- * Recurse deeper into the existing trie structure
- */
- if (matchesToken(bytes) && CollectionUtils.notEmpty(children)) {
- TokenizerNode lastChild = CollectionUtils.getLast(children);
- if (lastChild.partiallyMatchesToken(bytes)) {
- lastChild.addSorted(bytes);
- return;
- }
- }
-
- /*
- * Recursion ended. We must either
- * 1: increment numOccurrences if this input was equal to the previous
- * 2: convert this node from a leaf to a nub, and add a new child leaf
- * 3: split this node into a branch and leaf, and then add a second leaf
- */
-
- // add it as a child of this node
- int numIdenticalTokenBytes = numIdenticalBytes(bytes);// should be <= token.length
- int tailOffset = tokenStartOffset + numIdenticalTokenBytes;
- int tailLength = bytes.getLength() - tailOffset;
-
- if (numIdenticalTokenBytes == token.getLength()) {
- if (tailLength == 0) {// identical to this node (case 1)
- incrementNumOccurrences(1);
- } else {// identical to this node, but with a few extra tailing bytes. (leaf -> nub) (case 2)
- int childNodeDepth = nodeDepth + 1;
- int childTokenStartOffset = tokenStartOffset + numIdenticalTokenBytes;
- TokenizerNode newChildNode = builder.addNode(this, childNodeDepth, childTokenStartOffset,
- bytes, tailOffset);
- addChild(newChildNode);
- }
- } else {//numIdenticalBytes > 0, split into branch/leaf and then add second leaf (case 3)
- split(numIdenticalTokenBytes, bytes);
- }
- }
-
-
- protected void addChild(TokenizerNode node) {
- node.setParent(this);
- children.add(node);
- }
-
-
- /**
- * Called when we need to convert a leaf node into a branch with 2 leaves. Comments inside the
- * method assume we have token BAA starting at tokenStartOffset=0 and are adding BOO. The output
- * will be 3 nodes:
- *
- * - 1: B <- branch
- *
- 2: AA <- leaf
- *
- 3: OO <- leaf
- *
- *
- * @param numTokenBytesToRetain => 1 (the B)
- * @param bytes => BOO
- */
- protected void split(int numTokenBytesToRetain, final ByteRange bytes) {
- int childNodeDepth = nodeDepth;
- int childTokenStartOffset = tokenStartOffset + numTokenBytesToRetain;
-
- //create leaf AA
- TokenizerNode firstChild = builder.addNode(this, childNodeDepth, childTokenStartOffset,
- token, numTokenBytesToRetain);
- firstChild.setNumOccurrences(numOccurrences);// do before clearing this node's numOccurrences
- token.setLength(numTokenBytesToRetain);//shorten current token from BAA to B
- numOccurrences = 0;//current node is now a branch
-
- moveChildrenToDifferentParent(firstChild);//point the new leaf (AA) to the new branch (B)
- addChild(firstChild);//add the new leaf (AA) to the branch's (B's) children
-
- //create leaf OO
- TokenizerNode secondChild = builder.addNode(this, childNodeDepth, childTokenStartOffset,
- bytes, tokenStartOffset + numTokenBytesToRetain);
- addChild(secondChild);//add the new leaf (00) to the branch's (B's) children
-
- // we inserted branch node B as a new level above/before the two children, so increment the
- // depths of the children below
- firstChild.incrementNodeDepthRecursively();
- secondChild.incrementNodeDepthRecursively();
- }
-
-
- protected void incrementNodeDepthRecursively() {
- ++nodeDepth;
- builder.submitMaxNodeDepthCandidate(nodeDepth);
- for (int i = 0; i < children.size(); ++i) {
- children.get(i).incrementNodeDepthRecursively();
- }
- }
-
-
- protected void moveChildrenToDifferentParent(TokenizerNode newParent) {
- for (int i = 0; i < children.size(); ++i) {
- TokenizerNode child = children.get(i);
- child.setParent(newParent);
- newParent.children.add(child);
- }
- children.clear();
- }
-
-
- /************************ byte[] utils *************************/
-
- protected boolean partiallyMatchesToken(ByteRange bytes) {
- return numIdenticalBytes(bytes) > 0;
- }
-
- protected boolean matchesToken(ByteRange bytes) {
- return numIdenticalBytes(bytes) == getTokenLength();
- }
-
- protected int numIdenticalBytes(ByteRange bytes) {
- return ByteRangeUtils.numEqualPrefixBytes(token, bytes, tokenStartOffset);
- }
-
-
- /***************** moving nodes around ************************/
-
- public void appendNodesToExternalList(List appendTo, boolean includeNonLeaves,
- boolean includeLeaves) {
- if (includeNonLeaves && !isLeaf() || includeLeaves && isLeaf()) {
- appendTo.add(this);
- }
- for (int i = 0; i < children.size(); ++i) {
- TokenizerNode child = children.get(i);
- child.appendNodesToExternalList(appendTo, includeNonLeaves, includeLeaves);
- }
- }
-
- public int setInsertionIndexes(int nextIndex) {
- int newNextIndex = nextIndex;
- if (hasOccurrences()) {
- setFirstInsertionIndex(nextIndex);
- newNextIndex += numOccurrences;
- }
- for (int i = 0; i < children.size(); ++i) {
- TokenizerNode child = children.get(i);
- newNextIndex = child.setInsertionIndexes(newNextIndex);
- }
- return newNextIndex;
- }
-
- public void appendOutputArrayOffsets(List offsets) {
- if (hasOccurrences()) {
- offsets.add(outputArrayOffset);
- }
- for (int i = 0; i < children.size(); ++i) {
- TokenizerNode child = children.get(i);
- child.appendOutputArrayOffsets(offsets);
- }
- }
-
-
- /***************** searching *********************************/
-
- /*
- * Do a trie style search through the tokenizer. One option for looking up families or qualifiers
- * during encoding, but currently unused in favor of tracking this information as they are added.
- *
- * Keeping code pending further performance testing.
- */
- public void getNode(TokenizerRowSearchResult resultHolder, byte[] key, int keyOffset,
- int keyLength) {
- int thisNodeDepthPlusLength = tokenStartOffset + token.getLength();
-
- // quick check if the key is shorter than this node (may not work for binary search)
- if (CollectionUtils.isEmpty(children)) {
- if (thisNodeDepthPlusLength < keyLength) {// ran out of bytes
- resultHolder.set(TokenizerRowSearchPosition.NO_MATCH, null);
- return;
- }
- }
-
- // all token bytes must match
- for (int i = 0; i < token.getLength(); ++i) {
- if (key[tokenStartOffset + keyOffset + i] != token.get(i)) {
- // TODO return whether it's before or after so we can binary search
- resultHolder.set(TokenizerRowSearchPosition.NO_MATCH, null);
- return;
- }
- }
-
- if (thisNodeDepthPlusLength == keyLength && numOccurrences > 0) {
- resultHolder.set(TokenizerRowSearchPosition.MATCH, this);// MATCH
- return;
- }
-
- if (CollectionUtils.notEmpty(children)) {
- // TODO binary search the children
- for (int i = 0; i < children.size(); ++i) {
- TokenizerNode child = children.get(i);
- child.getNode(resultHolder, key, keyOffset, keyLength);
- if (resultHolder.isMatch()) {
- return;
- } else if (resultHolder.getDifference() == TokenizerRowSearchPosition.BEFORE) {
- // passed it, so it doesn't exist
- resultHolder.set(TokenizerRowSearchPosition.NO_MATCH, null);
- return;
- }
- // key is still AFTER the current node, so continue searching
- }
- }
-
- // checked all children (or there were no children), and didn't find it
- resultHolder.set(TokenizerRowSearchPosition.NO_MATCH, null);
- return;
- }
-
-
- /****************** writing back to byte[]'s *************************/
-
- public byte[] getNewByteArray() {
- byte[] arrayToFill = new byte[tokenStartOffset + token.getLength()];
- fillInBytes(arrayToFill);
- return arrayToFill;
- }
-
- public void fillInBytes(byte[] arrayToFill) {
- for (int i = 0; i < token.getLength(); ++i) {
- arrayToFill[tokenStartOffset + i] = token.get(i);
- }
- if (parent != null) {
- parent.fillInBytes(arrayToFill);
- }
- }
-
-
- /************************** printing ***********************/
-
- @Override
- public String toString() {
- String s = "";
- if (parent == null) {
- s += "R ";
- } else {
- s += getBnlIndicator(false) + " " + Bytes.toString(parent.getNewByteArray());
- }
- s += "[" + Bytes.toString(token.deepCopyToNewArray()) + "]";
- if (numOccurrences > 0) {
- s += "x" + numOccurrences;
- }
- return s;
- }
-
- public String getPaddedTokenAndOccurrenceString() {
- StringBuilder sb = new StringBuilder();
- sb.append(getBnlIndicator(true));
- sb.append(Strings.padFront(numOccurrences + "", ' ', 3));
- sb.append(Strings.padFront(nodeDepth + "", ' ', 3));
- if (outputArrayOffset >= 0) {
- sb.append(Strings.padFront(outputArrayOffset + "", ' ', 3));
- }
- sb.append(" ");
- for (int i = 0; i < tokenStartOffset; ++i) {
- sb.append(" ");
- }
- sb.append(Bytes.toString(token.deepCopyToNewArray()).replaceAll(" ", "_"));
- return sb.toString();
- }
-
- public String getBnlIndicator(boolean indent) {
- if (indent) {
- if (isNub()) {
- return " N ";
- }
- return isBranch() ? "B " : " L";
- }
- if (isNub()) {
- return "N";
- }
- return isBranch() ? "B" : "L";
- }
-
-
- /********************** count different node types ********************/
-
- public int getNumBranchNodesIncludingThisNode() {
- if (isLeaf()) {
- return 0;
- }
- int totalFromThisPlusChildren = isBranch() ? 1 : 0;
- for (int i = 0; i < children.size(); ++i) {
- TokenizerNode child = children.get(i);
- totalFromThisPlusChildren += child.getNumBranchNodesIncludingThisNode();
- }
- return totalFromThisPlusChildren;
- }
-
- public int getNumNubNodesIncludingThisNode() {
- if (isLeaf()) {
- return 0;
- }
- int totalFromThisPlusChildren = isNub() ? 1 : 0;
- for (int i = 0; i < children.size(); ++i) {
- TokenizerNode child = children.get(i);
- totalFromThisPlusChildren += child.getNumNubNodesIncludingThisNode();
- }
- return totalFromThisPlusChildren;
- }
-
- public int getNumLeafNodesIncludingThisNode() {
- if (isLeaf()) {
- return 1;
- }
- int totalFromChildren = 0;
- for (int i = 0; i < children.size(); ++i) {
- TokenizerNode child = children.get(i);
- totalFromChildren += child.getNumLeafNodesIncludingThisNode();
- }
- return totalFromChildren;
- }
-
-
- /*********************** simple read-only methods *******************************/
-
- public int getNodeDepth() {
- return nodeDepth;
- }
-
- public int getTokenLength() {
- return token.getLength();
- }
-
- public boolean hasOccurrences() {
- return numOccurrences > 0;
- }
-
- public boolean isRoot() {
- return this.parent == null;
- }
-
- public int getNumChildren() {
- return CollectionUtils.nullSafeSize(children);
- }
-
- public TokenizerNode getLastChild() {
- if (CollectionUtils.isEmpty(children)) {
- return null;
- }
- return CollectionUtils.getLast(children);
- }
-
- public boolean isLeaf() {
- return CollectionUtils.isEmpty(children) && hasOccurrences();
- }
-
- public boolean isBranch() {
- return CollectionUtils.notEmpty(children) && !hasOccurrences();
- }
-
- public boolean isNub() {
- return CollectionUtils.notEmpty(children) && hasOccurrences();
- }
-
-
- /********************** simple mutation methods *************************/
-
- /**
- * Each occurrence > 1 indicates a repeat of the previous entry.
- * This can be called directly by
- * an external class without going through the process of detecting a repeat if it is a known
- * repeat by some external mechanism. PtEncoder uses this when adding cells to a row if it knows
- * the new cells are part of the current row.
- * @param d increment by this amount
- */
- public void incrementNumOccurrences(int d) {
- numOccurrences += d;
- }
-
-
- /************************* autogenerated get/set ******************/
-
- public int getTokenOffset() {
- return tokenStartOffset;
- }
-
- public TokenizerNode getParent() {
- return parent;
- }
-
- public ByteRange getToken() {
- return token;
- }
-
- public int getNumOccurrences() {
- return numOccurrences;
- }
-
- public void setParent(TokenizerNode parent) {
- this.parent = parent;
- }
-
- public void setNumOccurrences(int numOccurrences) {
- this.numOccurrences = numOccurrences;
- }
-
- public ArrayList getChildren() {
- return children;
- }
-
- public long getId() {
- return id;
- }
-
- public int getFirstInsertionIndex() {
- return firstInsertionIndex;
- }
-
- public void setFirstInsertionIndex(int firstInsertionIndex) {
- this.firstInsertionIndex = firstInsertionIndex;
- }
-
- public int getNegativeIndex() {
- return negativeIndex;
- }
-
- public void setNegativeIndex(int negativeIndex) {
- this.negativeIndex = negativeIndex;
- }
-
- public int getOutputArrayOffset() {
- return outputArrayOffset;
- }
-
- public void setOutputArrayOffset(int outputArrayOffset) {
- this.outputArrayOffset = outputArrayOffset;
- }
-
- public void setId(long id) {
- this.id = id;
- }
-
- public void setBuilder(Tokenizer builder) {
- this.builder = builder;
- }
-
- public void setTokenOffset(int tokenOffset) {
- this.tokenStartOffset = tokenOffset;
- }
-
- public void setToken(ByteRange token) {
- this.token = token;
- }
-
-}
diff --git a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/tokenize/TokenizerRowSearchPosition.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/tokenize/TokenizerRowSearchPosition.java
deleted file mode 100644
index f829ee8fd13..00000000000
--- a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/tokenize/TokenizerRowSearchPosition.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.codec.prefixtree.encode.tokenize;
-
-import org.apache.yetus.audience.InterfaceAudience;
-
-
-/**
- * Warning: currently unused, but code is valid. Pending performance testing on more data sets.
- *
- * Where is the key relative to our current position in the tree. For example, the current tree node
- * is "BEFORE" the key we are seeking
- */
-@InterfaceAudience.Private
-public enum TokenizerRowSearchPosition {
-
- AFTER,//the key is after this tree node, so keep searching
- BEFORE,//in a binary search, this tells us to back up
- MATCH,//the current node is a full match
- NO_MATCH,//might as well return a value more informative than null
-
-}
diff --git a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/tokenize/TokenizerRowSearchResult.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/tokenize/TokenizerRowSearchResult.java
deleted file mode 100644
index 681cc457fd7..00000000000
--- a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/tokenize/TokenizerRowSearchResult.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.codec.prefixtree.encode.tokenize;
-
-import org.apache.yetus.audience.InterfaceAudience;
-
-
-/**
- * for recursively searching a PtBuilder
- */
-@InterfaceAudience.Private
-public class TokenizerRowSearchResult{
-
- /************ fields ************************/
-
- protected TokenizerRowSearchPosition difference;
- protected TokenizerNode matchingNode;
-
-
- /*************** construct *****************/
-
- public TokenizerRowSearchResult() {
- }
-
- public TokenizerRowSearchResult(TokenizerRowSearchPosition difference) {
- this.difference = difference;
- }
-
- public TokenizerRowSearchResult(TokenizerNode matchingNode) {
- this.difference = TokenizerRowSearchPosition.MATCH;
- this.matchingNode = matchingNode;
- }
-
-
- /*************** methods **********************/
-
- public boolean isMatch() {
- return TokenizerRowSearchPosition.MATCH == difference;
- }
-
-
- /************* get/set ***************************/
-
- public TokenizerRowSearchPosition getDifference() {
- return difference;
- }
-
- public TokenizerNode getMatchingNode() {
- return matchingNode;
- }
-
- public void set(TokenizerRowSearchPosition difference, TokenizerNode matchingNode) {
- this.difference = difference;
- this.matchingNode = matchingNode;
- }
-
-}
diff --git a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/scanner/CellScannerPosition.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/scanner/CellScannerPosition.java
deleted file mode 100644
index 70682480bb2..00000000000
--- a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/scanner/CellScannerPosition.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.codec.prefixtree.scanner;
-
-import org.apache.yetus.audience.InterfaceAudience;
-
-/**
- * An indicator of the state of the scanner after an operation such as nextCell() or
- * positionAt(..). For example:
- *
- * - In a DataBlockScanner, the AFTER_LAST position indicates to the parent StoreFileScanner that
- * it should load the next block.
- * - In a StoreFileScanner, the AFTER_LAST position indicates that the file has been exhausted.
- *
- * - In a RegionScanner, the AFTER_LAST position indicates that the scanner should move to the
- * next region.
- *
- */
-@InterfaceAudience.Private
-public enum CellScannerPosition {
-
- /**
- * getCurrentCell() will NOT return a valid cell. Calling nextCell() will advance to the first
- * cell.
- */
- BEFORE_FIRST,
-
- /**
- * getCurrentCell() will return a valid cell, but it is not the cell requested by positionAt(..),
- * rather it is the nearest cell before the requested cell.
- */
- BEFORE,
-
- /**
- * getCurrentCell() will return a valid cell, and it is exactly the cell that was requested by
- * positionAt(..).
- */
- AT,
-
- /**
- * getCurrentCell() will return a valid cell, but it is not the cell requested by positionAt(..),
- * rather it is the nearest cell after the requested cell.
- */
- AFTER,
-
- /**
- * getCurrentCell() will NOT return a valid cell. Calling nextCell() will have no effect.
- */
- AFTER_LAST
-
-}
diff --git a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/scanner/CellSearcher.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/scanner/CellSearcher.java
deleted file mode 100644
index 04a7361df92..00000000000
--- a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/scanner/CellSearcher.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.codec.prefixtree.scanner;
-
-import org.apache.yetus.audience.InterfaceAudience;
-import org.apache.hadoop.hbase.Cell;
-
-/**
- * Methods for seeking to a random {@link Cell} inside a sorted collection of cells. Indicates that
- * the implementation is able to navigate between cells without iterating through every cell.
- */
-@InterfaceAudience.Private
-public interface CellSearcher extends ReversibleCellScanner {
- /**
- * Reset any state in the scanner so it appears it was freshly opened.
- */
- void resetToBeforeFirstEntry();
-
- /**
- *
- * Do everything within this scanner's power to find the key. Look forward and backwards.
- *
- *
- * Abort as soon as we know it can't be found, possibly leaving the Searcher in an invalid state.
- *
- * @param key position the CellScanner exactly on this key
- * @return true if the cell existed and getCurrentCell() holds a valid cell
- */
- boolean positionAt(Cell key);
-
- /**
- *
- * Same as positionAt(..), but go to the extra effort of finding the previous key if there's no
- * exact match.
- *
- * @param key position the CellScanner on this key or the closest cell before
- * @return AT if exact match
- * BEFORE if on last cell before key
- * BEFORE_FIRST if key was before the first cell in this scanner's scope
- */
- CellScannerPosition positionAtOrBefore(Cell key);
-
- /**
- *
- * Same as positionAt(..), but go to the extra effort of finding the next key if there's no exact
- * match.
- *
- * @param key position the CellScanner on this key or the closest cell after
- * @return AT if exact match
- * AFTER if on first cell after key
- * AFTER_LAST if key was after the last cell in this scanner's scope
- */
- CellScannerPosition positionAtOrAfter(Cell key);
-
- /**
- *
- * Note: Added for backwards compatibility with
- * org.apache.hadoop.hbase.regionserver.KeyValueScanner#reseek(Cell)
- *
- * Look for the key, but only look after the current position. Probably not needed for an
- * efficient tree implementation, but is important for implementations without random access such
- * as unencoded KeyValue blocks.
- *
- * @param key position the CellScanner exactly on this key
- * @return true if getCurrent() holds a valid cell
- */
- boolean seekForwardTo(Cell key);
-
- /**
- *
- * Same as seekForwardTo(..), but go to the extra effort of finding the next key if there's no
- * exact match.
- *
- * @param key
- * @return AT if exact match
- * AFTER if on first cell after key
- * AFTER_LAST if key was after the last cell in this scanner's scope
- */
- CellScannerPosition seekForwardToOrBefore(Cell key);
-
- /**
- *
- * Same as seekForwardTo(..), but go to the extra effort of finding the next key if there's no
- * exact match.
- *
- * @param key
- * @return AT if exact match
- * AFTER if on first cell after key
- * AFTER_LAST if key was after the last cell in this scanner's scope
- */
- CellScannerPosition seekForwardToOrAfter(Cell key);
-
- /**
- *
- * Note: This may not be appropriate to have in the interface. Need to investigate.
- *
- * Position the scanner in an invalid state after the last cell: CellScannerPosition.AFTER_LAST.
- * This is used by tests and for handling certain edge cases.
- */
- void positionAfterLastCell();
-
-}
diff --git a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/scanner/ReversibleCellScanner.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/scanner/ReversibleCellScanner.java
deleted file mode 100644
index 3a7643e4671..00000000000
--- a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/scanner/ReversibleCellScanner.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.codec.prefixtree.scanner;
-
-import org.apache.yetus.audience.InterfaceAudience;
-import org.apache.hadoop.hbase.CellScanner;
-
-/**
- * An extension of CellScanner indicating the scanner supports iterating backwards through cells.
- *
- * Note: This was not added to suggest that HBase should support client facing reverse Scanners,
- * but
- * because some {@link CellSearcher} implementations, namely PrefixTree, need a method of backing
- * up if the positionAt(..) method goes past the requested cell.
- */
-@InterfaceAudience.Private
-public interface ReversibleCellScanner extends CellScanner {
-
- /**
- * Try to position the scanner one Cell before the current position.
- * @return true if the operation was successful, meaning getCurrentCell() will return a valid
- * Cell.
- * false if there were no previous cells, meaning getCurrentCell() will return null.
- * Scanner position will be
- * {@link org.apache.hadoop.hbase.codec.prefixtree.scanner.CellScannerPosition#BEFORE_FIRST}
- */
- boolean previous();
-
- /**
- * Try to position the scanner in the row before the current row.
- * @param endOfRow true for the last cell in the previous row; false for the first cell
- * @return true if the operation was successful, meaning getCurrentCell() will return a valid
- * Cell.
- * false if there were no previous cells, meaning getCurrentCell() will return null.
- * Scanner position will be
- * {@link org.apache.hadoop.hbase.codec.prefixtree.scanner.CellScannerPosition#BEFORE_FIRST}
- */
- boolean previousRow(boolean endOfRow);
-}
diff --git a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/byterange/ByteRangeSet.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/byterange/ByteRangeSet.java
deleted file mode 100644
index 6ab5e50a948..00000000000
--- a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/byterange/ByteRangeSet.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.util.byterange;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.yetus.audience.InterfaceAudience;
-import org.apache.hadoop.hbase.util.ArrayUtils;
-import org.apache.hadoop.hbase.util.ByteRange;
-import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.hadoop.hbase.util.SimpleMutableByteRange;
-
-import org.apache.hadoop.hbase.shaded.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.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
-public abstract class ByteRangeSet {
-
- /******************** fields **********************/
-
- protected byte[] byteAppender;
- protected int numBytes;
-
- protected Map uniqueIndexByUniqueRange;
-
- protected ArrayList uniqueRanges;
- protected int numUniqueRanges = 0;
-
- protected int[] uniqueRangeIndexByInsertionId;
- protected int numInputs;
-
- protected List sortedIndexByUniqueIndex;
- protected int[] sortedIndexByInsertionId;
- protected ArrayList sortedRanges;
-
-
- /****************** construct **********************/
-
- protected ByteRangeSet() {
- this.byteAppender = new byte[0];
- this.uniqueRanges = Lists.newArrayList();
- this.uniqueRangeIndexByInsertionId = new int[0];
- this.sortedIndexByUniqueIndex = Lists.newArrayList();
- this.sortedIndexByInsertionId = new int[0];
- this.sortedRanges = Lists.newArrayList();
- }
-
- public void reset() {
- numBytes = 0;
- uniqueIndexByUniqueRange.clear();
- numUniqueRanges = 0;
- numInputs = 0;
- sortedIndexByUniqueIndex.clear();
- sortedRanges.clear();
- }
-
-
- /*************** abstract *************************/
-
- public abstract void addToSortedRanges();
-
-
- /**************** methods *************************/
-
- /**
- * Check if the incoming byte range exists. If not, add it to the backing byteAppender[] and
- * insert it into the tracking Map uniqueIndexByUniqueRange.
- */
- public void add(ByteRange bytes) {
- Integer index = uniqueIndexByUniqueRange.get(bytes);
- if (index == null) {
- index = store(bytes);
- }
- int minLength = numInputs + 1;
- uniqueRangeIndexByInsertionId = ArrayUtils.growIfNecessary(uniqueRangeIndexByInsertionId,
- minLength, 2 * minLength);
- uniqueRangeIndexByInsertionId[numInputs] = index;
- ++numInputs;
- }
-
- protected int store(ByteRange bytes) {
- int indexOfNewElement = numUniqueRanges;
- if (uniqueRanges.size() <= numUniqueRanges) {
- uniqueRanges.add(new SimpleMutableByteRange());
- }
- ByteRange storedRange = uniqueRanges.get(numUniqueRanges);
- int neededBytes = numBytes + bytes.getLength();
- byteAppender = ArrayUtils.growIfNecessary(byteAppender, neededBytes, 2 * neededBytes);
- bytes.deepCopyTo(byteAppender, numBytes);
- storedRange.set(byteAppender, numBytes, bytes.getLength());// this isn't valid yet
- numBytes += bytes.getLength();
- uniqueIndexByUniqueRange.put(storedRange, indexOfNewElement);
- int newestUniqueIndex = numUniqueRanges;
- ++numUniqueRanges;
- return newestUniqueIndex;
- }
-
- public ByteRangeSet compile() {
- addToSortedRanges();
- for (int i = 0; i < sortedRanges.size(); ++i) {
- sortedIndexByUniqueIndex.add(null);// need to grow the size
- }
- // TODO move this to an invert(int[]) util method
- for (int i = 0; i < sortedIndexByUniqueIndex.size(); ++i) {
- int uniqueIndex = uniqueIndexByUniqueRange.get(sortedRanges.get(i));
- sortedIndexByUniqueIndex.set(uniqueIndex, i);
- }
- sortedIndexByInsertionId = ArrayUtils.growIfNecessary(sortedIndexByInsertionId, numInputs,
- numInputs);
- for (int i = 0; i < numInputs; ++i) {
- int uniqueRangeIndex = uniqueRangeIndexByInsertionId[i];
- int sortedIndex = sortedIndexByUniqueIndex.get(uniqueRangeIndex);
- sortedIndexByInsertionId[i] = sortedIndex;
- }
- return this;
- }
-
- public int getSortedIndexForInsertionId(int insertionId) {
- return sortedIndexByInsertionId[insertionId];
- }
-
- public int size() {
- return uniqueIndexByUniqueRange.size();
- }
-
-
- /***************** standard methods ************************/
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- int i = 0;
- for (ByteRange r : sortedRanges) {
- if (i > 0) {
- sb.append("\n");
- }
- sb.append(i + " " + Bytes.toStringBinary(r.deepCopyToNewArray()));
- ++i;
- }
- sb.append("\ntotalSize:" + numBytes);
- sb.append("\navgSize:" + getAvgSize());
- return sb.toString();
- }
-
-
- /**************** get/set *****************************/
-
- public ArrayList getSortedRanges() {
- return sortedRanges;
- }
-
- public long getAvgSize() {
- return numBytes / numUniqueRanges;
- }
-
-}
diff --git a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/byterange/impl/ByteRangeHashSet.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/byterange/impl/ByteRangeHashSet.java
deleted file mode 100644
index 1ddda573222..00000000000
--- a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/byterange/impl/ByteRangeHashSet.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.util.byterange.impl;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-
-import org.apache.yetus.audience.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.hadoop.hbase.util.byterange.ByteRangeSet;
-
-/**
- * This is probably the best implementation of ByteRangeSet at the moment, though a HashMap produces
- * garbage when adding a new element to it. We can probably create a tighter implementation without
- * pointers or garbage.
- */
-@InterfaceAudience.Private
-public class ByteRangeHashSet extends ByteRangeSet {
-
- /************************ constructors *****************************/
-
- public ByteRangeHashSet() {
- this.uniqueIndexByUniqueRange = new HashMap<>();
- }
-
- public ByteRangeHashSet(List rawByteArrays) {
- for (ByteRange in : IterableUtils.nullSafe(rawByteArrays)) {
- add(in);
- }
- }
-
- @Override
- public void addToSortedRanges() {
- sortedRanges.addAll(CollectionUtils.nullSafe(uniqueIndexByUniqueRange.keySet()));
- Collections.sort(sortedRanges);
- }
-
-}
diff --git a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/byterange/impl/ByteRangeTreeSet.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/byterange/impl/ByteRangeTreeSet.java
deleted file mode 100644
index 15ef620cea7..00000000000
--- a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/byterange/impl/ByteRangeTreeSet.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.util.byterange.impl;
-
-import java.util.List;
-import java.util.TreeMap;
-
-import org.apache.yetus.audience.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.hadoop.hbase.util.byterange.ByteRangeSet;
-
-/**
- * Not currently used in production, but here as a benchmark comparison against ByteRangeHashSet.
- */
-@InterfaceAudience.Private
-public class ByteRangeTreeSet extends ByteRangeSet {
-
- /************************ constructors *****************************/
-
- public ByteRangeTreeSet() {
- this.uniqueIndexByUniqueRange = new TreeMap<>();
- }
-
- public ByteRangeTreeSet(List rawByteArrays) {
- this();//needed to initialize the TreeSet
- for(ByteRange in : IterableUtils.nullSafe(rawByteArrays)){
- add(in);
- }
- }
-
- @Override
- public void addToSortedRanges() {
- sortedRanges.addAll(CollectionUtils.nullSafe(uniqueIndexByUniqueRange.keySet()));
- }
-
-}
diff --git a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/vint/UFIntTool.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/vint/UFIntTool.java
deleted file mode 100644
index 3ff75c87a68..00000000000
--- a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/vint/UFIntTool.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.util.vint;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.yetus.audience.InterfaceAudience;
-import org.apache.hadoop.hbase.nio.ByteBuff;
-
-/**
- * UFInt is an abbreviation for Unsigned Fixed-width Integer.
- *
- * This class converts between positive ints and 1-4 bytes that represent the int. All input ints
- * must be positive. Max values stored in N bytes are:
- *
- * N=1: 2^8 => 256
- * N=2: 2^16 => 65,536
- * N=3: 2^24 => 16,777,216
- * N=4: 2^31 => 2,147,483,648 (Integer.MAX_VALUE)
- *
- * This was created to get most of the memory savings of a variable length integer when encoding
- * an array of input integers, but to fix the number of bytes for each integer to the number needed
- * to store the maximum integer in the array. This enables a binary search to be performed on the
- * array of encoded integers.
- *
- * PrefixTree nodes often store offsets into a block that can fit into 1 or 2 bytes. Note that if
- * the maximum value of an array of numbers needs 2 bytes, then it's likely that a majority of the
- * numbers will also require 2 bytes.
- *
- * warnings:
- * * no input validation for max performance
- * * no negatives
- */
-@InterfaceAudience.Private
-public class UFIntTool {
-
- private static final int NUM_BITS_IN_LONG = 64;
-
- public static long maxValueForNumBytes(int numBytes) {
- return (1L << (numBytes * 8)) - 1;
- }
-
- public static int numBytes(final long value) {
- if (value == 0) {// 0 doesn't work with the formula below
- return 1;
- }
- return (NUM_BITS_IN_LONG + 7 - Long.numberOfLeadingZeros(value)) / 8;
- }
-
- public static byte[] getBytes(int outputWidth, final long value) {
- byte[] bytes = new byte[outputWidth];
- writeBytes(outputWidth, value, bytes, 0);
- return bytes;
- }
-
- public static void writeBytes(int outputWidth, final long value, byte[] bytes, int offset) {
- bytes[offset + outputWidth - 1] = (byte) value;
- for (int i = outputWidth - 2; i >= 0; --i) {
- bytes[offset + i] = (byte) (value >>> (outputWidth - i - 1) * 8);
- }
- }
-
- private static final long[] MASKS = new long[] {
- (long) 255,
- (long) 255 << 8,
- (long) 255 << 16,
- (long) 255 << 24,
- (long) 255 << 32,
- (long) 255 << 40,
- (long) 255 << 48,
- (long) 255 << 56
- };
-
- public static void writeBytes(int outputWidth, final long value, OutputStream os) throws IOException {
- for (int i = outputWidth - 1; i >= 0; --i) {
- os.write((byte) ((value & MASKS[i]) >>> (8 * i)));
- }
- }
-
- public static long fromBytes(final byte[] bytes) {
- long value = 0;
- value |= bytes[0] & 0xff;// these seem to do ok without casting the byte to int
- for (int i = 1; i < bytes.length; ++i) {
- value <<= 8;
- value |= bytes[i] & 0xff;
- }
- return value;
- }
-
- public static long fromBytes(final ByteBuff buf, final int offset, final int width) {
- long value = 0;
- value |= buf.get(offset + 0) & 0xff;// these seem to do ok without casting the byte to int
- for (int i = 1; i < width; ++i) {
- value <<= 8;
- value |= buf.get(i + offset) & 0xff;
- }
- return value;
- }
-
-}
diff --git a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/vint/UVIntTool.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/vint/UVIntTool.java
deleted file mode 100644
index c2f1ca61d3e..00000000000
--- a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/vint/UVIntTool.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.util.vint;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.apache.yetus.audience.InterfaceAudience;
-import org.apache.hadoop.hbase.nio.ByteBuff;
-
-/**
- * Simple Variable Length Integer encoding. Left bit of 0 means we are on the last byte. If left
- * bit of the current byte is 1, then there is at least one more byte.
- */
-@InterfaceAudience.Private
-public class UVIntTool {
-
- public static final byte
- BYTE_7_RIGHT_BITS_SET = 127,
- BYTE_LEFT_BIT_SET = -128;
-
- public static final long
- INT_7_RIGHT_BITS_SET = 127,
- INT_8TH_BIT_SET = 128;
-
- public static final byte[]
- MAX_VALUE_BYTES = new byte[] { -1, -1, -1, -1, 7 };
-
- /********************* int -> bytes **************************/
-
- public static int numBytes(int in) {
- if (in == 0) {
- // doesn't work with the formula below
- return 1;
- }
- return (38 - Integer.numberOfLeadingZeros(in)) / 7;// 38 comes from 32+(7-1)
- }
-
- public static byte[] getBytes(int value) {
- int numBytes = numBytes(value);
- byte[] bytes = new byte[numBytes];
- int remainder = value;
- for (int i = 0; i < numBytes - 1; ++i) {
- // set the left bit
- bytes[i] = (byte) ((remainder & INT_7_RIGHT_BITS_SET) | INT_8TH_BIT_SET);
- remainder >>= 7;
- }
- // do not set the left bit
- bytes[numBytes - 1] = (byte) (remainder & INT_7_RIGHT_BITS_SET);
- return bytes;
- }
-
- public static int writeBytes(int value, OutputStream os) throws IOException {
- int numBytes = numBytes(value);
- int remainder = value;
- for (int i = 0; i < numBytes - 1; ++i) {
- // set the left bit
- os.write((byte) ((remainder & INT_7_RIGHT_BITS_SET) | INT_8TH_BIT_SET));
- remainder >>= 7;
- }
- // do not set the left bit
- os.write((byte) (remainder & INT_7_RIGHT_BITS_SET));
- return numBytes;
- }
-
- /******************** bytes -> int **************************/
-
- public static int getInt(ByteBuff buffer, int offset) {
- int value = 0;
- for (int i = 0;; ++i) {
- byte b = buffer.get(offset + i);
- int shifted = BYTE_7_RIGHT_BITS_SET & b;// kill leftmost bit
- shifted <<= 7 * i;
- value |= shifted;
- if (b >= 0) {
- break;
- }
- }
- return value;
- }
-
- public static int getInt(InputStream is) throws IOException {
- int value = 0;
- int i = 0;
- int b;
- do{
- b = is.read();
- int shifted = BYTE_7_RIGHT_BITS_SET & b;// kill leftmost bit
- shifted <<= 7 * i;
- value |= shifted;
- ++i;
- }while(b > Byte.MAX_VALUE);
- return value;
- }
-}
diff --git a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/vint/UVLongTool.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/vint/UVLongTool.java
deleted file mode 100644
index 01efe0df017..00000000000
--- a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/vint/UVLongTool.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.util.vint;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-
-import org.apache.yetus.audience.InterfaceAudience;
-import org.apache.hadoop.hbase.nio.ByteBuff;
-import org.apache.hadoop.hbase.nio.SingleByteBuff;
-
-/**
- * Simple Variable Length Integer encoding. Left bit of 0 means we are on the last byte. If left
- * bit of the current byte is 1, then there is at least one more byte.
- */
-@InterfaceAudience.Private
-public class UVLongTool{
-
- public static final byte
- BYTE_7_RIGHT_BITS_SET = 127,
- BYTE_LEFT_BIT_SET = -128;
-
- public static final long
- LONG_7_RIGHT_BITS_SET = 127,
- LONG_8TH_BIT_SET = 128;
-
- public static final byte[]
- MAX_VALUE_BYTES = new byte[] { -1, -1, -1, -1, -1, -1, -1, -1, 127 };
-
-
- /********************* long -> bytes **************************/
-
- public static int numBytes(long in) {// do a check for illegal arguments if not protected
- if (in == 0) {
- return 1;
- }// doesn't work with the formula below
- return (70 - Long.numberOfLeadingZeros(in)) / 7;// 70 comes from 64+(7-1)
- }
-
- public static byte[] getBytes(long value) {
- int numBytes = numBytes(value);
- byte[] bytes = new byte[numBytes];
- long remainder = value;
- for (int i = 0; i < numBytes - 1; ++i) {
- bytes[i] = (byte) ((remainder & LONG_7_RIGHT_BITS_SET) | LONG_8TH_BIT_SET);// set the left bit
- remainder >>= 7;
- }
- bytes[numBytes - 1] = (byte) (remainder & LONG_7_RIGHT_BITS_SET);// do not set the left bit
- return bytes;
- }
-
- public static int writeBytes(long value, OutputStream os) throws IOException {
- int numBytes = numBytes(value);
- long remainder = value;
- for (int i = 0; i < numBytes - 1; ++i) {
- // set the left bit
- os.write((byte) ((remainder & LONG_7_RIGHT_BITS_SET) | LONG_8TH_BIT_SET));
- remainder >>= 7;
- }
- // do not set the left bit
- os.write((byte) (remainder & LONG_7_RIGHT_BITS_SET));
- return numBytes;
- }
-
- /******************** bytes -> long **************************/
-
- public static long getLong(byte[] bytes) {
- return getLong(new SingleByteBuff(ByteBuffer.wrap(bytes)), 0);
- }
-
- public static long getLong(ByteBuff buf, int offset) {
- long value = 0;
- for (int i = 0;; ++i) {
- byte b = buf.get(offset + i);
- long shifted = BYTE_7_RIGHT_BITS_SET & b;// kill leftmost bit
- shifted <<= 7 * i;
- value |= shifted;
- if (b >= 0) {
- break;
- }// first bit was 0, so that's the last byte in the VarLong
- }
- return value;
- }
-
- public static long getLong(InputStream is) throws IOException {
- long value = 0;
- int i = 0;
- int b;
- do {
- b = is.read();
- long shifted = BYTE_7_RIGHT_BITS_SET & b;// kill leftmost bit
- shifted <<= 7 * i;
- value |= shifted;
- ++i;
- } while (b > Byte.MAX_VALUE);
- return value;
- }
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/keyvalue/TestKeyValueTool.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/keyvalue/TestKeyValueTool.java
deleted file mode 100644
index 3e5f0f80fe2..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/keyvalue/TestKeyValueTool.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.codec.keyvalue;
-
-import java.nio.ByteBuffer;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.hadoop.hbase.KeyValue;
-import org.apache.hadoop.hbase.KeyValueTestUtil;
-import org.apache.hadoop.hbase.testclassification.MiscTests;
-import org.apache.hadoop.hbase.testclassification.SmallTests;
-import org.apache.hadoop.hbase.codec.prefixtree.row.TestRowData;
-import org.apache.hadoop.hbase.codec.prefixtree.row.data.TestRowDataRandomKeyValuesWithTags;
-import org.apache.hadoop.hbase.codec.prefixtree.row.data.TestRowDataTrivialWithTags;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import static org.junit.Assume.assumeFalse;
-
-@Category({MiscTests.class, SmallTests.class})
-@RunWith(Parameterized.class)
-public class TestKeyValueTool {
-
- @Parameters
- public static Collection parameters() {
- return TestRowData.InMemory.getAllAsObjectArray();
- }
-
- @Parameterized.Parameter
- public TestRowData rows;
-
- @Test
- public void testRoundTripToBytes() {
- assumeFalse(rows instanceof TestRowDataTrivialWithTags);
- assumeFalse(rows instanceof TestRowDataRandomKeyValuesWithTags);
-
- List kvs = rows.getInputs();
- ByteBuffer bb = KeyValueTestUtil.toByteBufferAndRewind(kvs, false);
- List roundTrippedKvs = KeyValueTestUtil.rewindThenToList(bb, false, false);
- Assert.assertArrayEquals(kvs.toArray(), roundTrippedKvs.toArray());
- }
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/PrefixTreeTestConstants.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/PrefixTreeTestConstants.java
deleted file mode 100644
index aabc0f0190b..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/PrefixTreeTestConstants.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.codec.prefixtree;
-
-import org.apache.hadoop.hbase.util.Bytes;
-
-public class PrefixTreeTestConstants {
-
- public static final byte[] TEST_CF = Bytes.toBytes("cfDefault");
-
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/blockmeta/TestBlockMeta.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/blockmeta/TestBlockMeta.java
deleted file mode 100644
index 24931476a90..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/blockmeta/TestBlockMeta.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.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.hadoop.hbase.nio.SingleByteBuff;
-import org.apache.hadoop.hbase.testclassification.MiscTests;
-import org.apache.hadoop.hbase.testclassification.SmallTests;
-import org.apache.hadoop.hbase.codec.prefixtree.PrefixTreeBlockMeta;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-@Category({MiscTests.class, SmallTests.class})
-public class TestBlockMeta {
-
- static int BLOCK_START = 123;
-
- private static PrefixTreeBlockMeta createSample() {
- PrefixTreeBlockMeta m = new PrefixTreeBlockMeta();
- m.setNumMetaBytes(0);
- m.setNumKeyValueBytes(3195);
-
- m.setNumRowBytes(0);
- m.setNumFamilyBytes(3);
- m.setNumQualifierBytes(12345);
- m.setNumTagsBytes(50);
- m.setNumTimestampBytes(23456);
- m.setNumMvccVersionBytes(5);
- m.setNumValueBytes(34567);
-
- m.setNextNodeOffsetWidth(3);
- m.setFamilyOffsetWidth(1);
- m.setQualifierOffsetWidth(2);
- m.setTagsOffsetWidth(2);
- m.setTimestampIndexWidth(1);
- m.setMvccVersionIndexWidth(2);
- m.setValueOffsetWidth(8);
- m.setValueLengthWidth(3);
-
- m.setRowTreeDepth(11);
- m.setMaxRowLength(200);
- m.setMaxQualifierLength(50);
- m.setMaxTagsLength(40);
-
- m.setMinTimestamp(1318966363481L);
- m.setTimestampDeltaWidth(3);
- m.setMinMvccVersion(100L);
- m.setMvccVersionDeltaWidth(4);
-
- m.setAllSameType(false);
- m.setAllTypes(KeyValue.Type.Delete.getCode());
-
- m.setNumUniqueRows(88);
- m.setNumUniqueFamilies(1);
- m.setNumUniqueQualifiers(56);
- m.setNumUniqueTags(5);
- return m;
- }
-
- @Test
- public void testStreamSerialization() throws IOException {
- PrefixTreeBlockMeta original = createSample();
- ByteArrayOutputStream os = new ByteArrayOutputStream(10000);
- original.writeVariableBytesToOutputStream(os);
- ByteBuffer buffer = ByteBuffer.wrap(os.toByteArray());
- PrefixTreeBlockMeta roundTripped = new PrefixTreeBlockMeta(new SingleByteBuff(buffer));
- Assert.assertTrue(original.equals(roundTripped));
- }
-
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/TestTokenizer.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/TestTokenizer.java
deleted file mode 100644
index 77cc5d3d799..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/TestTokenizer.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.codec.prefixtree.builder;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.hadoop.hbase.testclassification.MiscTests;
-import org.apache.hadoop.hbase.testclassification.SmallTests;
-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.SimpleMutableByteRange;
-import org.apache.hadoop.hbase.util.Bytes;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-@Category({MiscTests.class,SmallTests.class})
-@RunWith(Parameterized.class)
-public class TestTokenizer {
-
- @Parameters
- public static Collection parameters() {
- return new TestTokenizerData.InMemory().getAllAsObjectArray();
- }
-
- private List inputs;
- private Tokenizer builder;
- private List roundTripped;
-
- public TestTokenizer(TestTokenizerData sortedByteArrays) {
- this.inputs = sortedByteArrays.getInputs();
- this.builder = new Tokenizer();
- for (byte[] array : inputs) {
- builder.addSorted(new SimpleMutableByteRange(array));
- }
- this.roundTripped = builder.getArrays();
- }
-
- @Test
- public void testReaderRoundTrip() {
- Assert.assertEquals(inputs.size(), roundTripped.size());
- Assert.assertTrue(Bytes.isSorted(roundTripped));
- Assert.assertTrue(Bytes.equals(inputs, roundTripped));
- }
-
- @Test
- public void testSearching() {
- for (byte[] input : inputs) {
- TokenizerRowSearchResult resultHolder = new TokenizerRowSearchResult();
- builder.getNode(resultHolder, input, 0, input.length);
- TokenizerNode n = resultHolder.getMatchingNode();
- byte[] output = n.getNewByteArray();
- Assert.assertTrue(Bytes.equals(input, output));
- }
- }
-
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/TestTokenizerData.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/TestTokenizerData.java
deleted file mode 100644
index 49bc81e4c62..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/TestTokenizerData.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.codec.prefixtree.builder;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.hadoop.hbase.codec.prefixtree.builder.data.TestTokenizerDataBasic;
-import org.apache.hadoop.hbase.codec.prefixtree.builder.data.TestTokenizerDataEdgeCase;
-
-import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
-
-public interface TestTokenizerData {
-
- List getInputs();
- List getOutputs();
-
- class InMemory {
- public Collection getAllAsObjectArray() {
- List all = Lists.newArrayList();
- all.add(new Object[] { new TestTokenizerDataBasic() });
- all.add(new Object[] { new TestTokenizerDataEdgeCase() });
- return all;
- }
- }
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/TestTreeDepth.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/TestTreeDepth.java
deleted file mode 100644
index 83d6e801140..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/TestTreeDepth.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.codec.prefixtree.builder;
-
-import java.util.List;
-
-
-import org.apache.hadoop.hbase.testclassification.MiscTests;
-import org.apache.hadoop.hbase.testclassification.SmallTests;
-import org.apache.hadoop.hbase.codec.prefixtree.encode.tokenize.Tokenizer;
-import org.apache.hadoop.hbase.util.SimpleMutableByteRange;
-import org.apache.hadoop.hbase.util.Bytes;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
-
-@Category({MiscTests.class, SmallTests.class})
-public class TestTreeDepth {
-
- @Test
- public void testSingleNode() {
- List inputs = Lists.newArrayList("a");
- testInternal(inputs, 1);
- }
-
- @Test
- public void testSimpleBranch() {
- List inputs = Lists.newArrayList("a", "aa", "ab");
- testInternal(inputs, 2);
- }
-
- @Test
- public void testEmptyRoot() {
- List inputs = Lists.newArrayList("a", "b");
- testInternal(inputs, 2);
- }
-
- @Test
- public void testRootAsNub() {
- List inputs = Lists.newArrayList("a", "aa");
- testInternal(inputs, 2);
- }
-
- @Test
- public void testRootAsNubPlusNub() {
- List inputs = Lists.newArrayList("a", "aa", "aaa");
- testInternal(inputs, 3);
- }
-
- @Test
- public void testEmptyRootPlusNub() {
- List inputs = Lists.newArrayList("a", "aa", "b");
- testInternal(inputs, 3);
- }
-
- @Test
- public void testSplitDistantAncestor() {
- List inputs = Lists.newArrayList("a", "ac", "acd", "b");
- testInternal(inputs, 4);
- }
-
- protected void testInternal(List inputs, int expectedTreeDepth) {
- Tokenizer builder = new Tokenizer();
- for (String s : inputs) {
- SimpleMutableByteRange b = new SimpleMutableByteRange(Bytes.toBytes(s));
- builder.addSorted(b);
- }
- Assert.assertEquals(1, builder.getRoot().getNodeDepth());
- Assert.assertEquals(expectedTreeDepth, builder.getTreeDepth());
- }
-
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/data/TestTokenizerDataBasic.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/data/TestTokenizerDataBasic.java
deleted file mode 100644
index 1df09f3a263..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/data/TestTokenizerDataBasic.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.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.hadoop.hbase.shaded.com.google.common.collect.Lists;
-
-public class TestTokenizerDataBasic implements TestTokenizerData {
-
- static List d = Lists.newArrayList();
- static {
- List s = Lists.newArrayList();
- s.add("abc");// nub
- s.add("abcde");// leaf
- s.add("bbc");// causes root to split and have empty token
- s.add("bbc");// makes numOccurrences=2 on the bbc node
- s.add("cd");// just to get another node after the numOccurrences=2
- d = Bytes.getUtf8ByteArrays(s);
- }
-
- @Override
- public List getInputs() {
- return d;
- }
-
- @Override
- public List getOutputs() {
- return d;
- }
-
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/data/TestTokenizerDataEdgeCase.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/data/TestTokenizerDataEdgeCase.java
deleted file mode 100644
index 3e25d835bff..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/data/TestTokenizerDataEdgeCase.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.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.hadoop.hbase.shaded.com.google.common.collect.Lists;
-
-public class TestTokenizerDataEdgeCase implements TestTokenizerData {
-
- static List d = Lists.newArrayList();
- static {
- /*
- * tricky little combination because the acegi token will partially match abdfi, but when you
- * descend into abdfi, it will not fully match
- */
- List s = Lists.newArrayList();
- s.add("abdfh");
- s.add("abdfi");
- s.add("acegi");
- d = Bytes.getUtf8ByteArrays(s);
- }
-
- @Override
- public List getInputs() {
- return d;
- }
-
- @Override
- public List getOutputs() {
- return d;
- }
-
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/column/TestColumnBuilder.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/column/TestColumnBuilder.java
deleted file mode 100644
index 19a6311f54e..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/column/TestColumnBuilder.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.codec.prefixtree.column;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.hadoop.hbase.nio.SingleByteBuff;
-import org.apache.hadoop.hbase.testclassification.MiscTests;
-import org.apache.hadoop.hbase.testclassification.SmallTests;
-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.other.ColumnNodeType;
-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.ByteRangeUtils;
-import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.hadoop.hbase.util.byterange.impl.ByteRangeTreeSet;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
-
-@Category({MiscTests.class, SmallTests.class})
-@RunWith(Parameterized.class)
-public class TestColumnBuilder {
-
- @Parameters
- public static Collection parameters() {
- return new TestColumnData.InMemory().getAllAsObjectArray();
- }
-
- /*********** fields **********************************/
-
- protected TestColumnData columns;
- protected ByteRangeTreeSet columnSorter;
- protected List sortedUniqueColumns;
- protected PrefixTreeBlockMeta blockMeta;
- protected Tokenizer builder;
- protected ColumnSectionWriter writer;
- protected byte[] bytes;
- protected byte[] buffer;
- protected ColumnReader reader;
-
- /*************** construct ****************************/
-
- public TestColumnBuilder(TestColumnData columns) {
- this.columns = columns;
- List inputs = columns.getInputs();
- this.columnSorter = new ByteRangeTreeSet(inputs);
- this.sortedUniqueColumns = columnSorter.compile().getSortedRanges();
- List copies = ByteRangeUtils.copyToNewArrays(sortedUniqueColumns);
- Assert.assertTrue(Bytes.isSorted(copies));
- this.blockMeta = new PrefixTreeBlockMeta();
- this.blockMeta.setNumMetaBytes(0);
- this.blockMeta.setNumRowBytes(0);
- this.builder = new Tokenizer();
- }
-
- /************* methods ********************************/
-
- @Test
- public void testReaderRoundTrip() throws IOException {
- for (int i = 0; i < sortedUniqueColumns.size(); ++i) {
- ByteRange column = sortedUniqueColumns.get(i);
- builder.addSorted(column);
- }
- List builderOutputArrays = builder.getArrays();
- for (int i = 0; i < builderOutputArrays.size(); ++i) {
- byte[] inputArray = sortedUniqueColumns.get(i).deepCopyToNewArray();
- byte[] outputArray = builderOutputArrays.get(i);
- boolean same = Bytes.equals(inputArray, outputArray);
- Assert.assertTrue(same);
- }
- Assert.assertEquals(sortedUniqueColumns.size(), builderOutputArrays.size());
-
- writer = new ColumnSectionWriter(blockMeta, builder, ColumnNodeType.QUALIFIER);
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- writer.compile().writeBytes(baos);
- bytes = baos.toByteArray();
- buffer = new byte[blockMeta.getMaxQualifierLength()];
- reader = new ColumnReader(buffer, ColumnNodeType.QUALIFIER);
- reader.initOnBlock(blockMeta, new SingleByteBuff(ByteBuffer.wrap(bytes)));
-
- List builderNodes = Lists.newArrayList();
- builder.appendNodes(builderNodes, true, true);
- int i = 0;
- for (TokenizerNode builderNode : builderNodes) {
- if (!builderNode.hasOccurrences()) {
- continue;
- }
- Assert.assertEquals(1, builderNode.getNumOccurrences());// we de-duped before adding to
- // builder
- int position = builderNode.getOutputArrayOffset();
- byte[] output = reader.populateBuffer(position).copyBufferToNewArray();
- boolean same = Bytes.equals(sortedUniqueColumns.get(i).deepCopyToNewArray(), output);
- Assert.assertTrue(same);
- ++i;
- }
- }
-
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/column/TestColumnData.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/column/TestColumnData.java
deleted file mode 100644
index d9315ab1382..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/column/TestColumnData.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.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.hadoop.hbase.shaded.com.google.common.collect.Lists;
-
-public interface TestColumnData {
-
- List getInputs();
- List getOutputs();
-
- class InMemory {
- public Collection getAllAsObjectArray() {
- List all = Lists.newArrayList();
- all.add(new Object[] { new TestColumnDataSimple() });
- for (int leftShift = 0; leftShift < 16; ++leftShift) {
- all.add(new Object[] { new TestColumnDataRandom(1 << leftShift) });
- }
- return all;
- }
- }
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/column/data/TestColumnDataRandom.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/column/data/TestColumnDataRandom.java
deleted file mode 100644
index 0fdc616d1da..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/column/data/TestColumnDataRandom.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.codec.prefixtree.column.data;
-
-import java.util.List;
-
-import org.apache.hadoop.hbase.CellUtil;
-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.SimpleMutableByteRange;
-import org.apache.hadoop.hbase.util.byterange.ByteRangeSet;
-import org.apache.hadoop.hbase.util.byterange.impl.ByteRangeTreeSet;
-import org.apache.hadoop.hbase.util.RedundantKVGenerator;
-
-import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
-
-public class TestColumnDataRandom implements TestColumnData {
-
- private List inputs = Lists.newArrayList();
- private List outputs = Lists.newArrayList();
-
- public TestColumnDataRandom(int numColumns) {
- RedundantKVGenerator generator = new RedundantKVGenerator();
- ByteRangeSet sortedColumns = new ByteRangeTreeSet();
- List d = generator.generateTestKeyValues(numColumns);
- for (KeyValue col : d) {
- ByteRange colRange = new SimpleMutableByteRange(CellUtil.cloneQualifier(col));
- inputs.add(colRange);
- sortedColumns.add(colRange);
- }
- for (ByteRange col : sortedColumns.compile().getSortedRanges()) {
- outputs.add(col);
- }
- }
-
- @Override
- public List getInputs() {
- return inputs;
- }
-
- @Override
- public List getOutputs() {
- return outputs;
- }
-
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/column/data/TestColumnDataSimple.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/column/data/TestColumnDataSimple.java
deleted file mode 100644
index 721240af6f6..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/column/data/TestColumnDataSimple.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.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.ByteRangeUtils;
-import org.apache.hadoop.hbase.util.Bytes;
-
-import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
-
-public class TestColumnDataSimple implements TestColumnData {
-
- @Override
- public List getInputs() {
- List d = Lists.newArrayList();
- d.add("abc");
- d.add("abcde");
- d.add("abc");
- d.add("bbc");
- d.add("abc");
- return ByteRangeUtils.fromArrays(Bytes.getUtf8ByteArrays(d));
- }
-
- @Override
- public List getOutputs() {
- List d = Lists.newArrayList();
- d.add("abc");
- d.add("abcde");
- d.add("bbc");
- return ByteRangeUtils.fromArrays(Bytes.getUtf8ByteArrays(d));
- }
-
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/BaseTestRowData.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/BaseTestRowData.java
deleted file mode 100644
index d006740967c..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/BaseTestRowData.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.codec.prefixtree.row;
-
-import java.util.List;
-
-import org.apache.hadoop.hbase.CellUtil;
-import org.apache.hadoop.hbase.KeyValue;
-import org.apache.hadoop.hbase.codec.prefixtree.PrefixTreeBlockMeta;
-import org.apache.hadoop.hbase.codec.prefixtree.scanner.CellSearcher;
-
-import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
-
-public abstract class BaseTestRowData implements TestRowData {
-
- @Override
- public List getRowStartIndexes() {
- List rowStartIndexes = Lists.newArrayList();
- rowStartIndexes.add(0);
- List inputs = getInputs();
- for (int i = 1; i < inputs.size(); ++i) {
- KeyValue lastKv = inputs.get(i - 1);
- KeyValue kv = inputs.get(i);
- if (!CellUtil.matchingRows(lastKv, kv)) {
- rowStartIndexes.add(i);
- }
- }
- return rowStartIndexes;
- }
-
- @Override
- public void individualBlockMetaAssertions(PrefixTreeBlockMeta blockMeta) {
- }
-
- @Override
- public void individualSearcherAssertions(CellSearcher searcher) {
- }
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/TestPrefixTreeSearcher.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/TestPrefixTreeSearcher.java
deleted file mode 100644
index 0dbec215c95..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/TestPrefixTreeSearcher.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.codec.prefixtree.row;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.hadoop.hbase.Cell;
-import org.apache.hadoop.hbase.CellUtil;
-import org.apache.hadoop.hbase.PrivateCellUtil;
-import org.apache.hadoop.hbase.KeyValue;
-import org.apache.hadoop.hbase.KeyValueUtil;
-import org.apache.hadoop.hbase.nio.ByteBuff;
-import org.apache.hadoop.hbase.nio.SingleByteBuff;
-import org.apache.hadoop.hbase.testclassification.MiscTests;
-import org.apache.hadoop.hbase.testclassification.SmallTests;
-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.row.data.TestRowDataSearchWithPrefix;
-import org.apache.hadoop.hbase.codec.prefixtree.scanner.CellScannerPosition;
-import org.apache.hadoop.hbase.codec.prefixtree.scanner.CellSearcher;
-import org.apache.hadoop.hbase.util.ByteBufferUtils;
-import org.apache.hadoop.hbase.util.CollectionUtils;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-@Category({MiscTests.class, SmallTests.class})
-@RunWith(Parameterized.class)
-public class TestPrefixTreeSearcher {
-
- protected static int BLOCK_START = 7;
-
- @Parameters
- public static Collection parameters() {
- return TestRowData.InMemory.getAllAsObjectArray();
- }
-
- protected TestRowData rows;
- protected ByteBuff block;
-
- public TestPrefixTreeSearcher(TestRowData testRows) throws IOException {
- this.rows = testRows;
- ByteArrayOutputStream os = new ByteArrayOutputStream(1 << 20);
- PrefixTreeEncoder kvBuilder = new PrefixTreeEncoder(os, true);
- for (KeyValue kv : rows.getInputs()) {
- kvBuilder.write(kv);
- }
- kvBuilder.flush();
- byte[] outputBytes = os.toByteArray();
- ByteBuffer out = ByteBuffer.allocateDirect(outputBytes.length);
- ByteBufferUtils.copyFromArrayToBuffer(out, outputBytes, 0, outputBytes.length);
- out.position(0);
- this.block = new SingleByteBuff(out);
- }
-
- @Test
- public void testScanForwards() throws IOException {
- CellSearcher searcher = null;
- try {
- searcher = DecoderFactory.checkOut(block, true);
-
- int i = -1;
- while (searcher.advance()) {
- ++i;
- KeyValue inputCell = rows.getInputs().get(i);
- Cell outputCell = searcher.current();
-
- // check all 3 permutations of equals()
- Assert.assertEquals(inputCell, outputCell);
- Assert.assertEquals(outputCell, inputCell);
- Assert.assertTrue(CellUtil.equals(inputCell, outputCell));
- }
- Assert.assertEquals(rows.getInputs().size(), i + 1);
- } finally {
- DecoderFactory.checkIn(searcher);
- }
- }
-
-
- @Test
- public void testScanBackwards() throws IOException {
- CellSearcher searcher = null;
- try {
- searcher = DecoderFactory.checkOut(block, true);
- searcher.positionAfterLastCell();
- int i = -1;
- while (searcher.previous()) {
- ++i;
- int oppositeIndex = rows.getInputs().size() - i - 1;
- KeyValue inputKv = rows.getInputs().get(oppositeIndex);
- KeyValue outputKv = KeyValueUtil.copyToNewKeyValue(searcher.current());
- Assert.assertEquals(inputKv, outputKv);
- }
- Assert.assertEquals(rows.getInputs().size(), i + 1);
- } finally {
- DecoderFactory.checkIn(searcher);
- }
- }
-
-
- @Test
- public void testRandomSeekHits() throws IOException {
- CellSearcher searcher = null;
- try {
- searcher = DecoderFactory.checkOut(block, true);
- for (KeyValue kv : rows.getInputs()) {
- boolean hit = searcher.positionAt(kv);
- Assert.assertTrue(hit);
- Cell foundKv = searcher.current();
- Assert.assertTrue(CellUtil.equals(kv, foundKv));
- }
- } finally {
- DecoderFactory.checkIn(searcher);
- }
- }
-
- @Test
- public void testRandomSeekMisses() throws IOException {
- CellSearcher searcher = null;
- List rowStartIndexes = rows.getRowStartIndexes();
- try {
- searcher = DecoderFactory.checkOut(block, true);
-
- //test both the positionAtOrBefore and positionAtOrAfter methods
- for(boolean beforeVsAfterOnMiss : new boolean[]{true, false}){
- for (int i=0; i < rows.getInputs().size(); ++i) {
- KeyValue kv = rows.getInputs().get(i);
-
- //nextRow
- Cell inputNextRow = PrivateCellUtil.createFirstOnNextRow(kv);
-
- CellScannerPosition position = beforeVsAfterOnMiss
- ? searcher.positionAtOrBefore(inputNextRow)
- : searcher.positionAtOrAfter(inputNextRow);
- boolean isFirstInRow = rowStartIndexes.contains(i);
- if(isFirstInRow){
- int rowIndex = rowStartIndexes.indexOf(i);
- if(rowIndex < rowStartIndexes.size() - 1){
- if(beforeVsAfterOnMiss){
- Assert.assertEquals(CellScannerPosition.BEFORE, position);
- }else{
- Assert.assertEquals(CellScannerPosition.AFTER, position);
- }
-
- int expectedInputIndex = beforeVsAfterOnMiss
- ? rowStartIndexes.get(rowIndex + 1) - 1
- : rowStartIndexes.get(rowIndex + 1);
- Assert.assertEquals(rows.getInputs().get(expectedInputIndex), searcher.current());
- }
- }
-
- //previous KV
- KeyValue inputPreviousKv = KeyValueUtil.previousKey(kv);
- boolean hit = searcher.positionAt(inputPreviousKv);
- Assert.assertFalse(hit);
- position = searcher.positionAtOrAfter(inputPreviousKv);
- if(CollectionUtils.isLastIndex(rows.getInputs(), i)){
- Assert.assertTrue(CellScannerPosition.AFTER_LAST == position);
- }else{
- Assert.assertTrue(CellScannerPosition.AFTER == position);
- /*
- * TODO: why i+1 instead of i?
- */
- Assert.assertEquals(rows.getInputs().get(i+1), searcher.current());
- }
- }
- }
- } finally {
- DecoderFactory.checkIn(searcher);
- }
- }
-
-
- @Test
- public void testRandomSeekIndividualAssertions() throws IOException {
- CellSearcher searcher = null;
- try {
- searcher = DecoderFactory.checkOut(block, true);
- rows.individualSearcherAssertions(searcher);
- } finally {
- DecoderFactory.checkIn(searcher);
- }
- }
-
- @Test
- public void testSeekWithPrefix() throws IOException {
- if (!(rows instanceof TestRowDataSearchWithPrefix)) {
- return;
- }
- CellSearcher searcher = null;
- try {
- searcher = DecoderFactory.checkOut(block, true);
- // seek with half bytes of second row key, should return second row
- KeyValue kv = rows.getInputs().get(1);
- KeyValue firstKVOnRow = KeyValueUtil.createFirstOnRow(Arrays.copyOfRange(
- kv.getRowArray(), kv.getRowOffset(),
- kv.getRowOffset() + kv.getRowLength() / 2));
- CellScannerPosition position = searcher.positionAtOrAfter(firstKVOnRow);
- Assert.assertEquals(CellScannerPosition.AFTER, position);
- Assert.assertEquals(kv, searcher.current());
- } finally {
- DecoderFactory.checkIn(searcher);
- }
- }
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/TestRowData.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/TestRowData.java
deleted file mode 100644
index 8d187120cc0..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/TestRowData.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.codec.prefixtree.row;
-
-import java.util.Collection;
-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.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.TestRowDataRandomKeyValuesWithTags;
-import org.apache.hadoop.hbase.codec.prefixtree.row.data.TestRowDataSearchWithPrefix;
-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.TestRowDataTrivialWithTags;
-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 org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
-
-/*
- * A master class for registering different implementations of TestRowData.
- */
-public interface TestRowData {
-
- List getInputs();
- List getRowStartIndexes();
-
- void individualBlockMetaAssertions(PrefixTreeBlockMeta blockMeta);
-
- void individualSearcherAssertions(CellSearcher searcher);
-
- static class InMemory {
-
- /*
- * The following are different styles of data that the codec may encounter. Having these small
- * representations of the data helps pinpoint what is wrong if the encoder breaks.
- */
- public static Collection getAll() {
- List all = Lists.newArrayList();
- //simple
- all.add(new TestRowDataEmpty());
- all.add(new TestRowDataTrivial());
- all.add(new TestRowDataTrivialWithTags());
- all.add(new TestRowDataSimple());
- all.add(new TestRowDataDeeper());
-
- //more specific
- all.add(new TestRowDataSingleQualifier());
-// all.add(new TestRowDataMultiFamilies());//multiple families disabled in PrefixTreeEncoder
- all.add(new TestRowDataNub());
- all.add(new TestRowDataSearcherRowMiss());
- all.add(new TestRowDataQualifierByteOrdering());
- all.add(new TestRowDataComplexQualifiers());
- all.add(new TestRowDataDifferentTimestamps());
-
- //larger data volumes (hard to debug)
- all.add(new TestRowDataNumberStrings());
- all.add(new TestRowDataUrls());
- all.add(new TestRowDataUrlsExample());
- all.add(new TestRowDataExerciseFInts());
- all.add(new TestRowDataRandomKeyValues());
- all.add(new TestRowDataRandomKeyValuesWithTags());
-
- //test data for HBase-12078
- all.add(new TestRowDataSearchWithPrefix());
- return all;
- }
-
- public static Collection getAllAsObjectArray() {
- List all = Lists.newArrayList();
- for (TestRowData testRows : getAll()) {
- all.add(new Object[] { testRows });
- }
- return all;
- }
- }
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/TestRowEncoder.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/TestRowEncoder.java
deleted file mode 100644
index a8e5feb8684..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/TestRowEncoder.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.codec.prefixtree.row;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.Collection;
-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.nio.ByteBuff;
-import org.apache.hadoop.hbase.nio.SingleByteBuff;
-import org.apache.hadoop.hbase.testclassification.MiscTests;
-import org.apache.hadoop.hbase.testclassification.SmallTests;
-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.ByteBufferUtils;
-import org.apache.hadoop.hbase.util.Bytes;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
-
-@Category({MiscTests.class, SmallTests.class})
-@RunWith(Parameterized.class)
-public class TestRowEncoder {
-
- protected static int BLOCK_START = 7;
-
- @Parameters
- public static Collection parameters() {
- return TestRowData.InMemory.getAllAsObjectArray();
- }
-
- protected TestRowData rows;
- protected List inputKvs;
- protected boolean includeMemstoreTS = true;
- protected ByteArrayOutputStream os;
- protected PrefixTreeEncoder encoder;
- protected int totalBytes;
- protected PrefixTreeBlockMeta blockMetaWriter;
- protected byte[] outputBytes;
- protected ByteBuff buffer;
- protected ByteArrayInputStream is;
- protected PrefixTreeBlockMeta blockMetaReader;
- protected byte[] inputBytes;
- protected PrefixTreeArraySearcher searcher;
-
- public TestRowEncoder(TestRowData testRows) {
- this.rows = testRows;
- }
-
- @Before
- public void compile() throws IOException {
- // Always run with tags. But should also ensure that KVs without tags work fine
- os = new ByteArrayOutputStream(1 << 20);
- encoder = new PrefixTreeEncoder(os, includeMemstoreTS);
-
- inputKvs = rows.getInputs();
- for (KeyValue kv : inputKvs) {
- encoder.write(kv);
- }
- encoder.flush();
- totalBytes = encoder.getTotalBytes();
- blockMetaWriter = encoder.getBlockMeta();
- outputBytes = os.toByteArray();
-
- // start reading, but save the assertions for @Test methods
- ByteBuffer out = ByteBuffer.allocateDirect(outputBytes.length);
- ByteBufferUtils.copyFromArrayToBuffer(out, outputBytes, 0, outputBytes.length);
- out.position(0);
- buffer = new SingleByteBuff(out);
- blockMetaReader = new PrefixTreeBlockMeta(buffer);
-
- searcher = new PrefixTreeArraySearcher(blockMetaReader, blockMetaReader.getRowTreeDepth(),
- blockMetaReader.getMaxRowLength(), blockMetaReader.getMaxQualifierLength(),
- blockMetaReader.getMaxTagsLength());
- searcher.initOnBlock(blockMetaReader, buffer, includeMemstoreTS);
- }
-
- @Test
- public void testEncoderOutput() throws IOException {
- Assert.assertEquals(totalBytes, outputBytes.length);
- Assert.assertEquals(blockMetaWriter, blockMetaReader);
- }
-
- @Test
- public void testForwardScanner() {
- int counter = -1;
- while (searcher.advance()) {
- ++counter;
- KeyValue inputKv = rows.getInputs().get(counter);
- KeyValue outputKv = KeyValueUtil.copyToNewKeyValue(searcher.current());
- assertKeyAndValueEqual(inputKv, outputKv);
- }
- // assert same number of cells
- Assert.assertEquals(rows.getInputs().size(), counter + 1);
- }
-
-
- /**
- * probably not needed since testReverseScannerWithJitter() below is more thorough
- */
- @Test
- public void testReverseScanner() {
- searcher.positionAfterLastCell();
- int counter = -1;
- while (searcher.previous()) {
- ++counter;
- int oppositeIndex = rows.getInputs().size() - counter - 1;
- KeyValue inputKv = rows.getInputs().get(oppositeIndex);
- KeyValue outputKv = KeyValueUtil.copyToNewKeyValue(searcher.current());
- assertKeyAndValueEqual(inputKv, outputKv);
- }
- Assert.assertEquals(rows.getInputs().size(), counter + 1);
- }
-
-
- /**
- * Exercise the nubCellsRemain variable by calling next+previous. NubCellsRemain is basically
- * a special fan index.
- */
- @Test
- public void testReverseScannerWithJitter() {
- searcher.positionAfterLastCell();
- int counter = -1;
- while (true) {
- boolean foundCell = searcher.previous();
- if (!foundCell) {
- break;
- }
- ++counter;
-
- // a next+previous should cancel out
- if (!searcher.isAfterLast()) {
- searcher.advance();
- searcher.previous();
- }
-
- int oppositeIndex = rows.getInputs().size() - counter - 1;
- KeyValue inputKv = rows.getInputs().get(oppositeIndex);
- KeyValue outputKv = KeyValueUtil.copyToNewKeyValue(searcher.current());
- assertKeyAndValueEqual(inputKv, outputKv);
- }
- Assert.assertEquals(rows.getInputs().size(), counter + 1);
- }
-
- @Test
- public void testIndividualBlockMetaAssertions() {
- rows.individualBlockMetaAssertions(blockMetaReader);
- }
-
-
- /**************** helper **************************/
-
- protected void assertKeyAndValueEqual(Cell expected, Cell actual) {
- // assert keys are equal (doesn't compare values)
- Assert.assertEquals(expected, actual);
- if (includeMemstoreTS) {
- Assert.assertEquals(expected.getSequenceId(), actual.getSequenceId());
- }
- // assert values equal
- Assert.assertTrue(Bytes.equals(expected.getValueArray(), expected.getValueOffset(),
- expected.getValueLength(), actual.getValueArray(), actual.getValueOffset(),
- actual.getValueLength()));
- }
-
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataComplexQualifiers.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataComplexQualifiers.java
deleted file mode 100644
index bee4eac99ab..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataComplexQualifiers.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.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.hadoop.hbase.shaded.com.google.common.collect.Lists;
-
-public class TestRowDataComplexQualifiers extends BaseTestRowData{
-
- static byte[]
- Arow = Bytes.toBytes("Arow"),
- cf = PrefixTreeTestConstants.TEST_CF,
- v0 = Bytes.toBytes("v0");
-
- static List qualifiers = Lists.newArrayList();
- static {
- List qualifierStrings = Lists.newArrayList();
- qualifierStrings.add("cq");
- qualifierStrings.add("cq0");
- qualifierStrings.add("cq1");
- qualifierStrings.add("cq2");
- qualifierStrings.add("dq0");// second root level fan
- qualifierStrings.add("dq1");// nub
- qualifierStrings.add("dq111");// leaf on nub
- qualifierStrings.add("dq11111a");// leaf on leaf
- for (String s : qualifierStrings) {
- qualifiers.add(Bytes.toBytes(s));
- }
- }
-
- static long ts = 55L;
-
- static List d = Lists.newArrayList();
- static {
- for (byte[] qualifier : qualifiers) {
- d.add(new KeyValue(Arow, cf, qualifier, ts, v0));
- }
- }
-
- @Override
- public List getInputs() {
- return d;
- }
-
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataDeeper.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataDeeper.java
deleted file mode 100644
index 3db52cca457..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataDeeper.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.codec.prefixtree.row.data;
-
-import java.util.List;
-
-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.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.junit.Assert;
-
-import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
-
-/*
- * Goes beyond a trivial trie to add a branch on the "cf" node
- */
-public class TestRowDataDeeper extends BaseTestRowData{
-
- static byte[]
- cdc = Bytes.toBytes("cdc"),
- cf6 = Bytes.toBytes("cf6"),
- cfc = Bytes.toBytes("cfc"),
- f = Bytes.toBytes("f"),
- q = Bytes.toBytes("q"),
- v = Bytes.toBytes("v");
-
- static long
- ts = 55L;
-
- static List d = Lists.newArrayList();
- static{
- d.add(new KeyValue(cdc, f, q, ts, v));
- d.add(new KeyValue(cf6, f, q, ts, v));
- d.add(new KeyValue(cfc, f, q, ts, v));
- }
-
- @Override
- public List getInputs() {
- return d;
- }
-
- @Override
- public void individualBlockMetaAssertions(PrefixTreeBlockMeta blockMeta) {
- //0: token:c; fan:d,f
- //1: token:f; fan:6,c
- //2: leaves
- Assert.assertEquals(3, blockMeta.getRowTreeDepth());
- }
-
- @Override
- public void individualSearcherAssertions(CellSearcher searcher) {
- /**
- * The searcher should get a token mismatch on the "r" branch. Assert that it skips not only
- * rA, but rB as well.
- */
- KeyValue cfcRow = KeyValueUtil.createFirstOnRow(Bytes.toBytes("cfc"));
- CellScannerPosition position = searcher.positionAtOrAfter(cfcRow);
- Assert.assertEquals(CellScannerPosition.AFTER, position);
- Assert.assertEquals(d.get(2), searcher.current());
- searcher.previous();
- Assert.assertEquals(d.get(1), searcher.current());
- }
-}
-
-
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataDifferentTimestamps.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataDifferentTimestamps.java
deleted file mode 100644
index b7793ce6ba3..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataDifferentTimestamps.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.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.junit.Assert;
-
-import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
-
-/*
- * test different timestamps
- */
-public class TestRowDataDifferentTimestamps extends BaseTestRowData{
-
- static byte[]
- Arow = Bytes.toBytes("Arow"),
- Brow = Bytes.toBytes("Brow"),
- cf = Bytes.toBytes("fammy"),
- cq0 = Bytes.toBytes("cq0"),
- cq1 = Bytes.toBytes("cq1"),
- v0 = Bytes.toBytes("v0");
-
- static List d = Lists.newArrayList();
- static{
- KeyValue kv0 = new KeyValue(Arow, cf, cq0, 0L, v0);
- kv0.setSequenceId(123456789L);
- d.add(kv0);
-
- KeyValue kv1 = new KeyValue(Arow, cf, cq1, 1L, v0);
- kv1.setSequenceId(3L);
- d.add(kv1);
-
- KeyValue kv2 = new KeyValue(Brow, cf, cq0, 12345678L, v0);
- kv2.setSequenceId(65537L);
- d.add(kv2);
-
- //watch out... Long.MAX_VALUE comes back as 1332221664203, even with other encoders
- //d.add(new KeyValue(Brow, cf, cq1, Long.MAX_VALUE, v0));
- KeyValue kv3 = new KeyValue(Brow, cf, cq1, Long.MAX_VALUE-1, v0);
- kv3.setSequenceId(1L);
- d.add(kv3);
-
- KeyValue kv4 = new KeyValue(Brow, cf, cq1, 999999999, v0);
- //don't set memstoreTS
- d.add(kv4);
-
- KeyValue kv5 = new KeyValue(Brow, cf, cq1, 12345, v0);
- kv5.setSequenceId(0L);
- d.add(kv5);
- }
-
- @Override
- public List getInputs() {
- return d;
- }
-
- @Override
- public void individualBlockMetaAssertions(PrefixTreeBlockMeta blockMeta) {
- Assert.assertTrue(blockMeta.getNumMvccVersionBytes() > 0);
- Assert.assertEquals(12, blockMeta.getNumValueBytes());
-
- Assert.assertFalse(blockMeta.isAllSameTimestamp());
- Assert.assertNotNull(blockMeta.getMinTimestamp());
- Assert.assertTrue(blockMeta.getTimestampIndexWidth() > 0);
- Assert.assertTrue(blockMeta.getTimestampDeltaWidth() > 0);
-
- Assert.assertFalse(blockMeta.isAllSameMvccVersion());
- Assert.assertNotNull(blockMeta.getMinMvccVersion());
- Assert.assertTrue(blockMeta.getMvccVersionIndexWidth() > 0);
- Assert.assertTrue(blockMeta.getMvccVersionDeltaWidth() > 0);
- }
-
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataEmpty.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataEmpty.java
deleted file mode 100644
index f36c7c74f77..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataEmpty.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.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.hadoop.hbase.codec.prefixtree.row.BaseTestRowData;
-
-import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
-
-public class TestRowDataEmpty extends BaseTestRowData{
-
- private static byte[] b = new byte[0];
-
- static List d = Lists.newArrayList();
- static {
- d.add(new KeyValue(b, b, b, 0L, Type.Put, b));
- }
-
- @Override
- public List getInputs() {
- return d;
- }
-
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataExerciseFInts.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataExerciseFInts.java
deleted file mode 100644
index 16ef39cd5cc..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataExerciseFInts.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.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.hadoop.hbase.util.SimpleMutableByteRange;
-import org.apache.hadoop.hbase.util.byterange.impl.ByteRangeTreeSet;
-import org.junit.Assert;
-
-import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
-
-/*
- * test different timestamps
- *
- * http://pastebin.com/7ks8kzJ2
- * http://pastebin.com/MPn03nsK
- */
-public class TestRowDataExerciseFInts extends BaseTestRowData{
-
- static List rows;
- static{
- List rowStrings = new ArrayList<>(16);
- rowStrings.add("com.edsBlog/directoryAa/pageAaa");
- rowStrings.add("com.edsBlog/directoryAa/pageBbb");
- rowStrings.add("com.edsBlog/directoryAa/pageCcc");
- rowStrings.add("com.edsBlog/directoryAa/pageDdd");
- rowStrings.add("com.edsBlog/directoryBb/pageEee");
- rowStrings.add("com.edsBlog/directoryBb/pageFff");
- rowStrings.add("com.edsBlog/directoryBb/pageGgg");
- rowStrings.add("com.edsBlog/directoryBb/pageHhh");
- rowStrings.add("com.isabellasBlog/directoryAa/pageAaa");
- rowStrings.add("com.isabellasBlog/directoryAa/pageBbb");
- rowStrings.add("com.isabellasBlog/directoryAa/pageCcc");
- rowStrings.add("com.isabellasBlog/directoryAa/pageDdd");
- rowStrings.add("com.isabellasBlog/directoryBb/pageEee");
- rowStrings.add("com.isabellasBlog/directoryBb/pageFff");
- rowStrings.add("com.isabellasBlog/directoryBb/pageGgg");
- rowStrings.add("com.isabellasBlog/directoryBb/pageHhh");
- ByteRangeTreeSet ba = new ByteRangeTreeSet();
- for(String row : rowStrings){
- ba.add(new SimpleMutableByteRange(Bytes.toBytes(row)));
- }
- rows = ba.compile().getSortedRanges();
- }
-
- static List cols = Lists.newArrayList();
- static{
- cols.add("Chrome");
- cols.add("Chromeb");
- cols.add("Firefox");
- cols.add("InternetExplorer");
- cols.add("Opera");
- cols.add("Safari");
- cols.add("Z1stBrowserWithHuuuuuuuuuuuugeQualifier");
- cols.add("Z2ndBrowserWithEvenBiggerQualifierMoreMoreMoreMoreMore");
- cols.add("Z3rdBrowserWithEvenBiggerQualifierMoreMoreMoreMoreMore");
- cols.add("Z4thBrowserWithEvenBiggerQualifierMoreMoreMoreMoreMore");
- cols.add("Z5thBrowserWithEvenBiggerQualifierMoreMoreMoreMoreMore");
- cols.add("Z6thBrowserWithEvenBiggerQualifierMoreMoreMoreMoreMore");
- cols.add("Z7thBrowserWithEvenBiggerQualifierMoreMoreMoreMoreMore");
- cols.add("Z8thBrowserWithEvenBiggerQualifierMoreMoreMoreMoreMore");
- cols.add("Z9thBrowserWithEvenBiggerQualifierMoreMoreMoreMoreMore");
- }
-
- static long ts = 1234567890;
-
- static int MAX_VALUE = 50;
-
- static List kvs = Lists.newArrayList();
- static {
- for (ByteRange row : rows) {
- for (String col : cols) {
- KeyValue kv = new KeyValue(row.deepCopyToNewArray(), PrefixTreeTestConstants.TEST_CF,
- Bytes.toBytes(col), ts, KeyValue.Type.Put, Bytes.toBytes("VALUE"));
- kvs.add(kv);
- }
- }
- }
-
- @Override
- public List getInputs() {
- return kvs;
- }
-
- @Override
- public void individualBlockMetaAssertions(PrefixTreeBlockMeta blockMeta) {
- Assert.assertTrue(blockMeta.getNextNodeOffsetWidth() > 1);
- Assert.assertTrue(blockMeta.getQualifierOffsetWidth() > 1);
- }
-
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataMultiFamilies.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataMultiFamilies.java
deleted file mode 100644
index 90a580b225b..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataMultiFamilies.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.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.hadoop.hbase.shaded.com.google.common.collect.Lists;
-
-public class TestRowDataMultiFamilies extends BaseTestRowData{
-
- static byte[]
- rowA = Bytes.toBytes("rowA"),
- rowB = Bytes.toBytes("rowB"),
- famA = Bytes.toBytes("famA"),
- famB = Bytes.toBytes("famB"),
- famBB = Bytes.toBytes("famBB"),
- q0 = Bytes.toBytes("q0"),
- q1 = Bytes.toBytes("q1"),//start with a different character
- vvv = Bytes.toBytes("vvv");
-
- static long ts = 55L;
-
- static List d = Lists.newArrayList();
- static {
- d.add(new KeyValue(rowA, famA, q0, ts, vvv));
- d.add(new KeyValue(rowA, famB, q1, ts, vvv));
- d.add(new KeyValue(rowA, famBB, q0, ts, vvv));
- d.add(new KeyValue(rowB, famA, q0, ts, vvv));
- d.add(new KeyValue(rowB, famA, q1, ts, vvv));
- d.add(new KeyValue(rowB, famB, q0, ts, vvv));
- d.add(new KeyValue(rowB, famBB, q0, ts, vvv));
- d.add(new KeyValue(rowB, famBB, q1, ts, vvv));
- }
-
- @Override
- public List getInputs() {
- return d;
- }
-
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataNub.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataNub.java
deleted file mode 100644
index c47cae522b8..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataNub.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.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.hadoop.hbase.shaded.com.google.common.collect.Lists;
-
-public class TestRowDataNub extends BaseTestRowData{
-
- static byte[]
- rowA = Bytes.toBytes("rowA"),
- rowB = Bytes.toBytes("rowB"),//nub
- rowBB = Bytes.toBytes("rowBB"),
- cf = PrefixTreeTestConstants.TEST_CF,
- cq0 = Bytes.toBytes("cq0"),
- cq1 = Bytes.toBytes("cq1"),
- v0 = Bytes.toBytes("v0");
-
- static long
- ts = 55L;
-
- static List d = Lists.newArrayList();
- static{
- d.add(new KeyValue(rowA, cf, cq0, ts, v0));
- d.add(new KeyValue(rowA, cf, cq1, ts, v0));
- d.add(new KeyValue(rowB, cf, cq0, ts, v0));
- d.add(new KeyValue(rowB, cf, cq1, ts, v0));
- d.add(new KeyValue(rowBB, cf, cq0, ts, v0));
- d.add(new KeyValue(rowBB, cf, cq1, ts, v0));
- }
-
- @Override
- public List getInputs() {
- return d;
- }
-
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataNumberStrings.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataNumberStrings.java
deleted file mode 100644
index 5c4d0084488..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataNumberStrings.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.codec.prefixtree.row.data;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.hadoop.hbase.CellComparatorImpl;
-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.hadoop.hbase.shaded.com.google.common.collect.Lists;
-
-public class TestRowDataNumberStrings extends BaseTestRowData{
-
- static List d = Lists.newArrayList();
- static {
-
- /**
- * Test a string-encoded list of numbers. 0, 1, 10, 11 will sort as 0, 1, 10, 11 if strings
- *
- * This helped catch a bug with reverse scanning where it was jumping from the last leaf cell to
- * the previous nub. It should do 11->10, but it was incorrectly doing 11->1
- */
- List problematicSeries = Lists.newArrayList(0, 1, 10, 11);//sort this at the end
- for(Integer i : problematicSeries){
-// for(int i=0; i < 13; ++i){
- byte[] row = Bytes.toBytes(""+i);
- byte[] family = Bytes.toBytes("F");
- byte[] column = Bytes.toBytes("C");
- byte[] value = Bytes.toBytes("V");
-
- d.add(new KeyValue(row, family, column, 0L, Type.Put, value));
- }
- Collections.sort(d, CellComparatorImpl.COMPARATOR);
- }
-
- @Override
- public List getInputs() {
- return d;
- }
-
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataQualifierByteOrdering.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataQualifierByteOrdering.java
deleted file mode 100644
index 6d45efaf18b..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataQualifierByteOrdering.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.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.hadoop.hbase.shaded.com.google.common.collect.Lists;
-
-public class TestRowDataQualifierByteOrdering extends BaseTestRowData{
-
- static byte[]
- Arow = Bytes.toBytes("Arow"),
- Brow = Bytes.toBytes("Brow"),
- Brow2 = Bytes.toBytes("Brow2"),
- fam = Bytes.toBytes("HappyFam"),
- cq0 = Bytes.toBytes("cq0"),
- cq1 = Bytes.toBytes("cq1tail"),//make sure tail does not come back as liat
- cq2 = Bytes.toBytes("cq2"),
- v0 = Bytes.toBytes("v0");
-
- static long ts = 55L;
-
- static List d = Lists.newArrayList();
- static {
- d.add(new KeyValue(Arow, fam, cq0, ts, v0));
- d.add(new KeyValue(Arow, fam, cq1, ts, v0));
- d.add(new KeyValue(Brow, fam, cq0, ts, v0));
- d.add(new KeyValue(Brow, fam, cq2, ts, v0));
- d.add(new KeyValue(Brow2, fam, cq1, ts, v0));
- d.add(new KeyValue(Brow2, fam, cq2, ts, v0));
- }
-
- @Override
- public List getInputs() {
- return d;
- }
-
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataRandomKeyValues.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataRandomKeyValues.java
deleted file mode 100644
index 7a58f2db6e8..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataRandomKeyValues.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.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.RedundantKVGenerator;
-
-import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
-
-public class TestRowDataRandomKeyValues extends BaseTestRowData {
-
- static List d = Lists.newArrayList();
- static RedundantKVGenerator generator = new RedundantKVGenerator();
- static {
- d = generator.generateTestKeyValues(1 << 10);
- }
-
- @Override
- public List getInputs() {
- return d;
- }
-
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataRandomKeyValuesWithTags.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataRandomKeyValuesWithTags.java
deleted file mode 100644
index bd15d3e240d..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataRandomKeyValuesWithTags.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.hadoop.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.RedundantKVGenerator;
-
-import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
-/**
- * Generated KVs with tags
- */
-public class TestRowDataRandomKeyValuesWithTags extends BaseTestRowData {
- static List d = Lists.newArrayList();
- static RedundantKVGenerator generator = new RedundantKVGenerator();
- static {
- d = generator.generateTestKeyValues(1 << 10, true);
- }
-
- @Override
- public List getInputs() {
- return d;
- }
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataSearchWithPrefix.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataSearchWithPrefix.java
deleted file mode 100644
index 0c4bd5bd6a8..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataSearchWithPrefix.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.hadoop.hbase.codec.prefixtree.row.data;
-
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-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.hadoop.hbase.shaded.com.google.common.collect.Lists;
-
-public class TestRowDataSearchWithPrefix extends BaseTestRowData {
-
- static byte[] cf = Bytes.toBytes("cf");
-
- static byte[] cq = Bytes.toBytes("cq");
-
- static byte[] v = Bytes.toBytes("v");
-
- static List d = Lists.newArrayList();
-
- static long ts = 55L;
-
- static byte[] createRowKey(int keyPart1, int keyPart2) {
- ByteArrayOutputStream bos = new ByteArrayOutputStream(16);
- DataOutputStream dos = new DataOutputStream(bos);
- try {
- dos.writeInt(keyPart1);
- dos.writeInt(keyPart2);
- } catch (IOException e) {
- // should not happen
- throw new RuntimeException(e);
- }
-
- return bos.toByteArray();
- }
-
- static {
- d.add(new KeyValue(createRowKey(1, 12345), cf, cq, ts, v));
- d.add(new KeyValue(createRowKey(12345, 0x01000000), cf, cq, ts, v));
- d.add(new KeyValue(createRowKey(12345, 0x01010000), cf, cq, ts, v));
- d.add(new KeyValue(createRowKey(12345, 0x02000000), cf, cq, ts, v));
- d.add(new KeyValue(createRowKey(12345, 0x02020000), cf, cq, ts, v));
- d.add(new KeyValue(createRowKey(12345, 0x03000000), cf, cq, ts, v));
- d.add(new KeyValue(createRowKey(12345, 0x03030000), cf, cq, ts, v));
- d.add(new KeyValue(createRowKey(12345, 0x04000000), cf, cq, ts, v));
- d.add(new KeyValue(createRowKey(12345, 0x04040000), cf, cq, ts, v));
- }
-
- @Override
- public List getInputs() {
- return d;
- }
-
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataSearcherRowMiss.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataSearcherRowMiss.java
deleted file mode 100644
index 2fbd4b444d1..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataSearcherRowMiss.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.codec.prefixtree.row.data;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.hadoop.hbase.Cell;
-import org.apache.hadoop.hbase.CellUtil;
-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.junit.Assert;
-
-import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
-
-public class TestRowDataSearcherRowMiss extends BaseTestRowData{
-
- static byte[]
- //don't let the rows share any common prefix bytes
- A = Bytes.toBytes("A"),
- AA = Bytes.toBytes("AA"),
- AAA = Bytes.toBytes("AAA"),
- B = Bytes.toBytes("B"),
- cf = Bytes.toBytes("fam"),
- cq = Bytes.toBytes("cq0"),
- v = Bytes.toBytes("v0");
-
- static long
- ts = 55L;
-
- static List d = Lists.newArrayList();
- static{
- d.add(new KeyValue(A, cf, cq, ts, v));
- d.add(new KeyValue(AA, cf, cq, ts, v));
- d.add(new KeyValue(AAA, cf, cq, ts, v));
- d.add(new KeyValue(B, cf, cq, ts, v));
- }
-
- @Override
- public List getInputs() {
- return d;
- }
-
- @Override
- public void individualSearcherAssertions(CellSearcher searcher) {
- assertRowOffsetsCorrect();
-
- searcher.resetToBeforeFirstEntry();
-
- //test first cell
- try {
- searcher.advance();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- Cell first = searcher.current();
- Assert.assertTrue(CellUtil.equals(d.get(0), first));
-
- //test first cell in second row
- Assert.assertTrue(searcher.positionAt(d.get(1)));
- Assert.assertTrue(CellUtil.equals(d.get(1), searcher.current()));
-
- testBetween1and2(searcher);
- testBetween2and3(searcher);
- }
-
- /************ private methods, call from above *******************/
-
- private void assertRowOffsetsCorrect(){
- Assert.assertEquals(4, getRowStartIndexes().size());
- }
-
- private void testBetween1and2(CellSearcher searcher){
- CellScannerPosition p;//reuse
- Cell betweenAAndAAA = new KeyValue(AA, cf, cq, ts-2, v);
-
- //test exact
- Assert.assertFalse(searcher.positionAt(betweenAAndAAA));
-
- //test atOrBefore
- p = searcher.positionAtOrBefore(betweenAAndAAA);
- Assert.assertEquals(CellScannerPosition.BEFORE, p);
- Assert.assertTrue(CellUtil.equals(searcher.current(), d.get(1)));
-
- //test atOrAfter
- p = searcher.positionAtOrAfter(betweenAAndAAA);
- Assert.assertEquals(CellScannerPosition.AFTER, p);
- Assert.assertTrue(CellUtil.equals(searcher.current(), d.get(2)));
- }
-
- private void testBetween2and3(CellSearcher searcher){
- CellScannerPosition p;//reuse
- Cell betweenAAAndB = new KeyValue(AAA, cf, cq, ts-2, v);
-
- //test exact
- Assert.assertFalse(searcher.positionAt(betweenAAAndB));
-
- //test atOrBefore
- p = searcher.positionAtOrBefore(betweenAAAndB);
- Assert.assertEquals(CellScannerPosition.BEFORE, p);
- Assert.assertTrue(CellUtil.equals(searcher.current(), d.get(2)));
-
- //test atOrAfter
- p = searcher.positionAtOrAfter(betweenAAAndB);
- Assert.assertEquals(CellScannerPosition.AFTER, p);
- Assert.assertTrue(CellUtil.equals(searcher.current(), d.get(3)));
- }
-
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataSimple.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataSimple.java
deleted file mode 100644
index edb6dde7fd5..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataSimple.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.codec.prefixtree.row.data;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.hadoop.hbase.Cell;
-import org.apache.hadoop.hbase.CellUtil;
-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.junit.Assert;
-
-import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
-
-public class TestRowDataSimple extends BaseTestRowData {
-
- static byte[]
- // don't let the rows share any common prefix bytes
- rowA = Bytes.toBytes("Arow"),
- rowB = Bytes.toBytes("Brow"), cf = Bytes.toBytes("fam"),
- cq0 = Bytes.toBytes("cq0"),
- cq1 = Bytes.toBytes("cq1tail"),// make sure tail does not come back as liat
- cq2 = Bytes.toBytes("dcq2"),// start with a different character
- v0 = Bytes.toBytes("v0");
-
- static long ts = 55L;
-
- static List d = Lists.newArrayList();
- static {
- d.add(new KeyValue(rowA, cf, cq0, ts, v0));
- d.add(new KeyValue(rowA, cf, cq1, ts, v0));
- d.add(new KeyValue(rowA, cf, cq2, ts, v0));
- d.add(new KeyValue(rowB, cf, cq0, ts, v0));
- d.add(new KeyValue(rowB, cf, cq1, ts, v0));
- d.add(new KeyValue(rowB, cf, cq2, ts, v0));
- }
-
- @Override
- public List getInputs() {
- return d;
- }
-
- @Override
- public void individualSearcherAssertions(CellSearcher searcher) {
- CellScannerPosition p;// reuse
- searcher.resetToBeforeFirstEntry();
-
- // test first cell
- try {
- searcher.advance();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- Cell first = searcher.current();
- Assert.assertTrue(CellUtil.equals(d.get(0), first));
-
- // test first cell in second row
- Assert.assertTrue(searcher.positionAt(d.get(3)));
- Assert.assertTrue(CellUtil.equals(d.get(3), searcher.current()));
-
- Cell between4And5 = new KeyValue(rowB, cf, cq1, ts - 2, v0);
-
- // test exact
- Assert.assertFalse(searcher.positionAt(between4And5));
-
- // test atOrBefore
- p = searcher.positionAtOrBefore(between4And5);
- Assert.assertEquals(CellScannerPosition.BEFORE, p);
- Assert.assertTrue(CellUtil.equals(searcher.current(), d.get(4)));
-
- // test atOrAfter
- p = searcher.positionAtOrAfter(between4And5);
- Assert.assertEquals(CellScannerPosition.AFTER, p);
- Assert.assertTrue(CellUtil.equals(searcher.current(), d.get(5)));
-
- // test when key falls before first key in block
- Cell beforeFirst = new KeyValue(Bytes.toBytes("A"), cf, cq0, ts, v0);
- Assert.assertFalse(searcher.positionAt(beforeFirst));
- p = searcher.positionAtOrBefore(beforeFirst);
- Assert.assertEquals(CellScannerPosition.BEFORE_FIRST, p);
- p = searcher.positionAtOrAfter(beforeFirst);
- Assert.assertEquals(CellScannerPosition.AFTER, p);
- Assert.assertTrue(CellUtil.equals(searcher.current(), d.get(0)));
- Assert.assertEquals(d.get(0), searcher.current());
-
- // test when key falls after last key in block
- Cell afterLast = new KeyValue(Bytes.toBytes("z"), cf, cq0, ts, v0);// must be lower case z
- Assert.assertFalse(searcher.positionAt(afterLast));
- p = searcher.positionAtOrAfter(afterLast);
- Assert.assertEquals(CellScannerPosition.AFTER_LAST, p);
- p = searcher.positionAtOrBefore(afterLast);
- Assert.assertEquals(CellScannerPosition.BEFORE, p);
- Assert.assertTrue(CellUtil.equals(searcher.current(), CollectionUtils.getLast(d)));
- }
-
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataSingleQualifier.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataSingleQualifier.java
deleted file mode 100644
index 294dc3f1c81..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataSingleQualifier.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.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.hadoop.hbase.shaded.com.google.common.collect.Lists;
-
-public class TestRowDataSingleQualifier extends BaseTestRowData{
-
- static byte[]
- rowA = Bytes.toBytes("rowA"),
- rowB = Bytes.toBytes("rowB"),
- cf = PrefixTreeTestConstants.TEST_CF,
- cq0 = Bytes.toBytes("cq0"),
- v0 = Bytes.toBytes("v0");
-
- static long ts = 55L;
-
- static List d = Lists.newArrayList();
- static {
- d.add(new KeyValue(rowA, cf, cq0, ts, v0));
- d.add(new KeyValue(rowB, cf, cq0, ts, v0));
- }
-
- @Override
- public List getInputs() {
- return d;
- }
-
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataTrivial.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataTrivial.java
deleted file mode 100644
index 56c1f6a4d7d..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataTrivial.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.codec.prefixtree.row.data;
-
-import java.util.List;
-
-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.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.junit.Assert;
-
-import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
-
-public class TestRowDataTrivial extends BaseTestRowData{
-
- static byte[]
- rA = Bytes.toBytes("rA"),
- rB = Bytes.toBytes("rB"),//turn "r" into a branch for the Searcher tests
- cf = Bytes.toBytes("fam"),
- cq0 = Bytes.toBytes("q0"),
- v0 = Bytes.toBytes("v0");
-
- static long ts = 55L;
-
- static List d = Lists.newArrayList();
- static {
- d.add(new KeyValue(rA, cf, cq0, ts, v0));
- d.add(new KeyValue(rB, cf, cq0, ts, v0));
- }
-
- @Override
- public List getInputs() {
- return d;
- }
-
- @Override
- public void individualBlockMetaAssertions(PrefixTreeBlockMeta blockMeta) {
- // node[0] -> root[r]
- // node[1] -> leaf[A], etc
- Assert.assertEquals(2, blockMeta.getRowTreeDepth());
- }
-
- @Override
- public void individualSearcherAssertions(CellSearcher searcher) {
- /**
- * The searcher should get a token mismatch on the "r" branch. Assert that it skips not only rA,
- * but rB as well.
- */
- KeyValue afterLast = KeyValueUtil.createFirstOnRow(Bytes.toBytes("zzz"));
- CellScannerPosition position = searcher.positionAtOrAfter(afterLast);
- Assert.assertEquals(CellScannerPosition.AFTER_LAST, position);
- Assert.assertNull(searcher.current());
- }
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataTrivialWithTags.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataTrivialWithTags.java
deleted file mode 100644
index 669f19a2e11..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataTrivialWithTags.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.hadoop.hbase.codec.prefixtree.row.data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.hadoop.hbase.KeyValue;
-import org.apache.hadoop.hbase.KeyValueUtil;
-import org.apache.hadoop.hbase.Tag;
-import org.apache.hadoop.hbase.ArrayBackedTag;
-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.junit.Assert;
-
-import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
-
-public class TestRowDataTrivialWithTags extends BaseTestRowData{
- static byte[] rA = Bytes.toBytes("rA"), rB = Bytes.toBytes("rB"),// turn "r"
- // into a
- // branch for
- // the
- // Searcher
- // tests
- cf = Bytes.toBytes("fam"), cq0 = Bytes.toBytes("q0"), v0 = Bytes.toBytes("v0");
-
- static long ts = 55L;
-
- static List d = Lists.newArrayList();
- static {
- List tagList = new ArrayList<>(2);
- Tag t = new ArrayBackedTag((byte) 1, "visisbility");
- tagList.add(t);
- t = new ArrayBackedTag((byte) 2, "ACL");
- tagList.add(t);
- d.add(new KeyValue(rA, cf, cq0, ts, v0, tagList));
- d.add(new KeyValue(rB, cf, cq0, ts, v0, tagList));
- }
-
- @Override
- public List getInputs() {
- return d;
- }
-
- @Override
- public void individualBlockMetaAssertions(PrefixTreeBlockMeta blockMeta) {
- // node[0] -> root[r]
- // node[1] -> leaf[A], etc
- Assert.assertEquals(2, blockMeta.getRowTreeDepth());
- }
-
- @Override
- public void individualSearcherAssertions(CellSearcher searcher) {
- /**
- * The searcher should get a token mismatch on the "r" branch. Assert that
- * it skips not only rA, but rB as well.
- */
- KeyValue afterLast = KeyValueUtil.createFirstOnRow(Bytes.toBytes("zzz"));
- CellScannerPosition position = searcher.positionAtOrAfter(afterLast);
- Assert.assertEquals(CellScannerPosition.AFTER_LAST, position);
- Assert.assertNull(searcher.current());
- }
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataUrls.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataUrls.java
deleted file mode 100644
index 3ac7877782a..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataUrls.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.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.hadoop.hbase.util.SimpleMutableByteRange;
-import org.apache.hadoop.hbase.util.byterange.impl.ByteRangeTreeSet;
-
-import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
-
-/*
- * test different timestamps
- *
- * http://pastebin.com/7ks8kzJ2
- * http://pastebin.com/MPn03nsK
- */
-public class TestRowDataUrls extends BaseTestRowData{
-
- static List rows;
- static{
- List rowStrings = new ArrayList<>(16);
- rowStrings.add("com.edsBlog/directoryAa/pageAaa");
- rowStrings.add("com.edsBlog/directoryAa/pageBbb");
- rowStrings.add("com.edsBlog/directoryAa/pageCcc");
- rowStrings.add("com.edsBlog/directoryAa/pageDdd");
- rowStrings.add("com.edsBlog/directoryBb/pageEee");
- rowStrings.add("com.edsBlog/directoryBb/pageFff");
- rowStrings.add("com.edsBlog/directoryBb/pageGgg");
- rowStrings.add("com.edsBlog/directoryBb/pageHhh");
- rowStrings.add("com.isabellasBlog/directoryAa/pageAaa");
- rowStrings.add("com.isabellasBlog/directoryAa/pageBbb");
- rowStrings.add("com.isabellasBlog/directoryAa/pageCcc");
- rowStrings.add("com.isabellasBlog/directoryAa/pageDdd");
- rowStrings.add("com.isabellasBlog/directoryBb/pageEee");
- rowStrings.add("com.isabellasBlog/directoryBb/pageFff");
- rowStrings.add("com.isabellasBlog/directoryBb/pageGgg");
- rowStrings.add("com.isabellasBlog/directoryBb/pageHhh");
- ByteRangeTreeSet ba = new ByteRangeTreeSet();
- for (String row : rowStrings) {
- ba.add(new SimpleMutableByteRange(Bytes.toBytes(row)));
- }
- rows = ba.compile().getSortedRanges();
- }
-
- static List cols = Lists.newArrayList();
- static {
- cols.add("Chrome");
- cols.add("Chromeb");
- cols.add("Firefox");
- cols.add("InternetExplorer");
- cols.add("Opera");
- cols.add("Safari");
- }
-
- static long ts = 1234567890;
-
- static int MAX_VALUE = 50;
-
- static List kvs = Lists.newArrayList();
- static {
- for (ByteRange row : rows) {
- for (String col : cols) {
- KeyValue kv = new KeyValue(row.deepCopyToNewArray(), PrefixTreeTestConstants.TEST_CF,
- Bytes.toBytes(col), ts, KeyValue.Type.Put, Bytes.toBytes("VALUE"));
- kvs.add(kv);
- // System.out.println("TestRows5:"+kv);
- }
- }
- }
-
- @Override
- public List getInputs() {
- return kvs;
- }
-
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataUrlsExample.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataUrlsExample.java
deleted file mode 100644
index a0c2ee11855..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/data/TestRowDataUrlsExample.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.codec.prefixtree.row.data;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-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.hadoop.hbase.shaded.com.google.common.collect.Lists;
-
-/*
- * test different timestamps
- *
- * http://pastebin.com/7ks8kzJ2
- * http://pastebin.com/MPn03nsK
- */
-public class TestRowDataUrlsExample extends BaseTestRowData{
-
- static String TENANT_ID = Integer.toString(95322);
- static String APP_ID = Integer.toString(12);
- static List URLS = Lists.newArrayList(
- "com.dablog/2011/10/04/boating",
- "com.dablog/2011/10/09/lasers",
- "com.jamiesrecipes", //this nub helped find a bug
- "com.jamiesrecipes/eggs");
- static String FAMILY = "hits";
- static List BROWSERS = Lists.newArrayList(
- "Chrome", "IE8", "IE9beta");//, "Opera", "Safari");
- static long TIMESTAMP = 1234567890;
-
- static int MAX_VALUE = 50;
-
- static List kvs = Lists.newArrayList();
- static{
- for(String rowKey : URLS){
- for(String qualifier : BROWSERS){
- KeyValue kv = new KeyValue(
- Bytes.toBytes(rowKey),
- Bytes.toBytes(FAMILY),
- Bytes.toBytes(qualifier),
- TIMESTAMP,
- KeyValue.Type.Put,
- Bytes.toBytes("VvvV"));
- kvs.add(kv);
- }
- }
- }
-
- /**
- * Used for generating docs.
- */
- public static void main(String... args) throws IOException{
- System.out.println("-- inputs --");
- System.out.println(KeyValueTestUtil.toStringWithPadding(kvs, true));
- ByteArrayOutputStream os = new ByteArrayOutputStream(1<<20);
- PrefixTreeEncoder encoder = new PrefixTreeEncoder(os, false);
-
- for(KeyValue kv : kvs){
- encoder.write(kv);
- }
- encoder.flush();
-
- System.out.println("-- qualifier SortedPtBuilderNodes --");
- for(TokenizerNode tokenizer : encoder.getQualifierWriter().getNonLeaves()){
- System.out.println(tokenizer);
- }
- for(TokenizerNode tokenizerNode : encoder.getQualifierWriter().getLeaves()){
- System.out.println(tokenizerNode);
- }
-
- System.out.println("-- qualifier PtColumnNodeWriters --");
- for(ColumnNodeWriter writer : encoder.getQualifierWriter().getColumnNodeWriters()){
- System.out.println(writer);
- }
-
- System.out.println("-- rowKey SortedPtBuilderNodes --");
- for(TokenizerNode tokenizerNode : encoder.getRowWriter().getNonLeaves()){
- System.out.println(tokenizerNode);
- }
- for(TokenizerNode tokenizerNode : encoder.getRowWriter().getLeaves()){
- System.out.println(tokenizerNode);
- }
-
- System.out.println("-- row PtRowNodeWriters --");
- for(RowNodeWriter writer : encoder.getRowWriter().getNonLeafWriters()){
- System.out.println(writer);
- }
- for(RowNodeWriter writer : encoder.getRowWriter().getLeafWriters()){
- System.out.println(writer);
- }
-
- System.out.println("-- concatenated values --");
- System.out.println(Bytes.toStringBinary(encoder.getValueByteRange().deepCopyToNewArray()));
- }
-
- @Override
- public List getInputs() {
- return kvs;
- }
-
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/timestamp/TestTimestampData.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/timestamp/TestTimestampData.java
deleted file mode 100644
index 00704f40c2f..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/timestamp/TestTimestampData.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.codec.prefixtree.timestamp;
-
-import java.util.Collection;
-import java.util.List;
-
-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 org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
-
-public interface TestTimestampData {
-
- List getInputs();
- long getMinimum();
- List getOutputs();
-
- class InMemory {
- public Collection getAllAsObjectArray() {
- List all = Lists.newArrayList();
- all.add(new Object[] { new TestTimestampDataBasic() });
- all.add(new Object[] { new TestTimestampDataNumbers() });
- all.add(new Object[] { new TestTimestampDataRepeats() });
- return all;
- }
- }
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/timestamp/TestTimestampEncoder.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/timestamp/TestTimestampEncoder.java
deleted file mode 100644
index 1d0ad1b981e..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/timestamp/TestTimestampEncoder.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.codec.prefixtree.timestamp;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.Collection;
-
-import org.apache.hadoop.hbase.nio.SingleByteBuff;
-import org.apache.hadoop.hbase.testclassification.MiscTests;
-import org.apache.hadoop.hbase.testclassification.SmallTests;
-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.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-@Category({MiscTests.class, SmallTests.class})
-@RunWith(Parameterized.class)
-public class TestTimestampEncoder {
-
- @Parameters
- public static Collection parameters() {
- return new TestTimestampData.InMemory().getAllAsObjectArray();
- }
-
- private TestTimestampData timestamps;
- private PrefixTreeBlockMeta blockMeta;
- private LongEncoder encoder;
- private byte[] bytes;
- private TimestampDecoder decoder;
-
- public TestTimestampEncoder(TestTimestampData testTimestamps) throws IOException {
- this.timestamps = testTimestamps;
- this.blockMeta = new PrefixTreeBlockMeta();
- this.blockMeta.setNumMetaBytes(0);
- this.blockMeta.setNumRowBytes(0);
- this.blockMeta.setNumQualifierBytes(0);
- this.encoder = new LongEncoder();
- for (Long ts : testTimestamps.getInputs()) {
- encoder.add(ts);
- }
- encoder.compile();
- blockMeta.setTimestampFields(encoder);
- bytes = encoder.getByteArray();
- decoder = new TimestampDecoder();
- decoder.initOnBlock(blockMeta, new SingleByteBuff(ByteBuffer.wrap(bytes)));
- }
-
- @Test
- public void testCompressorMinimum() {
- Assert.assertEquals(timestamps.getMinimum(), encoder.getMin());
- }
-
- @Test
- public void testCompressorRoundTrip() {
- long[] outputs = encoder.getSortedUniqueTimestamps();
- for (int i = 0; i < timestamps.getOutputs().size(); ++i) {
- long input = timestamps.getOutputs().get(i);
- long output = outputs[i];
- Assert.assertEquals(input, output);
- }
- }
-
- @Test
- public void testReaderMinimum() {
- Assert.assertEquals(timestamps.getMinimum(), decoder.getLong(0));
- }
-
- @Test
- public void testReaderRoundTrip() {
- for (int i = 0; i < timestamps.getOutputs().size(); ++i) {
- long input = timestamps.getOutputs().get(i);
- long output = decoder.getLong(i);
- Assert.assertEquals(input, output);
- }
- }
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/timestamp/data/TestTimestampDataBasic.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/timestamp/data/TestTimestampDataBasic.java
deleted file mode 100644
index d4fbb4d5b87..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/timestamp/data/TestTimestampDataBasic.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.codec.prefixtree.timestamp.data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.hadoop.hbase.codec.prefixtree.timestamp.TestTimestampData;
-
-public class TestTimestampDataBasic implements TestTimestampData {
-
- @Override
- public List getInputs() {
- List d = new ArrayList<>(5);
- d.add(5L);
- d.add(3L);
- d.add(0L);
- d.add(1L);
- d.add(3L);
- return d;
- }
-
- @Override
- public long getMinimum() {
- return 0L;
- }
-
- @Override
- public List getOutputs() {
- List d = new ArrayList<>(4);
- d.add(0L);
- d.add(1L);
- d.add(3L);
- d.add(5L);
- return d;
- }
-
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/timestamp/data/TestTimestampDataNumbers.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/timestamp/data/TestTimestampDataNumbers.java
deleted file mode 100644
index d0bc8378927..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/timestamp/data/TestTimestampDataNumbers.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.codec.prefixtree.timestamp.data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.hadoop.hbase.codec.prefixtree.timestamp.TestTimestampData;
-
-public class TestTimestampDataNumbers implements TestTimestampData {
-
- private int shift = 8;
-
- @Override
- public List getInputs() {
- List d = new ArrayList<>(5);
- d.add(5L << shift);
- d.add(3L << shift);
- d.add(7L << shift);
- d.add(1L << shift);
- d.add(3L << shift);
- return d;
- }
-
- @Override
- public long getMinimum() {
- return 1L << shift;
- }
-
- @Override
- public List getOutputs() {
- List d = new ArrayList<>(4);
- d.add(1L << shift);
- d.add(3L << shift);
- d.add(5L << shift);
- d.add(7L << shift);
- return d;
- }
-
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/timestamp/data/TestTimestampDataRepeats.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/timestamp/data/TestTimestampDataRepeats.java
deleted file mode 100644
index 3320d66baba..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/timestamp/data/TestTimestampDataRepeats.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.codec.prefixtree.timestamp.data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.hadoop.hbase.codec.prefixtree.timestamp.TestTimestampData;
-
-public class TestTimestampDataRepeats implements TestTimestampData {
-
- private static long t = 1234567890L;
-
- @Override
- public List getInputs() {
- List d = new ArrayList<>(5);
- d.add(t);
- d.add(t);
- d.add(t);
- d.add(t);
- d.add(t);
- return d;
- }
-
- @Override
- public long getMinimum() {
- return t;
- }
-
- @Override
- public List getOutputs() {
- List d = new ArrayList<>();
- return d;
- }
-
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/bytes/TestByteRange.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/bytes/TestByteRange.java
deleted file mode 100644
index 028d6047329..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/bytes/TestByteRange.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.util.bytes;
-
-import junit.framework.Assert;
-
-import org.apache.hadoop.hbase.testclassification.MiscTests;
-import org.apache.hadoop.hbase.testclassification.SmallTests;
-import org.apache.hadoop.hbase.util.ByteRange;
-import org.apache.hadoop.hbase.util.SimpleMutableByteRange;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-@Category({MiscTests.class, SmallTests.class})
-public class TestByteRange {
-
- @Test
- public void testConstructor() {
- ByteRange b = new SimpleMutableByteRange(new byte[] { 0, 1, 2 });
- Assert.assertEquals(3, b.getLength());
- }
-
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/comparator/ByteArrayComparator.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/comparator/ByteArrayComparator.java
deleted file mode 100644
index 9a81d903efc..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/comparator/ByteArrayComparator.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.util.comparator;
-
-import java.util.Comparator;
-
-import org.apache.hadoop.hbase.util.Bytes;
-
-public class ByteArrayComparator implements Comparator {
-
- @Override
- public int compare(byte[] a, byte[] b) {
- return Bytes.compareTo(a, b);
- }
-
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/number/NumberFormatter.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/number/NumberFormatter.java
deleted file mode 100644
index 4aaea61615b..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/number/NumberFormatter.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.util.number;
-
-import java.text.DecimalFormat;
-
-public class NumberFormatter {
-
- public static String addCommas(final Number pValue) {
- if (pValue == null) {
- return null;
- }
- String format = "###,###,###,###,###,###,###,###.#####################";
- return new DecimalFormat(format).format(pValue);// biggest is 19 digits
- }
-
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/number/RandomNumberUtils.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/number/RandomNumberUtils.java
deleted file mode 100644
index f2f06e60dba..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/number/RandomNumberUtils.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.util.number;
-
-import java.util.Random;
-
-public class RandomNumberUtils {
-
- public static long nextPositiveLong(Random random) {
- while (true) {
- long value = random.nextLong();
- if (value > 0) {
- return value;
- }
- }
- }
-
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/vint/TestFIntTool.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/vint/TestFIntTool.java
deleted file mode 100644
index 4d12335207b..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/vint/TestFIntTool.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.util.vint;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import org.apache.hadoop.hbase.testclassification.MiscTests;
-import org.apache.hadoop.hbase.testclassification.SmallTests;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-/********************** tests *************************/
-
-@Category({MiscTests.class, SmallTests.class})
-public class TestFIntTool {
- @Test
- public void testLeadingZeros() {
- Assert.assertEquals(64, Long.numberOfLeadingZeros(0));
- Assert.assertEquals(63, Long.numberOfLeadingZeros(1));
- Assert.assertEquals(0, Long.numberOfLeadingZeros(Long.MIN_VALUE));
- Assert.assertEquals(0, Long.numberOfLeadingZeros(-1));
- Assert.assertEquals(1, Long.numberOfLeadingZeros(Long.MAX_VALUE));
- Assert.assertEquals(1, Long.numberOfLeadingZeros(Long.MAX_VALUE - 1));
- }
-
- @Test
- public void testMaxValueForNumBytes() {
- Assert.assertEquals(255, UFIntTool.maxValueForNumBytes(1));
- Assert.assertEquals(65535, UFIntTool.maxValueForNumBytes(2));
- Assert.assertEquals(0xffffff, UFIntTool.maxValueForNumBytes(3));
- Assert.assertEquals(0xffffffffffffffL, UFIntTool.maxValueForNumBytes(7));
- }
-
- @Test
- public void testNumBytes() {
- Assert.assertEquals(1, UFIntTool.numBytes(0));
- Assert.assertEquals(1, UFIntTool.numBytes(1));
- Assert.assertEquals(1, UFIntTool.numBytes(255));
- Assert.assertEquals(2, UFIntTool.numBytes(256));
- Assert.assertEquals(2, UFIntTool.numBytes(65535));
- Assert.assertEquals(3, UFIntTool.numBytes(65536));
- Assert.assertEquals(4, UFIntTool.numBytes(0xffffffffL));
- Assert.assertEquals(5, UFIntTool.numBytes(0x100000000L));
- Assert.assertEquals(4, UFIntTool.numBytes(Integer.MAX_VALUE));
- Assert.assertEquals(8, UFIntTool.numBytes(Long.MAX_VALUE));
- Assert.assertEquals(8, UFIntTool.numBytes(Long.MAX_VALUE - 1));
- }
-
- @Test
- public void testGetBytes() {
- Assert.assertArrayEquals(new byte[] { 0 }, UFIntTool.getBytes(1, 0));
- Assert.assertArrayEquals(new byte[] { 1 }, UFIntTool.getBytes(1, 1));
- Assert.assertArrayEquals(new byte[] { -1 }, UFIntTool.getBytes(1, 255));
- Assert.assertArrayEquals(new byte[] { 1, 0 }, UFIntTool.getBytes(2, 256));
- Assert.assertArrayEquals(new byte[] { 1, 3 }, UFIntTool.getBytes(2, 256 + 3));
- Assert.assertArrayEquals(new byte[] { 1, -128 }, UFIntTool.getBytes(2, 256 + 128));
- Assert.assertArrayEquals(new byte[] { 1, -1 }, UFIntTool.getBytes(2, 256 + 255));
- Assert.assertArrayEquals(new byte[] { 127, -1, -1, -1 },
- UFIntTool.getBytes(4, Integer.MAX_VALUE));
- Assert.assertArrayEquals(new byte[] { 127, -1, -1, -1, -1, -1, -1, -1 },
- UFIntTool.getBytes(8, Long.MAX_VALUE));
- }
-
- @Test
- public void testFromBytes() {
- Assert.assertEquals(0, UFIntTool.fromBytes(new byte[] { 0 }));
- Assert.assertEquals(1, UFIntTool.fromBytes(new byte[] { 1 }));
- Assert.assertEquals(255, UFIntTool.fromBytes(new byte[] { -1 }));
- Assert.assertEquals(256, UFIntTool.fromBytes(new byte[] { 1, 0 }));
- Assert.assertEquals(256 + 3, UFIntTool.fromBytes(new byte[] { 1, 3 }));
- Assert.assertEquals(256 + 128, UFIntTool.fromBytes(new byte[] { 1, -128 }));
- Assert.assertEquals(256 + 255, UFIntTool.fromBytes(new byte[] { 1, -1 }));
- Assert.assertEquals(Integer.MAX_VALUE, UFIntTool.fromBytes(new byte[] { 127, -1, -1, -1 }));
- Assert.assertEquals(Long.MAX_VALUE,
- UFIntTool.fromBytes(new byte[] { 127, -1, -1, -1, -1, -1, -1, -1 }));
- }
-
- @Test
- public void testRoundTrips() {
- long[] values = new long[] { 0, 1, 2, 255, 256, 31123, 65535, 65536, 65537, 0xfffffeL,
- 0xffffffL, 0x1000000L, 0x1000001L, Integer.MAX_VALUE - 1, Integer.MAX_VALUE,
- (long) Integer.MAX_VALUE + 1, Long.MAX_VALUE - 1, Long.MAX_VALUE };
- for (int i = 0; i < values.length; ++i) {
- Assert.assertEquals(values[i], UFIntTool.fromBytes(UFIntTool.getBytes(8, values[i])));
- }
- }
-
- @Test
- public void testWriteBytes() throws IOException {// copied from testGetBytes
- Assert.assertArrayEquals(new byte[] { 0 }, bytesViaOutputStream(1, 0));
- Assert.assertArrayEquals(new byte[] { 1 }, bytesViaOutputStream(1, 1));
- Assert.assertArrayEquals(new byte[] { -1 }, bytesViaOutputStream(1, 255));
- Assert.assertArrayEquals(new byte[] { 1, 0 }, bytesViaOutputStream(2, 256));
- Assert.assertArrayEquals(new byte[] { 1, 3 }, bytesViaOutputStream(2, 256 + 3));
- Assert.assertArrayEquals(new byte[] { 1, -128 }, bytesViaOutputStream(2, 256 + 128));
- Assert.assertArrayEquals(new byte[] { 1, -1 }, bytesViaOutputStream(2, 256 + 255));
- Assert.assertArrayEquals(new byte[] { 127, -1, -1, -1 },
- bytesViaOutputStream(4, Integer.MAX_VALUE));
- Assert.assertArrayEquals(new byte[] { 127, -1, -1, -1, -1, -1, -1, -1 },
- bytesViaOutputStream(8, Long.MAX_VALUE));
- }
-
- private byte[] bytesViaOutputStream(int outputWidth, long value) throws IOException {
- ByteArrayOutputStream os = new ByteArrayOutputStream();
- UFIntTool.writeBytes(outputWidth, value, os);
- return os.toByteArray();
- }
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/vint/TestVIntTool.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/vint/TestVIntTool.java
deleted file mode 100644
index 9171619a1d0..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/vint/TestVIntTool.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.util.vint;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.Random;
-
-import org.apache.hadoop.hbase.nio.SingleByteBuff;
-import org.apache.hadoop.hbase.testclassification.MiscTests;
-import org.apache.hadoop.hbase.testclassification.SmallTests;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-@Category({MiscTests.class, SmallTests.class})
-public class TestVIntTool {
-
- @Test
- public void testNumBytes() {
- Assert.assertEquals(1, UVIntTool.numBytes(0));
- Assert.assertEquals(1, UVIntTool.numBytes(1));
- Assert.assertEquals(1, UVIntTool.numBytes(100));
- Assert.assertEquals(1, UVIntTool.numBytes(126));
- Assert.assertEquals(1, UVIntTool.numBytes(127));
- Assert.assertEquals(2, UVIntTool.numBytes(128));
- Assert.assertEquals(2, UVIntTool.numBytes(129));
- Assert.assertEquals(5, UVIntTool.numBytes(Integer.MAX_VALUE));
- }
-
- @Test
- public void testWriteBytes() throws IOException {
- Assert.assertArrayEquals(new byte[] { 0 }, bytesViaOutputStream(0));
- Assert.assertArrayEquals(new byte[] { 1 }, bytesViaOutputStream(1));
- Assert.assertArrayEquals(new byte[] { 63 }, bytesViaOutputStream(63));
- Assert.assertArrayEquals(new byte[] { 127 }, bytesViaOutputStream(127));
- Assert.assertArrayEquals(new byte[] { -128, 1 }, bytesViaOutputStream(128));
- Assert.assertArrayEquals(new byte[] { -128 + 27, 1 }, bytesViaOutputStream(155));
- Assert.assertArrayEquals(UVIntTool.MAX_VALUE_BYTES, bytesViaOutputStream(Integer.MAX_VALUE));
- }
-
- private byte[] bytesViaOutputStream(int value) throws IOException {
- ByteArrayOutputStream os = new ByteArrayOutputStream();
- UVIntTool.writeBytes(value, os);
- return os.toByteArray();
- }
-
- @Test
- public void testToBytes() {
- Assert.assertArrayEquals(new byte[] { 0 }, UVIntTool.getBytes(0));
- Assert.assertArrayEquals(new byte[] { 1 }, UVIntTool.getBytes(1));
- Assert.assertArrayEquals(new byte[] { 63 }, UVIntTool.getBytes(63));
- Assert.assertArrayEquals(new byte[] { 127 }, UVIntTool.getBytes(127));
- Assert.assertArrayEquals(new byte[] { -128, 1 }, UVIntTool.getBytes(128));
- Assert.assertArrayEquals(new byte[] { -128 + 27, 1 }, UVIntTool.getBytes(155));
- Assert.assertArrayEquals(UVIntTool.MAX_VALUE_BYTES, UVIntTool.getBytes(Integer.MAX_VALUE));
- }
-
- @Test
- public void testFromBytes() {
- Assert.assertEquals(Integer.MAX_VALUE,
- UVIntTool.getInt(new SingleByteBuff(ByteBuffer.wrap(UVIntTool.MAX_VALUE_BYTES)), 0));
- }
-
- @Test
- public void testRoundTrips() {
- Random random = new Random();
- for (int i = 0; i < 10000; ++i) {
- int value = random.nextInt(Integer.MAX_VALUE);
- byte[] bytes = UVIntTool.getBytes(value);
- int roundTripped = UVIntTool.getInt(new SingleByteBuff(ByteBuffer.wrap(bytes)), 0);
- Assert.assertEquals(value, roundTripped);
- }
- }
-
- @Test
- public void testInputStreams() throws IOException {
- ByteArrayInputStream is;
- is = new ByteArrayInputStream(new byte[] { 0 });
- Assert.assertEquals(0, UVIntTool.getInt(is));
- is = new ByteArrayInputStream(new byte[] { 5 });
- Assert.assertEquals(5, UVIntTool.getInt(is));
- is = new ByteArrayInputStream(new byte[] { -128 + 27, 1 });
- Assert.assertEquals(155, UVIntTool.getInt(is));
- }
-
-}
diff --git a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/vint/TestVLongTool.java b/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/vint/TestVLongTool.java
deleted file mode 100644
index 247dee086b9..00000000000
--- a/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/vint/TestVLongTool.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.util.vint;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.Random;
-
-import org.apache.hadoop.hbase.nio.SingleByteBuff;
-import org.apache.hadoop.hbase.testclassification.MiscTests;
-import org.apache.hadoop.hbase.testclassification.SmallTests;
-import org.apache.hadoop.hbase.util.number.RandomNumberUtils;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-@Category({MiscTests.class, SmallTests.class})
-public class TestVLongTool {
-
- @Test
- public void testNumBytes() {
- Assert.assertEquals(1, UVLongTool.numBytes(0));
- Assert.assertEquals(1, UVLongTool.numBytes(1));
- Assert.assertEquals(1, UVLongTool.numBytes(100));
- Assert.assertEquals(1, UVLongTool.numBytes(126));
- Assert.assertEquals(1, UVLongTool.numBytes(127));
- Assert.assertEquals(2, UVLongTool.numBytes(128));
- Assert.assertEquals(2, UVLongTool.numBytes(129));
- Assert.assertEquals(9, UVLongTool.numBytes(Long.MAX_VALUE));
- }
-
- @Test
- public void testToBytes() {
- Assert.assertArrayEquals(new byte[] { 0 }, UVLongTool.getBytes(0));
- Assert.assertArrayEquals(new byte[] { 1 }, UVLongTool.getBytes(1));
- Assert.assertArrayEquals(new byte[] { 63 }, UVLongTool.getBytes(63));
- Assert.assertArrayEquals(new byte[] { 127 }, UVLongTool.getBytes(127));
- Assert.assertArrayEquals(new byte[] { -128, 1 }, UVLongTool.getBytes(128));
- Assert.assertArrayEquals(new byte[] { -128 + 27, 1 }, UVLongTool.getBytes(155));
- Assert.assertArrayEquals(UVLongTool.MAX_VALUE_BYTES, UVLongTool.getBytes(Long.MAX_VALUE));
- }
-
- @Test
- public void testFromBytes() {
- Assert.assertEquals(Long.MAX_VALUE, UVLongTool.getLong(UVLongTool.MAX_VALUE_BYTES));
- }
-
- @Test
- public void testFromBytesOffset() {
- Assert.assertEquals(Long.MAX_VALUE,
- UVLongTool.getLong(new SingleByteBuff(ByteBuffer.wrap(UVLongTool.MAX_VALUE_BYTES)), 0));
-
- long ms = 1318966363481L;
-// System.out.println(ms);
- byte[] bytes = UVLongTool.getBytes(ms);
-// System.out.println(Arrays.toString(bytes));
- long roundTripped = UVLongTool.getLong(new SingleByteBuff(ByteBuffer.wrap(bytes)), 0);
- Assert.assertEquals(ms, roundTripped);
-
- int calculatedNumBytes = UVLongTool.numBytes(ms);
- int actualNumBytes = bytes.length;
- Assert.assertEquals(actualNumBytes, calculatedNumBytes);
-
- byte[] shiftedBytes = new byte[1000];
- int shift = 33;
- System.arraycopy(bytes, 0, shiftedBytes, shift, bytes.length);
- long shiftedRoundTrip =
- UVLongTool.getLong(new SingleByteBuff(ByteBuffer.wrap(shiftedBytes)), shift);
- Assert.assertEquals(ms, shiftedRoundTrip);
- }
-
- @Test
- public void testRoundTrips() {
- Random random = new Random();
- for (int i = 0; i < 10000; ++i) {
- long value = RandomNumberUtils.nextPositiveLong(random);
- byte[] bytes = UVLongTool.getBytes(value);
- long roundTripped = UVLongTool.getLong(bytes);
- Assert.assertEquals(value, roundTripped);
- int calculatedNumBytes = UVLongTool.numBytes(value);
- int actualNumBytes = bytes.length;
- Assert.assertEquals(actualNumBytes, calculatedNumBytes);
- }
- }
-
- @Test
- public void testInputStreams() throws IOException {
- ByteArrayInputStream is;
- is = new ByteArrayInputStream(new byte[] { 0 });
- Assert.assertEquals(0, UVLongTool.getLong(is));
- is = new ByteArrayInputStream(new byte[] { 5 });
- Assert.assertEquals(5, UVLongTool.getLong(is));
- is = new ByteArrayInputStream(new byte[] { -128 + 27, 1 });
- Assert.assertEquals(155, UVLongTool.getLong(is));
- }
-}
diff --git a/hbase-prefix-tree/src/test/resources/log4j.properties b/hbase-prefix-tree/src/test/resources/log4j.properties
deleted file mode 100644
index c322699ced2..00000000000
--- a/hbase-prefix-tree/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,68 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Define some default values that can be overridden by system properties
-hbase.root.logger=INFO,console
-hbase.log.dir=.
-hbase.log.file=hbase.log
-
-# Define the root logger to the system property "hbase.root.logger".
-log4j.rootLogger=${hbase.root.logger}
-
-# Logging Threshold
-log4j.threshold=ALL
-
-#
-# Daily Rolling File Appender
-#
-log4j.appender.DRFA=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.DRFA.File=${hbase.log.dir}/${hbase.log.file}
-
-# Rollver at midnight
-log4j.appender.DRFA.DatePattern=.yyyy-MM-dd
-
-# 30-day backup
-#log4j.appender.DRFA.MaxBackupIndex=30
-log4j.appender.DRFA.layout=org.apache.log4j.PatternLayout
-# Debugging Pattern format
-log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %C{2}(%L): %m%n
-
-
-#
-# console
-# Add "console" to rootlogger above if you want to use this
-#
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.target=System.err
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %C{2}(%L): %m%n
-
-# Custom Logging levels
-
-#log4j.logger.org.apache.hadoop.fs.FSNamesystem=DEBUG
-
-log4j.logger.org.apache.hadoop=WARN
-log4j.logger.org.apache.zookeeper=ERROR
-log4j.logger.org.apache.hadoop.hbase=DEBUG
-
-#These settings are workarounds against spurious logs from the minicluster.
-#See HBASE-4709
-log4j.logger.org.apache.hadoop.metrics2.impl.MetricsConfig=WARN
-log4j.logger.org.apache.hadoop.metrics2.impl.MetricsSinkAdapter=WARN
-log4j.logger.org.apache.hadoop.metrics2.impl.MetricsSystemImpl=WARN
-log4j.logger.org.apache.hadoop.metrics2.util.MBeans=WARN
-# Enable this to get detailed connection error/retry logging.
-# log4j.logger.org.apache.hadoop.hbase.client.ConnectionImplementation=TRACE
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index eb537fbc325..6b58b9af080 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -392,11 +392,6 @@
org.apache.hbase
hbase-replication