Repository: hbase Updated Branches: refs/heads/branch-1.3 1b0ebf8d1 -> 091a70acf
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/091a70ac Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/091a70ac Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/091a70ac Branch: refs/heads/branch-1.3 Commit: 091a70acf6ca10aecd88f9d3333a3eeb24c437a7 Parents: 1b0ebf8 Author: Guanghao Zhang <[email protected]> Authored: Mon Apr 24 11:14:45 2017 +0800 Committer: Guanghao Zhang <[email protected]> Committed: Thu Apr 27 17:10:55 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/091a70ac/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 15c906f..11fc181 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 @@ -2666,7 +2666,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
