You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2017/07/31 06:17:55 UTC
[5/9] hbase git commit: HBASE-18465: [AMv2] remove old split region
code that is no longer needed
HBASE-18465: [AMv2] remove old split region code that is no longer needed
Signed-off-by: Michael Stack <st...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/00c1b566
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/00c1b566
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/00c1b566
Branch: refs/heads/HBASE-18426
Commit: 00c1b566658aa2fecde4ce2dbde2464f5771430e
Parents: 0e9390b
Author: Yi Liang <yl...@us.ibm.com>
Authored: Fri Jul 28 14:57:44 2017 -0700
Committer: Michael Stack <st...@apache.org>
Committed: Sun Jul 30 15:24:58 2017 -0500
----------------------------------------------------------------------
.../hadoop/hbase/client/RawAsyncHBaseAdmin.java | 2 -
.../hbase/shaded/protobuf/ProtobufUtil.java | 50 -
.../shaded/protobuf/generated/AdminProtos.java | 1558 +++---------------
.../src/main/protobuf/Admin.proto | 18 -
.../AnnotationReadingPriorityFunction.java | 2 -
.../hbase/regionserver/RSRpcServices.java | 39 -
.../TestLoadIncrementalHFilesSplitRecovery.java | 4 +-
.../hadoop/hbase/master/MockRegionServer.java | 8 -
.../regionserver/TestReplicator.java | 6 -
9 files changed, 196 insertions(+), 1491 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/00c1b566/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.java
index 0cef556..ca4a80e 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.java
@@ -107,8 +107,6 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetRegionLo
import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetRegionLoadResponse;
import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.RollWALWriterRequest;
import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.RollWALWriterResponse;
-import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionRequest;
-import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionResponse;
import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.StopServerRequest;
import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.StopServerResponse;
import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.UpdateConfigurationRequest;
http://git-wip-us.apache.org/repos/asf/hbase/blob/00c1b566/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java
index 91b7d3f..2311e23 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java
@@ -129,7 +129,6 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetStoreFil
import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetStoreFileResponse;
import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.OpenRegionRequest;
import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.ServerInfo;
-import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionRequest;
import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.WarmupRegionRequest;
import org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos;
import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos;
@@ -2003,26 +2002,6 @@ public final class ProtobufUtil {
}
}
- /**
- * A helper to split a region using admin protocol.
- *
- * @param admin
- * @param hri
- * @param splitPoint
- * @throws IOException
- */
- public static void split(final RpcController controller,
- final AdminService.BlockingInterface admin, final HRegionInfo hri, byte[] splitPoint)
- throws IOException {
- SplitRegionRequest request =
- ProtobufUtil.buildSplitRegionRequest(hri.getRegionName(), splitPoint);
- try {
- admin.splitRegion(controller, request);
- } catch (ServiceException se) {
- throw ProtobufUtil.getRemoteException(se);
- }
- }
-
// End helpers for Admin
/*
@@ -3312,35 +3291,6 @@ public final class ProtobufUtil {
return builder.build();
}
- /**
- * Create a SplitRegionRequest for a given region name
- * @param regionName the name of the region to split
- * @param splitPoint the split point
- * @return a SplitRegionRequest
- * @deprecated Use {@link #buildSplitRegionRequest(byte[], Optional)} instead.
- */
- @Deprecated
- public static SplitRegionRequest buildSplitRegionRequest(final byte[] regionName,
- final byte[] splitPoint) {
- return buildSplitRegionRequest(regionName, Optional.ofNullable(splitPoint));
- }
-
- /**
- * Create a SplitRegionRequest for a given region name
- * @param regionName the name of the region to split
- * @param splitPoint the split point
- * @return a SplitRegionRequest
- */
- public static SplitRegionRequest buildSplitRegionRequest(byte[] regionName,
- Optional<byte[]> splitPoint) {
- SplitRegionRequest.Builder builder = SplitRegionRequest.newBuilder();
- RegionSpecifier region =
- RequestConverter.buildRegionSpecifier(RegionSpecifierType.REGION_NAME, regionName);
- builder.setRegion(region);
- splitPoint.ifPresent(sp -> builder.setSplitPoint(UnsafeByteOperations.unsafeWrap(sp)));
- return builder.build();
- }
-
public static ProcedureDescription buildProcedureDescription(String signature, String instance,
Map<String, String> props) {
ProcedureDescription.Builder builder =