http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5a2158f2/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.PeriodicMemStoreFlusher.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.PeriodicMemStoreFlusher.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.PeriodicMemStoreFlusher.html
index ea14609..bbd45f7 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.PeriodicMemStoreFlusher.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.PeriodicMemStoreFlusher.html
@@ -1244,7 +1244,7 @@
 <span class="sourceLineNo">1236</span>    if (getNumberOfOnlineRegions() &gt; 
2) return false;<a name="line.1236"></a>
 <span class="sourceLineNo">1237</span>    boolean allUserRegionsOffline = 
true;<a name="line.1237"></a>
 <span class="sourceLineNo">1238</span>    for (Map.Entry&lt;String, 
HRegion&gt; e: this.onlineRegions.entrySet()) {<a name="line.1238"></a>
-<span class="sourceLineNo">1239</span>      if 
(!e.getValue().getRegionInfo().isMetaTable()) {<a name="line.1239"></a>
+<span class="sourceLineNo">1239</span>      if 
(!e.getValue().getRegionInfo().isMetaRegion()) {<a name="line.1239"></a>
 <span class="sourceLineNo">1240</span>        allUserRegionsOffline = false;<a 
name="line.1240"></a>
 <span class="sourceLineNo">1241</span>        break;<a name="line.1241"></a>
 <span class="sourceLineNo">1242</span>      }<a name="line.1242"></a>
@@ -2086,7 +2086,7 @@
 <span class="sourceLineNo">2078</span>  public WAL getWAL(RegionInfo 
regionInfo) throws IOException {<a name="line.2078"></a>
 <span class="sourceLineNo">2079</span>    WAL wal;<a name="line.2079"></a>
 <span class="sourceLineNo">2080</span>    // _ROOT_ and hbase:meta regions 
have separate WAL.<a name="line.2080"></a>
-<span class="sourceLineNo">2081</span>    if (regionInfo != null &amp;&amp; 
regionInfo.isMetaTable()<a name="line.2081"></a>
+<span class="sourceLineNo">2081</span>    if (regionInfo != null &amp;&amp; 
regionInfo.isMetaRegion()<a name="line.2081"></a>
 <span class="sourceLineNo">2082</span>        &amp;&amp; 
regionInfo.getReplicaId() == RegionInfo.DEFAULT_REPLICA_ID) {<a 
name="line.2082"></a>
 <span class="sourceLineNo">2083</span>      wal = 
walFactory.getMetaWAL(regionInfo.getEncodedNameAsBytes());<a 
name="line.2083"></a>
 <span class="sourceLineNo">2084</span>    } else if (regionInfo == null) {<a 
name="line.2084"></a>
@@ -2682,7 +2682,7 @@
 <span class="sourceLineNo">2674</span>    try {<a name="line.2674"></a>
 <span class="sourceLineNo">2675</span>      for (Map.Entry&lt;String, 
HRegion&gt; e: this.onlineRegions.entrySet()) {<a name="line.2675"></a>
 <span class="sourceLineNo">2676</span>        HRegion r = e.getValue();<a 
name="line.2676"></a>
-<span class="sourceLineNo">2677</span>        if 
(!r.getRegionInfo().isMetaTable() &amp;&amp; r.isAvailable()) {<a 
name="line.2677"></a>
+<span class="sourceLineNo">2677</span>        if 
(!r.getRegionInfo().isMetaRegion() &amp;&amp; r.isAvailable()) {<a 
name="line.2677"></a>
 <span class="sourceLineNo">2678</span>          // Don't update zk with this 
close transition; pass false.<a name="line.2678"></a>
 <span class="sourceLineNo">2679</span>          
closeRegionIgnoreErrors(r.getRegionInfo(), abort);<a name="line.2679"></a>
 <span class="sourceLineNo">2680</span>        }<a name="line.2680"></a>
@@ -3094,7 +3094,7 @@
 <span class="sourceLineNo">3086</span>  protected boolean closeRegion(String 
encodedName, final boolean abort, final ServerName sn)<a name="line.3086"></a>
 <span class="sourceLineNo">3087</span>      throws NotServingRegionException 
{<a name="line.3087"></a>
 <span class="sourceLineNo">3088</span>    //Check for permissions to close.<a 
name="line.3088"></a>
-<span class="sourceLineNo">3089</span>    Region actualRegion = 
this.getRegion(encodedName);<a name="line.3089"></a>
+<span class="sourceLineNo">3089</span>    HRegion actualRegion = 
this.getRegion(encodedName);<a name="line.3089"></a>
 <span class="sourceLineNo">3090</span>    // Can be null if we're calling 
close on a region that's not online<a name="line.3090"></a>
 <span class="sourceLineNo">3091</span>    if ((actualRegion != null) 
&amp;&amp; (actualRegion.getCoprocessorHost() != null)) {<a 
name="line.3091"></a>
 <span class="sourceLineNo">3092</span>      try {<a name="line.3092"></a>
@@ -3213,7 +3213,7 @@
 <span class="sourceLineNo">3205</span>   * @return HRegion for the passed 
binary &lt;code&gt;regionName&lt;/code&gt; or null if<a name="line.3205"></a>
 <span class="sourceLineNo">3206</span>   *         named region is not member 
of the online regions.<a name="line.3206"></a>
 <span class="sourceLineNo">3207</span>   */<a name="line.3207"></a>
-<span class="sourceLineNo">3208</span>  public Region getOnlineRegion(final 
byte[] regionName) {<a name="line.3208"></a>
+<span class="sourceLineNo">3208</span>  public HRegion getOnlineRegion(final 
byte[] regionName) {<a name="line.3208"></a>
 <span class="sourceLineNo">3209</span>    String encodedRegionName = 
RegionInfo.encodeRegionName(regionName);<a name="line.3209"></a>
 <span class="sourceLineNo">3210</span>    return 
this.onlineRegions.get(encodedRegionName);<a name="line.3210"></a>
 <span class="sourceLineNo">3211</span>  }<a name="line.3211"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5a2158f2/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.html
index ea14609..bbd45f7 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.html
@@ -1244,7 +1244,7 @@
 <span class="sourceLineNo">1236</span>    if (getNumberOfOnlineRegions() &gt; 
2) return false;<a name="line.1236"></a>
 <span class="sourceLineNo">1237</span>    boolean allUserRegionsOffline = 
true;<a name="line.1237"></a>
 <span class="sourceLineNo">1238</span>    for (Map.Entry&lt;String, 
HRegion&gt; e: this.onlineRegions.entrySet()) {<a name="line.1238"></a>
-<span class="sourceLineNo">1239</span>      if 
(!e.getValue().getRegionInfo().isMetaTable()) {<a name="line.1239"></a>
+<span class="sourceLineNo">1239</span>      if 
(!e.getValue().getRegionInfo().isMetaRegion()) {<a name="line.1239"></a>
 <span class="sourceLineNo">1240</span>        allUserRegionsOffline = false;<a 
name="line.1240"></a>
 <span class="sourceLineNo">1241</span>        break;<a name="line.1241"></a>
 <span class="sourceLineNo">1242</span>      }<a name="line.1242"></a>
@@ -2086,7 +2086,7 @@
 <span class="sourceLineNo">2078</span>  public WAL getWAL(RegionInfo 
regionInfo) throws IOException {<a name="line.2078"></a>
 <span class="sourceLineNo">2079</span>    WAL wal;<a name="line.2079"></a>
 <span class="sourceLineNo">2080</span>    // _ROOT_ and hbase:meta regions 
have separate WAL.<a name="line.2080"></a>
-<span class="sourceLineNo">2081</span>    if (regionInfo != null &amp;&amp; 
regionInfo.isMetaTable()<a name="line.2081"></a>
+<span class="sourceLineNo">2081</span>    if (regionInfo != null &amp;&amp; 
regionInfo.isMetaRegion()<a name="line.2081"></a>
 <span class="sourceLineNo">2082</span>        &amp;&amp; 
regionInfo.getReplicaId() == RegionInfo.DEFAULT_REPLICA_ID) {<a 
name="line.2082"></a>
 <span class="sourceLineNo">2083</span>      wal = 
walFactory.getMetaWAL(regionInfo.getEncodedNameAsBytes());<a 
name="line.2083"></a>
 <span class="sourceLineNo">2084</span>    } else if (regionInfo == null) {<a 
name="line.2084"></a>
@@ -2682,7 +2682,7 @@
 <span class="sourceLineNo">2674</span>    try {<a name="line.2674"></a>
 <span class="sourceLineNo">2675</span>      for (Map.Entry&lt;String, 
HRegion&gt; e: this.onlineRegions.entrySet()) {<a name="line.2675"></a>
 <span class="sourceLineNo">2676</span>        HRegion r = e.getValue();<a 
name="line.2676"></a>
-<span class="sourceLineNo">2677</span>        if 
(!r.getRegionInfo().isMetaTable() &amp;&amp; r.isAvailable()) {<a 
name="line.2677"></a>
+<span class="sourceLineNo">2677</span>        if 
(!r.getRegionInfo().isMetaRegion() &amp;&amp; r.isAvailable()) {<a 
name="line.2677"></a>
 <span class="sourceLineNo">2678</span>          // Don't update zk with this 
close transition; pass false.<a name="line.2678"></a>
 <span class="sourceLineNo">2679</span>          
closeRegionIgnoreErrors(r.getRegionInfo(), abort);<a name="line.2679"></a>
 <span class="sourceLineNo">2680</span>        }<a name="line.2680"></a>
@@ -3094,7 +3094,7 @@
 <span class="sourceLineNo">3086</span>  protected boolean closeRegion(String 
encodedName, final boolean abort, final ServerName sn)<a name="line.3086"></a>
 <span class="sourceLineNo">3087</span>      throws NotServingRegionException 
{<a name="line.3087"></a>
 <span class="sourceLineNo">3088</span>    //Check for permissions to close.<a 
name="line.3088"></a>
-<span class="sourceLineNo">3089</span>    Region actualRegion = 
this.getRegion(encodedName);<a name="line.3089"></a>
+<span class="sourceLineNo">3089</span>    HRegion actualRegion = 
this.getRegion(encodedName);<a name="line.3089"></a>
 <span class="sourceLineNo">3090</span>    // Can be null if we're calling 
close on a region that's not online<a name="line.3090"></a>
 <span class="sourceLineNo">3091</span>    if ((actualRegion != null) 
&amp;&amp; (actualRegion.getCoprocessorHost() != null)) {<a 
name="line.3091"></a>
 <span class="sourceLineNo">3092</span>      try {<a name="line.3092"></a>
@@ -3213,7 +3213,7 @@
 <span class="sourceLineNo">3205</span>   * @return HRegion for the passed 
binary &lt;code&gt;regionName&lt;/code&gt; or null if<a name="line.3205"></a>
 <span class="sourceLineNo">3206</span>   *         named region is not member 
of the online regions.<a name="line.3206"></a>
 <span class="sourceLineNo">3207</span>   */<a name="line.3207"></a>
-<span class="sourceLineNo">3208</span>  public Region getOnlineRegion(final 
byte[] regionName) {<a name="line.3208"></a>
+<span class="sourceLineNo">3208</span>  public HRegion getOnlineRegion(final 
byte[] regionName) {<a name="line.3208"></a>
 <span class="sourceLineNo">3209</span>    String encodedRegionName = 
RegionInfo.encodeRegionName(regionName);<a name="line.3209"></a>
 <span class="sourceLineNo">3210</span>    return 
this.onlineRegions.get(encodedRegionName);<a name="line.3210"></a>
 <span class="sourceLineNo">3211</span>  }<a name="line.3211"></a>

Reply via email to