Repository: hbase Updated Branches: refs/heads/0.98 c8812737b -> 273fe4fc8 refs/heads/branch-1 058ac502f -> fb8cc733e refs/heads/master 6dee406bf -> 25e6baee4
HBASE-11667 Comment ClientScanner logic for NSREs. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/25e6baee Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/25e6baee Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/25e6baee Branch: refs/heads/master Commit: 25e6baee424602942afbe40b01ea0b4cff1ea9b1 Parents: 6dee406 Author: Lars Hofhansl <[email protected]> Authored: Wed Aug 6 11:28:11 2014 -0700 Committer: Lars Hofhansl <[email protected]> Committed: Wed Aug 6 11:28:11 2014 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/client/ClientScanner.java | 7 +++++++ 1 file changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/25e6baee/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java index d13f881..64a77f4 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java @@ -415,7 +415,14 @@ public class ClientScanner extends AbstractClientScanner { } // Else, its signal from depths of ScannerCallable that we need to reset the scanner. if (this.lastResult != null) { + // The region has moved. We need to open a brand new scanner at + // the new location. + // Reset the startRow to the row we've seen last so that the new + // scanner starts at the correct row. Otherwise we may see previously + // returned rows again. + // (ScannerCallable by now has "relocated" the correct region) this.scan.setStartRow(this.lastResult.getRow()); + // Skip first row returned. We already let it out on previous // invocation. skipFirst = true;
