Repository: hbase Updated Branches: refs/heads/branch-1 4bda365ab -> 7da7a77ff refs/heads/master 0a500e5d3 -> 5038fc76c
Amend HBASE-13303 Fix size calculation of results on the region server Signed-off-by: Andrew Purtell <apurt...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5038fc76 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5038fc76 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5038fc76 Branch: refs/heads/master Commit: 5038fc76c950029c78681dff816d7465f6acbb91 Parents: 0a500e5 Author: Jonathan Lawlor <jonathan.law...@cloudera.com> Authored: Thu Mar 26 15:54:38 2015 -0700 Committer: Andrew Purtell <apurt...@apache.org> Committed: Fri Mar 27 22:11:30 2015 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/hbase/regionserver/HRegion.java | 2 +- .../java/org/apache/hadoop/hbase/regionserver/StoreScanner.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/5038fc76/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java index e390d6b..bd25a82 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java @@ -5663,7 +5663,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver { // long size = 0; for (Cell c : results) { - size += CellUtil.estimatedHeapSizeOf(c); + size += CellUtil.estimatedHeapSizeOfWithoutTags(c); } return size; http://git-wip-us.apache.org/repos/asf/hbase/blob/5038fc76/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java index 7ce4e0b..298d5bc 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java @@ -544,7 +544,7 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner outResult.add(cell); count++; totalBytesRead += CellUtil.estimatedSerializedSizeOf(cell); - totalHeapSize += CellUtil.estimatedHeapSizeOf(cell); + totalHeapSize += CellUtil.estimatedHeapSizeOfWithoutTags(cell); if (totalBytesRead > maxRowSize) { throw new RowTooBigException("Max row size allowed: " + maxRowSize + ", but the row is bigger than that.");
