From 655050de84752475510e8a0e40047e07fcc21813 Mon Sep 17 00:00:00 2001 From: Jonathan Lawlor Date: Thu, 26 Mar 2015 15:54:38 -0700 Subject: [PATCH] HBASE-13303 --- .../src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java | 2 +- .../main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 3b1f267..fe14f74 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 @@ -5655,7 +5655,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver { // long size = 0; for (Cell c : results) { - size += CellUtil.estimatedHeapSizeOf(c); + size += CellUtil.estimatedHeapSizeOfWithoutTags(c); } return size; 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."); -- 1.9.3 (Apple Git-50)