http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ce958bce/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.html
----------------------------------------------------------------------
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.html 
b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.html
index d649da0..3150448 100644
--- 
a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.html
+++ 
b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.html
@@ -169,158 +169,160 @@
 <span class="sourceLineNo">161</span>   *<a name="line.161"></a>
 <span class="sourceLineNo">162</span>   */<a name="line.162"></a>
 <span class="sourceLineNo">163</span>  public void close() {<a 
name="line.163"></a>
-<span class="sourceLineNo">164</span>    this.scanner.close();<a 
name="line.164"></a>
-<span class="sourceLineNo">165</span>    try {<a name="line.165"></a>
-<span class="sourceLineNo">166</span>      this.htable.close();<a 
name="line.166"></a>
-<span class="sourceLineNo">167</span>    } catch (IOException ioe) {<a 
name="line.167"></a>
-<span class="sourceLineNo">168</span>      LOG.warn("Error closing table", 
ioe);<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    }<a name="line.169"></a>
-<span class="sourceLineNo">170</span>  }<a name="line.170"></a>
-<span class="sourceLineNo">171</span><a name="line.171"></a>
-<span class="sourceLineNo">172</span>  /**<a name="line.172"></a>
-<span class="sourceLineNo">173</span>   * Returns the current key.<a 
name="line.173"></a>
-<span class="sourceLineNo">174</span>   *<a name="line.174"></a>
-<span class="sourceLineNo">175</span>   * @return The current key.<a 
name="line.175"></a>
-<span class="sourceLineNo">176</span>   * @throws IOException<a 
name="line.176"></a>
-<span class="sourceLineNo">177</span>   * @throws InterruptedException When 
the job is aborted.<a name="line.177"></a>
-<span class="sourceLineNo">178</span>   */<a name="line.178"></a>
-<span class="sourceLineNo">179</span>  public ImmutableBytesWritable 
getCurrentKey() throws IOException,<a name="line.179"></a>
-<span class="sourceLineNo">180</span>      InterruptedException {<a 
name="line.180"></a>
-<span class="sourceLineNo">181</span>    return key;<a name="line.181"></a>
-<span class="sourceLineNo">182</span>  }<a name="line.182"></a>
-<span class="sourceLineNo">183</span><a name="line.183"></a>
-<span class="sourceLineNo">184</span>  /**<a name="line.184"></a>
-<span class="sourceLineNo">185</span>   * Returns the current value.<a 
name="line.185"></a>
-<span class="sourceLineNo">186</span>   *<a name="line.186"></a>
-<span class="sourceLineNo">187</span>   * @return The current value.<a 
name="line.187"></a>
-<span class="sourceLineNo">188</span>   * @throws IOException When the value 
is faulty.<a name="line.188"></a>
-<span class="sourceLineNo">189</span>   * @throws InterruptedException When 
the job is aborted.<a name="line.189"></a>
-<span class="sourceLineNo">190</span>   */<a name="line.190"></a>
-<span class="sourceLineNo">191</span>  public Result getCurrentValue() throws 
IOException, InterruptedException {<a name="line.191"></a>
-<span class="sourceLineNo">192</span>    return value;<a name="line.192"></a>
-<span class="sourceLineNo">193</span>  }<a name="line.193"></a>
-<span class="sourceLineNo">194</span><a name="line.194"></a>
-<span class="sourceLineNo">195</span><a name="line.195"></a>
-<span class="sourceLineNo">196</span>  /**<a name="line.196"></a>
-<span class="sourceLineNo">197</span>   * Positions the record reader to the 
next record.<a name="line.197"></a>
-<span class="sourceLineNo">198</span>   *<a name="line.198"></a>
-<span class="sourceLineNo">199</span>   * @return 
&lt;code&gt;true&lt;/code&gt; if there was another record.<a 
name="line.199"></a>
-<span class="sourceLineNo">200</span>   * @throws IOException When reading the 
record failed.<a name="line.200"></a>
-<span class="sourceLineNo">201</span>   * @throws InterruptedException When 
the job was aborted.<a name="line.201"></a>
-<span class="sourceLineNo">202</span>   */<a name="line.202"></a>
-<span class="sourceLineNo">203</span>  public boolean nextKeyValue() throws 
IOException, InterruptedException {<a name="line.203"></a>
-<span class="sourceLineNo">204</span>    if (key == null) key = new 
ImmutableBytesWritable();<a name="line.204"></a>
-<span class="sourceLineNo">205</span>    if (value == null) value = new 
Result();<a name="line.205"></a>
-<span class="sourceLineNo">206</span>    try {<a name="line.206"></a>
-<span class="sourceLineNo">207</span>      try {<a name="line.207"></a>
-<span class="sourceLineNo">208</span>        value = this.scanner.next();<a 
name="line.208"></a>
-<span class="sourceLineNo">209</span>        if (value != null &amp;&amp; 
value.isStale()) numStale++;<a name="line.209"></a>
-<span class="sourceLineNo">210</span>        if (logScannerActivity) {<a 
name="line.210"></a>
-<span class="sourceLineNo">211</span>          rowcount ++;<a 
name="line.211"></a>
-<span class="sourceLineNo">212</span>          if (rowcount &gt;= 
logPerRowCount) {<a name="line.212"></a>
-<span class="sourceLineNo">213</span>            long now = 
System.currentTimeMillis();<a name="line.213"></a>
-<span class="sourceLineNo">214</span>            LOG.info("Mapper took " + 
(now-timestamp)<a name="line.214"></a>
-<span class="sourceLineNo">215</span>              + "ms to process " + 
rowcount + " rows");<a name="line.215"></a>
-<span class="sourceLineNo">216</span>            timestamp = now;<a 
name="line.216"></a>
-<span class="sourceLineNo">217</span>            rowcount = 0;<a 
name="line.217"></a>
-<span class="sourceLineNo">218</span>          }<a name="line.218"></a>
-<span class="sourceLineNo">219</span>        }<a name="line.219"></a>
-<span class="sourceLineNo">220</span>      } catch (IOException e) {<a 
name="line.220"></a>
-<span class="sourceLineNo">221</span>        // do not retry if the exception 
tells us not to do so<a name="line.221"></a>
-<span class="sourceLineNo">222</span>        if (e instanceof 
DoNotRetryIOException) {<a name="line.222"></a>
-<span class="sourceLineNo">223</span>          throw e;<a name="line.223"></a>
-<span class="sourceLineNo">224</span>        }<a name="line.224"></a>
-<span class="sourceLineNo">225</span>        // try to handle all other 
IOExceptions by restarting<a name="line.225"></a>
-<span class="sourceLineNo">226</span>        // the scanner, if the second 
call fails, it will be rethrown<a name="line.226"></a>
-<span class="sourceLineNo">227</span>        LOG.info("recovered from " + 
StringUtils.stringifyException(e));<a name="line.227"></a>
-<span class="sourceLineNo">228</span>        if (lastSuccessfulRow == null) 
{<a name="line.228"></a>
-<span class="sourceLineNo">229</span>          LOG.warn("We are restarting the 
first next() invocation," +<a name="line.229"></a>
-<span class="sourceLineNo">230</span>              " if your mapper has 
restarted a few other times like this" +<a name="line.230"></a>
-<span class="sourceLineNo">231</span>              " then you should consider 
killing this job and investigate" +<a name="line.231"></a>
-<span class="sourceLineNo">232</span>              " why it's taking so 
long.");<a name="line.232"></a>
-<span class="sourceLineNo">233</span>        }<a name="line.233"></a>
-<span class="sourceLineNo">234</span>        if (lastSuccessfulRow == null) 
{<a name="line.234"></a>
-<span class="sourceLineNo">235</span>          restart(scan.getStartRow());<a 
name="line.235"></a>
-<span class="sourceLineNo">236</span>        } else {<a name="line.236"></a>
-<span class="sourceLineNo">237</span>          restart(lastSuccessfulRow);<a 
name="line.237"></a>
-<span class="sourceLineNo">238</span>          scanner.next();    // skip 
presumed already mapped row<a name="line.238"></a>
-<span class="sourceLineNo">239</span>        }<a name="line.239"></a>
-<span class="sourceLineNo">240</span>        value = scanner.next();<a 
name="line.240"></a>
-<span class="sourceLineNo">241</span>        if (value != null &amp;&amp; 
value.isStale()) numStale++;<a name="line.241"></a>
-<span class="sourceLineNo">242</span>        numRestarts++;<a 
name="line.242"></a>
-<span class="sourceLineNo">243</span>      }<a name="line.243"></a>
-<span class="sourceLineNo">244</span>      if (value != null &amp;&amp; 
value.size() &gt; 0) {<a name="line.244"></a>
-<span class="sourceLineNo">245</span>        key.set(value.getRow());<a 
name="line.245"></a>
-<span class="sourceLineNo">246</span>        lastSuccessfulRow = key.get();<a 
name="line.246"></a>
-<span class="sourceLineNo">247</span>        return true;<a 
name="line.247"></a>
-<span class="sourceLineNo">248</span>      }<a name="line.248"></a>
-<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span>      updateCounters();<a 
name="line.250"></a>
-<span class="sourceLineNo">251</span>      return false;<a name="line.251"></a>
-<span class="sourceLineNo">252</span>    } catch (IOException ioe) {<a 
name="line.252"></a>
-<span class="sourceLineNo">253</span>      if (logScannerActivity) {<a 
name="line.253"></a>
-<span class="sourceLineNo">254</span>        long now = 
System.currentTimeMillis();<a name="line.254"></a>
-<span class="sourceLineNo">255</span>        LOG.info("Mapper took " + 
(now-timestamp)<a name="line.255"></a>
-<span class="sourceLineNo">256</span>          + "ms to process " + rowcount + 
" rows");<a name="line.256"></a>
-<span class="sourceLineNo">257</span>        LOG.info(ioe);<a 
name="line.257"></a>
-<span class="sourceLineNo">258</span>        String lastRow = 
lastSuccessfulRow == null ?<a name="line.258"></a>
-<span class="sourceLineNo">259</span>          "null" : 
Bytes.toStringBinary(lastSuccessfulRow);<a name="line.259"></a>
-<span class="sourceLineNo">260</span>        LOG.info("lastSuccessfulRow=" + 
lastRow);<a name="line.260"></a>
-<span class="sourceLineNo">261</span>      }<a name="line.261"></a>
-<span class="sourceLineNo">262</span>      throw ioe;<a name="line.262"></a>
-<span class="sourceLineNo">263</span>    }<a name="line.263"></a>
-<span class="sourceLineNo">264</span>  }<a name="line.264"></a>
-<span class="sourceLineNo">265</span><a name="line.265"></a>
-<span class="sourceLineNo">266</span>  /**<a name="line.266"></a>
-<span class="sourceLineNo">267</span>   * If hbase runs on new version of 
mapreduce, RecordReader has access to<a name="line.267"></a>
-<span class="sourceLineNo">268</span>   * counters thus can update counters 
based on scanMetrics.<a name="line.268"></a>
-<span class="sourceLineNo">269</span>   * If hbase runs on old version of 
mapreduce, it won't be able to get<a name="line.269"></a>
-<span class="sourceLineNo">270</span>   * access to counters and 
TableRecorderReader can't update counter values.<a name="line.270"></a>
-<span class="sourceLineNo">271</span>   * @throws IOException<a 
name="line.271"></a>
-<span class="sourceLineNo">272</span>   */<a name="line.272"></a>
-<span class="sourceLineNo">273</span>  private void updateCounters() throws 
IOException {<a name="line.273"></a>
-<span class="sourceLineNo">274</span>    ScanMetrics scanMetrics = 
currentScan.getScanMetrics();<a name="line.274"></a>
-<span class="sourceLineNo">275</span>    if (scanMetrics == null) {<a 
name="line.275"></a>
-<span class="sourceLineNo">276</span>      return;<a name="line.276"></a>
-<span class="sourceLineNo">277</span>    }<a name="line.277"></a>
-<span class="sourceLineNo">278</span><a name="line.278"></a>
-<span class="sourceLineNo">279</span>    updateCounters(scanMetrics, 
numRestarts, getCounter, context, numStale);<a name="line.279"></a>
-<span class="sourceLineNo">280</span>  }<a name="line.280"></a>
-<span class="sourceLineNo">281</span><a name="line.281"></a>
-<span class="sourceLineNo">282</span>  protected static void 
updateCounters(ScanMetrics scanMetrics, long numScannerRestarts,<a 
name="line.282"></a>
-<span class="sourceLineNo">283</span>      Method getCounter, 
TaskAttemptContext context, long numStale) {<a name="line.283"></a>
-<span class="sourceLineNo">284</span>    // we can get access to counters only 
if hbase uses new mapreduce APIs<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    if (getCounter == null) {<a 
name="line.285"></a>
-<span class="sourceLineNo">286</span>      return;<a name="line.286"></a>
-<span class="sourceLineNo">287</span>    }<a name="line.287"></a>
-<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span>    try {<a name="line.289"></a>
-<span class="sourceLineNo">290</span>      for (Map.Entry&lt;String, Long&gt; 
entry:scanMetrics.getMetricsMap().entrySet()) {<a name="line.290"></a>
-<span class="sourceLineNo">291</span>        Counter ct = 
(Counter)getCounter.invoke(context,<a name="line.291"></a>
-<span class="sourceLineNo">292</span>            HBASE_COUNTER_GROUP_NAME, 
entry.getKey());<a name="line.292"></a>
-<span class="sourceLineNo">293</span><a name="line.293"></a>
-<span class="sourceLineNo">294</span>        ct.increment(entry.getValue());<a 
name="line.294"></a>
-<span class="sourceLineNo">295</span>      }<a name="line.295"></a>
-<span class="sourceLineNo">296</span>      ((Counter) 
getCounter.invoke(context, HBASE_COUNTER_GROUP_NAME,<a name="line.296"></a>
-<span class="sourceLineNo">297</span>          
"NUM_SCANNER_RESTARTS")).increment(numScannerRestarts);<a name="line.297"></a>
+<span class="sourceLineNo">164</span>    if (this.scanner != null) {<a 
name="line.164"></a>
+<span class="sourceLineNo">165</span>      this.scanner.close();<a 
name="line.165"></a>
+<span class="sourceLineNo">166</span>    }<a name="line.166"></a>
+<span class="sourceLineNo">167</span>    try {<a name="line.167"></a>
+<span class="sourceLineNo">168</span>      this.htable.close();<a 
name="line.168"></a>
+<span class="sourceLineNo">169</span>    } catch (IOException ioe) {<a 
name="line.169"></a>
+<span class="sourceLineNo">170</span>      LOG.warn("Error closing table", 
ioe);<a name="line.170"></a>
+<span class="sourceLineNo">171</span>    }<a name="line.171"></a>
+<span class="sourceLineNo">172</span>  }<a name="line.172"></a>
+<span class="sourceLineNo">173</span><a name="line.173"></a>
+<span class="sourceLineNo">174</span>  /**<a name="line.174"></a>
+<span class="sourceLineNo">175</span>   * Returns the current key.<a 
name="line.175"></a>
+<span class="sourceLineNo">176</span>   *<a name="line.176"></a>
+<span class="sourceLineNo">177</span>   * @return The current key.<a 
name="line.177"></a>
+<span class="sourceLineNo">178</span>   * @throws IOException<a 
name="line.178"></a>
+<span class="sourceLineNo">179</span>   * @throws InterruptedException When 
the job is aborted.<a name="line.179"></a>
+<span class="sourceLineNo">180</span>   */<a name="line.180"></a>
+<span class="sourceLineNo">181</span>  public ImmutableBytesWritable 
getCurrentKey() throws IOException,<a name="line.181"></a>
+<span class="sourceLineNo">182</span>      InterruptedException {<a 
name="line.182"></a>
+<span class="sourceLineNo">183</span>    return key;<a name="line.183"></a>
+<span class="sourceLineNo">184</span>  }<a name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span>  /**<a name="line.186"></a>
+<span class="sourceLineNo">187</span>   * Returns the current value.<a 
name="line.187"></a>
+<span class="sourceLineNo">188</span>   *<a name="line.188"></a>
+<span class="sourceLineNo">189</span>   * @return The current value.<a 
name="line.189"></a>
+<span class="sourceLineNo">190</span>   * @throws IOException When the value 
is faulty.<a name="line.190"></a>
+<span class="sourceLineNo">191</span>   * @throws InterruptedException When 
the job is aborted.<a name="line.191"></a>
+<span class="sourceLineNo">192</span>   */<a name="line.192"></a>
+<span class="sourceLineNo">193</span>  public Result getCurrentValue() throws 
IOException, InterruptedException {<a name="line.193"></a>
+<span class="sourceLineNo">194</span>    return value;<a name="line.194"></a>
+<span class="sourceLineNo">195</span>  }<a name="line.195"></a>
+<span class="sourceLineNo">196</span><a name="line.196"></a>
+<span class="sourceLineNo">197</span><a name="line.197"></a>
+<span class="sourceLineNo">198</span>  /**<a name="line.198"></a>
+<span class="sourceLineNo">199</span>   * Positions the record reader to the 
next record.<a name="line.199"></a>
+<span class="sourceLineNo">200</span>   *<a name="line.200"></a>
+<span class="sourceLineNo">201</span>   * @return 
&lt;code&gt;true&lt;/code&gt; if there was another record.<a 
name="line.201"></a>
+<span class="sourceLineNo">202</span>   * @throws IOException When reading the 
record failed.<a name="line.202"></a>
+<span class="sourceLineNo">203</span>   * @throws InterruptedException When 
the job was aborted.<a name="line.203"></a>
+<span class="sourceLineNo">204</span>   */<a name="line.204"></a>
+<span class="sourceLineNo">205</span>  public boolean nextKeyValue() throws 
IOException, InterruptedException {<a name="line.205"></a>
+<span class="sourceLineNo">206</span>    if (key == null) key = new 
ImmutableBytesWritable();<a name="line.206"></a>
+<span class="sourceLineNo">207</span>    if (value == null) value = new 
Result();<a name="line.207"></a>
+<span class="sourceLineNo">208</span>    try {<a name="line.208"></a>
+<span class="sourceLineNo">209</span>      try {<a name="line.209"></a>
+<span class="sourceLineNo">210</span>        value = this.scanner.next();<a 
name="line.210"></a>
+<span class="sourceLineNo">211</span>        if (value != null &amp;&amp; 
value.isStale()) numStale++;<a name="line.211"></a>
+<span class="sourceLineNo">212</span>        if (logScannerActivity) {<a 
name="line.212"></a>
+<span class="sourceLineNo">213</span>          rowcount ++;<a 
name="line.213"></a>
+<span class="sourceLineNo">214</span>          if (rowcount &gt;= 
logPerRowCount) {<a name="line.214"></a>
+<span class="sourceLineNo">215</span>            long now = 
System.currentTimeMillis();<a name="line.215"></a>
+<span class="sourceLineNo">216</span>            LOG.info("Mapper took " + 
(now-timestamp)<a name="line.216"></a>
+<span class="sourceLineNo">217</span>              + "ms to process " + 
rowcount + " rows");<a name="line.217"></a>
+<span class="sourceLineNo">218</span>            timestamp = now;<a 
name="line.218"></a>
+<span class="sourceLineNo">219</span>            rowcount = 0;<a 
name="line.219"></a>
+<span class="sourceLineNo">220</span>          }<a name="line.220"></a>
+<span class="sourceLineNo">221</span>        }<a name="line.221"></a>
+<span class="sourceLineNo">222</span>      } catch (IOException e) {<a 
name="line.222"></a>
+<span class="sourceLineNo">223</span>        // do not retry if the exception 
tells us not to do so<a name="line.223"></a>
+<span class="sourceLineNo">224</span>        if (e instanceof 
DoNotRetryIOException) {<a name="line.224"></a>
+<span class="sourceLineNo">225</span>          throw e;<a name="line.225"></a>
+<span class="sourceLineNo">226</span>        }<a name="line.226"></a>
+<span class="sourceLineNo">227</span>        // try to handle all other 
IOExceptions by restarting<a name="line.227"></a>
+<span class="sourceLineNo">228</span>        // the scanner, if the second 
call fails, it will be rethrown<a name="line.228"></a>
+<span class="sourceLineNo">229</span>        LOG.info("recovered from " + 
StringUtils.stringifyException(e));<a name="line.229"></a>
+<span class="sourceLineNo">230</span>        if (lastSuccessfulRow == null) 
{<a name="line.230"></a>
+<span class="sourceLineNo">231</span>          LOG.warn("We are restarting the 
first next() invocation," +<a name="line.231"></a>
+<span class="sourceLineNo">232</span>              " if your mapper has 
restarted a few other times like this" +<a name="line.232"></a>
+<span class="sourceLineNo">233</span>              " then you should consider 
killing this job and investigate" +<a name="line.233"></a>
+<span class="sourceLineNo">234</span>              " why it's taking so 
long.");<a name="line.234"></a>
+<span class="sourceLineNo">235</span>        }<a name="line.235"></a>
+<span class="sourceLineNo">236</span>        if (lastSuccessfulRow == null) 
{<a name="line.236"></a>
+<span class="sourceLineNo">237</span>          restart(scan.getStartRow());<a 
name="line.237"></a>
+<span class="sourceLineNo">238</span>        } else {<a name="line.238"></a>
+<span class="sourceLineNo">239</span>          restart(lastSuccessfulRow);<a 
name="line.239"></a>
+<span class="sourceLineNo">240</span>          scanner.next();    // skip 
presumed already mapped row<a name="line.240"></a>
+<span class="sourceLineNo">241</span>        }<a name="line.241"></a>
+<span class="sourceLineNo">242</span>        value = scanner.next();<a 
name="line.242"></a>
+<span class="sourceLineNo">243</span>        if (value != null &amp;&amp; 
value.isStale()) numStale++;<a name="line.243"></a>
+<span class="sourceLineNo">244</span>        numRestarts++;<a 
name="line.244"></a>
+<span class="sourceLineNo">245</span>      }<a name="line.245"></a>
+<span class="sourceLineNo">246</span>      if (value != null &amp;&amp; 
value.size() &gt; 0) {<a name="line.246"></a>
+<span class="sourceLineNo">247</span>        key.set(value.getRow());<a 
name="line.247"></a>
+<span class="sourceLineNo">248</span>        lastSuccessfulRow = key.get();<a 
name="line.248"></a>
+<span class="sourceLineNo">249</span>        return true;<a 
name="line.249"></a>
+<span class="sourceLineNo">250</span>      }<a name="line.250"></a>
+<span class="sourceLineNo">251</span><a name="line.251"></a>
+<span class="sourceLineNo">252</span>      updateCounters();<a 
name="line.252"></a>
+<span class="sourceLineNo">253</span>      return false;<a name="line.253"></a>
+<span class="sourceLineNo">254</span>    } catch (IOException ioe) {<a 
name="line.254"></a>
+<span class="sourceLineNo">255</span>      if (logScannerActivity) {<a 
name="line.255"></a>
+<span class="sourceLineNo">256</span>        long now = 
System.currentTimeMillis();<a name="line.256"></a>
+<span class="sourceLineNo">257</span>        LOG.info("Mapper took " + 
(now-timestamp)<a name="line.257"></a>
+<span class="sourceLineNo">258</span>          + "ms to process " + rowcount + 
" rows");<a name="line.258"></a>
+<span class="sourceLineNo">259</span>        LOG.info(ioe);<a 
name="line.259"></a>
+<span class="sourceLineNo">260</span>        String lastRow = 
lastSuccessfulRow == null ?<a name="line.260"></a>
+<span class="sourceLineNo">261</span>          "null" : 
Bytes.toStringBinary(lastSuccessfulRow);<a name="line.261"></a>
+<span class="sourceLineNo">262</span>        LOG.info("lastSuccessfulRow=" + 
lastRow);<a name="line.262"></a>
+<span class="sourceLineNo">263</span>      }<a name="line.263"></a>
+<span class="sourceLineNo">264</span>      throw ioe;<a name="line.264"></a>
+<span class="sourceLineNo">265</span>    }<a name="line.265"></a>
+<span class="sourceLineNo">266</span>  }<a name="line.266"></a>
+<span class="sourceLineNo">267</span><a name="line.267"></a>
+<span class="sourceLineNo">268</span>  /**<a name="line.268"></a>
+<span class="sourceLineNo">269</span>   * If hbase runs on new version of 
mapreduce, RecordReader has access to<a name="line.269"></a>
+<span class="sourceLineNo">270</span>   * counters thus can update counters 
based on scanMetrics.<a name="line.270"></a>
+<span class="sourceLineNo">271</span>   * If hbase runs on old version of 
mapreduce, it won't be able to get<a name="line.271"></a>
+<span class="sourceLineNo">272</span>   * access to counters and 
TableRecorderReader can't update counter values.<a name="line.272"></a>
+<span class="sourceLineNo">273</span>   * @throws IOException<a 
name="line.273"></a>
+<span class="sourceLineNo">274</span>   */<a name="line.274"></a>
+<span class="sourceLineNo">275</span>  private void updateCounters() throws 
IOException {<a name="line.275"></a>
+<span class="sourceLineNo">276</span>    ScanMetrics scanMetrics = 
currentScan.getScanMetrics();<a name="line.276"></a>
+<span class="sourceLineNo">277</span>    if (scanMetrics == null) {<a 
name="line.277"></a>
+<span class="sourceLineNo">278</span>      return;<a name="line.278"></a>
+<span class="sourceLineNo">279</span>    }<a name="line.279"></a>
+<span class="sourceLineNo">280</span><a name="line.280"></a>
+<span class="sourceLineNo">281</span>    updateCounters(scanMetrics, 
numRestarts, getCounter, context, numStale);<a name="line.281"></a>
+<span class="sourceLineNo">282</span>  }<a name="line.282"></a>
+<span class="sourceLineNo">283</span><a name="line.283"></a>
+<span class="sourceLineNo">284</span>  protected static void 
updateCounters(ScanMetrics scanMetrics, long numScannerRestarts,<a 
name="line.284"></a>
+<span class="sourceLineNo">285</span>      Method getCounter, 
TaskAttemptContext context, long numStale) {<a name="line.285"></a>
+<span class="sourceLineNo">286</span>    // we can get access to counters only 
if hbase uses new mapreduce APIs<a name="line.286"></a>
+<span class="sourceLineNo">287</span>    if (getCounter == null) {<a 
name="line.287"></a>
+<span class="sourceLineNo">288</span>      return;<a name="line.288"></a>
+<span class="sourceLineNo">289</span>    }<a name="line.289"></a>
+<span class="sourceLineNo">290</span><a name="line.290"></a>
+<span class="sourceLineNo">291</span>    try {<a name="line.291"></a>
+<span class="sourceLineNo">292</span>      for (Map.Entry&lt;String, Long&gt; 
entry:scanMetrics.getMetricsMap().entrySet()) {<a name="line.292"></a>
+<span class="sourceLineNo">293</span>        Counter ct = 
(Counter)getCounter.invoke(context,<a name="line.293"></a>
+<span class="sourceLineNo">294</span>            HBASE_COUNTER_GROUP_NAME, 
entry.getKey());<a name="line.294"></a>
+<span class="sourceLineNo">295</span><a name="line.295"></a>
+<span class="sourceLineNo">296</span>        ct.increment(entry.getValue());<a 
name="line.296"></a>
+<span class="sourceLineNo">297</span>      }<a name="line.297"></a>
 <span class="sourceLineNo">298</span>      ((Counter) 
getCounter.invoke(context, HBASE_COUNTER_GROUP_NAME,<a name="line.298"></a>
-<span class="sourceLineNo">299</span>          
"NUM_SCAN_RESULTS_STALE")).increment(numStale);<a name="line.299"></a>
-<span class="sourceLineNo">300</span>    } catch (Exception e) {<a 
name="line.300"></a>
-<span class="sourceLineNo">301</span>      LOG.debug("can't update counter." + 
StringUtils.stringifyException(e));<a name="line.301"></a>
-<span class="sourceLineNo">302</span>    }<a name="line.302"></a>
-<span class="sourceLineNo">303</span>  }<a name="line.303"></a>
-<span class="sourceLineNo">304</span><a name="line.304"></a>
-<span class="sourceLineNo">305</span>  /**<a name="line.305"></a>
-<span class="sourceLineNo">306</span>   * The current progress of the record 
reader through its data.<a name="line.306"></a>
-<span class="sourceLineNo">307</span>   *<a name="line.307"></a>
-<span class="sourceLineNo">308</span>   * @return A number between 0.0 and 
1.0, the fraction of the data read.<a name="line.308"></a>
-<span class="sourceLineNo">309</span>   */<a name="line.309"></a>
-<span class="sourceLineNo">310</span>  public float getProgress() {<a 
name="line.310"></a>
-<span class="sourceLineNo">311</span>    // Depends on the total number of 
tuples<a name="line.311"></a>
-<span class="sourceLineNo">312</span>    return 0;<a name="line.312"></a>
-<span class="sourceLineNo">313</span>  }<a name="line.313"></a>
-<span class="sourceLineNo">314</span><a name="line.314"></a>
-<span class="sourceLineNo">315</span>}<a name="line.315"></a>
+<span class="sourceLineNo">299</span>          
"NUM_SCANNER_RESTARTS")).increment(numScannerRestarts);<a name="line.299"></a>
+<span class="sourceLineNo">300</span>      ((Counter) 
getCounter.invoke(context, HBASE_COUNTER_GROUP_NAME,<a name="line.300"></a>
+<span class="sourceLineNo">301</span>          
"NUM_SCAN_RESULTS_STALE")).increment(numStale);<a name="line.301"></a>
+<span class="sourceLineNo">302</span>    } catch (Exception e) {<a 
name="line.302"></a>
+<span class="sourceLineNo">303</span>      LOG.debug("can't update counter." + 
StringUtils.stringifyException(e));<a name="line.303"></a>
+<span class="sourceLineNo">304</span>    }<a name="line.304"></a>
+<span class="sourceLineNo">305</span>  }<a name="line.305"></a>
+<span class="sourceLineNo">306</span><a name="line.306"></a>
+<span class="sourceLineNo">307</span>  /**<a name="line.307"></a>
+<span class="sourceLineNo">308</span>   * The current progress of the record 
reader through its data.<a name="line.308"></a>
+<span class="sourceLineNo">309</span>   *<a name="line.309"></a>
+<span class="sourceLineNo">310</span>   * @return A number between 0.0 and 
1.0, the fraction of the data read.<a name="line.310"></a>
+<span class="sourceLineNo">311</span>   */<a name="line.311"></a>
+<span class="sourceLineNo">312</span>  public float getProgress() {<a 
name="line.312"></a>
+<span class="sourceLineNo">313</span>    // Depends on the total number of 
tuples<a name="line.313"></a>
+<span class="sourceLineNo">314</span>    return 0;<a name="line.314"></a>
+<span class="sourceLineNo">315</span>  }<a name="line.315"></a>
+<span class="sourceLineNo">316</span><a name="line.316"></a>
+<span class="sourceLineNo">317</span>}<a name="line.317"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ce958bce/apidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfo.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfo.html 
b/apidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfo.html
index 5807821..96deb2d 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfo.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfo.html
@@ -7,191 +7,187 @@
 <body>
 <div class="sourceContainer">
 <pre><span class="sourceLineNo">001</span>/**<a name="line.1"></a>
-<span class="sourceLineNo">002</span> * Copyright The Apache Software 
Foundation<a name="line.2"></a>
-<span class="sourceLineNo">003</span> *<a name="line.3"></a>
-<span class="sourceLineNo">004</span> * Licensed to the Apache Software 
Foundation (ASF) under one<a name="line.4"></a>
-<span class="sourceLineNo">005</span> * or more contributor license 
agreements.  See the NOTICE file<a name="line.5"></a>
-<span class="sourceLineNo">006</span> * distributed with this work for 
additional information<a name="line.6"></a>
-<span class="sourceLineNo">007</span> * regarding copyright ownership.  The 
ASF licenses this file<a name="line.7"></a>
-<span class="sourceLineNo">008</span> * to you under the Apache License, 
Version 2.0 (the<a name="line.8"></a>
-<span class="sourceLineNo">009</span> * "License"); you may not use this file 
except in compliance<a name="line.9"></a>
-<span class="sourceLineNo">010</span> * with the License.  You may obtain a 
copy of the License at<a name="line.10"></a>
+<span class="sourceLineNo">002</span> * Licensed to the Apache Software 
Foundation (ASF) under one<a name="line.2"></a>
+<span class="sourceLineNo">003</span> * or more contributor license 
agreements.  See the NOTICE file<a name="line.3"></a>
+<span class="sourceLineNo">004</span> * distributed with this work for 
additional information<a name="line.4"></a>
+<span class="sourceLineNo">005</span> * regarding copyright ownership.  The 
ASF licenses this file<a name="line.5"></a>
+<span class="sourceLineNo">006</span> * to you under the Apache License, 
Version 2.0 (the<a name="line.6"></a>
+<span class="sourceLineNo">007</span> * "License"); you may not use this file 
except in compliance<a name="line.7"></a>
+<span class="sourceLineNo">008</span> * with the License.  You may obtain a 
copy of the License at<a name="line.8"></a>
+<span class="sourceLineNo">009</span> *<a name="line.9"></a>
+<span class="sourceLineNo">010</span> *     
http://www.apache.org/licenses/LICENSE-2.0<a name="line.10"></a>
 <span class="sourceLineNo">011</span> *<a name="line.11"></a>
-<span class="sourceLineNo">012</span> *     
http://www.apache.org/licenses/LICENSE-2.0<a name="line.12"></a>
-<span class="sourceLineNo">013</span> *<a name="line.13"></a>
-<span class="sourceLineNo">014</span> * Unless required by applicable law or 
agreed to in writing, software<a name="line.14"></a>
-<span class="sourceLineNo">015</span> * distributed under the License is 
distributed on an "AS IS" BASIS,<a name="line.15"></a>
-<span class="sourceLineNo">016</span> * WITHOUT WARRANTIES OR CONDITIONS OF 
ANY KIND, either express or implied.<a name="line.16"></a>
-<span class="sourceLineNo">017</span> * See the License for the specific 
language governing permissions and<a name="line.17"></a>
-<span class="sourceLineNo">018</span> * limitations under the License.<a 
name="line.18"></a>
-<span class="sourceLineNo">019</span> */<a name="line.19"></a>
+<span class="sourceLineNo">012</span> * Unless required by applicable law or 
agreed to in writing, software<a name="line.12"></a>
+<span class="sourceLineNo">013</span> * distributed under the License is 
distributed on an "AS IS" BASIS,<a name="line.13"></a>
+<span class="sourceLineNo">014</span> * WITHOUT WARRANTIES OR CONDITIONS OF 
ANY KIND, either express or implied.<a name="line.14"></a>
+<span class="sourceLineNo">015</span> * See the License for the specific 
language governing permissions and<a name="line.15"></a>
+<span class="sourceLineNo">016</span> * limitations under the License.<a 
name="line.16"></a>
+<span class="sourceLineNo">017</span> */<a name="line.17"></a>
+<span class="sourceLineNo">018</span><a name="line.18"></a>
+<span class="sourceLineNo">019</span>package 
org.apache.hadoop.hbase.rsgroup;<a name="line.19"></a>
 <span class="sourceLineNo">020</span><a name="line.20"></a>
