Repository: hbase Updated Branches: refs/heads/branch-1.1 8c858c214 -> aa0e492f8
HBASE-15153 Apply checkFamilies addendum on increment to 1.1 and 1.0 Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/aa0e492f Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/aa0e492f Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/aa0e492f Branch: refs/heads/branch-1.1 Commit: aa0e492f8f42c1ef53a7966f447d58027c105481 Parents: 8c858c2 Author: stack <[email protected]> Authored: Fri Jan 22 09:44:39 2016 -0800 Committer: stack <[email protected]> Committed: Fri Jan 22 09:44:39 2016 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/hbase/regionserver/HRegion.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/aa0e492f/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 b40927c..86d9b3c 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 @@ -7106,6 +7106,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi checkReadOnly(); checkResources(); checkRow(increment.getRow(), "increment"); + checkFamilies(increment.getFamilyCellMap().keySet()); startRegionOperation(Operation.INCREMENT); this.writeRequestsCount.increment(); try { @@ -7120,7 +7121,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi // wait on mvcc to complete before returning to the client. We also reorder the write so that // the update of memstore happens AFTER sync returns; i.e. the write pipeline does less // zigzagging now. - // + // // See the comment on INCREMENT_FAST_BUT_NARROW_CONSISTENCY_KEY // for the constraints that apply when you take this code path; it is correct but only if // Increments are used mutating an Increment Cell; mixing concurrent Put+Delete and Increment
