hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r956754 - in /hbase/branches/0.89.20100621/src/main/java/org/apache/hadoop/hbase/regionserver: HRegion.java Store.java
Date Tue, 22 Jun 2010 01:00:10 GMT
Author: stack
Date: Tue Jun 22 01:00:09 2010
New Revision: 956754

URL: http://svn.apache.org/viewvc?rev=956754&view=rev
Log:
HBASE-1025 Reconstruction log playback has no bounds on memory used

Modified:
    hbase/branches/0.89.20100621/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
    hbase/branches/0.89.20100621/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java

Modified: hbase/branches/0.89.20100621/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89.20100621/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=956754&r1=956753&r2=956754&view=diff
==============================================================================
--- hbase/branches/0.89.20100621/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
(original)
+++ hbase/branches/0.89.20100621/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
Tue Jun 22 01:00:09 2010
@@ -3072,7 +3072,7 @@ public class HRegion implements HeapSize
   }
 
   public static final long FIXED_OVERHEAD = ClassSize.align(
-      (5 * Bytes.SIZEOF_LONG) + Bytes.SIZEOF_BOOLEAN +
+      (4 * Bytes.SIZEOF_LONG) + Bytes.SIZEOF_BOOLEAN +
       (21 * ClassSize.REFERENCE) + ClassSize.OBJECT + Bytes.SIZEOF_INT);
 
   public static final long DEEP_OVERHEAD = ClassSize.align(FIXED_OVERHEAD +

Modified: hbase/branches/0.89.20100621/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89.20100621/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java?rev=956754&r1=956753&r2=956754&view=diff
==============================================================================
--- hbase/branches/0.89.20100621/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
(original)
+++ hbase/branches/0.89.20100621/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
Tue Jun 22 01:00:09 2010
@@ -1451,9 +1451,8 @@ public class Store implements HeapSize {
   }
 
   public static final long FIXED_OVERHEAD = ClassSize.align(
-      ClassSize.OBJECT + (16 * ClassSize.REFERENCE) +
-      (6 * Bytes.SIZEOF_LONG) + (3 * Bytes.SIZEOF_INT) + Bytes.SIZEOF_BOOLEAN +
-      ClassSize.align(ClassSize.ARRAY));
+      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 +
       ClassSize.OBJECT + ClassSize.REENTRANT_LOCK +



Mime
View raw message