You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by la...@apache.org on 2016/11/01 19:51:05 UTC
[11/50] hbase git commit: HBASE-15153 Apply checkFamilies addendum on
increment to 1.1 and 1.0
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/ed2dbda5
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ed2dbda5
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ed2dbda5
Branch: refs/heads/branch-1.0
Commit: ed2dbda596480753b3e9eedd025d962c3a2cd968
Parents: 24002e2
Author: stack <st...@apache.org>
Authored: Fri Jan 22 09:44:39 2016 -0800
Committer: stack <st...@apache.org>
Committed: Fri Jan 22 09:45:11 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/ed2dbda5/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 4b8f3b6..0c5dfe7 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
@@ -5836,6 +5836,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver { //
checkReadOnly();
checkResources();
checkRow(increment.getRow(), "increment");
+ checkFamilies(increment.getFamilyCellMap().keySet());
startRegionOperation(Operation.INCREMENT);
this.writeRequestsCount.increment();
try {
@@ -5850,7 +5851,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver { //
// 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