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

HBASE-14315 Save one call to KeyValueHeap.peek per row.

This commit is contained in:
Lars Hofhansl 2015-08-28 15:05:41 -07:00
parent cc1542828d
commit cf4c0fb71c
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -518,8 +518,8 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner
return scannerContext.setScannerState(NextState.NO_MORE_VALUES).hasMoreValues(); return scannerContext.setScannerState(NextState.NO_MORE_VALUES).hasMoreValues();
} }
Cell peeked = this.heap.peek(); Cell cell = this.heap.peek();
if (peeked == null) { if (cell == null) {
close(false);// Do all cleanup except heap.close() close(false);// Do all cleanup except heap.close()
return scannerContext.setScannerState(NextState.NO_MORE_VALUES).hasMoreValues(); return scannerContext.setScannerState(NextState.NO_MORE_VALUES).hasMoreValues();
} }
@ -531,16 +531,14 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner
// rows. Else it is possible we are still traversing the same row so we must perform the row // rows. Else it is possible we are still traversing the same row so we must perform the row
// comparison. // comparison.
if (!scannerContext.hasAnyLimit(LimitScope.BETWEEN_CELLS) || matcher.curCell == null || if (!scannerContext.hasAnyLimit(LimitScope.BETWEEN_CELLS) || matcher.curCell == null ||
!CellUtil.matchingRow(peeked, matcher.curCell)) { !CellUtil.matchingRow(cell, matcher.curCell)) {
this.countPerRow = 0; this.countPerRow = 0;
matcher.setToNewRow(peeked); matcher.setToNewRow(cell);
} }
// Clear progress away unless invoker has indicated it should be kept. // Clear progress away unless invoker has indicated it should be kept.
if (!scannerContext.getKeepProgress()) scannerContext.clearProgress(); if (!scannerContext.getKeepProgress()) scannerContext.clearProgress();
Cell cell;
// Only do a sanity-check if store and comparator are available. // Only do a sanity-check if store and comparator are available.
CellComparator comparator = CellComparator comparator =
store != null ? store.getComparator() : null; store != null ? store.getComparator() : null;
@ -548,7 +546,7 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner
int count = 0; int count = 0;
long totalBytesRead = 0; long totalBytesRead = 0;
LOOP: while((cell = this.heap.peek()) != null) { LOOP: do {
// Update and check the time limit based on the configured value of cellsPerTimeoutCheck // Update and check the time limit based on the configured value of cellsPerTimeoutCheck
if ((kvsScanned % cellsPerHeartbeatCheck == 0)) { if ((kvsScanned % cellsPerHeartbeatCheck == 0)) {
scannerContext.updateTimeProgress(); scannerContext.updateTimeProgress();
@ -659,7 +657,7 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner
default: default:
throw new RuntimeException("UNEXPECTED"); throw new RuntimeException("UNEXPECTED");
} }
} } while((cell = this.heap.peek()) != null);
if (count > 0) { if (count > 0) {
return scannerContext.setScannerState(NextState.MORE_VALUES).hasMoreValues(); return scannerContext.setScannerState(NextState.MORE_VALUES).hasMoreValues();