Author: jgray
Date: Tue Jul 21 06:43:57 2009
New Revision: 796161
URL: http://svn.apache.org/viewvc?rev=796161&view=rev
Log:
HBASE-1677 TestHeapSize failing for me on latest trunk
Modified:
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/package-info.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java
Modified:
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/package-info.java
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/package-info.java?rev=796161&r1=796160&r2=796161&view=diff
==============================================================================
---
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/package-info.java
(original)
+++
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/package-info.java
Tue Jul 21 06:43:57 2009
@@ -21,4 +21,4 @@
Provides classes from old hbase versions used migrating data.
Nineteen package has classes from hbase 0.19.
*/
-package org.apache.hadoop.hbase.migration.nineteen;
+package org.apache.hadoop.hbase.migration;
Modified:
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=796161&r1=796160&r2=796161&view=diff
==============================================================================
---
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java
(original)
+++
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java
Tue Jul 21 06:43:57 2009
@@ -2313,7 +2313,7 @@
public static final long FIXED_OVERHEAD = ClassSize.align(
(3 * Bytes.SIZEOF_LONG) + (2 * Bytes.SIZEOF_INT) + Bytes.SIZEOF_BOOLEAN +
- (21 * ClassSize.REFERENCE) + ClassSize.OBJECT);
+ (20 * ClassSize.REFERENCE) + ClassSize.OBJECT);
public static final long DEEP_OVERHEAD = ClassSize.align(FIXED_OVERHEAD +
ClassSize.OBJECT + (2 * ClassSize.ATOMIC_BOOLEAN) +
