[1/3] hbase git commit: HBASE-18183 Region interface cleanup for CP expose.

2017-10-11 Thread anoopsamjohn 
Repository: hbase
Updated Branches:
  refs/heads/branch-2 2e368cf46 -> b212bf936


http://git-wip-us.apache.org/repos/asf/hbase/blob/b212bf93/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java
index f777067..ca5a83b 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java
@@ -123,7 +123,6 @@ import 
org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.ScanReques
 import 
org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.ScanResponse;
 import 
org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.GetSpaceQuotaSnapshotsRequest;
 import 
org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.GetSpaceQuotaSnapshotsResponse;
-import 
org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode;
 
 /**
  * A mock RegionServer implementation.
@@ -264,12 +263,12 @@ ClientProtos.ClientService.BlockingInterface, 
RegionServerServices {
   }
 
   @Override
-  public void addRegion(Region r) {
+  public void addRegion(HRegion r) {
 // TODO Auto-generated method stub
   }
 
   @Override
-  public boolean removeRegion(Region r, ServerName destination) {
+  public boolean removeRegion(HRegion r, ServerName destination) {
 // TODO Auto-generated method stub
 return false;
   }
@@ -333,11 +332,6 @@ ClientProtos.ClientService.BlockingInterface, 
RegionServerServices {
   }
 
   @Override
-  public void postOpenDeployTasks(Region r) throws KeeperException, 
IOException {
-// TODO Auto-generated method stub
-  }
-
-  @Override
   public void postOpenDeployTasks(PostOpenDeployContext context) throws 
KeeperException,
   IOException {
 // TODO Auto-generated method stub
@@ -592,7 +586,7 @@ ClientProtos.ClientService.BlockingInterface, 
RegionServerServices {
   }
 
   @Override
-  public Map getRecoveringRegions() {
+  public Map getRecoveringRegions() {
 // TODO Auto-generated method stub
 return null;
   }
@@ -609,17 +603,6 @@ ClientProtos.ClientService.BlockingInterface, 
RegionServerServices {
   }
 
   @Override
-  public boolean reportRegionStateTransition(TransitionCode code, 
RegionInfo... hris) {
-return false;
-  }
-
-  @Override
-  public boolean reportRegionStateTransition(TransitionCode code, long 
openSeqNum,
-  RegionInfo... hris) {
-return false;
-  }
-
-  @Override
   public boolean reportRegionStateTransition(RegionStateTransitionContext 
context) {
 return false;
   }

http://git-wip-us.apache.org/repos/asf/hbase/blob/b212bf93/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java
index c1eaef7..7220ff2 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java
@@ -34,7 +34,6 @@ import org.apache.hadoop.hbase.ServerName;
 import org.apache.hadoop.hbase.master.RegionState.State;
 import org.apache.hadoop.hbase.regionserver.HRegion;
 import org.apache.hadoop.hbase.regionserver.HRegionServer;
-import org.apache.hadoop.hbase.regionserver.Region;
 import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
 import org.apache.hadoop.hbase.testclassification.FlakeyTests;
 import org.apache.hadoop.hbase.testclassification.LargeTests;
@@ -225,9 +224,9 @@ public class TestMasterFailover {
 // region server should expire (how it can be verified?)
 MetaTableLocator.setMetaLocation(activeMaster.getZooKeeper(),
   rs.getServerName(), State.OPENING);
-Region meta = 
rs.getRegion(HRegionInfo.FIRST_META_REGIONINFO.getEncodedName());
+HRegion meta = 
rs.getRegion(HRegionInfo.FIRST_META_REGIONINFO.getEncodedName());
 rs.removeRegion(meta, null);
-((HRegion)meta).close();
+meta.close();
 
 log("Aborting master");
 activeMaster.abort("test-kill");

http://git-wip-us.apache.org/repos/asf/hbase/blob/b212bf93/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java
index c0464a4..5dc55f2 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java
+++ 
b/

[1/3] hbase git commit: HBASE-18183 Region interface cleanup for CP expose.

2017-10-11 Thread anoopsamjohn 
Repository: hbase
Updated Branches:
  refs/heads/master 690ff38f5 -> b4ed13008


http://git-wip-us.apache.org/repos/asf/hbase/blob/b4ed1300/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java
index f777067..ca5a83b 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java
@@ -123,7 +123,6 @@ import 
org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.ScanReques
 import 
org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.ScanResponse;
 import 
org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.GetSpaceQuotaSnapshotsRequest;
 import 
org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.GetSpaceQuotaSnapshotsResponse;
-import 
org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode;
 
 /**
  * A mock RegionServer implementation.
@@ -264,12 +263,12 @@ ClientProtos.ClientService.BlockingInterface, 
RegionServerServices {
   }
 
   @Override
-  public void addRegion(Region r) {
+  public void addRegion(HRegion r) {
 // TODO Auto-generated method stub
   }
 
   @Override
-  public boolean removeRegion(Region r, ServerName destination) {
+  public boolean removeRegion(HRegion r, ServerName destination) {
 // TODO Auto-generated method stub
 return false;
   }
@@ -333,11 +332,6 @@ ClientProtos.ClientService.BlockingInterface, 
RegionServerServices {
   }
 
   @Override
-  public void postOpenDeployTasks(Region r) throws KeeperException, 
IOException {
-// TODO Auto-generated method stub
-  }
-
-  @Override
   public void postOpenDeployTasks(PostOpenDeployContext context) throws 
KeeperException,
   IOException {
 // TODO Auto-generated method stub
@@ -592,7 +586,7 @@ ClientProtos.ClientService.BlockingInterface, 
RegionServerServices {
   }
 
   @Override
-  public Map getRecoveringRegions() {
+  public Map getRecoveringRegions() {
 // TODO Auto-generated method stub
 return null;
   }
@@ -609,17 +603,6 @@ ClientProtos.ClientService.BlockingInterface, 
RegionServerServices {
   }
 
   @Override
-  public boolean reportRegionStateTransition(TransitionCode code, 
RegionInfo... hris) {
-return false;
-  }
-
-  @Override
-  public boolean reportRegionStateTransition(TransitionCode code, long 
openSeqNum,
-  RegionInfo... hris) {
-return false;
-  }
-
-  @Override
   public boolean reportRegionStateTransition(RegionStateTransitionContext 
context) {
 return false;
   }

http://git-wip-us.apache.org/repos/asf/hbase/blob/b4ed1300/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java
index c1eaef7..7220ff2 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java
@@ -34,7 +34,6 @@ import org.apache.hadoop.hbase.ServerName;
 import org.apache.hadoop.hbase.master.RegionState.State;
 import org.apache.hadoop.hbase.regionserver.HRegion;
 import org.apache.hadoop.hbase.regionserver.HRegionServer;
-import org.apache.hadoop.hbase.regionserver.Region;
 import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
 import org.apache.hadoop.hbase.testclassification.FlakeyTests;
 import org.apache.hadoop.hbase.testclassification.LargeTests;
@@ -225,9 +224,9 @@ public class TestMasterFailover {
 // region server should expire (how it can be verified?)
 MetaTableLocator.setMetaLocation(activeMaster.getZooKeeper(),
   rs.getServerName(), State.OPENING);
-Region meta = 
rs.getRegion(HRegionInfo.FIRST_META_REGIONINFO.getEncodedName());
+HRegion meta = 
rs.getRegion(HRegionInfo.FIRST_META_REGIONINFO.getEncodedName());
 rs.removeRegion(meta, null);
-((HRegion)meta).close();
+meta.close();
 
 log("Aborting master");
 activeMaster.abort("test-kill");

http://git-wip-us.apache.org/repos/asf/hbase/blob/b4ed1300/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java
index c0464a4..5dc55f2 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java
+++ 
b/hb