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 f4d4348..a1ff0b0 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 @@ -5019,18 +5019,18 @@ public class HRegion implements HeapSize { // , Writable{ return results; } - public ClientProtos.RegionLoadStats mutateRow(RowMutations rm) throws IOException { + public void mutateRow(RowMutations rm) throws IOException { // Don't need nonces here - RowMutations only supports puts and deletes - return mutateRowsWithLocks(rm.getMutations(), Collections.singleton(rm.getRow())); + mutateRowsWithLocks(rm.getMutations(), Collections.singleton(rm.getRow())); } /** * Perform atomic mutations within the region w/o nonces. * See {@link #mutateRowsWithLocks(Collection, Collection, long, long)} */ - public ClientProtos.RegionLoadStats mutateRowsWithLocks(Collection mutations, + public void mutateRowsWithLocks(Collection mutations, Collection rowsToLock) throws IOException { - return mutateRowsWithLocks(mutations, rowsToLock, HConstants.NO_NONCE, HConstants.NO_NONCE); + mutateRowsWithLocks(mutations, rowsToLock, HConstants.NO_NONCE, HConstants.NO_NONCE); } /** @@ -5045,11 +5045,10 @@ public class HRegion implements HeapSize { // , Writable{ * rowsToLock is sorted in order to avoid deadlocks. * @throws IOException */ - public ClientProtos.RegionLoadStats mutateRowsWithLocks(Collection mutations, + public void mutateRowsWithLocks(Collection mutations, Collection rowsToLock, long nonceGroup, long nonce) throws IOException { MultiRowMutationProcessor proc = new MultiRowMutationProcessor(mutations, rowsToLock); processRowsWithLocks(proc, -1, nonceGroup, nonce); - return getRegionStats(); } /** diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index c04338f..e8e8c1b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -4644,7 +4644,8 @@ public class HRegionServer implements ClientProtos.ClientService.BlockingInterfa throw new DoNotRetryIOException("Atomic put and/or delete only, not " + type.name()); } } - return region.mutateRow(rm); + region.mutateRow(rm); + return region.getRegionStats(); } /**