saintstack commented on a change in pull request #2776:
URL: https://github.com/apache/hbase/pull/2776#discussion_r546259601
##########
File path:
hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparatorImpl.java
##########
@@ -125,38 +442,174 @@ public final int compareFamilies(Cell left, Cell right) {
right.getFamilyArray(), right.getFamilyOffset(),
right.getFamilyLength());
}
+ static int compareQualifiers(KeyValue left, KeyValue right) {
+ // NOTE: Same method is in CellComparatorImpl, also private, not shared,
intentionally. Not
+ // sharing gets us a few percent more throughput in compares. If changes
here or there, make
+ // sure done in both places.
+ // Compare Rows. Cache row length.
+ int leftRowLength = left.getRowLength();
+ int rightRowLength = right.getRowLength();
+
+ int leftFamilyLengthPosition = left.getFamilyLengthPosition(leftRowLength);
+ byte leftFamilyLength = left.getFamilyLength(leftFamilyLengthPosition);
+ int leftKeyLength = left.getKeyLength();
+ int leftQualifierLength =
+ left.getQualifierLength(leftKeyLength, leftRowLength,
leftFamilyLength);
+
+ // No need of left row length below here.
+
+ int rightFamilyLengthPosition =
right.getFamilyLengthPosition(rightRowLength);
+ byte rightFamilyLength = right.getFamilyLength(rightFamilyLengthPosition);
+ int rightKeyLength = right.getKeyLength();
+ int rightQualifierLength =
+ right.getQualifierLength(rightKeyLength, rightRowLength,
rightFamilyLength);
+
+ // Compare families.
+ int leftFamilyOffset = left.getFamilyOffset(leftFamilyLengthPosition);
+ int rightFamilyOffset = right.getFamilyOffset(rightFamilyLengthPosition);
+
+ // Compare qualifiers
+ return Bytes.compareTo(left.getQualifierArray(), leftFamilyOffset +
leftFamilyLength,
+ leftQualifierLength, right.getQualifierArray(), rightFamilyOffset +
rightFamilyLength,
+ rightQualifierLength);
+ }
+
+ static int compareQualifiers(KeyValue left, ByteBufferKeyValue right) {
+ // NOTE: Same method is in CellComparatorImpl, also private, not shared,
intentionally. Not
+ // sharing gets us a few percent more throughput in compares. If changes
here or there, make
+ // sure done in both places.
+ // Compare Rows. Cache row length.
+ int leftRowLength = left.getRowLength();
+ int rightRowLength = right.getRowLength();
+
+ int leftFamilyLengthPosition = left.getFamilyLengthPosition(leftRowLength);
+ byte leftFamilyLength = left.getFamilyLength(leftFamilyLengthPosition);
+ int leftKeyLength = left.getKeyLength();
+ int leftQualifierLength =
+ left.getQualifierLength(leftKeyLength, leftRowLength,
leftFamilyLength);
+
+ // No need of left row length below here.
+
+ int rightFamilyLengthPosition =
right.getFamilyLengthPosition(rightRowLength);
+ byte rightFamilyLength = right.getFamilyLength(rightFamilyLengthPosition);
+ int rightKeyLength = right.getKeyLength();
+ int rightQualifierLength =
+ right.getQualifierLength(rightKeyLength, rightRowLength,
rightFamilyLength);
+
+ // Compare families.
+ int leftFamilyOffset = left.getFamilyOffset(leftFamilyLengthPosition);
+ int rightFamilyPosition =
right.getFamilyPosition(rightFamilyLengthPosition);
+
+ // Compare qualifiers
+ return ByteBufferUtils.compareTo(left.getQualifierArray(),
+ leftFamilyOffset + leftFamilyLength, leftQualifierLength,
right.getQualifierByteBuffer(),
+ rightFamilyPosition + rightFamilyLength, rightQualifierLength);
+ }
+
+ static int compareQualifiers(ByteBufferKeyValue left, KeyValue right) {
+ // NOTE: Same method is in CellComparatorImpl, also private, not shared,
intentionally. Not
+ // sharing gets us a few percent more throughput in compares. If changes
here or there, make
+ // sure done in both places.
+ // Compare Rows. Cache row length.
+ int leftRowLength = left.getRowLength();
+ int rightRowLength = right.getRowLength();
+
+ int leftFamilyLengthPosition = left.getFamilyLengthPosition(leftRowLength);
+ byte leftFamilyLength = left.getFamilyLength(leftFamilyLengthPosition);
+ int leftKeyLength = left.getKeyLength();
+ int leftQualifierLength =
+ left.getQualifierLength(leftKeyLength, leftRowLength,
leftFamilyLength);
+
+ // No need of left row length below here.
+
+ int rightFamilyLengthPosition =
right.getFamilyLengthPosition(rightRowLength);
+ byte rightFamilyLength = right.getFamilyLength(rightFamilyLengthPosition);
+ int rightKeyLength = right.getKeyLength();
+ int rightQualifierLength =
+ right.getQualifierLength(rightKeyLength, rightRowLength,
rightFamilyLength);
+
+ // Compare families.
+ int leftFamilyPosition = left.getFamilyPosition(leftFamilyLengthPosition);
+ int rightFamilyOffset = right.getFamilyOffset(rightFamilyLengthPosition);
+
+ // Compare qualifiers
+ return ByteBufferUtils.compareTo(left.getQualifierByteBuffer(),
+ leftFamilyPosition + leftFamilyLength, leftQualifierLength,
right.getQualifierArray(),
+ rightFamilyOffset + rightFamilyLength, rightQualifierLength);
+ }
+
+ static int compareQualifiers(ByteBufferKeyValue left, ByteBufferKeyValue
right) {
+ // NOTE: Same method is in CellComparatorImpl, also private, not shared,
intentionally. Not
+ // sharing gets us a few percent more throughput in compares. If changes
here or there, make
+ // sure done in both places.
+ // Compare Rows. Cache row length.
+ int leftRowLength = left.getRowLength();
+ int rightRowLength = right.getRowLength();
+
+ int leftFamilyLengthPosition = left.getFamilyLengthPosition(leftRowLength);
+ byte leftFamilyLength = left.getFamilyLength(leftFamilyLengthPosition);
+ int leftKeyLength = left.getKeyLength();
+ int leftQualifierLength =
+ left.getQualifierLength(leftKeyLength, leftRowLength,
leftFamilyLength);
+
+ // No need of left row length below here.
+
+ int rightFamilyLengthPosition =
right.getFamilyLengthPosition(rightRowLength);
+ byte rightFamilyLength = right.getFamilyLength(rightFamilyLengthPosition);
+ int rightKeyLength = right.getKeyLength();
+ int rightQualifierLength =
+ right.getQualifierLength(rightKeyLength, rightRowLength,
rightFamilyLength);
+
+ // Compare families.
+ int leftFamilyPosition = left.getFamilyPosition(leftFamilyLengthPosition);
+ int rightFamilyPosition =
right.getFamilyPosition(rightFamilyLengthPosition);
+
+ // Compare qualifiers
+ return ByteBufferUtils.compareTo(left.getQualifierByteBuffer(),
+ leftFamilyPosition + leftFamilyLength, leftQualifierLength,
right.getQualifierByteBuffer(),
+ rightFamilyPosition + rightFamilyLength, rightQualifierLength);
+ }
+
/**
* Compare the qualifiers part of the left and right cells.
* @return 0 if both cells are equal, 1 if left cell is bigger than right,
-1 otherwise
*/
@Override
public final int compareQualifiers(Cell left, Cell right) {
- if (left instanceof ByteBufferExtendedCell && right instanceof
ByteBufferExtendedCell) {
- return ByteBufferUtils
- .compareTo(((ByteBufferExtendedCell) left).getQualifierByteBuffer(),
- ((ByteBufferExtendedCell) left).getQualifierPosition(),
- left.getQualifierLength(), ((ByteBufferExtendedCell)
right).getQualifierByteBuffer(),
- ((ByteBufferExtendedCell) right).getQualifierPosition(),
- right.getQualifierLength());
- }
- if (left instanceof ByteBufferExtendedCell) {
- return ByteBufferUtils.compareTo(((ByteBufferExtendedCell)
left).getQualifierByteBuffer(),
+ if ((left instanceof ByteBufferKeyValue) && (right instanceof
ByteBufferKeyValue)) {
+ return compareQualifiers((ByteBufferKeyValue) left, (ByteBufferKeyValue)
right);
+ } else if ((left instanceof KeyValue) && (right instanceof KeyValue)) {
+ return compareQualifiers((KeyValue) left, (KeyValue) right);
+ } else if ((left instanceof KeyValue) && (right instanceof
ByteBufferKeyValue)) {
+ return compareQualifiers((KeyValue) left, (ByteBufferKeyValue) right);
+ } else if ((left instanceof ByteBufferKeyValue) && (right instanceof
KeyValue)) {
+ return compareQualifiers((ByteBufferKeyValue) left, (KeyValue) right);
+ } else {
+ if (left instanceof ByteBufferExtendedCell && right instanceof
ByteBufferExtendedCell) {
Review comment:
+1. Not in this issue but file a follow-on.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
