Amend HBASE-4381 Refactor split decisions into a split policy class

Adjusts heap size estimates for HRegion and Store to fix failing TestHeapSize.


git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1170804 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Todd Lipcon 2011-09-14 19:34:26 +00:00
parent 89c642d754
commit 0b83bf1d7a
2 changed files with 2 additions and 2 deletions

View File

@ -3690,7 +3690,7 @@ public class HRegion implements HeapSize { // , Writable{
public static final long FIXED_OVERHEAD = ClassSize.align( public static final long FIXED_OVERHEAD = ClassSize.align(
ClassSize.OBJECT + ClassSize.OBJECT +
ClassSize.ARRAY + ClassSize.ARRAY +
27 * ClassSize.REFERENCE + Bytes.SIZEOF_INT + 28 * ClassSize.REFERENCE + Bytes.SIZEOF_INT +
(4 * Bytes.SIZEOF_LONG) + (4 * Bytes.SIZEOF_LONG) +
Bytes.SIZEOF_BOOLEAN); Bytes.SIZEOF_BOOLEAN);

View File

@ -1789,7 +1789,7 @@ public class Store implements HeapSize {
public static final long FIXED_OVERHEAD = ClassSize.align( public static final long FIXED_OVERHEAD = ClassSize.align(
ClassSize.OBJECT + (16 * ClassSize.REFERENCE) + ClassSize.OBJECT + (16 * ClassSize.REFERENCE) +
(8 * Bytes.SIZEOF_LONG) + (1 * Bytes.SIZEOF_DOUBLE) + (7 * Bytes.SIZEOF_LONG) + (1 * Bytes.SIZEOF_DOUBLE) +
(6 * Bytes.SIZEOF_INT) + (3 * Bytes.SIZEOF_BOOLEAN)); (6 * Bytes.SIZEOF_INT) + (3 * Bytes.SIZEOF_BOOLEAN));
public static final long DEEP_OVERHEAD = ClassSize.align(FIXED_OVERHEAD + public static final long DEEP_OVERHEAD = ClassSize.align(FIXED_OVERHEAD +