You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2015/02/10 03:06:39 UTC
[3/4] hbase git commit: HBASE-12973 RegionCoprocessorEnvironment
should provide HRegionInfo directly
HBASE-12973 RegionCoprocessorEnvironment should provide HRegionInfo directly
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e06c0d00
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e06c0d00
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e06c0d00
Branch: refs/heads/branch-1
Commit: e06c0d006c8affd0427ee08322588a7c99c5abaf
Parents: 93bfa26
Author: Andrew Purtell <ap...@apache.org>
Authored: Mon Feb 9 17:58:16 2015 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Mon Feb 9 17:58:16 2015 -0800
----------------------------------------------------------------------
.../hbase/coprocessor/RegionCoprocessorEnvironment.java | 7 +++++--
.../hadoop/hbase/regionserver/RegionCoprocessorHost.java | 5 +++++
.../hadoop/hbase/security/token/TestTokenAuthentication.java | 8 +++++++-
3 files changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/e06c0d00/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/RegionCoprocessorEnvironment.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/RegionCoprocessorEnvironment.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/RegionCoprocessorEnvironment.java
index db6312f..ccb16bf 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/RegionCoprocessorEnvironment.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/RegionCoprocessorEnvironment.java
@@ -25,6 +25,7 @@ import org.apache.hadoop.hbase.classification.InterfaceAudience;
import org.apache.hadoop.hbase.classification.InterfaceStability;
import org.apache.hadoop.hbase.CoprocessorEnvironment;
import org.apache.hadoop.hbase.HBaseInterfaceAudience;
+import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.regionserver.RegionServerServices;
@@ -34,10 +35,12 @@ public interface RegionCoprocessorEnvironment extends CoprocessorEnvironment {
/** @return the region associated with this coprocessor */
HRegion getRegion();
+ /** @return region information for the region this coprocessor is running on */
+ HRegionInfo getRegionInfo();
+
/** @return reference to the region server services */
RegionServerServices getRegionServerServices();
/** @return shared data between all instances of this coprocessor */
- ConcurrentMap<String, Object> getSharedData();
-
+ ConcurrentMap<String, Object> getSharedData();
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/e06c0d00/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java
index fcb6fe2..d5235fb 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java
@@ -169,6 +169,11 @@ public class RegionCoprocessorHost
return latencies;
}
+ @Override
+ public HRegionInfo getRegionInfo() {
+ return region.getRegionInfo();
+ }
+
}
static class TableCoprocessorAttribute {
http://git-wip-us.apache.org/repos/asf/hbase/blob/e06c0d00/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java
index 9611c5d..305a06b 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java
@@ -41,7 +41,7 @@ import org.apache.hadoop.hbase.CoordinatedStateManager;
import org.apache.hadoop.hbase.Coprocessor;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.testclassification.MediumTests;
+import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.Server;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.TableName;
@@ -64,6 +64,7 @@ import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.regionserver.RegionServerServices;
import org.apache.hadoop.hbase.security.SecurityInfo;
import org.apache.hadoop.hbase.security.User;
+import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
import org.apache.hadoop.hbase.util.Sleeper;
@@ -244,6 +245,11 @@ public class TestTokenAuthentication {
public ClassLoader getClassLoader() {
return Thread.currentThread().getContextClassLoader();
}
+
+ @Override
+ public HRegionInfo getRegionInfo() {
+ return null;
+ }
});
started = true;