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

HBASE-15496 Throw RowTooBigException only for user scan/get (Guanghao Zhang)

Browse Source
This commit is contained in:
tedyu 2016-03-25 18:18:35 -07:00
parent 11d11d3fcc
commit b865fb9434
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.java
View File

@ -610,6 +610,10 @@ public class ScanQueryMatcher {
} }
} }
boolean isUserScan() {
return this.isUserScan;
}
//Used only for testing purposes //Used only for testing purposes
static MatchCode checkColumn(ColumnTracker columnTracker, byte[] bytes, int offset, static MatchCode checkColumn(ColumnTracker columnTracker, byte[] bytes, int offset,
int length, long ttl, byte type, boolean ignoreCount) throws IOException { int length, long ttl, byte type, boolean ignoreCount) throws IOException {

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

@ -351,7 +351,7 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner
if (!isParallelSeek) { if (!isParallelSeek) {
long totalScannersSoughtBytes = 0; long totalScannersSoughtBytes = 0;
for (KeyValueScanner scanner : scanners) { for (KeyValueScanner scanner : scanners) {
if (totalScannersSoughtBytes >= maxRowSize) { if (matcher.isUserScan() && totalScannersSoughtBytes >= maxRowSize) {
throw new RowTooBigException("Max row size allowed: " + maxRowSize throw new RowTooBigException("Max row size allowed: " + maxRowSize
+ ", but row is bigger than that"); + ", but row is bigger than that");
} }
@ -572,7 +572,7 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner
scannerContext.incrementSizeProgress(CellUtil.estimatedHeapSizeOf(cell)); scannerContext.incrementSizeProgress(CellUtil.estimatedHeapSizeOf(cell));
scannerContext.incrementBatchProgress(1); scannerContext.incrementBatchProgress(1);
if (totalBytesRead > maxRowSize) { if (matcher.isUserScan() && totalBytesRead > maxRowSize) {
throw new RowTooBigException( throw new RowTooBigException(
"Max row size allowed: " + maxRowSize + ", but the row is bigger than that."); "Max row size allowed: " + maxRowSize + ", but the row is bigger than that.");
} }