-<span class="sourceLineNo">021</span>package 
org.apache.hadoop.hbase.rsgroup;<a name="line.21"></a>
-<span class="sourceLineNo">022</span><a name="line.22"></a>
-<span class="sourceLineNo">023</span>import com.google.common.collect.Sets;<a 
name="line.23"></a>
-<span class="sourceLineNo">024</span>import 
com.google.common.net.HostAndPort;<a name="line.24"></a>
+<span class="sourceLineNo">021</span>import java.util.Collection;<a 
name="line.21"></a>
+<span class="sourceLineNo">022</span>import java.util.Set;<a 
name="line.22"></a>
+<span class="sourceLineNo">023</span>import java.util.SortedSet;<a 
name="line.23"></a>
+<span class="sourceLineNo">024</span>import java.util.TreeSet;<a 
name="line.24"></a>
 <span class="sourceLineNo">025</span><a name="line.25"></a>
-<span class="sourceLineNo">026</span>import java.util.Collection;<a 
name="line.26"></a>
-<span class="sourceLineNo">027</span>import java.util.NavigableSet;<a 
name="line.27"></a>
-<span class="sourceLineNo">028</span>import java.util.Set;<a 
name="line.28"></a>
-<span class="sourceLineNo">029</span><a name="line.29"></a>
-<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.classification.InterfaceStability;<a name="line.32"></a>
-<span class="sourceLineNo">033</span><a name="line.33"></a>
-<span class="sourceLineNo">034</span>/**<a name="line.34"></a>
-<span class="sourceLineNo">035</span> * Stores the group information of region 
server groups.<a name="line.35"></a>
-<span class="sourceLineNo">036</span> */<a name="line.36"></a>
-<span class="sourceLineNo">037</span>@InterfaceAudience.Public<a 
name="line.37"></a>
-<span class="sourceLineNo">038</span>@InterfaceStability.Evolving<a 
name="line.38"></a>
-<span class="sourceLineNo">039</span>public class RSGroupInfo {<a 
name="line.39"></a>
+<span class="sourceLineNo">026</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import 
org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import 
org.apache.hadoop.hbase.classification.InterfaceStability;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.net.Address;<a name="line.29"></a>
+<span class="sourceLineNo">030</span><a name="line.30"></a>
+<span class="sourceLineNo">031</span>/**<a name="line.31"></a>
+<span class="sourceLineNo">032</span> * Stores the group information of region 
server groups.<a name="line.32"></a>
+<span class="sourceLineNo">033</span> */<a name="line.33"></a>
+<span class="sourceLineNo">034</span>@InterfaceAudience.Public<a 
name="line.34"></a>
+<span class="sourceLineNo">035</span>@InterfaceStability.Evolving<a 
name="line.35"></a>
+<span class="sourceLineNo">036</span>public class RSGroupInfo {<a 
name="line.36"></a>
+<span class="sourceLineNo">037</span><a name="line.37"></a>
+<span class="sourceLineNo">038</span>  public static final String 
DEFAULT_GROUP = "default";<a name="line.38"></a>
+<span class="sourceLineNo">039</span>  public static final String 
NAMESPACEDESC_PROP_GROUP = "hbase.rsgroup.name";<a name="line.39"></a>
 <span class="sourceLineNo">040</span><a name="line.40"></a>
-<span class="sourceLineNo">041</span>  public static final String 
DEFAULT_GROUP = "default";<a name="line.41"></a>
-<span class="sourceLineNo">042</span>  public static final String 
NAMESPACEDESC_PROP_GROUP = "hbase.rsgroup.name";<a name="line.42"></a>
-<span class="sourceLineNo">043</span><a name="line.43"></a>
-<span class="sourceLineNo">044</span>  private String name;<a 
name="line.44"></a>
-<span class="sourceLineNo">045</span>  private Set&lt;HostAndPort&gt; 
servers;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>  private NavigableSet&lt;TableName&gt; 
tables;<a name="line.46"></a>
-<span class="sourceLineNo">047</span><a name="line.47"></a>
-<span class="sourceLineNo">048</span>  public RSGroupInfo(String name) {<a 
name="line.48"></a>
-<span class="sourceLineNo">049</span>    this(name, 
Sets.&lt;HostAndPort&gt;newHashSet(), Sets.&lt;TableName&gt;newTreeSet());<a 
name="line.49"></a>
-<span class="sourceLineNo">050</span>  }<a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span>  RSGroupInfo(String name,<a 
name="line.52"></a>
-<span class="sourceLineNo">053</span>              Set&lt;HostAndPort&gt; 
servers,<a name="line.53"></a>
-<span class="sourceLineNo">054</span>              
NavigableSet&lt;TableName&gt; tables) {<a name="line.54"></a>
-<span class="sourceLineNo">055</span>    this.name = name;<a 
name="line.55"></a>
-<span class="sourceLineNo">056</span>    this.servers = servers;<a 
name="line.56"></a>
-<span class="sourceLineNo">057</span>    this.tables = tables;<a 
name="line.57"></a>
-<span class="sourceLineNo">058</span>  }<a name="line.58"></a>
-<span class="sourceLineNo">059</span><a name="line.59"></a>
-<span class="sourceLineNo">060</span>  public RSGroupInfo(RSGroupInfo src) {<a 
name="line.60"></a>
-<span class="sourceLineNo">061</span>    name = src.getName();<a 
name="line.61"></a>
-<span class="sourceLineNo">062</span>    servers = 
Sets.newHashSet(src.getServers());<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    tables = 
Sets.newTreeSet(src.getTables());<a name="line.63"></a>
-<span class="sourceLineNo">064</span>  }<a name="line.64"></a>
-<span class="sourceLineNo">065</span><a name="line.65"></a>
-<span class="sourceLineNo">066</span>  /**<a name="line.66"></a>
-<span class="sourceLineNo">067</span>   * Get group name.<a name="line.67"></a>
-<span class="sourceLineNo">068</span>   *<a name="line.68"></a>
-<span class="sourceLineNo">069</span>   * @return group name<a 
name="line.69"></a>
-<span class="sourceLineNo">070</span>   */<a name="line.70"></a>
-<span class="sourceLineNo">071</span>  public String getName() {<a 
name="line.71"></a>
-<span class="sourceLineNo">072</span>    return name;<a name="line.72"></a>
-<span class="sourceLineNo">073</span>  }<a name="line.73"></a>
-<span class="sourceLineNo">074</span><a name="line.74"></a>
-<span class="sourceLineNo">075</span>  /**<a name="line.75"></a>
-<span class="sourceLineNo">076</span>   * Adds the server to the group.<a 
name="line.76"></a>
-<span class="sourceLineNo">077</span>   *<a name="line.77"></a>
-<span class="sourceLineNo">078</span>   * @param hostPort the server<a 
name="line.78"></a>
-<span class="sourceLineNo">079</span>   */<a name="line.79"></a>
-<span class="sourceLineNo">080</span>  public void addServer(HostAndPort 
hostPort){<a name="line.80"></a>
-<span class="sourceLineNo">081</span>    servers.add(hostPort);<a 
name="line.81"></a>
-<span class="sourceLineNo">082</span>  }<a name="line.82"></a>
-<span class="sourceLineNo">083</span><a name="line.83"></a>
-<span class="sourceLineNo">084</span>  /**<a name="line.84"></a>
-<span class="sourceLineNo">085</span>   * Adds a group of servers.<a 
name="line.85"></a>
-<span class="sourceLineNo">086</span>   *<a name="line.86"></a>
-<span class="sourceLineNo">087</span>   * @param hostPort the servers<a 
name="line.87"></a>
-<span class="sourceLineNo">088</span>   */<a name="line.88"></a>
-<span class="sourceLineNo">089</span>  public void 
addAllServers(Collection&lt;HostAndPort&gt; hostPort){<a name="line.89"></a>
-<span class="sourceLineNo">090</span>    servers.addAll(hostPort);<a 
name="line.90"></a>
-<span class="sourceLineNo">091</span>  }<a name="line.91"></a>
-<span class="sourceLineNo">092</span><a name="line.92"></a>
-<span class="sourceLineNo">093</span>  /**<a name="line.93"></a>
-<span class="sourceLineNo">094</span>   * @param hostPort hostPort of the 
server<a name="line.94"></a>
-<span class="sourceLineNo">095</span>   * @return true, if a server with 
hostPort is found<a name="line.95"></a>
-<span class="sourceLineNo">096</span>   */<a name="line.96"></a>
-<span class="sourceLineNo">097</span>  public boolean 
containsServer(HostAndPort hostPort) {<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    return servers.contains(hostPort);<a 
name="line.98"></a>
-<span class="sourceLineNo">099</span>  }<a name="line.99"></a>
-<span class="sourceLineNo">100</span><a name="line.100"></a>
-<span class="sourceLineNo">101</span>  /**<a name="line.101"></a>
-<span class="sourceLineNo">102</span>   * Get list of servers.<a 
name="line.102"></a>
-<span class="sourceLineNo">103</span>   *<a name="line.103"></a>
-<span class="sourceLineNo">104</span>   * @return set of servers<a 
name="line.104"></a>
-<span class="sourceLineNo">105</span>   */<a name="line.105"></a>
-<span class="sourceLineNo">106</span>  public Set&lt;HostAndPort&gt; 
getServers() {<a name="line.106"></a>
-<span class="sourceLineNo">107</span>    return servers;<a name="line.107"></a>
-<span class="sourceLineNo">108</span>  }<a name="line.108"></a>
-<span class="sourceLineNo">109</span><a name="line.109"></a>
-<span class="sourceLineNo">110</span>  /**<a name="line.110"></a>
-<span class="sourceLineNo">111</span>   * Remove a server from this group.<a 
name="line.111"></a>
-<span class="sourceLineNo">112</span>   *<a name="line.112"></a>
-<span class="sourceLineNo">113</span>   * @param hostPort HostPort of the 
server to remove<a name="line.113"></a>
-<span class="sourceLineNo">114</span>   */<a name="line.114"></a>
-<span class="sourceLineNo">115</span>  public boolean removeServer(HostAndPort 
hostPort) {<a name="line.115"></a>
-<span class="sourceLineNo">116</span>    return servers.remove(hostPort);<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>  }<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
-<span class="sourceLineNo">119</span>  /**<a name="line.119"></a>
-<span class="sourceLineNo">120</span>   * Set of tables that are members of 
this group<a name="line.120"></a>
-<span class="sourceLineNo">121</span>   * @return set of tables<a 
name="line.121"></a>
-<span class="sourceLineNo">122</span>   */<a name="line.122"></a>
-<span class="sourceLineNo">123</span>  public NavigableSet&lt;TableName&gt; 
getTables() {<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    return tables;<a name="line.124"></a>
+<span class="sourceLineNo">041</span>  private String name;<a 
name="line.41"></a>
+<span class="sourceLineNo">042</span>  // Keep servers in a sorted set so has 
an expected ordering when displayed.<a name="line.42"></a>
+<span class="sourceLineNo">043</span>  private SortedSet&lt;Address&gt; 
servers;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>  // Keep tables sorted too.<a 
name="line.44"></a>
+<span class="sourceLineNo">045</span>  private SortedSet&lt;TableName&gt; 
tables;<a name="line.45"></a>
+<span class="sourceLineNo">046</span><a name="line.46"></a>
+<span class="sourceLineNo">047</span>  public RSGroupInfo(String name) {<a 
name="line.47"></a>
+<span class="sourceLineNo">048</span>    this(name, new 
TreeSet&lt;Address&gt;(), new TreeSet&lt;TableName&gt;());<a name="line.48"></a>
+<span class="sourceLineNo">049</span>  }<a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span>  RSGroupInfo(String name, 
SortedSet&lt;Address&gt; servers, SortedSet&lt;TableName&gt; tables) {<a 
name="line.51"></a>
+<span class="sourceLineNo">052</span>    this.name = name;<a 
name="line.52"></a>
+<span class="sourceLineNo">053</span>    this.servers = servers == null? new 
TreeSet&lt;Address&gt;(): servers;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>    this.servers.addAll(servers);<a 
name="line.54"></a>
+<span class="sourceLineNo">055</span>    this.tables = new 
TreeSet&lt;&gt;(tables);<a name="line.55"></a>
+<span class="sourceLineNo">056</span>  }<a name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span>  public RSGroupInfo(RSGroupInfo src) {<a 
name="line.58"></a>
+<span class="sourceLineNo">059</span>    this(src.getName(), src.servers, 
src.tables);<a name="line.59"></a>
+<span class="sourceLineNo">060</span>  }<a name="line.60"></a>
+<span class="sourceLineNo">061</span><a name="line.61"></a>
+<span class="sourceLineNo">062</span>  /**<a name="line.62"></a>
+<span class="sourceLineNo">063</span>   * Get group name.<a name="line.63"></a>
+<span class="sourceLineNo">064</span>   *<a name="line.64"></a>
+<span class="sourceLineNo">065</span>   * @return group name<a 
name="line.65"></a>
+<span class="sourceLineNo">066</span>   */<a name="line.66"></a>
+<span class="sourceLineNo">067</span>  public String getName() {<a 
name="line.67"></a>
+<span class="sourceLineNo">068</span>    return name;<a name="line.68"></a>
+<span class="sourceLineNo">069</span>  }<a name="line.69"></a>
+<span class="sourceLineNo">070</span><a name="line.70"></a>
+<span class="sourceLineNo">071</span>  /**<a name="line.71"></a>
+<span class="sourceLineNo">072</span>   * Adds the server to the group.<a 
name="line.72"></a>
+<span class="sourceLineNo">073</span>   *<a name="line.73"></a>
+<span class="sourceLineNo">074</span>   * @param hostPort the server<a 
name="line.74"></a>
+<span class="sourceLineNo">075</span>   */<a name="line.75"></a>
+<span class="sourceLineNo">076</span>  public void addServer(Address 
hostPort){<a name="line.76"></a>
+<span class="sourceLineNo">077</span>    servers.add(hostPort);<a 
name="line.77"></a>
+<span class="sourceLineNo">078</span>  }<a name="line.78"></a>
+<span class="sourceLineNo">079</span><a name="line.79"></a>
+<span class="sourceLineNo">080</span>  /**<a name="line.80"></a>
+<span class="sourceLineNo">081</span>   * Adds a group of servers.<a 
name="line.81"></a>
+<span class="sourceLineNo">082</span>   *<a name="line.82"></a>
+<span class="sourceLineNo">083</span>   * @param hostPort the servers<a 
name="line.83"></a>
+<span class="sourceLineNo">084</span>   */<a name="line.84"></a>
+<span class="sourceLineNo">085</span>  public void 
addAllServers(Collection&lt;Address&gt; hostPort){<a name="line.85"></a>
+<span class="sourceLineNo">086</span>    servers.addAll(hostPort);<a 
name="line.86"></a>
+<span class="sourceLineNo">087</span>  }<a name="line.87"></a>
+<span class="sourceLineNo">088</span><a name="line.88"></a>
+<span class="sourceLineNo">089</span>  /**<a name="line.89"></a>
+<span class="sourceLineNo">090</span>   * @param hostPort hostPort of the 
server<a name="line.90"></a>
+<span class="sourceLineNo">091</span>   * @return true, if a server with 
hostPort is found<a name="line.91"></a>
+<span class="sourceLineNo">092</span>   */<a name="line.92"></a>
+<span class="sourceLineNo">093</span>  public boolean containsServer(Address 
hostPort) {<a name="line.93"></a>
+<span class="sourceLineNo">094</span>    return servers.contains(hostPort);<a 
name="line.94"></a>
+<span class="sourceLineNo">095</span>  }<a name="line.95"></a>
+<span class="sourceLineNo">096</span><a name="line.96"></a>
+<span class="sourceLineNo">097</span>  /**<a name="line.97"></a>
+<span class="sourceLineNo">098</span>   * Get list of servers.<a 
name="line.98"></a>
+<span class="sourceLineNo">099</span>   *<a name="line.99"></a>
+<span class="sourceLineNo">100</span>   * @return set of servers<a 
name="line.100"></a>
+<span class="sourceLineNo">101</span>   */<a name="line.101"></a>
+<span class="sourceLineNo">102</span>  public Set&lt;Address&gt; getServers() 
{<a name="line.102"></a>
+<span class="sourceLineNo">103</span>    return servers;<a name="line.103"></a>
+<span class="sourceLineNo">104</span>  }<a name="line.104"></a>
+<span class="sourceLineNo">105</span><a name="line.105"></a>
+<span class="sourceLineNo">106</span>  /**<a name="line.106"></a>
+<span class="sourceLineNo">107</span>   * Remove a server from this group.<a 
name="line.107"></a>
+<span class="sourceLineNo">108</span>   *<a name="line.108"></a>
+<span class="sourceLineNo">109</span>   * @param hostPort HostPort of the 
server to remove<a name="line.109"></a>
+<span class="sourceLineNo">110</span>   */<a name="line.110"></a>
+<span class="sourceLineNo">111</span>  public boolean removeServer(Address 
hostPort) {<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    return servers.remove(hostPort);<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>  }<a name="line.113"></a>
+<span class="sourceLineNo">114</span><a name="line.114"></a>
+<span class="sourceLineNo">115</span>  /**<a name="line.115"></a>
+<span class="sourceLineNo">116</span>   * Set of tables that are members of 
this group<a name="line.116"></a>
+<span class="sourceLineNo">117</span>   * @return set of tables<a 
name="line.117"></a>
+<span class="sourceLineNo">118</span>   */<a name="line.118"></a>
+<span class="sourceLineNo">119</span>  public SortedSet&lt;TableName&gt; 
getTables() {<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    return tables;<a name="line.120"></a>
+<span class="sourceLineNo">121</span>  }<a name="line.121"></a>
+<span class="sourceLineNo">122</span><a name="line.122"></a>
+<span class="sourceLineNo">123</span>  public void addTable(TableName table) 
{<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    tables.add(table);<a 
name="line.124"></a>
 <span class="sourceLineNo">125</span>  }<a name="line.125"></a>
 <span class="sourceLineNo">126</span><a name="line.126"></a>
-<span class="sourceLineNo">127</span>  public void addTable(TableName table) 
{<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    tables.add(table);<a 
name="line.128"></a>
+<span class="sourceLineNo">127</span>  public void 
addAllTables(Collection&lt;TableName&gt; arg) {<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    tables.addAll(arg);<a 
name="line.128"></a>
 <span class="sourceLineNo">129</span>  }<a name="line.129"></a>
 <span class="sourceLineNo">130</span><a name="line.130"></a>
-<span class="sourceLineNo">131</span>  public void 
addAllTables(Collection&lt;TableName&gt; arg) {<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    tables.addAll(arg);<a 
name="line.132"></a>
+<span class="sourceLineNo">131</span>  public boolean containsTable(TableName 
table) {<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    return tables.contains(table);<a 
name="line.132"></a>
 <span class="sourceLineNo">133</span>  }<a name="line.133"></a>
 <span class="sourceLineNo">134</span><a name="line.134"></a>
-<span class="sourceLineNo">135</span>  public boolean containsTable(TableName 
table) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span>    return tables.contains(table);<a 
name="line.136"></a>
+<span class="sourceLineNo">135</span>  public boolean removeTable(TableName 
table) {<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    return tables.remove(table);<a 
name="line.136"></a>
 <span class="sourceLineNo">137</span>  }<a name="line.137"></a>
 <span class="sourceLineNo">138</span><a name="line.138"></a>
-<span class="sourceLineNo">139</span>  public boolean removeTable(TableName 
table) {<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    return tables.remove(table);<a 
name="line.140"></a>
-<span class="sourceLineNo">141</span>  }<a name="line.141"></a>
-<span class="sourceLineNo">142</span><a name="line.142"></a>
-<span class="sourceLineNo">143</span>  @Override<a name="line.143"></a>
-<span class="sourceLineNo">144</span>  public String toString() {<a 
name="line.144"></a>
-<span class="sourceLineNo">145</span>    StringBuffer sb = new 
StringBuffer();<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    sb.append("Name:");<a 
name="line.146"></a>
-<span class="sourceLineNo">147</span>    sb.append(this.name);<a 
name="line.147"></a>
-<span class="sourceLineNo">148</span>    sb.append(", ");<a 
name="line.148"></a>
-<span class="sourceLineNo">149</span>    sb.append(" Servers:");<a 
name="line.149"></a>
-<span class="sourceLineNo">150</span>    sb.append(this.servers);<a 
name="line.150"></a>
-<span class="sourceLineNo">151</span>    return sb.toString();<a 
name="line.151"></a>
-<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span>  }<a name="line.153"></a>
-<span class="sourceLineNo">154</span><a name="line.154"></a>
-<span class="sourceLineNo">155</span>  @Override<a name="line.155"></a>
-<span class="sourceLineNo">156</span>  public boolean equals(Object o) {<a 
name="line.156"></a>
-<span class="sourceLineNo">157</span>    if (this == o) {<a 
name="line.157"></a>
-<span class="sourceLineNo">158</span>      return true;<a name="line.158"></a>
-<span class="sourceLineNo">159</span>    }<a name="line.159"></a>
-<span class="sourceLineNo">160</span>    if (o == null || getClass() != 
o.getClass()) {<a name="line.160"></a>
-<span class="sourceLineNo">161</span>      return false;<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    }<a name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span>    RSGroupInfo RSGroupInfo = 
(RSGroupInfo) o;<a name="line.164"></a>
-<span class="sourceLineNo">165</span><a name="line.165"></a>
-<span class="sourceLineNo">166</span>    if (!name.equals(RSGroupInfo.name)) 
{<a name="line.166"></a>
-<span class="sourceLineNo">167</span>      return false;<a name="line.167"></a>
-<span class="sourceLineNo">168</span>    }<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    if 
(!servers.equals(RSGroupInfo.servers)) {<a name="line.169"></a>
-<span class="sourceLineNo">170</span>      return false;<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    }<a name="line.171"></a>
-<span class="sourceLineNo">172</span>    if 
(!tables.equals(RSGroupInfo.tables)) {<a name="line.172"></a>
-<span class="sourceLineNo">173</span>      return false;<a name="line.173"></a>
-<span class="sourceLineNo">174</span>    }<a name="line.174"></a>
-<span class="sourceLineNo">175</span><a name="line.175"></a>
-<span class="sourceLineNo">176</span>    return true;<a name="line.176"></a>
-<span class="sourceLineNo">177</span>  }<a name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span>  @Override<a name="line.179"></a>
-<span class="sourceLineNo">180</span>  public int hashCode() {<a 
name="line.180"></a>
-<span class="sourceLineNo">181</span>    int result = servers.hashCode();<a 
name="line.181"></a>
-<span class="sourceLineNo">182</span>    result = 31 * result + 
tables.hashCode();<a name="line.182"></a>
-<span class="sourceLineNo">183</span>    result = 31 * result + 
name.hashCode();<a name="line.183"></a>
-<span class="sourceLineNo">184</span>    return result;<a name="line.184"></a>
-<span class="sourceLineNo">185</span>  }<a name="line.185"></a>
-<span class="sourceLineNo">186</span>}<a name="line.186"></a>
+<span class="sourceLineNo">139</span>  @Override<a name="line.139"></a>
+<span class="sourceLineNo">140</span>  public String toString() {<a 
name="line.140"></a>
+<span class="sourceLineNo">141</span>    StringBuffer sb = new 
StringBuffer();<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    sb.append("Name:");<a 
name="line.142"></a>
+<span class="sourceLineNo">143</span>    sb.append(this.name);<a 
name="line.143"></a>
+<span class="sourceLineNo">144</span>    sb.append(", ");<a 
name="line.144"></a>
+<span class="sourceLineNo">145</span>    sb.append(" Servers:");<a 
name="line.145"></a>
+<span class="sourceLineNo">146</span>    sb.append(this.servers);<a 
name="line.146"></a>
+<span class="sourceLineNo">147</span>    return sb.toString();<a 
name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span>  }<a name="line.149"></a>
+<span class="sourceLineNo">150</span><a name="line.150"></a>
+<span class="sourceLineNo">151</span>  @Override<a name="line.151"></a>
+<span class="sourceLineNo">152</span>  public boolean equals(Object o) {<a 
name="line.152"></a>
+<span class="sourceLineNo">153</span>    if (this == o) {<a 
name="line.153"></a>
+<span class="sourceLineNo">154</span>      return true;<a name="line.154"></a>
+<span class="sourceLineNo">155</span>    }<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    if (o == null || getClass() != 
o.getClass()) {<a name="line.156"></a>
+<span class="sourceLineNo">157</span>      return false;<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    }<a name="line.158"></a>
+<span class="sourceLineNo">159</span><a name="line.159"></a>
+<span class="sourceLineNo">160</span>    RSGroupInfo RSGroupInfo = 
(RSGroupInfo) o;<a name="line.160"></a>
+<span class="sourceLineNo">161</span><a name="line.161"></a>
+<span class="sourceLineNo">162</span>    if (!name.equals(RSGroupInfo.name)) 
{<a name="line.162"></a>
+<span class="sourceLineNo">163</span>      return false;<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    }<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    if 
(!servers.equals(RSGroupInfo.servers)) {<a name="line.165"></a>
+<span class="sourceLineNo">166</span>      return false;<a name="line.166"></a>
+<span class="sourceLineNo">167</span>    }<a name="line.167"></a>
+<span class="sourceLineNo">168</span>    if 
(!tables.equals(RSGroupInfo.tables)) {<a name="line.168"></a>
+<span class="sourceLineNo">169</span>      return false;<a name="line.169"></a>
+<span class="sourceLineNo">170</span>    }<a name="line.170"></a>
+<span class="sourceLineNo">171</span><a name="line.171"></a>
+<span class="sourceLineNo">172</span>    return true;<a name="line.172"></a>
+<span class="sourceLineNo">173</span>  }<a name="line.173"></a>
+<span class="sourceLineNo">174</span><a name="line.174"></a>
+<span class="sourceLineNo">175</span>  @Override<a name="line.175"></a>
+<span class="sourceLineNo">176</span>  public int hashCode() {<a 
name="line.176"></a>
+<span class="sourceLineNo">177</span>    int result = servers.hashCode();<a 
name="line.177"></a>
+<span class="sourceLineNo">178</span>    result = 31 * result + 
tables.hashCode();<a name="line.178"></a>
+<span class="sourceLineNo">179</span>    result = 31 * result + 
name.hashCode();<a name="line.179"></a>
+<span class="sourceLineNo">180</span>    return result;<a name="line.180"></a>
+<span class="sourceLineNo">181</span>  }<a name="line.181"></a>
+<span class="sourceLineNo">182</span>}<a name="line.182"></a>
 
 
 

Reply via email to