Reidddddd commented on a change in pull request #3066:
URL: https://github.com/apache/hbase/pull/3066#discussion_r597392209
##########
File path:
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
##########
@@ -2958,22 +2959,22 @@ private void scan(HBaseRpcController controller,
ScanRequest request, RegionScan
// Collect values to be returned here
moreRows = scanner.nextRaw(values, scannerContext);
+ numOfNextRawCalls++;
if (!values.isEmpty()) {
if (limitOfRows > 0) {
// First we need to check if the last result is partial and we
have a row change. If
// so then we need to increase the numOfCompleteRows.
if (results.isEmpty()) {
- if (rsh.rowOfLastPartialResult != null &&
- !CellUtil.matchingRow(values.get(0),
rsh.rowOfLastPartialResult)) {
+ if (rsh.rowOfLastPartialResult != null &&
!CellUtil.matchingRow(values.get(0), rsh.rowOfLastPartialResult)) {
numOfCompleteRows++;
checkLimitOfRows(numOfCompleteRows, limitOfRows, moreRows,
scannerContext,
builder);
}
} else {
Result lastResult = results.get(results.size() - 1);
- if (lastResult.mayHaveMoreCellsInRow() &&
- !CellUtil.matchingRow(values.get(0), lastResult.getRow()))
{
+ if (lastResult.mayHaveMoreCellsInRow() && !CellUtil
+ .matchingRow(values.get(0), lastResult.getRow())) {
Review comment:
Ditto
##########
File path:
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
##########
@@ -3015,8 +3016,7 @@ private void scan(HBaseRpcController controller,
ScanRequest request, RegionScan
if (limitReached || !moreRows) {
if (LOG.isTraceEnabled()) {
- LOG.trace("Done scanning. limitReached: " + limitReached + "
moreRows: " + moreRows
- + " scannerContext: " + scannerContext);
+ LOG.trace("Done scanning. limitReached: " + limitReached + "
moreRows: " + moreRows + " scannerContext: " + scannerContext);
Review comment:
Ditto
##########
File path:
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
##########
@@ -3053,21 +3053,22 @@ private void scan(HBaseRpcController controller,
ScanRequest request, RegionScan
builder.setScanMetrics(metricBuilder.build());
}
}
+ } finally {
+ region.closeRegionOperation();
+ // Update serverside metrics, even on error.
long end = EnvironmentEdgeManager.currentTime();
long responseCellSize = context != null ? context.getResponseCellSize()
: 0;
region.getMetrics().updateScanTime(end - before);
if (regionServer.metricsRegionServer != null) {
- regionServer.metricsRegionServer.updateScanSize(
- region.getTableDesc().getTableName(), responseCellSize);
- regionServer.metricsRegionServer.updateScanTime(
- region.getTableDesc().getTableName(), end - before);
+
regionServer.metricsRegionServer.updateScanSize(region.getTableDesc().getTableName(),
responseCellSize);
Review comment:
Ditto
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
