From dc82f5d093ea4f64d212a65141e70e86fe523439 Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Tue, 21 Jul 2009 06:43:57 +0000 Subject: [PATCH] HBASE-1677 TestHeapSize failing for me on latest trunk git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@796161 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/hadoop/hbase/migration/package-info.java | 2 +- src/java/org/apache/hadoop/hbase/regionserver/HRegion.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/java/org/apache/hadoop/hbase/migration/package-info.java b/src/java/org/apache/hadoop/hbase/migration/package-info.java index abd70f001bb..8830496d2c3 100644 --- a/src/java/org/apache/hadoop/hbase/migration/package-info.java +++ b/src/java/org/apache/hadoop/hbase/migration/package-info.java @@ -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; diff --git a/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java index 47e0d3a5192..fb529a9bc31 100644 --- a/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java +++ b/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java @@ -2313,7 +2313,7 @@ public class HRegion implements HConstants, HeapSize { // , Writable{ 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) +