http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e2f20c83/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/MemcachedBlockCache.html
----------------------------------------------------------------------
diff --git
a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/MemcachedBlockCache.html
b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/MemcachedBlockCache.html
index 9f8e960..6bc0579 100644
---
a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/MemcachedBlockCache.html
+++
b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/MemcachedBlockCache.html
@@ -207,96 +207,101 @@
<span class="sourceLineNo">199</span> }<a name="line.199"></a>
<span class="sourceLineNo">200</span><a name="line.200"></a>
<span class="sourceLineNo">201</span> @Override<a name="line.201"></a>
-<span class="sourceLineNo">202</span> public long getFreeSize() {<a
name="line.202"></a>
+<span class="sourceLineNo">202</span> public long getMaxSize() {<a
name="line.202"></a>
<span class="sourceLineNo">203</span> return 0;<a name="line.203"></a>
<span class="sourceLineNo">204</span> }<a name="line.204"></a>
<span class="sourceLineNo">205</span><a name="line.205"></a>
<span class="sourceLineNo">206</span> @Override<a name="line.206"></a>
-<span class="sourceLineNo">207</span> public long getCurrentSize() {<a
name="line.207"></a>
+<span class="sourceLineNo">207</span> public long getFreeSize() {<a
name="line.207"></a>
<span class="sourceLineNo">208</span> return 0;<a name="line.208"></a>
<span class="sourceLineNo">209</span> }<a name="line.209"></a>
<span class="sourceLineNo">210</span><a name="line.210"></a>
<span class="sourceLineNo">211</span> @Override<a name="line.211"></a>
-<span class="sourceLineNo">212</span> public long getCurrentDataSize() {<a
name="line.212"></a>
+<span class="sourceLineNo">212</span> public long getCurrentSize() {<a
name="line.212"></a>
<span class="sourceLineNo">213</span> return 0;<a name="line.213"></a>
<span class="sourceLineNo">214</span> }<a name="line.214"></a>
<span class="sourceLineNo">215</span><a name="line.215"></a>
<span class="sourceLineNo">216</span> @Override<a name="line.216"></a>
-<span class="sourceLineNo">217</span> public long getBlockCount() {<a
name="line.217"></a>
+<span class="sourceLineNo">217</span> public long getCurrentDataSize() {<a
name="line.217"></a>
<span class="sourceLineNo">218</span> return 0;<a name="line.218"></a>
<span class="sourceLineNo">219</span> }<a name="line.219"></a>
<span class="sourceLineNo">220</span><a name="line.220"></a>
<span class="sourceLineNo">221</span> @Override<a name="line.221"></a>
-<span class="sourceLineNo">222</span> public long getDataBlockCount() {<a
name="line.222"></a>
+<span class="sourceLineNo">222</span> public long getBlockCount() {<a
name="line.222"></a>
<span class="sourceLineNo">223</span> return 0;<a name="line.223"></a>
<span class="sourceLineNo">224</span> }<a name="line.224"></a>
<span class="sourceLineNo">225</span><a name="line.225"></a>
<span class="sourceLineNo">226</span> @Override<a name="line.226"></a>
-<span class="sourceLineNo">227</span> public Iterator<CachedBlock>
iterator() {<a name="line.227"></a>
-<span class="sourceLineNo">228</span> return new
Iterator<CachedBlock>() {<a name="line.228"></a>
-<span class="sourceLineNo">229</span> @Override<a name="line.229"></a>
-<span class="sourceLineNo">230</span> public boolean hasNext() {<a
name="line.230"></a>
-<span class="sourceLineNo">231</span> return false;<a
name="line.231"></a>
-<span class="sourceLineNo">232</span> }<a name="line.232"></a>
-<span class="sourceLineNo">233</span><a name="line.233"></a>
+<span class="sourceLineNo">227</span> public long getDataBlockCount() {<a
name="line.227"></a>
+<span class="sourceLineNo">228</span> return 0;<a name="line.228"></a>
+<span class="sourceLineNo">229</span> }<a name="line.229"></a>
+<span class="sourceLineNo">230</span><a name="line.230"></a>
+<span class="sourceLineNo">231</span> @Override<a name="line.231"></a>
+<span class="sourceLineNo">232</span> public Iterator<CachedBlock>
iterator() {<a name="line.232"></a>
+<span class="sourceLineNo">233</span> return new
Iterator<CachedBlock>() {<a name="line.233"></a>
<span class="sourceLineNo">234</span> @Override<a name="line.234"></a>
-<span class="sourceLineNo">235</span> public CachedBlock next() {<a
name="line.235"></a>
-<span class="sourceLineNo">236</span> throw new
NoSuchElementException("MemcachedBlockCache can't iterate over blocks.");<a
name="line.236"></a>
+<span class="sourceLineNo">235</span> public boolean hasNext() {<a
name="line.235"></a>
+<span class="sourceLineNo">236</span> return false;<a
name="line.236"></a>
<span class="sourceLineNo">237</span> }<a name="line.237"></a>
<span class="sourceLineNo">238</span><a name="line.238"></a>
<span class="sourceLineNo">239</span> @Override<a name="line.239"></a>
-<span class="sourceLineNo">240</span> public void remove() {<a
name="line.240"></a>
-<span class="sourceLineNo">241</span><a name="line.241"></a>
+<span class="sourceLineNo">240</span> public CachedBlock next() {<a
name="line.240"></a>
+<span class="sourceLineNo">241</span> throw new
NoSuchElementException("MemcachedBlockCache can't iterate over blocks.");<a
name="line.241"></a>
<span class="sourceLineNo">242</span> }<a name="line.242"></a>
-<span class="sourceLineNo">243</span> };<a name="line.243"></a>
-<span class="sourceLineNo">244</span> }<a name="line.244"></a>
-<span class="sourceLineNo">245</span><a name="line.245"></a>
-<span class="sourceLineNo">246</span> @Override<a name="line.246"></a>
-<span class="sourceLineNo">247</span> public BlockCache[] getBlockCaches()
{<a name="line.247"></a>
-<span class="sourceLineNo">248</span> return null;<a name="line.248"></a>
+<span class="sourceLineNo">243</span><a name="line.243"></a>
+<span class="sourceLineNo">244</span> @Override<a name="line.244"></a>
+<span class="sourceLineNo">245</span> public void remove() {<a
name="line.245"></a>
+<span class="sourceLineNo">246</span><a name="line.246"></a>
+<span class="sourceLineNo">247</span> }<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><a name="line.250"></a>
-<span class="sourceLineNo">251</span> /**<a name="line.251"></a>
-<span class="sourceLineNo">252</span> * Class to encode and decode an
HFileBlock to and from memecached's resulting byte arrays.<a
name="line.252"></a>
-<span class="sourceLineNo">253</span> */<a name="line.253"></a>
-<span class="sourceLineNo">254</span> private static class
HFileBlockTranscoder implements Transcoder<HFileBlock> {<a
name="line.254"></a>
+<span class="sourceLineNo">251</span> @Override<a name="line.251"></a>
+<span class="sourceLineNo">252</span> public BlockCache[] getBlockCaches()
{<a name="line.252"></a>
+<span class="sourceLineNo">253</span> return null;<a name="line.253"></a>
+<span class="sourceLineNo">254</span> }<a name="line.254"></a>
<span class="sourceLineNo">255</span><a name="line.255"></a>
-<span class="sourceLineNo">256</span> @Override<a name="line.256"></a>
-<span class="sourceLineNo">257</span> public boolean asyncDecode(CachedData
d) {<a name="line.257"></a>
-<span class="sourceLineNo">258</span> return false;<a name="line.258"></a>
-<span class="sourceLineNo">259</span> }<a name="line.259"></a>
+<span class="sourceLineNo">256</span> /**<a name="line.256"></a>
+<span class="sourceLineNo">257</span> * Class to encode and decode an
HFileBlock to and from memecached's resulting byte arrays.<a
name="line.257"></a>
+<span class="sourceLineNo">258</span> */<a name="line.258"></a>
+<span class="sourceLineNo">259</span> private static class
HFileBlockTranscoder implements Transcoder<HFileBlock> {<a
name="line.259"></a>
<span class="sourceLineNo">260</span><a name="line.260"></a>
<span class="sourceLineNo">261</span> @Override<a name="line.261"></a>
-<span class="sourceLineNo">262</span> public CachedData encode(HFileBlock
block) {<a name="line.262"></a>
-<span class="sourceLineNo">263</span> ByteBuffer bb =
ByteBuffer.allocate(block.getSerializedLength());<a name="line.263"></a>
-<span class="sourceLineNo">264</span> block.serialize(bb);<a
name="line.264"></a>
-<span class="sourceLineNo">265</span> return new CachedData(0,
bb.array(), CachedData.MAX_SIZE);<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> @Override<a name="line.268"></a>
-<span class="sourceLineNo">269</span> public HFileBlock decode(CachedData
d) {<a name="line.269"></a>
-<span class="sourceLineNo">270</span> try {<a name="line.270"></a>
-<span class="sourceLineNo">271</span> ByteBuff buf = new
SingleByteBuff(ByteBuffer.wrap(d.getData()));<a name="line.271"></a>
-<span class="sourceLineNo">272</span> return (HFileBlock)
HFileBlock.BLOCK_DESERIALIZER.deserialize(buf, true,<a name="line.272"></a>
-<span class="sourceLineNo">273</span> MemoryType.EXCLUSIVE);<a
name="line.273"></a>
-<span class="sourceLineNo">274</span> } catch (IOException e) {<a
name="line.274"></a>
-<span class="sourceLineNo">275</span> LOG.warn("Error deserializing
data from memcached",e);<a name="line.275"></a>
-<span class="sourceLineNo">276</span> }<a name="line.276"></a>
-<span class="sourceLineNo">277</span> return null;<a name="line.277"></a>
-<span class="sourceLineNo">278</span> }<a name="line.278"></a>
-<span class="sourceLineNo">279</span><a name="line.279"></a>
-<span class="sourceLineNo">280</span> @Override<a name="line.280"></a>
-<span class="sourceLineNo">281</span> public int getMaxSize() {<a
name="line.281"></a>
-<span class="sourceLineNo">282</span> return MAX_SIZE;<a
name="line.282"></a>
+<span class="sourceLineNo">262</span> public boolean asyncDecode(CachedData
d) {<a name="line.262"></a>
+<span class="sourceLineNo">263</span> return false;<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> @Override<a name="line.266"></a>
+<span class="sourceLineNo">267</span> public CachedData encode(HFileBlock
block) {<a name="line.267"></a>
+<span class="sourceLineNo">268</span> ByteBuffer bb =
ByteBuffer.allocate(block.getSerializedLength());<a name="line.268"></a>
+<span class="sourceLineNo">269</span> block.serialize(bb);<a
name="line.269"></a>
+<span class="sourceLineNo">270</span> return new CachedData(0,
bb.array(), CachedData.MAX_SIZE);<a name="line.270"></a>
+<span class="sourceLineNo">271</span> }<a name="line.271"></a>
+<span class="sourceLineNo">272</span><a name="line.272"></a>
+<span class="sourceLineNo">273</span> @Override<a name="line.273"></a>
+<span class="sourceLineNo">274</span> public HFileBlock decode(CachedData
d) {<a name="line.274"></a>
+<span class="sourceLineNo">275</span> try {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> ByteBuff buf = new
SingleByteBuff(ByteBuffer.wrap(d.getData()));<a name="line.276"></a>
+<span class="sourceLineNo">277</span> return (HFileBlock)
HFileBlock.BLOCK_DESERIALIZER.deserialize(buf, true,<a name="line.277"></a>
+<span class="sourceLineNo">278</span> MemoryType.EXCLUSIVE);<a
name="line.278"></a>
+<span class="sourceLineNo">279</span> } catch (IOException e) {<a
name="line.279"></a>
+<span class="sourceLineNo">280</span> LOG.warn("Error deserializing
data from memcached",e);<a name="line.280"></a>
+<span class="sourceLineNo">281</span> }<a name="line.281"></a>
+<span class="sourceLineNo">282</span> return null;<a name="line.282"></a>
<span class="sourceLineNo">283</span> }<a name="line.283"></a>
-<span class="sourceLineNo">284</span> }<a name="line.284"></a>
-<span class="sourceLineNo">285</span><a name="line.285"></a>
-<span class="sourceLineNo">286</span> @Override<a name="line.286"></a>
-<span class="sourceLineNo">287</span> public void returnBlock(BlockCacheKey
cacheKey, Cacheable block) {<a name="line.287"></a>
-<span class="sourceLineNo">288</span> // Not doing reference counting. All
blocks here are EXCLUSIVE<a name="line.288"></a>
+<span class="sourceLineNo">284</span><a name="line.284"></a>
+<span class="sourceLineNo">285</span> @Override<a name="line.285"></a>
+<span class="sourceLineNo">286</span> public int getMaxSize() {<a
name="line.286"></a>
+<span class="sourceLineNo">287</span> return MAX_SIZE;<a
name="line.287"></a>
+<span class="sourceLineNo">288</span> }<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>}<a name="line.291"></a>
+<span class="sourceLineNo">291</span> @Override<a name="line.291"></a>
+<span class="sourceLineNo">292</span> public void returnBlock(BlockCacheKey
cacheKey, Cacheable block) {<a name="line.292"></a>
+<span class="sourceLineNo">293</span> // Not doing reference counting. All
blocks here are EXCLUSIVE<a name="line.293"></a>
+<span class="sourceLineNo">294</span> }<a name="line.294"></a>
+<span class="sourceLineNo">295</span><a name="line.295"></a>
+<span class="sourceLineNo">296</span>}<a name="line.296"></a>
