svn commit: r997483 - in /hbase/trunk/src: main/java/org/apache/hadoop/hbase/regionserver/Store.java test/java/org/apache/hadoop/hbase/io/TestHeapSize.java

[stack]

Author: stack
Date: Wed Sep 15 20:23:31 2010
New Revision: 997483

URL: http://svn.apache.org/viewvc?rev=997483&view=rev
Log:
Fix TestHeapSize broke by HBASE-2988

Modified:
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/TestHeapSize.java

Modified: 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java?rev=997483&r1=997482&r2=997483&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java 
(original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java 
Wed Sep 15 20:23:31 2010
@@ -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 +

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/TestHeapSize.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/TestHeapSize.java?rev=997483&r1=997482&r2=997483&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/TestHeapSize.java 
(original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/TestHeapSize.java Wed 
Sep 15 20:23:31 2010
@@ -60,8 +60,8 @@ public class TestHeapSize extends TestCa
   /**
    * 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 TestCa
    * 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;