Repository: hbase Updated Branches: refs/heads/branch-1 89bef67d0 -> f13a21696
HBASE-16788 addendum Account for HStore archiveLock in heap size Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f13a2169 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f13a2169 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f13a2169 Branch: refs/heads/branch-1 Commit: f13a21696f2bbd4f572eb35c15282835998d4b34 Parents: 89bef67 Author: Gary Helmling <ga...@apache.org> Authored: Tue Oct 11 10:32:45 2016 -0700 Committer: Gary Helmling <ga...@apache.org> Committed: Tue Oct 11 11:46:12 2016 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/f13a2169/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java index 74f5a1c..7f00b7d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java @@ -2533,7 +2533,7 @@ public class HStore implements Store { } public static final long FIXED_OVERHEAD = - ClassSize.align(ClassSize.OBJECT + (16 * ClassSize.REFERENCE) + (11 * Bytes.SIZEOF_LONG) + ClassSize.align(ClassSize.OBJECT + (17 * ClassSize.REFERENCE) + (11 * Bytes.SIZEOF_LONG) + (5 * Bytes.SIZEOF_INT) + (2 * Bytes.SIZEOF_BOOLEAN)); public static final long DEEP_OVERHEAD = ClassSize.align(FIXED_OVERHEAD