Author: rawson
Date: Wed Sep 15 22:50:49 2010
New Revision: 997533
URL: http://svn.apache.org/viewvc?rev=997533&view=rev
Log:
HBASE-2997 Performance fixes - profiler driven (build/test fix)
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/KeyValue.java
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/KeyValue.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/KeyValue.java?rev=997533&r1=997532&r2=997533&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/KeyValue.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/KeyValue.java Wed Sep 15
22:50:49 2010
@@ -1904,10 +1904,11 @@ public class KeyValue implements Writabl
// HeapSize
public long heapSize() {
- return ClassSize.align(ClassSize.OBJECT + ClassSize.REFERENCE +
+ return ClassSize.align(ClassSize.OBJECT + (2 * ClassSize.REFERENCE) +
ClassSize.align(ClassSize.ARRAY + length) +
- (2 * Bytes.SIZEOF_INT) +
- Bytes.SIZEOF_LONG);
+ (3 * Bytes.SIZEOF_INT) +
+ ClassSize.align(ClassSize.ARRAY + (rowCache == null ? 0 :
rowCache.length)) +
+ (2 * Bytes.SIZEOF_LONG));
}
// this overload assumes that the length bytes have already been read,
