Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-25622 Result#compareResults should compare tags. (#3026) 

Signed-off-by: stack <stack@apache.org>
This commit is contained in:
shahrs87 2021-03-11 21:51:07 -08:00 committed by GitHub
parent 1a69a52653
commit 7386fb6e1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 172 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java
View File

@ -791,7 +791,8 @@ public class Result implements CellScannable, CellScanner {
Cell[] replicatedKVs = res2.rawCells();
for (int i = 0; i < res1.size(); i++) {
if (!ourKVs[i].equals(replicatedKVs[i]) ||
!CellUtil.matchingValue(ourKVs[i], replicatedKVs[i])) {
!CellUtil.matchingValue(ourKVs[i], replicatedKVs[i]) ||
!CellUtil.matchingTags(ourKVs[i], replicatedKVs[i])) {
throw new Exception("This result was different: "
+ res1.toString() + " compared to " + res2.toString());
}

4
hbase-common/src/main/java/org/apache/hadoop/hbase/CellUtil.java
View File

@ -570,6 +570,10 @@ public final class CellUtil {
buf.length);
}
public static boolean matchingTags(final Cell left, final Cell right) {
return PrivateCellUtil.matchingTags(left, right, left.getTagsLength(), right.getTagsLength());
}
/**
* @return True if a delete type, a {@link KeyValue.Type#Delete} or a
* {KeyValue.Type#DeleteFamily} or a

25
hbase-common/src/main/java/org/apache/hadoop/hbase/PrivateCellUtil.java
View File

@ -812,6 +812,31 @@ public final class PrivateCellUtil {
return a.getTypeByte() == b.getTypeByte();
}
public static boolean matchingTags(final Cell left, final Cell right, int llength,
int rlength) {
if (left instanceof ByteBufferExtendedCell && right instanceof ByteBufferExtendedCell) {
ByteBufferExtendedCell leftBBCell = (ByteBufferExtendedCell) left;
ByteBufferExtendedCell rightBBCell = (ByteBufferExtendedCell) right;
return ByteBufferUtils.equals(
leftBBCell.getTagsByteBuffer(), leftBBCell.getTagsPosition(), llength,
rightBBCell.getTagsByteBuffer(),rightBBCell.getTagsPosition(), rlength);
}
if (left instanceof ByteBufferExtendedCell) {
ByteBufferExtendedCell leftBBCell = (ByteBufferExtendedCell) left;
return ByteBufferUtils.equals(
leftBBCell.getTagsByteBuffer(), leftBBCell.getTagsPosition(), llength,
right.getTagsArray(), right.getTagsOffset(), rlength);
}
if (right instanceof ByteBufferExtendedCell) {
ByteBufferExtendedCell rightBBCell = (ByteBufferExtendedCell) right;
return ByteBufferUtils.equals(
rightBBCell.getTagsByteBuffer(), rightBBCell.getTagsPosition(), rlength,
left.getTagsArray(), left.getTagsOffset(), llength);
}
return Bytes.equals(left.getTagsArray(), left.getTagsOffset(), llength,
right.getTagsArray(), right.getTagsOffset(), rlength);
}
/**
* @return True if a delete type, a {@link KeyValue.Type#Delete} or a {KeyValue.Type#DeleteFamily}
* or a {@link KeyValue.Type#DeleteColumn} KeyValue type.

141
hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestResult.java
View File

@ -25,14 +25,18 @@ import java.util.Arrays;
import java.util.List;
import java.util.NoSuchElementException;
import junit.framework.TestCase;
import org.apache.hadoop.hbase.ArrayBackedTag;
import org.apache.hadoop.hbase.ByteBufferKeyValue;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellComparator;
import org.apache.hadoop.hbase.CellScanner;
import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.Tag;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.SmallTests;
import org.apache.hadoop.hbase.util.ByteBufferUtils;
import org.apache.hadoop.hbase.util.Bytes;
import org.junit.ClassRule;
import org.junit.experimental.categories.Category;
@ -66,6 +70,7 @@ public class TestResult extends TestCase {
static final byte [] row = Bytes.toBytes("row");
static final byte [] family = Bytes.toBytes("family");
static final byte [] value = Bytes.toBytes("value");
static final byte [] qual = Bytes.toBytes("qual");
/**
* Run some tests to ensure Result acts like a proper CellScanner.
@ -250,6 +255,142 @@ public class TestResult extends TestCase {
}
}
public void testCompareResultsWithTags() throws Exception {
Tag t1 = new ArrayBackedTag((byte) 1, Bytes.toBytes("TAG1"));
Tag t2 = new ArrayBackedTag((byte) 2, Bytes.toBytes("TAG2"));
// Both BB backed tags KV are null
Result result1 = getByteBufferBackedTagResult(null);
Result result2 = getByteBufferBackedTagResult(null);
Result.compareResults(result1, result2);
// Test both byte buffer backed tags KeyValue
result1 = getByteBufferBackedTagResult(t1);
result2 = getByteBufferBackedTagResult(t1);
Result.compareResults(result1, result2);
// Both array backed tags KV are null
result1 = getArrayBackedTagResult(null);
result2 = getArrayBackedTagResult(null);
Result.compareResults(result1, result2);
// Test both array backed tags KeyValue
result1 = getArrayBackedTagResult(t1);
result2 = getArrayBackedTagResult(t1);
Result.compareResults(result1, result2);
// left instance of byte buffer and right instance of array backed
result1 = getByteBufferBackedTagResult(t1);
result2 = getArrayBackedTagResult(t1);
Result.compareResults(result1, result2);
// left instance of array backed and right instance of byte buffer backed.
result1 = getArrayBackedTagResult(t1);
result2 = getByteBufferBackedTagResult(t1);
Result.compareResults(result1, result2);
// Left BB backed null tag and right BB backed non null tag
result1 = getByteBufferBackedTagResult(null);
result2 = getByteBufferBackedTagResult(t2);
try {
Result.compareResults(result1, result2);
fail();
} catch (Exception e) {
// Expected
}
// Left BB backed non null tag and right BB backed null tag
result1 = getByteBufferBackedTagResult(t1);
result2 = getByteBufferBackedTagResult(null);
try {
Result.compareResults(result1, result2);
fail();
} catch (Exception e) {
// Expected
}
// Both byte buffer backed tags KV are different
result1 = getByteBufferBackedTagResult(t1);
result2 = getByteBufferBackedTagResult(t2);
try {
Result.compareResults(result1, result2);
fail();
} catch (Exception e) {
// Expected
}
// Left array backed non null tag and right array backed null tag
result1 = getArrayBackedTagResult(t1);
result2 = getArrayBackedTagResult(null);
try {
Result.compareResults(result1, result2);
fail();
} catch (Exception e) {
// Expected
}
// Left array backed null tag and right array backed non null tag
result1 = getByteBufferBackedTagResult(null);
result2 = getByteBufferBackedTagResult(t2);
try {
Result.compareResults(result1, result2);
fail();
} catch (Exception e) {
// Expected
}
// Both array backed tags KV are different
result1 = getArrayBackedTagResult(t1);
result2 = getArrayBackedTagResult(t2);
try {
Result.compareResults(result1, result2);
fail();
} catch (Exception e) {
// Expected
}
// left instance of byte buffer and right instance of array backed are different
result1 = getByteBufferBackedTagResult(t1);
result2 = getArrayBackedTagResult(t2);
try {
Result.compareResults(result1, result2);
fail();
} catch (Exception e) {
// Expected
}
// left instance of array backed and right instance of byte buffer backed are different
result1 = getArrayBackedTagResult(t1);
result2 = getByteBufferBackedTagResult(t2);
try {
Result.compareResults(result1, result2);
fail();
} catch (Exception e) {
// Expected
}
}
private Result getArrayBackedTagResult(Tag tag) {
List<Tag> tags = null;
if (tag != null) {
tags = Arrays.asList(tag);
}
KeyValue kvCell = new KeyValue(row, family, qual, 0L, KeyValue.Type.Put,
value, tags);
return Result.create(new Cell[] {kvCell});
}
private Result getByteBufferBackedTagResult(Tag tag) {
List<Tag> tags = null;
if (tag != null) {
tags = Arrays.asList(tag);
}
KeyValue kvCell = new KeyValue(row, family, qual, 0L, KeyValue.Type.Put,
value, tags);
ByteBuffer buf = ByteBuffer.allocateDirect(kvCell.getBuffer().length);
ByteBufferUtils.copyFromArrayToBuffer(buf, kvCell.getBuffer(), 0, kvCell.getBuffer().length);
ByteBufferKeyValue bbKV = new ByteBufferKeyValue(buf, 0, buf.capacity(), 0L);
return Result.create(new Cell[] {bbKV});
}
/**
* Verifies that one can't modify instance of EMPTY_RESULT.
*/