svn commit: r1589230 - in /hbase/branches/0.89-fb/src: main/java/org/apache/hadoop/hbase/regionserver/HRegion.java test/java/org/apache/hadoop/hbase/io/TestHeapSize.java

[li...@apache.org]

Author: liyin
Date: Tue Apr 22 18:18:48 2014
New Revision: 1589230

URL: http://svn.apache.org/r1589230
Log:
[HBASE-2000] Fix TestHeapSize after adding coprocessorHost in HRegion and remove all warnings from TestHeapSize.java

Author: adela

Summary: increase the number of class references in HRegion.FIXED_OVERHEAD

Test Plan: ran the test after the change and it passes

Reviewers: daviddeng, manukranthk, elliott

Reviewed By: elliott

CC: hbase-eng@

Differential Revision: https://phabricator.fb.com/D1287392

Task ID: 4173054

Modified:
    hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
    hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/TestHeapSize.java

Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1589230&r1=1589229&r2=1589230&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original)
+++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java Tue Apr 22 18:18:48 2014
@@ -3937,7 +3937,7 @@ public class HRegion implements HeapSize
   public static final long FIXED_OVERHEAD = ClassSize.align(
       (2 * Bytes.SIZEOF_BOOLEAN) +
       (6 * Bytes.SIZEOF_LONG) + 2 * ClassSize.ARRAY +
-      (29 * ClassSize.REFERENCE) + ClassSize.OBJECT + Bytes.SIZEOF_INT);
+      (30 * ClassSize.REFERENCE) + ClassSize.OBJECT + Bytes.SIZEOF_INT);
 
   public static final long DEEP_OVERHEAD = ClassSize.align(FIXED_OVERHEAD +
       ClassSize.OBJECT + (2 * ClassSize.ATOMIC_BOOLEAN) +

Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/TestHeapSize.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/TestHeapSize.java?rev=1589230&r1=1589229&r2=1589230&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/TestHeapSize.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/TestHeapSize.java Tue Apr 22 18:18:48 2014
@@ -62,9 +62,8 @@ public class TestHeapSize extends TestCa
   /**
    * Test our hard-coded sizing of native java objects
    */
-  @SuppressWarnings("unchecked")
   public void testNativeSizes() throws IOException {
-    Class cl = null;
+    Class<?> cl = null;
     long expected = 0L;
     long actual = 0L;
 
@@ -213,9 +212,8 @@ public class TestHeapSize extends TestCa
    * TestHFile since it is a non public class
    * @throws IOException
    */
-  @SuppressWarnings("unchecked")
   public void testSizes() throws IOException {
-    Class cl = null;
+    Class<?> cl = null;
     long expected = 0L;
     long actual = 0L;