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

Fix TestHeapSize broke by HBASE-2988 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@997483 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2010-09-15 20:23:31 +00:00
parent 5d8b73585f
commit fb42084ba9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
View File

@ -1385,7 +1385,7 @@ public class Store implements HeapSize {
} }
public static final long FIXED_OVERHEAD = ClassSize.align( public static final long FIXED_OVERHEAD = ClassSize.align(
ClassSize.OBJECT + (14 * ClassSize.REFERENCE) + ClassSize.OBJECT + (15 * ClassSize.REFERENCE) +
(4 * Bytes.SIZEOF_LONG) + (3 * Bytes.SIZEOF_INT) + (Bytes.SIZEOF_BOOLEAN * 2)); (4 * Bytes.SIZEOF_LONG) + (3 * Bytes.SIZEOF_INT) + (Bytes.SIZEOF_BOOLEAN * 2));
public static final long DEEP_OVERHEAD = ClassSize.align(FIXED_OVERHEAD + public static final long DEEP_OVERHEAD = ClassSize.align(FIXED_OVERHEAD +

4
src/test/java/org/apache/hadoop/hbase/io/TestHeapSize.java
View File

@ -60,8 +60,8 @@ public class TestHeapSize extends TestCase {
/** /**
* Test our hard-coded sizing of native java objects * Test our hard-coded sizing of native java objects
*/ */
@SuppressWarnings("unchecked")
public void testNativeSizes() throws IOException { public void testNativeSizes() throws IOException {
@SuppressWarnings("rawtypes")
Class cl = null; Class cl = null;
long expected = 0L; long expected = 0L;
long actual = 0L; long actual = 0L;
@ -211,8 +211,8 @@ public class TestHeapSize extends TestCase {
* TestHFile since it is a non public class * TestHFile since it is a non public class
* @throws IOException * @throws IOException
*/ */
@SuppressWarnings("unchecked")
public void testSizes() throws IOException { public void testSizes() throws IOException {
@SuppressWarnings("rawtypes")
Class cl = null; Class cl = null;
long expected = 0L; long expected = 0L;
long actual = 0L; long actual = 0L;