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

HBASE-17897 StripeStoreFileManager#nonOpenRowCompare use the wrong comparison function

This commit is contained in:
CHIA-PING TSAI 2017-04-10 17:03:47 +08:00 committed by Chia-Ping Tsai
parent 23249eb0f5
commit cf3215d343
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StripeStoreFileManager.java
View File

@ -562,7 +562,7 @@ public class StripeStoreFileManager
*/ */
private final int nonOpenRowCompare(byte[] k1, byte[] k2) { private final int nonOpenRowCompare(byte[] k1, byte[] k2) {
assert !isOpen(k1) && !isOpen(k2); assert !isOpen(k1) && !isOpen(k2);
return cellComparator.compareRows(new KeyOnlyKeyValue(k1), k2, 0, k2.length); return Bytes.compareTo(k1, k2);
} }
private final int nonOpenRowCompare(Cell k1, byte[] k2) { private final int nonOpenRowCompare(Cell k1, byte[] k2) {

6
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStripeStoreFileManager.java
View File

@ -58,9 +58,9 @@ public class TestStripeStoreFileManager {
private static final Path CFDIR = HStore.getStoreHomedir(BASEDIR, "region", Bytes.toBytes("cf")); private static final Path CFDIR = HStore.getStoreHomedir(BASEDIR, "region", Bytes.toBytes("cf"));
private static final byte[] KEY_A = Bytes.toBytes("aaa"); private static final byte[] KEY_A = Bytes.toBytes("aaa");
private static final byte[] KEY_B = Bytes.toBytes("bbb"); private static final byte[] KEY_B = Bytes.toBytes("aab");
private static final byte[] KEY_C = Bytes.toBytes("ccc"); private static final byte[] KEY_C = Bytes.toBytes("aac");
private static final byte[] KEY_D = Bytes.toBytes("ddd"); private static final byte[] KEY_D = Bytes.toBytes("aad");
private static final KeyValue KV_A = new KeyValue(KEY_A, 0L); private static final KeyValue KV_A = new KeyValue(KEY_A, 0L);
private static final KeyValue KV_B = new KeyValue(KEY_B, 0L); private static final KeyValue KV_B = new KeyValue(KEY_B, 0L);