You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jm...@apache.org on 2015/02/22 21:55:42 UTC
[09/50] [abbrv] hbase git commit: HBASE-12979 Use setters instead of
return values for handing back statistics from HRegion methods
HBASE-12979 Use setters instead of return values for handing back statistics from HRegion methods
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/75148385
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/75148385
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/75148385
Branch: refs/heads/hbase-11339
Commit: 75148385ee5b2065992aea19a810436196576f20
Parents: 2583e8d
Author: Jesse Yates <jy...@apache.org>
Authored: Fri Feb 6 10:42:03 2015 -0800
Committer: Jesse Yates <jy...@apache.org>
Committed: Fri Feb 6 13:24:20 2015 -0800
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/regionserver/HRegion.java | 11 +++++------
.../apache/hadoop/hbase/regionserver/RSRpcServices.java | 3 ++-
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/75148385/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 d4a6ecf..3312df7 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
@@ -5245,18 +5245,18 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver { //
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<Mutation> mutations,
+ public void mutateRowsWithLocks(Collection<Mutation> mutations,
Collection<byte[]> rowsToLock) throws IOException {
- return mutateRowsWithLocks(mutations, rowsToLock, HConstants.NO_NONCE, HConstants.NO_NONCE);
+ mutateRowsWithLocks(mutations, rowsToLock, HConstants.NO_NONCE, HConstants.NO_NONCE);
}
/**
@@ -5271,11 +5271,10 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver { //
* <code>rowsToLock</code> is sorted in order to avoid deadlocks.
* @throws IOException
*/
- public ClientProtos.RegionLoadStats mutateRowsWithLocks(Collection<Mutation> mutations,
+ public void mutateRowsWithLocks(Collection<Mutation> mutations,
Collection<byte[]> rowsToLock, long nonceGroup, long nonce) throws IOException {
MultiRowMutationProcessor proc = new MultiRowMutationProcessor(mutations, rowsToLock);
processRowsWithLocks(proc, -1, nonceGroup, nonce);
- return getRegionStats();
}
/**
http://git-wip-us.apache.org/repos/asf/hbase/blob/75148385/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
index 3bdb528..68530d3 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
@@ -382,7 +382,8 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
throw new DoNotRetryIOException("Atomic put and/or delete only, not " + type.name());
}
}
- return region.mutateRow(rm);
+ region.mutateRow(rm);
+ return region.getRegionStats();
}
/**