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

HBASE-6520 MSLab May cause the Bytes.toLong not work correctly for increment (ShiXing) 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1370717 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Zhihong Yu 2012-08-08 09:33:11 +00:00
parent 5671b5ca86
commit ba966f8ada
2 changed files with 33 additions and 1 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/HRegion.java
View File

@ -4827,7 +4827,7 @@ public class HRegion implements HeapSize { // , Writable{
if (idx < results.size() &&
results.get(idx).matchingQualifier(column.getKey())) {
KeyValue kv = results.get(idx);
amount += Bytes.toLong(kv.getBuffer(), kv.getValueOffset());
amount += Bytes.toLong(kv.getBuffer(), kv.getValueOffset(), kv.getValueLength());
idx++;
}

32
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
View File

@ -2619,6 +2619,38 @@ public class TestHRegion extends HBaseTestCase {
}
}
public void testIncrement_WrongInitialSize() throws IOException {
this.region = initHRegion(tableName, getName(), fam1);
try {
byte[] row1 = Bytes.add(Bytes.toBytes("1234"), Bytes.toBytes(0L));
long row1Field1 = 0;
int row1Field2 = 1;
Put put1 = new Put(row1);
put1.add(fam1, qual1, Bytes.toBytes(row1Field1));
put1.add(fam1, qual2, Bytes.toBytes(row1Field2));
region.put(put1);
Increment increment = new Increment(row1);
increment.addColumn(fam1, qual1, 1);
//here we should be successful as normal
region.increment(increment, null, true);
assertICV(row1, fam1, qual1, row1Field1 + 1);
//failed to increment
increment = new Increment(row1);
increment.addColumn(fam1, qual2, 1);
try {
region.increment(increment, null, true);
fail("Expected to fail here");
} catch (Exception exception) {
// Expected.
}
assertICV(row1, fam1, qual2, row1Field2);
} finally {
HRegion.closeHRegion(this.region);
this.region = null;
}
}
private void assertICV(byte [] row,
byte [] familiy,
byte[] qualifier,