You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2017/10/12 03:19:43 UTC
hbase git commit: HBASE-18552 Backport the server side change in
HBASE-18489 to branch-1
Repository: hbase
Updated Branches:
refs/heads/branch-1 3959b39b9 -> ff23e1576
HBASE-18552 Backport the server side change in HBASE-18489 to branch-1
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ff23e157
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ff23e157
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ff23e157
Branch: refs/heads/branch-1
Commit: ff23e15769013050814b9dc674c65a430f24af36
Parents: 3959b39
Author: zhangduo <zh...@apache.org>
Authored: Fri Aug 18 10:19:19 2017 +0800
Committer: zhangduo <zh...@apache.org>
Committed: Thu Oct 12 10:42:21 2017 +0800
----------------------------------------------------------------------
.../apache/hadoop/hbase/regionserver/RSRpcServices.java | 6 +++---
.../hadoop/hbase/regionserver/ScannerContext.java | 12 +++++-------
.../apache/hadoop/hbase/regionserver/StoreScanner.java | 4 ++--
3 files changed, 10 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/ff23e157/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
index d3c8772..266b4f3 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
@@ -2855,9 +2855,9 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
// Heartbeat messages occur when the time limit has been reached.
builder.setHeartbeatMessage(timeLimitReached);
if (timeLimitReached && rsh.needCursor) {
- Cell readingCell = scannerContext.getPeekedCellInHeartbeat();
- if (readingCell != null) {
- builder.setCursor(ProtobufUtil.toCursor(readingCell));
+ Cell cursorCell = scannerContext.getLastPeekedCell();
+ if (cursorCell != null) {
+ builder.setCursor(ProtobufUtil.toCursor(cursorCell));
}
}
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/ff23e157/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ScannerContext.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ScannerContext.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ScannerContext.java
index ee53a95..6831c91 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ScannerContext.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ScannerContext.java
@@ -19,8 +19,6 @@ package org.apache.hadoop.hbase.regionserver;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.HBaseInterfaceAudience;
import org.apache.hadoop.hbase.classification.InterfaceAudience;
@@ -97,7 +95,7 @@ public class ScannerContext {
boolean keepProgress;
private static boolean DEFAULT_KEEP_PROGRESS = false;
- private Cell peekedCellInHeartbeat = null;
+ private Cell lastPeekedCell = null;
/**
* Tracks the relevant server side metrics during scans. null when metrics should not be tracked
@@ -324,12 +322,12 @@ public class ScannerContext {
|| checkTimeLimit(checkerScope);
}
- public Cell getPeekedCellInHeartbeat() {
- return peekedCellInHeartbeat;
+ public Cell getLastPeekedCell() {
+ return lastPeekedCell;
}
- public void setPeekedCellInHeartbeat(Cell peekedCellInHeartbeat) {
- this.peekedCellInHeartbeat = peekedCellInHeartbeat;
+ public void setLastPeekedCell(Cell lastPeekedCell) {
+ this.lastPeekedCell = lastPeekedCell;
}
@Override
http://git-wip-us.apache.org/repos/asf/hbase/blob/ff23e157/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
----------------------------------------------------------------------
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 7c34b87..fbdf7b2 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
@@ -46,11 +46,11 @@ import org.apache.hadoop.hbase.filter.Filter;
import org.apache.hadoop.hbase.regionserver.ScannerContext.LimitScope;
import org.apache.hadoop.hbase.regionserver.ScannerContext.NextState;
import org.apache.hadoop.hbase.regionserver.handler.ParallelSeekHandler;
-import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.regionserver.querymatcher.CompactionScanQueryMatcher;
import org.apache.hadoop.hbase.regionserver.querymatcher.LegacyScanQueryMatcher;
import org.apache.hadoop.hbase.regionserver.querymatcher.ScanQueryMatcher;
import org.apache.hadoop.hbase.regionserver.querymatcher.UserScanQueryMatcher;
+import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.CollectionUtils;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
@@ -540,7 +540,6 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner
if ((kvsScanned % cellsPerHeartbeatCheck == 0)) {
scannerContext.updateTimeProgress();
if (scannerContext.checkTimeLimit(LimitScope.BETWEEN_CELLS)) {
- scannerContext.setPeekedCellInHeartbeat(prevCell);
return scannerContext.setScannerState(NextState.TIME_LIMIT_REACHED).hasMoreValues();
}
}
@@ -548,6 +547,7 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner
if (prevCell != cell) ++kvsScanned; // Do object compare - we set prevKV from the same heap.
checkScanOrder(prevCell, cell, comparator);
prevCell = cell;
+ scannerContext.setLastPeekedCell(cell);
topChanged = false;
ScanQueryMatcher.MatchCode qcode = matcher.match(cell);
switch (qcode) {