From fb42084ba91d904bda8c6f3618f9b9f2e7feffef Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Wed, 15 Sep 2010 20:23:31 +0000 Subject: [PATCH] Fix TestHeapSize broke by HBASE-2988 git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@997483 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/java/org/apache/hadoop/hbase/regionserver/Store.java | 2 +- src/test/java/org/apache/hadoop/hbase/io/TestHeapSize.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java b/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java index ea70619f3fe..b18cf01f818 100644 --- a/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java +++ b/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java @@ -1385,7 +1385,7 @@ public class Store implements HeapSize { } 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)); public static final long DEEP_OVERHEAD = ClassSize.align(FIXED_OVERHEAD + diff --git a/src/test/java/org/apache/hadoop/hbase/io/TestHeapSize.java b/src/test/java/org/apache/hadoop/hbase/io/TestHeapSize.java index 804880dbfa7..820ea16cc3a 100644 --- a/src/test/java/org/apache/hadoop/hbase/io/TestHeapSize.java +++ b/src/test/java/org/apache/hadoop/hbase/io/TestHeapSize.java @@ -60,8 +60,8 @@ public class TestHeapSize extends TestCase { /** * Test our hard-coded sizing of native java objects */ - @SuppressWarnings("unchecked") public void testNativeSizes() throws IOException { + @SuppressWarnings("rawtypes") Class cl = null; long expected = 0L; long actual = 0L; @@ -211,8 +211,8 @@ public class TestHeapSize extends TestCase { * TestHFile since it is a non public class * @throws IOException */ - @SuppressWarnings("unchecked") public void testSizes() throws IOException { + @SuppressWarnings("rawtypes") Class cl = null; long expected = 0L; long actual = 0L;