Repository: hbase Updated Branches: refs/heads/branch-1 78c64c360 -> aca4eb8d5
HBASE-9899 for idempotent operation dups, return the result instead of throwing conflict exception (addendum for branch-1) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/aca4eb8d Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/aca4eb8d Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/aca4eb8d Branch: refs/heads/branch-1 Commit: aca4eb8d5cfaf92dcdca6de96ac5897edc405c9d Parents: 78c64c3 Author: Guanghao Zhang <[email protected]> Authored: Mon Apr 24 11:14:45 2017 +0800 Committer: Guanghao Zhang <[email protected]> Committed: Thu Apr 27 17:08:21 2017 +0800 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/hbase/regionserver/HRegion.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/aca4eb8d/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java index d16af6d..1fbb9b2 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java @@ -2761,7 +2761,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi } return new ReversedRegionScannerImpl(scan, additionalScanners, this); } - return new RegionScannerImpl(scan, additionalScanners, this); + return new RegionScannerImpl(scan, additionalScanners, this, nonceGroup, nonce); } @Override
