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

HBASE-8384 heap size computation for HStore is fishy 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1470777 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
sershe 2013-04-23 01:48:12 +00:00
parent b4dd49f55d
commit 1c09148425
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hbase-common/src/main/java/org/apache/hadoop/hbase/util/ClassSize.java
View File

@ -242,7 +242,6 @@ public class ClassSize {
} }
if (debug) { if (debug) {
if (LOG.isDebugEnabled()) { if (LOG.isDebugEnabled()) {
// Write out region name as string and its encoded name.
LOG.debug("" + index + " " + aField.getName() + " " + aField.getType()); LOG.debug("" + index + " " + aField.getName() + " " + aField.getType());
} }
} }
@ -269,7 +268,6 @@ public class ClassSize {
long size = align(prealign_size); long size = align(prealign_size);
if(debug) { if(debug) {
if (LOG.isDebugEnabled()) { if (LOG.isDebugEnabled()) {
// Write out region name as string and its encoded name.
LOG.debug("Primitives=" + coeff[0] + ", arrays=" + coeff[1] + LOG.debug("Primitives=" + coeff[0] + ", arrays=" + coeff[1] +
", references(includes " + nrOfRefsPerObj + ", references(includes " + nrOfRefsPerObj +
" for object overhead)=" + coeff[2] + ", refSize " + REFERENCE + " for object overhead)=" + coeff[2] + ", refSize " + REFERENCE +

4
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
View File

@ -1807,8 +1807,8 @@ public class HStore implements Store {
} }
public static final long FIXED_OVERHEAD = public static final long FIXED_OVERHEAD =
ClassSize.align((17 * ClassSize.REFERENCE) + (5 * Bytes.SIZEOF_LONG) ClassSize.align(ClassSize.OBJECT + (16 * ClassSize.REFERENCE) + (4 * Bytes.SIZEOF_LONG)
+ (2 * Bytes.SIZEOF_INT) + Bytes.SIZEOF_BOOLEAN); + (2 * Bytes.SIZEOF_INT) + (2 * Bytes.SIZEOF_BOOLEAN));
public static final long DEEP_OVERHEAD = ClassSize.align(FIXED_OVERHEAD public static final long DEEP_OVERHEAD = ClassSize.align(FIXED_OVERHEAD
+ ClassSize.OBJECT + ClassSize.REENTRANT_LOCK + ClassSize.OBJECT + ClassSize.REENTRANT_LOCK

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

@ -39,7 +39,7 @@ public class ScanInfo {
public static final long FIXED_OVERHEAD = ClassSize.align(ClassSize.OBJECT public static final long FIXED_OVERHEAD = ClassSize.align(ClassSize.OBJECT
+ (2 * ClassSize.REFERENCE) + (2 * Bytes.SIZEOF_INT) + (2 * ClassSize.REFERENCE) + (2 * Bytes.SIZEOF_INT)
+ Bytes.SIZEOF_LONG + Bytes.SIZEOF_BOOLEAN); + (2 * Bytes.SIZEOF_LONG) + Bytes.SIZEOF_BOOLEAN);
/** /**
* @param family {@link HColumnDescriptor} describing the column family * @param family {@link HColumnDescriptor} describing the column family