Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Amend HBASE-13303 Fix size calculation of results on the region server 

Signed-off-by: Andrew Purtell <apurtell@apache.org>
This commit is contained in:
Jonathan Lawlor 2015-03-26 15:54:38 -07:00 committed by Andrew Purtell
parent 0a500e5d30
commit 5038fc76c9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
View File

@ -5663,7 +5663,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver { //
long size = 0; long size = 0;
for (Cell c : results) { for (Cell c : results) {
size += CellUtil.estimatedHeapSizeOf(c); size += CellUtil.estimatedHeapSizeOfWithoutTags(c);
} }
return size; return size;

2
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
View File

@ -544,7 +544,7 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner
outResult.add(cell); outResult.add(cell);
count++; count++;
totalBytesRead += CellUtil.estimatedSerializedSizeOf(cell); totalBytesRead += CellUtil.estimatedSerializedSizeOf(cell);
totalHeapSize += CellUtil.estimatedHeapSizeOf(cell); totalHeapSize += CellUtil.estimatedHeapSizeOfWithoutTags(cell);
if (totalBytesRead > maxRowSize) { if (totalBytesRead > maxRowSize) {
throw new RowTooBigException("Max row size allowed: " + maxRowSize throw new RowTooBigException("Max row size allowed: " + maxRowSize
+ ", but the row is bigger than that."); + ", but the row is bigger than that.");