You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2014/02/11 04:58:42 UTC
svn commit: r1566981 - in /hbase/trunk/hbase-server/src:
main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
Author: tedyu
Date: Tue Feb 11 03:58:42 2014
New Revision: 1566981
URL: http://svn.apache.org/r1566981
Log:
HBASE-10487 Avoid allocating new KeyValue and according bytes-copying for appended kvs which don't have existing values (Honghua)
Modified:
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1566981&r1=1566980&r2=1566981&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java Tue Feb 11 03:58:42 2014
@@ -5010,30 +5010,22 @@ public class HRegion implements HeapSize
newKV.getTagsOffset(), oldKv.getTagsLength());
System.arraycopy(kv.getTagsArray(), kv.getTagsOffset(), newKV.getTagsArray(),
newKV.getTagsOffset() + oldKv.getTagsLength(), kv.getTagsLength());
+ // copy in row, family, and qualifier
+ System.arraycopy(kv.getRowArray(), kv.getRowOffset(),
+ newKV.getRowArray(), newKV.getRowOffset(), kv.getRowLength());
+ System.arraycopy(kv.getFamilyArray(), kv.getFamilyOffset(),
+ newKV.getFamilyArray(), newKV.getFamilyOffset(),
+ kv.getFamilyLength());
+ System.arraycopy(kv.getQualifierArray(), kv.getQualifierOffset(),
+ newKV.getQualifierArray(), newKV.getQualifierOffset(),
+ kv.getQualifierLength());
idx++;
} else {
- // allocate an empty kv once
- newKV = new KeyValue(row.length, kv.getFamilyLength(),
- kv.getQualifierLength(), now, KeyValue.Type.Put,
- kv.getValueLength(), kv.getTagsLength());
- // copy in the value
- System.arraycopy(kv.getValueArray(), kv.getValueOffset(),
- newKV.getValueArray(), newKV.getValueOffset(),
- kv.getValueLength());
- // copy in tags
- System.arraycopy(kv.getTagsArray(), kv.getTagsOffset(), newKV.getTagsArray(),
- newKV.getTagsOffset(), kv.getTagsLength());
- }
- // copy in row, family, and qualifier
- System.arraycopy(kv.getRowArray(), kv.getRowOffset(),
- newKV.getRowArray(), newKV.getRowOffset(), kv.getRowLength());
- System.arraycopy(kv.getFamilyArray(), kv.getFamilyOffset(),
- newKV.getFamilyArray(), newKV.getFamilyOffset(),
- kv.getFamilyLength());
- System.arraycopy(kv.getQualifierArray(), kv.getQualifierOffset(),
- newKV.getQualifierArray(), newKV.getQualifierOffset(),
- kv.getQualifierLength());
-
+ newKV = kv;
+ // Append's KeyValue.Type==Put and ts==HConstants.LATEST_TIMESTAMP,
+ // so only need to update the timestamp to 'now'
+ newKV.updateLatestStamp(Bytes.toBytes(now));
+ }
newKV.setMvccVersion(w.getWriteNumber());
// Give coprocessors a chance to update the new cell
if (coprocessorHost != null) {
Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java?rev=1566981&r1=1566980&r2=1566981&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java Tue Feb 11 03:58:42 2014
@@ -4422,7 +4422,7 @@ public class TestFromClientSide {
byte[] v1 = Bytes.toBytes("42");
byte[] v2 = Bytes.toBytes("23");
byte [][] QUALIFIERS = new byte [][] {
- Bytes.toBytes("b"), Bytes.toBytes("a")
+ Bytes.toBytes("b"), Bytes.toBytes("a"), Bytes.toBytes("c")
};
Append a = new Append(ROW);
a.add(FAMILY, QUALIFIERS[0], v1);
@@ -4433,9 +4433,14 @@ public class TestFromClientSide {
a = new Append(ROW);
a.add(FAMILY, QUALIFIERS[0], v2);
a.add(FAMILY, QUALIFIERS[1], v1);
+ a.add(FAMILY, QUALIFIERS[2], v2);
Result r = t.append(a);
assertEquals(0, Bytes.compareTo(Bytes.add(v1,v2), r.getValue(FAMILY, QUALIFIERS[0])));
assertEquals(0, Bytes.compareTo(Bytes.add(v2,v1), r.getValue(FAMILY, QUALIFIERS[1])));
+ // QUALIFIERS[2] previously not exist, verify both value and timestamp are correct
+ assertEquals(0, Bytes.compareTo(v2, r.getValue(FAMILY, QUALIFIERS[2])));
+ assertEquals(r.getColumnLatest(FAMILY, QUALIFIERS[0]).getTimestamp(),
+ r.getColumnLatest(FAMILY, QUALIFIERS[2]).getTimestamp());
}
@Test