You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mi...@apache.org on 2016/03/31 18:18:30 UTC
[28/51] [partial] hbase-site git commit: Published site at
d6fd85945130516ba10fe4854ce080e5a2329983.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f8d69509/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.CombinedCacheStats.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.CombinedCacheStats.html b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.CombinedCacheStats.html
index e805311..d9e2c11 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.CombinedCacheStats.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.CombinedCacheStats.html
@@ -147,129 +147,235 @@
<span class="sourceLineNo">139</span> }<a name="line.139"></a>
<span class="sourceLineNo">140</span><a name="line.140"></a>
<span class="sourceLineNo">141</span> @Override<a name="line.141"></a>
-<span class="sourceLineNo">142</span> public long getRequestCount() {<a name="line.142"></a>
-<span class="sourceLineNo">143</span> return lruCacheStats.getRequestCount()<a name="line.143"></a>
-<span class="sourceLineNo">144</span> + bucketCacheStats.getRequestCount();<a name="line.144"></a>
-<span class="sourceLineNo">145</span> }<a name="line.145"></a>
-<span class="sourceLineNo">146</span><a name="line.146"></a>
-<span class="sourceLineNo">147</span> @Override<a name="line.147"></a>
-<span class="sourceLineNo">148</span> public long getRequestCachingCount() {<a name="line.148"></a>
-<span class="sourceLineNo">149</span> return lruCacheStats.getRequestCachingCount()<a name="line.149"></a>
-<span class="sourceLineNo">150</span> + bucketCacheStats.getRequestCachingCount();<a name="line.150"></a>
-<span class="sourceLineNo">151</span> }<a name="line.151"></a>
-<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span> @Override<a name="line.153"></a>
-<span class="sourceLineNo">154</span> public long getMissCount() {<a name="line.154"></a>
-<span class="sourceLineNo">155</span> return lruCacheStats.getMissCount() + bucketCacheStats.getMissCount();<a name="line.155"></a>
-<span class="sourceLineNo">156</span> }<a name="line.156"></a>
-<span class="sourceLineNo">157</span><a name="line.157"></a>
-<span class="sourceLineNo">158</span> @Override<a name="line.158"></a>
-<span class="sourceLineNo">159</span> public long getPrimaryMissCount() {<a name="line.159"></a>
-<span class="sourceLineNo">160</span> return lruCacheStats.getPrimaryMissCount() + bucketCacheStats.getPrimaryMissCount();<a name="line.160"></a>
-<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> @Override<a name="line.163"></a>
-<span class="sourceLineNo">164</span> public long getMissCachingCount() {<a name="line.164"></a>
-<span class="sourceLineNo">165</span> return lruCacheStats.getMissCachingCount()<a name="line.165"></a>
-<span class="sourceLineNo">166</span> + bucketCacheStats.getMissCachingCount();<a name="line.166"></a>
-<span class="sourceLineNo">167</span> }<a name="line.167"></a>
-<span class="sourceLineNo">168</span><a name="line.168"></a>
-<span class="sourceLineNo">169</span> @Override<a name="line.169"></a>
-<span class="sourceLineNo">170</span> public long getHitCount() {<a name="line.170"></a>
-<span class="sourceLineNo">171</span> return lruCacheStats.getHitCount() + bucketCacheStats.getHitCount();<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> @Override<a name="line.174"></a>
-<span class="sourceLineNo">175</span> public long getPrimaryHitCount() {<a name="line.175"></a>
-<span class="sourceLineNo">176</span> return lruCacheStats.getPrimaryHitCount() + bucketCacheStats.getPrimaryHitCount();<a name="line.176"></a>
-<span class="sourceLineNo">177</span> }<a name="line.177"></a>
-<span class="sourceLineNo">178</span> @Override<a name="line.178"></a>
-<span class="sourceLineNo">179</span> public long getHitCachingCount() {<a name="line.179"></a>
-<span class="sourceLineNo">180</span> return lruCacheStats.getHitCachingCount()<a name="line.180"></a>
-<span class="sourceLineNo">181</span> + bucketCacheStats.getHitCachingCount();<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> @Override<a name="line.184"></a>
-<span class="sourceLineNo">185</span> public long getEvictionCount() {<a name="line.185"></a>
-<span class="sourceLineNo">186</span> return lruCacheStats.getEvictionCount()<a name="line.186"></a>
-<span class="sourceLineNo">187</span> + bucketCacheStats.getEvictionCount();<a name="line.187"></a>
-<span class="sourceLineNo">188</span> }<a name="line.188"></a>
-<span class="sourceLineNo">189</span><a name="line.189"></a>
-<span class="sourceLineNo">190</span> @Override<a name="line.190"></a>
-<span class="sourceLineNo">191</span> public long getEvictedCount() {<a name="line.191"></a>
-<span class="sourceLineNo">192</span> return lruCacheStats.getEvictedCount()<a name="line.192"></a>
-<span class="sourceLineNo">193</span> + bucketCacheStats.getEvictedCount();<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> @Override<a name="line.196"></a>
-<span class="sourceLineNo">197</span> public long getPrimaryEvictedCount() {<a name="line.197"></a>
-<span class="sourceLineNo">198</span> return lruCacheStats.getPrimaryEvictedCount()<a name="line.198"></a>
-<span class="sourceLineNo">199</span> + bucketCacheStats.getPrimaryEvictedCount();<a name="line.199"></a>
-<span class="sourceLineNo">200</span> }<a name="line.200"></a>
-<span class="sourceLineNo">201</span><a name="line.201"></a>
-<span class="sourceLineNo">202</span> @Override<a name="line.202"></a>
-<span class="sourceLineNo">203</span> public void rollMetricsPeriod() {<a name="line.203"></a>
-<span class="sourceLineNo">204</span> lruCacheStats.rollMetricsPeriod();<a name="line.204"></a>
-<span class="sourceLineNo">205</span> bucketCacheStats.rollMetricsPeriod();<a name="line.205"></a>
-<span class="sourceLineNo">206</span> }<a name="line.206"></a>
-<span class="sourceLineNo">207</span> <a name="line.207"></a>
-<span class="sourceLineNo">208</span> @Override<a name="line.208"></a>
-<span class="sourceLineNo">209</span> public long getFailedInserts() {<a name="line.209"></a>
-<span class="sourceLineNo">210</span> return lruCacheStats.getFailedInserts() + bucketCacheStats.getFailedInserts();<a name="line.210"></a>
-<span class="sourceLineNo">211</span> }<a name="line.211"></a>
-<span class="sourceLineNo">212</span><a name="line.212"></a>
-<span class="sourceLineNo">213</span> @Override<a name="line.213"></a>
-<span class="sourceLineNo">214</span> public long getSumHitCountsPastNPeriods() {<a name="line.214"></a>
-<span class="sourceLineNo">215</span> return lruCacheStats.getSumHitCountsPastNPeriods()<a name="line.215"></a>
-<span class="sourceLineNo">216</span> + bucketCacheStats.getSumHitCountsPastNPeriods();<a name="line.216"></a>
+<span class="sourceLineNo">142</span> public long getDataMissCount() {<a name="line.142"></a>
+<span class="sourceLineNo">143</span> return lruCacheStats.getDataMissCount() + bucketCacheStats.getDataMissCount();<a name="line.143"></a>
+<span class="sourceLineNo">144</span> }<a name="line.144"></a>
+<span class="sourceLineNo">145</span><a name="line.145"></a>
+<span class="sourceLineNo">146</span> @Override<a name="line.146"></a>
+<span class="sourceLineNo">147</span> public long getLeafIndexMissCount() {<a name="line.147"></a>
+<span class="sourceLineNo">148</span> return lruCacheStats.getLeafIndexMissCount() + bucketCacheStats.getLeafIndexMissCount();<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 long getBloomChunkMissCount() {<a name="line.152"></a>
+<span class="sourceLineNo">153</span> return lruCacheStats.getBloomChunkMissCount() + bucketCacheStats.getBloomChunkMissCount();<a name="line.153"></a>
+<span class="sourceLineNo">154</span> }<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span> @Override<a name="line.156"></a>
+<span class="sourceLineNo">157</span> public long getMetaMissCount() {<a name="line.157"></a>
+<span class="sourceLineNo">158</span> return lruCacheStats.getMetaMissCount() + bucketCacheStats.getMetaMissCount();<a name="line.158"></a>
+<span class="sourceLineNo">159</span> }<a name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span> @Override<a name="line.161"></a>
+<span class="sourceLineNo">162</span> public long getRootIndexMissCount() {<a name="line.162"></a>
+<span class="sourceLineNo">163</span> return lruCacheStats.getRootIndexMissCount() + bucketCacheStats.getRootIndexMissCount();<a name="line.163"></a>
+<span class="sourceLineNo">164</span> }<a name="line.164"></a>
+<span class="sourceLineNo">165</span><a name="line.165"></a>
+<span class="sourceLineNo">166</span> @Override<a name="line.166"></a>
+<span class="sourceLineNo">167</span> public long getIntermediateIndexMissCount() {<a name="line.167"></a>
+<span class="sourceLineNo">168</span> return lruCacheStats.getIntermediateIndexMissCount() +<a name="line.168"></a>
+<span class="sourceLineNo">169</span> bucketCacheStats.getIntermediateIndexMissCount();<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> @Override<a name="line.172"></a>
+<span class="sourceLineNo">173</span> public long getFileInfoMissCount() {<a name="line.173"></a>
+<span class="sourceLineNo">174</span> return lruCacheStats.getFileInfoMissCount() + bucketCacheStats.getFileInfoMissCount();<a name="line.174"></a>
+<span class="sourceLineNo">175</span> }<a name="line.175"></a>
+<span class="sourceLineNo">176</span><a name="line.176"></a>
+<span class="sourceLineNo">177</span> @Override<a name="line.177"></a>
+<span class="sourceLineNo">178</span> public long getGeneralBloomMetaMissCount() {<a name="line.178"></a>
+<span class="sourceLineNo">179</span> return lruCacheStats.getGeneralBloomMetaMissCount() +<a name="line.179"></a>
+<span class="sourceLineNo">180</span> bucketCacheStats.getGeneralBloomMetaMissCount();<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>
+<span class="sourceLineNo">183</span> @Override<a name="line.183"></a>
+<span class="sourceLineNo">184</span> public long getDeleteFamilyBloomMissCount() {<a name="line.184"></a>
+<span class="sourceLineNo">185</span> return lruCacheStats.getDeleteFamilyBloomMissCount() +<a name="line.185"></a>
+<span class="sourceLineNo">186</span> bucketCacheStats.getDeleteFamilyBloomMissCount();<a name="line.186"></a>
+<span class="sourceLineNo">187</span> }<a name="line.187"></a>
+<span class="sourceLineNo">188</span><a name="line.188"></a>
+<span class="sourceLineNo">189</span> @Override<a name="line.189"></a>
+<span class="sourceLineNo">190</span> public long getTrailerMissCount() {<a name="line.190"></a>
+<span class="sourceLineNo">191</span> return lruCacheStats.getTrailerMissCount() + bucketCacheStats.getTrailerMissCount();<a name="line.191"></a>
+<span class="sourceLineNo">192</span> }<a name="line.192"></a>
+<span class="sourceLineNo">193</span><a name="line.193"></a>
+<span class="sourceLineNo">194</span> @Override<a name="line.194"></a>
+<span class="sourceLineNo">195</span> public long getDataHitCount() {<a name="line.195"></a>
+<span class="sourceLineNo">196</span> return lruCacheStats.getDataHitCount() + bucketCacheStats.getDataHitCount();<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> @Override<a name="line.199"></a>
+<span class="sourceLineNo">200</span> public long getLeafIndexHitCount() {<a name="line.200"></a>
+<span class="sourceLineNo">201</span> return lruCacheStats.getLeafIndexHitCount() + bucketCacheStats.getLeafIndexHitCount();<a name="line.201"></a>
+<span class="sourceLineNo">202</span> }<a name="line.202"></a>
+<span class="sourceLineNo">203</span><a name="line.203"></a>
+<span class="sourceLineNo">204</span> @Override<a name="line.204"></a>
+<span class="sourceLineNo">205</span> public long getBloomChunkHitCount() {<a name="line.205"></a>
+<span class="sourceLineNo">206</span> return lruCacheStats.getBloomChunkHitCount() + bucketCacheStats.getBloomChunkHitCount();<a name="line.206"></a>
+<span class="sourceLineNo">207</span> }<a name="line.207"></a>
+<span class="sourceLineNo">208</span><a name="line.208"></a>
+<span class="sourceLineNo">209</span> @Override<a name="line.209"></a>
+<span class="sourceLineNo">210</span> public long getMetaHitCount() {<a name="line.210"></a>
+<span class="sourceLineNo">211</span> return lruCacheStats.getMetaHitCount() + bucketCacheStats.getMetaHitCount();<a name="line.211"></a>
+<span class="sourceLineNo">212</span> }<a name="line.212"></a>
+<span class="sourceLineNo">213</span><a name="line.213"></a>
+<span class="sourceLineNo">214</span> @Override<a name="line.214"></a>
+<span class="sourceLineNo">215</span> public long getRootIndexHitCount() {<a name="line.215"></a>
+<span class="sourceLineNo">216</span> return lruCacheStats.getRootIndexHitCount() + bucketCacheStats.getRootIndexHitCount();<a name="line.216"></a>
<span class="sourceLineNo">217</span> }<a name="line.217"></a>
-<span class="sourceLineNo">218</span> <a name="line.218"></a>
+<span class="sourceLineNo">218</span><a name="line.218"></a>
<span class="sourceLineNo">219</span> @Override<a name="line.219"></a>
-<span class="sourceLineNo">220</span> public long getSumRequestCountsPastNPeriods() {<a name="line.220"></a>
-<span class="sourceLineNo">221</span> return lruCacheStats.getSumRequestCountsPastNPeriods()<a name="line.221"></a>
-<span class="sourceLineNo">222</span> + bucketCacheStats.getSumRequestCountsPastNPeriods();<a name="line.222"></a>
+<span class="sourceLineNo">220</span> public long getIntermediateIndexHitCount() {<a name="line.220"></a>
+<span class="sourceLineNo">221</span> return lruCacheStats.getIntermediateIndexHitCount() +<a name="line.221"></a>
+<span class="sourceLineNo">222</span> bucketCacheStats.getIntermediateIndexHitCount();<a name="line.222"></a>
<span class="sourceLineNo">223</span> }<a name="line.223"></a>
-<span class="sourceLineNo">224</span> <a name="line.224"></a>
+<span class="sourceLineNo">224</span><a name="line.224"></a>
<span class="sourceLineNo">225</span> @Override<a name="line.225"></a>
-<span class="sourceLineNo">226</span> public long getSumHitCachingCountsPastNPeriods() {<a name="line.226"></a>
-<span class="sourceLineNo">227</span> return lruCacheStats.getSumHitCachingCountsPastNPeriods()<a name="line.227"></a>
-<span class="sourceLineNo">228</span> + bucketCacheStats.getSumHitCachingCountsPastNPeriods();<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 long getSumRequestCachingCountsPastNPeriods() {<a name="line.232"></a>
-<span class="sourceLineNo">233</span> return lruCacheStats.getSumRequestCachingCountsPastNPeriods()<a name="line.233"></a>
-<span class="sourceLineNo">234</span> + bucketCacheStats.getSumRequestCachingCountsPastNPeriods();<a name="line.234"></a>
-<span class="sourceLineNo">235</span> }<a name="line.235"></a>
-<span class="sourceLineNo">236</span> }<a name="line.236"></a>
-<span class="sourceLineNo">237</span><a name="line.237"></a>
-<span class="sourceLineNo">238</span> @Override<a name="line.238"></a>
-<span class="sourceLineNo">239</span> public Iterator<CachedBlock> iterator() {<a name="line.239"></a>
-<span class="sourceLineNo">240</span> return new BlockCachesIterator(getBlockCaches());<a name="line.240"></a>
-<span class="sourceLineNo">241</span> }<a name="line.241"></a>
-<span class="sourceLineNo">242</span><a name="line.242"></a>
-<span class="sourceLineNo">243</span> @Override<a name="line.243"></a>
-<span class="sourceLineNo">244</span> public BlockCache[] getBlockCaches() {<a name="line.244"></a>
-<span class="sourceLineNo">245</span> return new BlockCache [] {this.lruCache, this.l2Cache};<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> @Override<a name="line.248"></a>
-<span class="sourceLineNo">249</span> public void setMaxSize(long size) {<a name="line.249"></a>
-<span class="sourceLineNo">250</span> this.lruCache.setMaxSize(size);<a name="line.250"></a>
-<span class="sourceLineNo">251</span> }<a name="line.251"></a>
+<span class="sourceLineNo">226</span> public long getFileInfoHitCount() {<a name="line.226"></a>
+<span class="sourceLineNo">227</span> return lruCacheStats.getFileInfoHitCount() + bucketCacheStats.getFileInfoHitCount();<a name="line.227"></a>
+<span class="sourceLineNo">228</span> }<a name="line.228"></a>
+<span class="sourceLineNo">229</span><a name="line.229"></a>
+<span class="sourceLineNo">230</span> @Override<a name="line.230"></a>
+<span class="sourceLineNo">231</span> public long getGeneralBloomMetaHitCount() {<a name="line.231"></a>
+<span class="sourceLineNo">232</span> return lruCacheStats.getGeneralBloomMetaHitCount() +<a name="line.232"></a>
+<span class="sourceLineNo">233</span> bucketCacheStats.getGeneralBloomMetaHitCount();<a name="line.233"></a>
+<span class="sourceLineNo">234</span> }<a name="line.234"></a>
+<span class="sourceLineNo">235</span><a name="line.235"></a>
+<span class="sourceLineNo">236</span> @Override<a name="line.236"></a>
+<span class="sourceLineNo">237</span> public long getDeleteFamilyBloomHitCount() {<a name="line.237"></a>
+<span class="sourceLineNo">238</span> return lruCacheStats.getDeleteFamilyBloomHitCount() +<a name="line.238"></a>
+<span class="sourceLineNo">239</span> bucketCacheStats.getDeleteFamilyBloomHitCount();<a name="line.239"></a>
+<span class="sourceLineNo">240</span> }<a name="line.240"></a>
+<span class="sourceLineNo">241</span><a name="line.241"></a>
+<span class="sourceLineNo">242</span> @Override<a name="line.242"></a>
+<span class="sourceLineNo">243</span> public long getTrailerHitCount() {<a name="line.243"></a>
+<span class="sourceLineNo">244</span> return lruCacheStats.getTrailerHitCount() + bucketCacheStats.getTrailerHitCount();<a name="line.244"></a>
+<span class="sourceLineNo">245</span> }<a name="line.245"></a>
+<span class="sourceLineNo">246</span><a name="line.246"></a>
+<span class="sourceLineNo">247</span> @Override<a name="line.247"></a>
+<span class="sourceLineNo">248</span> public long getRequestCount() {<a name="line.248"></a>
+<span class="sourceLineNo">249</span> return lruCacheStats.getRequestCount()<a name="line.249"></a>
+<span class="sourceLineNo">250</span> + bucketCacheStats.getRequestCount();<a name="line.250"></a>
+<span class="sourceLineNo">251</span> }<a name="line.251"></a>
<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span> @Override<a name="line.253"></a>
-<span class="sourceLineNo">254</span> public void returnBlock(BlockCacheKey cacheKey, Cacheable block) {<a name="line.254"></a>
-<span class="sourceLineNo">255</span> // A noop<a name="line.255"></a>
-<span class="sourceLineNo">256</span> this.lruCache.returnBlock(cacheKey, block);<a name="line.256"></a>
-<span class="sourceLineNo">257</span> this.l2Cache.returnBlock(cacheKey, block);<a name="line.257"></a>
-<span class="sourceLineNo">258</span> }<a name="line.258"></a>
-<span class="sourceLineNo">259</span><a name="line.259"></a>
-<span class="sourceLineNo">260</span> @VisibleForTesting<a name="line.260"></a>
-<span class="sourceLineNo">261</span> public int getRefCount(BlockCacheKey cacheKey) {<a name="line.261"></a>
-<span class="sourceLineNo">262</span> return ((BucketCache) this.l2Cache).getRefCount(cacheKey);<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">253</span> @Override<a name="line.253"></a>
+<span class="sourceLineNo">254</span> public long getRequestCachingCount() {<a name="line.254"></a>
+<span class="sourceLineNo">255</span> return lruCacheStats.getRequestCachingCount()<a name="line.255"></a>
+<span class="sourceLineNo">256</span> + bucketCacheStats.getRequestCachingCount();<a name="line.256"></a>
+<span class="sourceLineNo">257</span> }<a name="line.257"></a>
+<span class="sourceLineNo">258</span><a name="line.258"></a>
+<span class="sourceLineNo">259</span> @Override<a name="line.259"></a>
+<span class="sourceLineNo">260</span> public long getMissCount() {<a name="line.260"></a>
+<span class="sourceLineNo">261</span> return lruCacheStats.getMissCount() + bucketCacheStats.getMissCount();<a name="line.261"></a>
+<span class="sourceLineNo">262</span> }<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span> @Override<a name="line.264"></a>
+<span class="sourceLineNo">265</span> public long getPrimaryMissCount() {<a name="line.265"></a>
+<span class="sourceLineNo">266</span> return lruCacheStats.getPrimaryMissCount() + bucketCacheStats.getPrimaryMissCount();<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> @Override<a name="line.269"></a>
+<span class="sourceLineNo">270</span> public long getMissCachingCount() {<a name="line.270"></a>
+<span class="sourceLineNo">271</span> return lruCacheStats.getMissCachingCount()<a name="line.271"></a>
+<span class="sourceLineNo">272</span> + bucketCacheStats.getMissCachingCount();<a name="line.272"></a>
+<span class="sourceLineNo">273</span> }<a name="line.273"></a>
+<span class="sourceLineNo">274</span><a name="line.274"></a>
+<span class="sourceLineNo">275</span> @Override<a name="line.275"></a>
+<span class="sourceLineNo">276</span> public long getHitCount() {<a name="line.276"></a>
+<span class="sourceLineNo">277</span> return lruCacheStats.getHitCount() + bucketCacheStats.getHitCount();<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 long getPrimaryHitCount() {<a name="line.281"></a>
+<span class="sourceLineNo">282</span> return lruCacheStats.getPrimaryHitCount() + bucketCacheStats.getPrimaryHitCount();<a name="line.282"></a>
+<span class="sourceLineNo">283</span> }<a name="line.283"></a>
+<span class="sourceLineNo">284</span> @Override<a name="line.284"></a>
+<span class="sourceLineNo">285</span> public long getHitCachingCount() {<a name="line.285"></a>
+<span class="sourceLineNo">286</span> return lruCacheStats.getHitCachingCount()<a name="line.286"></a>
+<span class="sourceLineNo">287</span> + bucketCacheStats.getHitCachingCount();<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> @Override<a name="line.290"></a>
+<span class="sourceLineNo">291</span> public long getEvictionCount() {<a name="line.291"></a>
+<span class="sourceLineNo">292</span> return lruCacheStats.getEvictionCount()<a name="line.292"></a>
+<span class="sourceLineNo">293</span> + bucketCacheStats.getEvictionCount();<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> @Override<a name="line.296"></a>
+<span class="sourceLineNo">297</span> public long getEvictedCount() {<a name="line.297"></a>
+<span class="sourceLineNo">298</span> return lruCacheStats.getEvictedCount()<a name="line.298"></a>
+<span class="sourceLineNo">299</span> + bucketCacheStats.getEvictedCount();<a name="line.299"></a>
+<span class="sourceLineNo">300</span> }<a name="line.300"></a>
+<span class="sourceLineNo">301</span><a name="line.301"></a>
+<span class="sourceLineNo">302</span> @Override<a name="line.302"></a>
+<span class="sourceLineNo">303</span> public long getPrimaryEvictedCount() {<a name="line.303"></a>
+<span class="sourceLineNo">304</span> return lruCacheStats.getPrimaryEvictedCount()<a name="line.304"></a>
+<span class="sourceLineNo">305</span> + bucketCacheStats.getPrimaryEvictedCount();<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> @Override<a name="line.308"></a>
+<span class="sourceLineNo">309</span> public void rollMetricsPeriod() {<a name="line.309"></a>
+<span class="sourceLineNo">310</span> lruCacheStats.rollMetricsPeriod();<a name="line.310"></a>
+<span class="sourceLineNo">311</span> bucketCacheStats.rollMetricsPeriod();<a name="line.311"></a>
+<span class="sourceLineNo">312</span> }<a name="line.312"></a>
+<span class="sourceLineNo">313</span> <a name="line.313"></a>
+<span class="sourceLineNo">314</span> @Override<a name="line.314"></a>
+<span class="sourceLineNo">315</span> public long getFailedInserts() {<a name="line.315"></a>
+<span class="sourceLineNo">316</span> return lruCacheStats.getFailedInserts() + bucketCacheStats.getFailedInserts();<a name="line.316"></a>
+<span class="sourceLineNo">317</span> }<a name="line.317"></a>
+<span class="sourceLineNo">318</span><a name="line.318"></a>
+<span class="sourceLineNo">319</span> @Override<a name="line.319"></a>
+<span class="sourceLineNo">320</span> public long getSumHitCountsPastNPeriods() {<a name="line.320"></a>
+<span class="sourceLineNo">321</span> return lruCacheStats.getSumHitCountsPastNPeriods()<a name="line.321"></a>
+<span class="sourceLineNo">322</span> + bucketCacheStats.getSumHitCountsPastNPeriods();<a name="line.322"></a>
+<span class="sourceLineNo">323</span> }<a name="line.323"></a>
+<span class="sourceLineNo">324</span> <a name="line.324"></a>
+<span class="sourceLineNo">325</span> @Override<a name="line.325"></a>
+<span class="sourceLineNo">326</span> public long getSumRequestCountsPastNPeriods() {<a name="line.326"></a>
+<span class="sourceLineNo">327</span> return lruCacheStats.getSumRequestCountsPastNPeriods()<a name="line.327"></a>
+<span class="sourceLineNo">328</span> + bucketCacheStats.getSumRequestCountsPastNPeriods();<a name="line.328"></a>
+<span class="sourceLineNo">329</span> }<a name="line.329"></a>
+<span class="sourceLineNo">330</span> <a name="line.330"></a>
+<span class="sourceLineNo">331</span> @Override<a name="line.331"></a>
+<span class="sourceLineNo">332</span> public long getSumHitCachingCountsPastNPeriods() {<a name="line.332"></a>
+<span class="sourceLineNo">333</span> return lruCacheStats.getSumHitCachingCountsPastNPeriods()<a name="line.333"></a>
+<span class="sourceLineNo">334</span> + bucketCacheStats.getSumHitCachingCountsPastNPeriods();<a name="line.334"></a>
+<span class="sourceLineNo">335</span> }<a name="line.335"></a>
+<span class="sourceLineNo">336</span><a name="line.336"></a>
+<span class="sourceLineNo">337</span> @Override<a name="line.337"></a>
+<span class="sourceLineNo">338</span> public long getSumRequestCachingCountsPastNPeriods() {<a name="line.338"></a>
+<span class="sourceLineNo">339</span> return lruCacheStats.getSumRequestCachingCountsPastNPeriods()<a name="line.339"></a>
+<span class="sourceLineNo">340</span> + bucketCacheStats.getSumRequestCachingCountsPastNPeriods();<a name="line.340"></a>
+<span class="sourceLineNo">341</span> }<a name="line.341"></a>
+<span class="sourceLineNo">342</span> }<a name="line.342"></a>
+<span class="sourceLineNo">343</span><a name="line.343"></a>
+<span class="sourceLineNo">344</span> @Override<a name="line.344"></a>
+<span class="sourceLineNo">345</span> public Iterator<CachedBlock> iterator() {<a name="line.345"></a>
+<span class="sourceLineNo">346</span> return new BlockCachesIterator(getBlockCaches());<a name="line.346"></a>
+<span class="sourceLineNo">347</span> }<a name="line.347"></a>
+<span class="sourceLineNo">348</span><a name="line.348"></a>
+<span class="sourceLineNo">349</span> @Override<a name="line.349"></a>
+<span class="sourceLineNo">350</span> public BlockCache[] getBlockCaches() {<a name="line.350"></a>
+<span class="sourceLineNo">351</span> return new BlockCache [] {this.lruCache, this.l2Cache};<a name="line.351"></a>
+<span class="sourceLineNo">352</span> }<a name="line.352"></a>
+<span class="sourceLineNo">353</span><a name="line.353"></a>
+<span class="sourceLineNo">354</span> @Override<a name="line.354"></a>
+<span class="sourceLineNo">355</span> public void setMaxSize(long size) {<a name="line.355"></a>
+<span class="sourceLineNo">356</span> this.lruCache.setMaxSize(size);<a name="line.356"></a>
+<span class="sourceLineNo">357</span> }<a name="line.357"></a>
+<span class="sourceLineNo">358</span><a name="line.358"></a>
+<span class="sourceLineNo">359</span> @Override<a name="line.359"></a>
+<span class="sourceLineNo">360</span> public void returnBlock(BlockCacheKey cacheKey, Cacheable block) {<a name="line.360"></a>
+<span class="sourceLineNo">361</span> // A noop<a name="line.361"></a>
+<span class="sourceLineNo">362</span> this.lruCache.returnBlock(cacheKey, block);<a name="line.362"></a>
+<span class="sourceLineNo">363</span> this.l2Cache.returnBlock(cacheKey, block);<a name="line.363"></a>
+<span class="sourceLineNo">364</span> }<a name="line.364"></a>
+<span class="sourceLineNo">365</span><a name="line.365"></a>
+<span class="sourceLineNo">366</span> @VisibleForTesting<a name="line.366"></a>
+<span class="sourceLineNo">367</span> public int getRefCount(BlockCacheKey cacheKey) {<a name="line.367"></a>
+<span class="sourceLineNo">368</span> return ((BucketCache) this.l2Cache).getRefCount(cacheKey);<a name="line.368"></a>
+<span class="sourceLineNo">369</span> }<a name="line.369"></a>
+<span class="sourceLineNo">370</span>}<a name="line.370"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f8d69509/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html
index e805311..d9e2c11 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html
@@ -147,129 +147,235 @@
<span class="sourceLineNo">139</span> }<a name="line.139"></a>
<span class="sourceLineNo">140</span><a name="line.140"></a>
<span class="sourceLineNo">141</span> @Override<a name="line.141"></a>
-<span class="sourceLineNo">142</span> public long getRequestCount() {<a name="line.142"></a>
-<span class="sourceLineNo">143</span> return lruCacheStats.getRequestCount()<a name="line.143"></a>
-<span class="sourceLineNo">144</span> + bucketCacheStats.getRequestCount();<a name="line.144"></a>
-<span class="sourceLineNo">145</span> }<a name="line.145"></a>
-<span class="sourceLineNo">146</span><a name="line.146"></a>
-<span class="sourceLineNo">147</span> @Override<a name="line.147"></a>
-<span class="sourceLineNo">148</span> public long getRequestCachingCount() {<a name="line.148"></a>
-<span class="sourceLineNo">149</span> return lruCacheStats.getRequestCachingCount()<a name="line.149"></a>
-<span class="sourceLineNo">150</span> + bucketCacheStats.getRequestCachingCount();<a name="line.150"></a>
-<span class="sourceLineNo">151</span> }<a name="line.151"></a>
-<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span> @Override<a name="line.153"></a>
-<span class="sourceLineNo">154</span> public long getMissCount() {<a name="line.154"></a>
-<span class="sourceLineNo">155</span> return lruCacheStats.getMissCount() + bucketCacheStats.getMissCount();<a name="line.155"></a>
-<span class="sourceLineNo">156</span> }<a name="line.156"></a>
-<span class="sourceLineNo">157</span><a name="line.157"></a>
-<span class="sourceLineNo">158</span> @Override<a name="line.158"></a>
-<span class="sourceLineNo">159</span> public long getPrimaryMissCount() {<a name="line.159"></a>
-<span class="sourceLineNo">160</span> return lruCacheStats.getPrimaryMissCount() + bucketCacheStats.getPrimaryMissCount();<a name="line.160"></a>
-<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> @Override<a name="line.163"></a>
-<span class="sourceLineNo">164</span> public long getMissCachingCount() {<a name="line.164"></a>
-<span class="sourceLineNo">165</span> return lruCacheStats.getMissCachingCount()<a name="line.165"></a>
-<span class="sourceLineNo">166</span> + bucketCacheStats.getMissCachingCount();<a name="line.166"></a>
-<span class="sourceLineNo">167</span> }<a name="line.167"></a>
-<span class="sourceLineNo">168</span><a name="line.168"></a>
-<span class="sourceLineNo">169</span> @Override<a name="line.169"></a>
-<span class="sourceLineNo">170</span> public long getHitCount() {<a name="line.170"></a>
-<span class="sourceLineNo">171</span> return lruCacheStats.getHitCount() + bucketCacheStats.getHitCount();<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> @Override<a name="line.174"></a>
-<span class="sourceLineNo">175</span> public long getPrimaryHitCount() {<a name="line.175"></a>
-<span class="sourceLineNo">176</span> return lruCacheStats.getPrimaryHitCount() + bucketCacheStats.getPrimaryHitCount();<a name="line.176"></a>
-<span class="sourceLineNo">177</span> }<a name="line.177"></a>
-<span class="sourceLineNo">178</span> @Override<a name="line.178"></a>
-<span class="sourceLineNo">179</span> public long getHitCachingCount() {<a name="line.179"></a>
-<span class="sourceLineNo">180</span> return lruCacheStats.getHitCachingCount()<a name="line.180"></a>
-<span class="sourceLineNo">181</span> + bucketCacheStats.getHitCachingCount();<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> @Override<a name="line.184"></a>
-<span class="sourceLineNo">185</span> public long getEvictionCount() {<a name="line.185"></a>
-<span class="sourceLineNo">186</span> return lruCacheStats.getEvictionCount()<a name="line.186"></a>
-<span class="sourceLineNo">187</span> + bucketCacheStats.getEvictionCount();<a name="line.187"></a>
-<span class="sourceLineNo">188</span> }<a name="line.188"></a>
-<span class="sourceLineNo">189</span><a name="line.189"></a>
-<span class="sourceLineNo">190</span> @Override<a name="line.190"></a>
-<span class="sourceLineNo">191</span> public long getEvictedCount() {<a name="line.191"></a>
-<span class="sourceLineNo">192</span> return lruCacheStats.getEvictedCount()<a name="line.192"></a>
-<span class="sourceLineNo">193</span> + bucketCacheStats.getEvictedCount();<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> @Override<a name="line.196"></a>
-<span class="sourceLineNo">197</span> public long getPrimaryEvictedCount() {<a name="line.197"></a>
-<span class="sourceLineNo">198</span> return lruCacheStats.getPrimaryEvictedCount()<a name="line.198"></a>
-<span class="sourceLineNo">199</span> + bucketCacheStats.getPrimaryEvictedCount();<a name="line.199"></a>
-<span class="sourceLineNo">200</span> }<a name="line.200"></a>
-<span class="sourceLineNo">201</span><a name="line.201"></a>
-<span class="sourceLineNo">202</span> @Override<a name="line.202"></a>
-<span class="sourceLineNo">203</span> public void rollMetricsPeriod() {<a name="line.203"></a>
-<span class="sourceLineNo">204</span> lruCacheStats.rollMetricsPeriod();<a name="line.204"></a>
-<span class="sourceLineNo">205</span> bucketCacheStats.rollMetricsPeriod();<a name="line.205"></a>
-<span class="sourceLineNo">206</span> }<a name="line.206"></a>
-<span class="sourceLineNo">207</span> <a name="line.207"></a>
-<span class="sourceLineNo">208</span> @Override<a name="line.208"></a>
-<span class="sourceLineNo">209</span> public long getFailedInserts() {<a name="line.209"></a>
-<span class="sourceLineNo">210</span> return lruCacheStats.getFailedInserts() + bucketCacheStats.getFailedInserts();<a name="line.210"></a>
-<span class="sourceLineNo">211</span> }<a name="line.211"></a>
-<span class="sourceLineNo">212</span><a name="line.212"></a>
-<span class="sourceLineNo">213</span> @Override<a name="line.213"></a>
-<span class="sourceLineNo">214</span> public long getSumHitCountsPastNPeriods() {<a name="line.214"></a>
-<span class="sourceLineNo">215</span> return lruCacheStats.getSumHitCountsPastNPeriods()<a name="line.215"></a>
-<span class="sourceLineNo">216</span> + bucketCacheStats.getSumHitCountsPastNPeriods();<a name="line.216"></a>
+<span class="sourceLineNo">142</span> public long getDataMissCount() {<a name="line.142"></a>
+<span class="sourceLineNo">143</span> return lruCacheStats.getDataMissCount() + bucketCacheStats.getDataMissCount();<a name="line.143"></a>
+<span class="sourceLineNo">144</span> }<a name="line.144"></a>
+<span class="sourceLineNo">145</span><a name="line.145"></a>
+<span class="sourceLineNo">146</span> @Override<a name="line.146"></a>
+<span class="sourceLineNo">147</span> public long getLeafIndexMissCount() {<a name="line.147"></a>
+<span class="sourceLineNo">148</span> return lruCacheStats.getLeafIndexMissCount() + bucketCacheStats.getLeafIndexMissCount();<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 long getBloomChunkMissCount() {<a name="line.152"></a>
+<span class="sourceLineNo">153</span> return lruCacheStats.getBloomChunkMissCount() + bucketCacheStats.getBloomChunkMissCount();<a name="line.153"></a>
+<span class="sourceLineNo">154</span> }<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span> @Override<a name="line.156"></a>
+<span class="sourceLineNo">157</span> public long getMetaMissCount() {<a name="line.157"></a>
+<span class="sourceLineNo">158</span> return lruCacheStats.getMetaMissCount() + bucketCacheStats.getMetaMissCount();<a name="line.158"></a>
+<span class="sourceLineNo">159</span> }<a name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span> @Override<a name="line.161"></a>
+<span class="sourceLineNo">162</span> public long getRootIndexMissCount() {<a name="line.162"></a>
+<span class="sourceLineNo">163</span> return lruCacheStats.getRootIndexMissCount() + bucketCacheStats.getRootIndexMissCount();<a name="line.163"></a>
+<span class="sourceLineNo">164</span> }<a name="line.164"></a>
+<span class="sourceLineNo">165</span><a name="line.165"></a>
+<span class="sourceLineNo">166</span> @Override<a name="line.166"></a>
+<span class="sourceLineNo">167</span> public long getIntermediateIndexMissCount() {<a name="line.167"></a>
+<span class="sourceLineNo">168</span> return lruCacheStats.getIntermediateIndexMissCount() +<a name="line.168"></a>
+<span class="sourceLineNo">169</span> bucketCacheStats.getIntermediateIndexMissCount();<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> @Override<a name="line.172"></a>
+<span class="sourceLineNo">173</span> public long getFileInfoMissCount() {<a name="line.173"></a>
+<span class="sourceLineNo">174</span> return lruCacheStats.getFileInfoMissCount() + bucketCacheStats.getFileInfoMissCount();<a name="line.174"></a>
+<span class="sourceLineNo">175</span> }<a name="line.175"></a>
+<span class="sourceLineNo">176</span><a name="line.176"></a>
+<span class="sourceLineNo">177</span> @Override<a name="line.177"></a>
+<span class="sourceLineNo">178</span> public long getGeneralBloomMetaMissCount() {<a name="line.178"></a>
+<span class="sourceLineNo">179</span> return lruCacheStats.getGeneralBloomMetaMissCount() +<a name="line.179"></a>
+<span class="sourceLineNo">180</span> bucketCacheStats.getGeneralBloomMetaMissCount();<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>
+<span class="sourceLineNo">183</span> @Override<a name="line.183"></a>
+<span class="sourceLineNo">184</span> public long getDeleteFamilyBloomMissCount() {<a name="line.184"></a>
+<span class="sourceLineNo">185</span> return lruCacheStats.getDeleteFamilyBloomMissCount() +<a name="line.185"></a>
+<span class="sourceLineNo">186</span> bucketCacheStats.getDeleteFamilyBloomMissCount();<a name="line.186"></a>
+<span class="sourceLineNo">187</span> }<a name="line.187"></a>
+<span class="sourceLineNo">188</span><a name="line.188"></a>
+<span class="sourceLineNo">189</span> @Override<a name="line.189"></a>
+<span class="sourceLineNo">190</span> public long getTrailerMissCount() {<a name="line.190"></a>
+<span class="sourceLineNo">191</span> return lruCacheStats.getTrailerMissCount() + bucketCacheStats.getTrailerMissCount();<a name="line.191"></a>
+<span class="sourceLineNo">192</span> }<a name="line.192"></a>
+<span class="sourceLineNo">193</span><a name="line.193"></a>
+<span class="sourceLineNo">194</span> @Override<a name="line.194"></a>
+<span class="sourceLineNo">195</span> public long getDataHitCount() {<a name="line.195"></a>
+<span class="sourceLineNo">196</span> return lruCacheStats.getDataHitCount() + bucketCacheStats.getDataHitCount();<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> @Override<a name="line.199"></a>
+<span class="sourceLineNo">200</span> public long getLeafIndexHitCount() {<a name="line.200"></a>
+<span class="sourceLineNo">201</span> return lruCacheStats.getLeafIndexHitCount() + bucketCacheStats.getLeafIndexHitCount();<a name="line.201"></a>
+<span class="sourceLineNo">202</span> }<a name="line.202"></a>
+<span class="sourceLineNo">203</span><a name="line.203"></a>
+<span class="sourceLineNo">204</span> @Override<a name="line.204"></a>
+<span class="sourceLineNo">205</span> public long getBloomChunkHitCount() {<a name="line.205"></a>
+<span class="sourceLineNo">206</span> return lruCacheStats.getBloomChunkHitCount() + bucketCacheStats.getBloomChunkHitCount();<a name="line.206"></a>
+<span class="sourceLineNo">207</span> }<a name="line.207"></a>
+<span class="sourceLineNo">208</span><a name="line.208"></a>
+<span class="sourceLineNo">209</span> @Override<a name="line.209"></a>
+<span class="sourceLineNo">210</span> public long getMetaHitCount() {<a name="line.210"></a>
+<span class="sourceLineNo">211</span> return lruCacheStats.getMetaHitCount() + bucketCacheStats.getMetaHitCount();<a name="line.211"></a>
+<span class="sourceLineNo">212</span> }<a name="line.212"></a>
+<span class="sourceLineNo">213</span><a name="line.213"></a>
+<span class="sourceLineNo">214</span> @Override<a name="line.214"></a>
+<span class="sourceLineNo">215</span> public long getRootIndexHitCount() {<a name="line.215"></a>
+<span class="sourceLineNo">216</span> return lruCacheStats.getRootIndexHitCount() + bucketCacheStats.getRootIndexHitCount();<a name="line.216"></a>
<span class="sourceLineNo">217</span> }<a name="line.217"></a>
-<span class="sourceLineNo">218</span> <a name="line.218"></a>
+<span class="sourceLineNo">218</span><a name="line.218"></a>
<span class="sourceLineNo">219</span> @Override<a name="line.219"></a>
-<span class="sourceLineNo">220</span> public long getSumRequestCountsPastNPeriods() {<a name="line.220"></a>
-<span class="sourceLineNo">221</span> return lruCacheStats.getSumRequestCountsPastNPeriods()<a name="line.221"></a>
-<span class="sourceLineNo">222</span> + bucketCacheStats.getSumRequestCountsPastNPeriods();<a name="line.222"></a>
+<span class="sourceLineNo">220</span> public long getIntermediateIndexHitCount() {<a name="line.220"></a>
+<span class="sourceLineNo">221</span> return lruCacheStats.getIntermediateIndexHitCount() +<a name="line.221"></a>
+<span class="sourceLineNo">222</span> bucketCacheStats.getIntermediateIndexHitCount();<a name="line.222"></a>
<span class="sourceLineNo">223</span> }<a name="line.223"></a>
-<span class="sourceLineNo">224</span> <a name="line.224"></a>
+<span class="sourceLineNo">224</span><a name="line.224"></a>
<span class="sourceLineNo">225</span> @Override<a name="line.225"></a>
-<span class="sourceLineNo">226</span> public long getSumHitCachingCountsPastNPeriods() {<a name="line.226"></a>
-<span class="sourceLineNo">227</span> return lruCacheStats.getSumHitCachingCountsPastNPeriods()<a name="line.227"></a>
-<span class="sourceLineNo">228</span> + bucketCacheStats.getSumHitCachingCountsPastNPeriods();<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 long getSumRequestCachingCountsPastNPeriods() {<a name="line.232"></a>
-<span class="sourceLineNo">233</span> return lruCacheStats.getSumRequestCachingCountsPastNPeriods()<a name="line.233"></a>
-<span class="sourceLineNo">234</span> + bucketCacheStats.getSumRequestCachingCountsPastNPeriods();<a name="line.234"></a>
-<span class="sourceLineNo">235</span> }<a name="line.235"></a>
-<span class="sourceLineNo">236</span> }<a name="line.236"></a>
-<span class="sourceLineNo">237</span><a name="line.237"></a>
-<span class="sourceLineNo">238</span> @Override<a name="line.238"></a>
-<span class="sourceLineNo">239</span> public Iterator<CachedBlock> iterator() {<a name="line.239"></a>
-<span class="sourceLineNo">240</span> return new BlockCachesIterator(getBlockCaches());<a name="line.240"></a>
-<span class="sourceLineNo">241</span> }<a name="line.241"></a>
-<span class="sourceLineNo">242</span><a name="line.242"></a>
-<span class="sourceLineNo">243</span> @Override<a name="line.243"></a>
-<span class="sourceLineNo">244</span> public BlockCache[] getBlockCaches() {<a name="line.244"></a>
-<span class="sourceLineNo">245</span> return new BlockCache [] {this.lruCache, this.l2Cache};<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> @Override<a name="line.248"></a>
-<span class="sourceLineNo">249</span> public void setMaxSize(long size) {<a name="line.249"></a>
-<span class="sourceLineNo">250</span> this.lruCache.setMaxSize(size);<a name="line.250"></a>
-<span class="sourceLineNo">251</span> }<a name="line.251"></a>
+<span class="sourceLineNo">226</span> public long getFileInfoHitCount() {<a name="line.226"></a>
+<span class="sourceLineNo">227</span> return lruCacheStats.getFileInfoHitCount() + bucketCacheStats.getFileInfoHitCount();<a name="line.227"></a>
+<span class="sourceLineNo">228</span> }<a name="line.228"></a>
+<span class="sourceLineNo">229</span><a name="line.229"></a>
+<span class="sourceLineNo">230</span> @Override<a name="line.230"></a>
+<span class="sourceLineNo">231</span> public long getGeneralBloomMetaHitCount() {<a name="line.231"></a>
+<span class="sourceLineNo">232</span> return lruCacheStats.getGeneralBloomMetaHitCount() +<a name="line.232"></a>
+<span class="sourceLineNo">233</span> bucketCacheStats.getGeneralBloomMetaHitCount();<a name="line.233"></a>
+<span class="sourceLineNo">234</span> }<a name="line.234"></a>
+<span class="sourceLineNo">235</span><a name="line.235"></a>
+<span class="sourceLineNo">236</span> @Override<a name="line.236"></a>
+<span class="sourceLineNo">237</span> public long getDeleteFamilyBloomHitCount() {<a name="line.237"></a>
+<span class="sourceLineNo">238</span> return lruCacheStats.getDeleteFamilyBloomHitCount() +<a name="line.238"></a>
+<span class="sourceLineNo">239</span> bucketCacheStats.getDeleteFamilyBloomHitCount();<a name="line.239"></a>
+<span class="sourceLineNo">240</span> }<a name="line.240"></a>
+<span class="sourceLineNo">241</span><a name="line.241"></a>
+<span class="sourceLineNo">242</span> @Override<a name="line.242"></a>
+<span class="sourceLineNo">243</span> public long getTrailerHitCount() {<a name="line.243"></a>
+<span class="sourceLineNo">244</span> return lruCacheStats.getTrailerHitCount() + bucketCacheStats.getTrailerHitCount();<a name="line.244"></a>
+<span class="sourceLineNo">245</span> }<a name="line.245"></a>
+<span class="sourceLineNo">246</span><a name="line.246"></a>
+<span class="sourceLineNo">247</span> @Override<a name="line.247"></a>
+<span class="sourceLineNo">248</span> public long getRequestCount() {<a name="line.248"></a>
+<span class="sourceLineNo">249</span> return lruCacheStats.getRequestCount()<a name="line.249"></a>
+<span class="sourceLineNo">250</span> + bucketCacheStats.getRequestCount();<a name="line.250"></a>
+<span class="sourceLineNo">251</span> }<a name="line.251"></a>
<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span> @Override<a name="line.253"></a>
-<span class="sourceLineNo">254</span> public void returnBlock(BlockCacheKey cacheKey, Cacheable block) {<a name="line.254"></a>
-<span class="sourceLineNo">255</span> // A noop<a name="line.255"></a>
-<span class="sourceLineNo">256</span> this.lruCache.returnBlock(cacheKey, block);<a name="line.256"></a>
-<span class="sourceLineNo">257</span> this.l2Cache.returnBlock(cacheKey, block);<a name="line.257"></a>
-<span class="sourceLineNo">258</span> }<a name="line.258"></a>
-<span class="sourceLineNo">259</span><a name="line.259"></a>
-<span class="sourceLineNo">260</span> @VisibleForTesting<a name="line.260"></a>
-<span class="sourceLineNo">261</span> public int getRefCount(BlockCacheKey cacheKey) {<a name="line.261"></a>
-<span class="sourceLineNo">262</span> return ((BucketCache) this.l2Cache).getRefCount(cacheKey);<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">253</span> @Override<a name="line.253"></a>
+<span class="sourceLineNo">254</span> public long getRequestCachingCount() {<a name="line.254"></a>
+<span class="sourceLineNo">255</span> return lruCacheStats.getRequestCachingCount()<a name="line.255"></a>
+<span class="sourceLineNo">256</span> + bucketCacheStats.getRequestCachingCount();<a name="line.256"></a>
+<span class="sourceLineNo">257</span> }<a name="line.257"></a>
+<span class="sourceLineNo">258</span><a name="line.258"></a>
+<span class="sourceLineNo">259</span> @Override<a name="line.259"></a>
+<span class="sourceLineNo">260</span> public long getMissCount() {<a name="line.260"></a>
+<span class="sourceLineNo">261</span> return lruCacheStats.getMissCount() + bucketCacheStats.getMissCount();<a name="line.261"></a>
+<span class="sourceLineNo">262</span> }<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span> @Override<a name="line.264"></a>
+<span class="sourceLineNo">265</span> public long getPrimaryMissCount() {<a name="line.265"></a>
+<span class="sourceLineNo">266</span> return lruCacheStats.getPrimaryMissCount() + bucketCacheStats.getPrimaryMissCount();<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> @Override<a name="line.269"></a>
+<span class="sourceLineNo">270</span> public long getMissCachingCount() {<a name="line.270"></a>
+<span class="sourceLineNo">271</span> return lruCacheStats.getMissCachingCount()<a name="line.271"></a>
+<span class="sourceLineNo">272</span> + bucketCacheStats.getMissCachingCount();<a name="line.272"></a>
+<span class="sourceLineNo">273</span> }<a name="line.273"></a>
+<span class="sourceLineNo">274</span><a name="line.274"></a>
+<span class="sourceLineNo">275</span> @Override<a name="line.275"></a>
+<span class="sourceLineNo">276</span> public long getHitCount() {<a name="line.276"></a>
+<span class="sourceLineNo">277</span> return lruCacheStats.getHitCount() + bucketCacheStats.getHitCount();<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 long getPrimaryHitCount() {<a name="line.281"></a>
+<span class="sourceLineNo">282</span> return lruCacheStats.getPrimaryHitCount() + bucketCacheStats.getPrimaryHitCount();<a name="line.282"></a>
+<span class="sourceLineNo">283</span> }<a name="line.283"></a>
+<span class="sourceLineNo">284</span> @Override<a name="line.284"></a>
+<span class="sourceLineNo">285</span> public long getHitCachingCount() {<a name="line.285"></a>
+<span class="sourceLineNo">286</span> return lruCacheStats.getHitCachingCount()<a name="line.286"></a>
+<span class="sourceLineNo">287</span> + bucketCacheStats.getHitCachingCount();<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> @Override<a name="line.290"></a>
+<span class="sourceLineNo">291</span> public long getEvictionCount() {<a name="line.291"></a>
+<span class="sourceLineNo">292</span> return lruCacheStats.getEvictionCount()<a name="line.292"></a>
+<span class="sourceLineNo">293</span> + bucketCacheStats.getEvictionCount();<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> @Override<a name="line.296"></a>
+<span class="sourceLineNo">297</span> public long getEvictedCount() {<a name="line.297"></a>
+<span class="sourceLineNo">298</span> return lruCacheStats.getEvictedCount()<a name="line.298"></a>
+<span class="sourceLineNo">299</span> + bucketCacheStats.getEvictedCount();<a name="line.299"></a>
+<span class="sourceLineNo">300</span> }<a name="line.300"></a>
+<span class="sourceLineNo">301</span><a name="line.301"></a>
+<span class="sourceLineNo">302</span> @Override<a name="line.302"></a>
+<span class="sourceLineNo">303</span> public long getPrimaryEvictedCount() {<a name="line.303"></a>
+<span class="sourceLineNo">304</span> return lruCacheStats.getPrimaryEvictedCount()<a name="line.304"></a>
+<span class="sourceLineNo">305</span> + bucketCacheStats.getPrimaryEvictedCount();<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> @Override<a name="line.308"></a>
+<span class="sourceLineNo">309</span> public void rollMetricsPeriod() {<a name="line.309"></a>
+<span class="sourceLineNo">310</span> lruCacheStats.rollMetricsPeriod();<a name="line.310"></a>
+<span class="sourceLineNo">311</span> bucketCacheStats.rollMetricsPeriod();<a name="line.311"></a>
+<span class="sourceLineNo">312</span> }<a name="line.312"></a>
+<span class="sourceLineNo">313</span> <a name="line.313"></a>
+<span class="sourceLineNo">314</span> @Override<a name="line.314"></a>
+<span class="sourceLineNo">315</span> public long getFailedInserts() {<a name="line.315"></a>
+<span class="sourceLineNo">316</span> return lruCacheStats.getFailedInserts() + bucketCacheStats.getFailedInserts();<a name="line.316"></a>
+<span class="sourceLineNo">317</span> }<a name="line.317"></a>
+<span class="sourceLineNo">318</span><a name="line.318"></a>
+<span class="sourceLineNo">319</span> @Override<a name="line.319"></a>
+<span class="sourceLineNo">320</span> public long getSumHitCountsPastNPeriods() {<a name="line.320"></a>
+<span class="sourceLineNo">321</span> return lruCacheStats.getSumHitCountsPastNPeriods()<a name="line.321"></a>
+<span class="sourceLineNo">322</span> + bucketCacheStats.getSumHitCountsPastNPeriods();<a name="line.322"></a>
+<span class="sourceLineNo">323</span> }<a name="line.323"></a>
+<span class="sourceLineNo">324</span> <a name="line.324"></a>
+<span class="sourceLineNo">325</span> @Override<a name="line.325"></a>
+<span class="sourceLineNo">326</span> public long getSumRequestCountsPastNPeriods() {<a name="line.326"></a>
+<span class="sourceLineNo">327</span> return lruCacheStats.getSumRequestCountsPastNPeriods()<a name="line.327"></a>
+<span class="sourceLineNo">328</span> + bucketCacheStats.getSumRequestCountsPastNPeriods();<a name="line.328"></a>
+<span class="sourceLineNo">329</span> }<a name="line.329"></a>
+<span class="sourceLineNo">330</span> <a name="line.330"></a>
+<span class="sourceLineNo">331</span> @Override<a name="line.331"></a>
+<span class="sourceLineNo">332</span> public long getSumHitCachingCountsPastNPeriods() {<a name="line.332"></a>
+<span class="sourceLineNo">333</span> return lruCacheStats.getSumHitCachingCountsPastNPeriods()<a name="line.333"></a>
+<span class="sourceLineNo">334</span> + bucketCacheStats.getSumHitCachingCountsPastNPeriods();<a name="line.334"></a>
+<span class="sourceLineNo">335</span> }<a name="line.335"></a>
+<span class="sourceLineNo">336</span><a name="line.336"></a>
+<span class="sourceLineNo">337</span> @Override<a name="line.337"></a>
+<span class="sourceLineNo">338</span> public long getSumRequestCachingCountsPastNPeriods() {<a name="line.338"></a>
+<span class="sourceLineNo">339</span> return lruCacheStats.getSumRequestCachingCountsPastNPeriods()<a name="line.339"></a>
+<span class="sourceLineNo">340</span> + bucketCacheStats.getSumRequestCachingCountsPastNPeriods();<a name="line.340"></a>
+<span class="sourceLineNo">341</span> }<a name="line.341"></a>
+<span class="sourceLineNo">342</span> }<a name="line.342"></a>
+<span class="sourceLineNo">343</span><a name="line.343"></a>
+<span class="sourceLineNo">344</span> @Override<a name="line.344"></a>
+<span class="sourceLineNo">345</span> public Iterator<CachedBlock> iterator() {<a name="line.345"></a>
+<span class="sourceLineNo">346</span> return new BlockCachesIterator(getBlockCaches());<a name="line.346"></a>
+<span class="sourceLineNo">347</span> }<a name="line.347"></a>
+<span class="sourceLineNo">348</span><a name="line.348"></a>
+<span class="sourceLineNo">349</span> @Override<a name="line.349"></a>
+<span class="sourceLineNo">350</span> public BlockCache[] getBlockCaches() {<a name="line.350"></a>
+<span class="sourceLineNo">351</span> return new BlockCache [] {this.lruCache, this.l2Cache};<a name="line.351"></a>
+<span class="sourceLineNo">352</span> }<a name="line.352"></a>
+<span class="sourceLineNo">353</span><a name="line.353"></a>
+<span class="sourceLineNo">354</span> @Override<a name="line.354"></a>
+<span class="sourceLineNo">355</span> public void setMaxSize(long size) {<a name="line.355"></a>
+<span class="sourceLineNo">356</span> this.lruCache.setMaxSize(size);<a name="line.356"></a>
+<span class="sourceLineNo">357</span> }<a name="line.357"></a>
+<span class="sourceLineNo">358</span><a name="line.358"></a>
+<span class="sourceLineNo">359</span> @Override<a name="line.359"></a>
+<span class="sourceLineNo">360</span> public void returnBlock(BlockCacheKey cacheKey, Cacheable block) {<a name="line.360"></a>
+<span class="sourceLineNo">361</span> // A noop<a name="line.361"></a>
+<span class="sourceLineNo">362</span> this.lruCache.returnBlock(cacheKey, block);<a name="line.362"></a>
+<span class="sourceLineNo">363</span> this.l2Cache.returnBlock(cacheKey, block);<a name="line.363"></a>
+<span class="sourceLineNo">364</span> }<a name="line.364"></a>
+<span class="sourceLineNo">365</span><a name="line.365"></a>
+<span class="sourceLineNo">366</span> @VisibleForTesting<a name="line.366"></a>
+<span class="sourceLineNo">367</span> public int getRefCount(BlockCacheKey cacheKey) {<a name="line.367"></a>
+<span class="sourceLineNo">368</span> return ((BucketCache) this.l2Cache).getRefCount(cacheKey);<a name="line.368"></a>
+<span class="sourceLineNo">369</span> }<a name="line.369"></a>
+<span class="sourceLineNo">370</span>}<a name="line.370"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f8d69509/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.BlockIndexChunk.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.BlockIndexChunk.html b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.BlockIndexChunk.html
index 6d4582a..4631f06 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.BlockIndexChunk.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.BlockIndexChunk.html
@@ -1178,7 +1178,7 @@
<span class="sourceLineNo">1170</span> if (cacheConf != null) {<a name="line.1170"></a>
<span class="sourceLineNo">1171</span> HFileBlock blockForCaching = blockWriter.getBlockForCaching(cacheConf);<a name="line.1171"></a>
<span class="sourceLineNo">1172</span> cacheConf.getBlockCache().cacheBlock(new BlockCacheKey(nameForCaching,<a name="line.1172"></a>
-<span class="sourceLineNo">1173</span> beginOffset), blockForCaching);<a name="line.1173"></a>
+<span class="sourceLineNo">1173</span> beginOffset, true, blockForCaching.getBlockType()), blockForCaching);<a name="line.1173"></a>
<span class="sourceLineNo">1174</span> }<a name="line.1174"></a>
<span class="sourceLineNo">1175</span><a name="line.1175"></a>
<span class="sourceLineNo">1176</span> // Add intermediate index block size<a name="line.1176"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f8d69509/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.BlockIndexReader.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.BlockIndexReader.html b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.BlockIndexReader.html
index 6d4582a..4631f06 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.BlockIndexReader.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.BlockIndexReader.html
@@ -1178,7 +1178,7 @@
<span class="sourceLineNo">1170</span> if (cacheConf != null) {<a name="line.1170"></a>
<span class="sourceLineNo">1171</span> HFileBlock blockForCaching = blockWriter.getBlockForCaching(cacheConf);<a name="line.1171"></a>
<span class="sourceLineNo">1172</span> cacheConf.getBlockCache().cacheBlock(new BlockCacheKey(nameForCaching,<a name="line.1172"></a>
-<span class="sourceLineNo">1173</span> beginOffset), blockForCaching);<a name="line.1173"></a>
+<span class="sourceLineNo">1173</span> beginOffset, true, blockForCaching.getBlockType()), blockForCaching);<a name="line.1173"></a>
<span class="sourceLineNo">1174</span> }<a name="line.1174"></a>
<span class="sourceLineNo">1175</span><a name="line.1175"></a>
<span class="sourceLineNo">1176</span> // Add intermediate index block size<a name="line.1176"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f8d69509/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.BlockIndexWriter.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.BlockIndexWriter.html b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.BlockIndexWriter.html
index 6d4582a..4631f06 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.BlockIndexWriter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.BlockIndexWriter.html
@@ -1178,7 +1178,7 @@
<span class="sourceLineNo">1170</span> if (cacheConf != null) {<a name="line.1170"></a>
<span class="sourceLineNo">1171</span> HFileBlock blockForCaching = blockWriter.getBlockForCaching(cacheConf);<a name="line.1171"></a>
<span class="sourceLineNo">1172</span> cacheConf.getBlockCache().cacheBlock(new BlockCacheKey(nameForCaching,<a name="line.1172"></a>
-<span class="sourceLineNo">1173</span> beginOffset), blockForCaching);<a name="line.1173"></a>
+<span class="sourceLineNo">1173</span> beginOffset, true, blockForCaching.getBlockType()), blockForCaching);<a name="line.1173"></a>
<span class="sourceLineNo">1174</span> }<a name="line.1174"></a>
<span class="sourceLineNo">1175</span><a name="line.1175"></a>
<span class="sourceLineNo">1176</span> // Add intermediate index block size<a name="line.1176"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f8d69509/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.ByteArrayKeyBlockIndexReader.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.ByteArrayKeyBlockIndexReader.html b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.ByteArrayKeyBlockIndexReader.html
index 6d4582a..4631f06 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.ByteArrayKeyBlockIndexReader.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.ByteArrayKeyBlockIndexReader.html
@@ -1178,7 +1178,7 @@
<span class="sourceLineNo">1170</span> if (cacheConf != null) {<a name="line.1170"></a>
<span class="sourceLineNo">1171</span> HFileBlock blockForCaching = blockWriter.getBlockForCaching(cacheConf);<a name="line.1171"></a>
<span class="sourceLineNo">1172</span> cacheConf.getBlockCache().cacheBlock(new BlockCacheKey(nameForCaching,<a name="line.1172"></a>
-<span class="sourceLineNo">1173</span> beginOffset), blockForCaching);<a name="line.1173"></a>
+<span class="sourceLineNo">1173</span> beginOffset, true, blockForCaching.getBlockType()), blockForCaching);<a name="line.1173"></a>
<span class="sourceLineNo">1174</span> }<a name="line.1174"></a>
<span class="sourceLineNo">1175</span><a name="line.1175"></a>
<span class="sourceLineNo">1176</span> // Add intermediate index block size<a name="line.1176"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f8d69509/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.CellBasedKeyBlockIndexReader.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.CellBasedKeyBlockIndexReader.html b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.CellBasedKeyBlockIndexReader.html
index 6d4582a..4631f06 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.CellBasedKeyBlockIndexReader.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.CellBasedKeyBlockIndexReader.html
@@ -1178,7 +1178,7 @@
<span class="sourceLineNo">1170</span> if (cacheConf != null) {<a name="line.1170"></a>
<span class="sourceLineNo">1171</span> HFileBlock blockForCaching = blockWriter.getBlockForCaching(cacheConf);<a name="line.1171"></a>
<span class="sourceLineNo">1172</span> cacheConf.getBlockCache().cacheBlock(new BlockCacheKey(nameForCaching,<a name="line.1172"></a>
-<span class="sourceLineNo">1173</span> beginOffset), blockForCaching);<a name="line.1173"></a>
+<span class="sourceLineNo">1173</span> beginOffset, true, blockForCaching.getBlockType()), blockForCaching);<a name="line.1173"></a>
<span class="sourceLineNo">1174</span> }<a name="line.1174"></a>
<span class="sourceLineNo">1175</span><a name="line.1175"></a>
<span class="sourceLineNo">1176</span> // Add intermediate index block size<a name="line.1176"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f8d69509/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.html b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.html
index 6d4582a..4631f06 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.html
@@ -1178,7 +1178,7 @@
<span class="sourceLineNo">1170</span> if (cacheConf != null) {<a name="line.1170"></a>
<span class="sourceLineNo">1171</span> HFileBlock blockForCaching = blockWriter.getBlockForCaching(cacheConf);<a name="line.1171"></a>
<span class="sourceLineNo">1172</span> cacheConf.getBlockCache().cacheBlock(new BlockCacheKey(nameForCaching,<a name="line.1172"></a>
-<span class="sourceLineNo">1173</span> beginOffset), blockForCaching);<a name="line.1173"></a>
+<span class="sourceLineNo">1173</span> beginOffset, true, blockForCaching.getBlockType()), blockForCaching);<a name="line.1173"></a>
<span class="sourceLineNo">1174</span> }<a name="line.1174"></a>
<span class="sourceLineNo">1175</span><a name="line.1175"></a>
<span class="sourceLineNo">1176</span> // Add intermediate index block size<a name="line.1176"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f8d69509/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.BlockIndexNotLoadedException.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.BlockIndexNotLoadedException.html b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.BlockIndexNotLoadedException.html
index 687f207..a9d150e 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.BlockIndexNotLoadedException.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.BlockIndexNotLoadedException.html
@@ -367,7 +367,7 @@
<span class="sourceLineNo">359</span> BlockCache blockCache = this.cacheConf.getBlockCache();<a name="line.359"></a>
<span class="sourceLineNo">360</span> if (blockCache != null && block != null) {<a name="line.360"></a>
<span class="sourceLineNo">361</span> BlockCacheKey cacheKey = new BlockCacheKey(this.getFileContext().getHFileName(),<a name="line.361"></a>
-<span class="sourceLineNo">362</span> block.getOffset(), this.isPrimaryReplicaReader());<a name="line.362"></a>
+<span class="sourceLineNo">362</span> block.getOffset(), this.isPrimaryReplicaReader(), block.getBlockType());<a name="line.362"></a>
<span class="sourceLineNo">363</span> blockCache.returnBlock(cacheKey, block);<a name="line.363"></a>
<span class="sourceLineNo">364</span> }<a name="line.364"></a>
<span class="sourceLineNo">365</span> }<a name="line.365"></a>
@@ -1433,7 +1433,7 @@
<span class="sourceLineNo">1425</span> // Check cache for block. If found return.<a name="line.1425"></a>
<span class="sourceLineNo">1426</span> long metaBlockOffset = metaBlockIndexReader.getRootBlockOffset(block);<a name="line.1426"></a>
<span class="sourceLineNo">1427</span> BlockCacheKey cacheKey = new BlockCacheKey(name, metaBlockOffset,<a name="line.1427"></a>
-<span class="sourceLineNo">1428</span> this.isPrimaryReplicaReader());<a name="line.1428"></a>
+<span class="sourceLineNo">1428</span> this.isPrimaryReplicaReader(), BlockType.META);<a name="line.1428"></a>
<span class="sourceLineNo">1429</span><a name="line.1429"></a>
<span class="sourceLineNo">1430</span> cacheBlock &= cacheConf.shouldCacheBlockOnRead(BlockType.META.getCategory());<a name="line.1430"></a>
<span class="sourceLineNo">1431</span> if (cacheConf.isBlockCacheEnabled()) {<a name="line.1431"></a>
@@ -1483,7 +1483,7 @@
<span class="sourceLineNo">1475</span> // from doing).<a name="line.1475"></a>
<span class="sourceLineNo">1476</span><a name="line.1476"></a>
<span class="sourceLineNo">1477</span> BlockCacheKey cacheKey = new BlockCacheKey(name, dataBlockOffset,<a name="line.1477"></a>
-<span class="sourceLineNo">1478</span> this.isPrimaryReplicaReader());<a name="line.1478"></a>
+<span class="sourceLineNo">1478</span> this.isPrimaryReplicaReader(), expectedBlockType);<a name="line.1478"></a>
<span class="sourceLineNo">1479</span><a name="line.1479"></a>
<span class="sourceLineNo">1480</span> boolean useLock = false;<a name="line.1480"></a>
<span class="sourceLineNo">1481</span> IdLock.Entry lockEntry = null;<a name="line.1481"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f8d69509/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.EncodedScanner.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.EncodedScanner.html b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.EncodedScanner.html
index 687f207..a9d150e 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.EncodedScanner.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.EncodedScanner.html
@@ -367,7 +367,7 @@
<span class="sourceLineNo">359</span> BlockCache blockCache = this.cacheConf.getBlockCache();<a name="line.359"></a>
<span class="sourceLineNo">360</span> if (blockCache != null && block != null) {<a name="line.360"></a>
<span class="sourceLineNo">361</span> BlockCacheKey cacheKey = new BlockCacheKey(this.getFileContext().getHFileName(),<a name="line.361"></a>
-<span class="sourceLineNo">362</span> block.getOffset(), this.isPrimaryReplicaReader());<a name="line.362"></a>
+<span class="sourceLineNo">362</span> block.getOffset(), this.isPrimaryReplicaReader(), block.getBlockType());<a name="line.362"></a>
<span class="sourceLineNo">363</span> blockCache.returnBlock(cacheKey, block);<a name="line.363"></a>
<span class="sourceLineNo">364</span> }<a name="line.364"></a>
<span class="sourceLineNo">365</span> }<a name="line.365"></a>
@@ -1433,7 +1433,7 @@
<span class="sourceLineNo">1425</span> // Check cache for block. If found return.<a name="line.1425"></a>
<span class="sourceLineNo">1426</span> long metaBlockOffset = metaBlockIndexReader.getRootBlockOffset(block);<a name="line.1426"></a>
<span class="sourceLineNo">1427</span> BlockCacheKey cacheKey = new BlockCacheKey(name, metaBlockOffset,<a name="line.1427"></a>
-<span class="sourceLineNo">1428</span> this.isPrimaryReplicaReader());<a name="line.1428"></a>
+<span class="sourceLineNo">1428</span> this.isPrimaryReplicaReader(), BlockType.META);<a name="line.1428"></a>
<span class="sourceLineNo">1429</span><a name="line.1429"></a>
<span class="sourceLineNo">1430</span> cacheBlock &= cacheConf.shouldCacheBlockOnRead(BlockType.META.getCategory());<a name="line.1430"></a>
<span class="sourceLineNo">1431</span> if (cacheConf.isBlockCacheEnabled()) {<a name="line.1431"></a>
@@ -1483,7 +1483,7 @@
<span class="sourceLineNo">1475</span> // from doing).<a name="line.1475"></a>
<span class="sourceLineNo">1476</span><a name="line.1476"></a>
<span class="sourceLineNo">1477</span> BlockCacheKey cacheKey = new BlockCacheKey(name, dataBlockOffset,<a name="line.1477"></a>
-<span class="sourceLineNo">1478</span> this.isPrimaryReplicaReader());<a name="line.1478"></a>
+<span class="sourceLineNo">1478</span> this.isPrimaryReplicaReader(), expectedBlockType);<a name="line.1478"></a>
<span class="sourceLineNo">1479</span><a name="line.1479"></a>
<span class="sourceLineNo">1480</span> boolean useLock = false;<a name="line.1480"></a>
<span class="sourceLineNo">1481</span> IdLock.Entry lockEntry = null;<a name="line.1481"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f8d69509/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.HFileScannerImpl.ShareableMemoryKeyValue.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.HFileScannerImpl.ShareableMemoryKeyValue.html b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.HFileScannerImpl.ShareableMemoryKeyValue.html
index 687f207..a9d150e 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.HFileScannerImpl.ShareableMemoryKeyValue.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.HFileScannerImpl.ShareableMemoryKeyValue.html
@@ -367,7 +367,7 @@
<span class="sourceLineNo">359</span> BlockCache blockCache = this.cacheConf.getBlockCache();<a name="line.359"></a>
<span class="sourceLineNo">360</span> if (blockCache != null && block != null) {<a name="line.360"></a>
<span class="sourceLineNo">361</span> BlockCacheKey cacheKey = new BlockCacheKey(this.getFileContext().getHFileName(),<a name="line.361"></a>
-<span class="sourceLineNo">362</span> block.getOffset(), this.isPrimaryReplicaReader());<a name="line.362"></a>
+<span class="sourceLineNo">362</span> block.getOffset(), this.isPrimaryReplicaReader(), block.getBlockType());<a name="line.362"></a>
<span class="sourceLineNo">363</span> blockCache.returnBlock(cacheKey, block);<a name="line.363"></a>
<span class="sourceLineNo">364</span> }<a name="line.364"></a>
<span class="sourceLineNo">365</span> }<a name="line.365"></a>
@@ -1433,7 +1433,7 @@
<span class="sourceLineNo">1425</span> // Check cache for block. If found return.<a name="line.1425"></a>
<span class="sourceLineNo">1426</span> long metaBlockOffset = metaBlockIndexReader.getRootBlockOffset(block);<a name="line.1426"></a>
<span class="sourceLineNo">1427</span> BlockCacheKey cacheKey = new BlockCacheKey(name, metaBlockOffset,<a name="line.1427"></a>
-<span class="sourceLineNo">1428</span> this.isPrimaryReplicaReader());<a name="line.1428"></a>
+<span class="sourceLineNo">1428</span> this.isPrimaryReplicaReader(), BlockType.META);<a name="line.1428"></a>
<span class="sourceLineNo">1429</span><a name="line.1429"></a>
<span class="sourceLineNo">1430</span> cacheBlock &= cacheConf.shouldCacheBlockOnRead(BlockType.META.getCategory());<a name="line.1430"></a>
<span class="sourceLineNo">1431</span> if (cacheConf.isBlockCacheEnabled()) {<a name="line.1431"></a>
@@ -1483,7 +1483,7 @@
<span class="sourceLineNo">1475</span> // from doing).<a name="line.1475"></a>
<span class="sourceLineNo">1476</span><a name="line.1476"></a>
<span class="sourceLineNo">1477</span> BlockCacheKey cacheKey = new BlockCacheKey(name, dataBlockOffset,<a name="line.1477"></a>
-<span class="sourceLineNo">1478</span> this.isPrimaryReplicaReader());<a name="line.1478"></a>
+<span class="sourceLineNo">1478</span> this.isPrimaryReplicaReader(), expectedBlockType);<a name="line.1478"></a>
<span class="sourceLineNo">1479</span><a name="line.1479"></a>
<span class="sourceLineNo">1480</span> boolean useLock = false;<a name="line.1480"></a>
<span class="sourceLineNo">1481</span> IdLock.Entry lockEntry = null;<a name="line.1481"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f8d69509/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.HFileScannerImpl.ShareableMemoryNoTagsKeyValue.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.HFileScannerImpl.ShareableMemoryNoTagsKeyValue.html b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.HFileScannerImpl.ShareableMemoryNoTagsKeyValue.html
index 687f207..a9d150e 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.HFileScannerImpl.ShareableMemoryNoTagsKeyValue.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.HFileScannerImpl.ShareableMemoryNoTagsKeyValue.html
@@ -367,7 +367,7 @@
<span class="sourceLineNo">359</span> BlockCache blockCache = this.cacheConf.getBlockCache();<a name="line.359"></a>
<span class="sourceLineNo">360</span> if (blockCache != null && block != null) {<a name="line.360"></a>
<span class="sourceLineNo">361</span> BlockCacheKey cacheKey = new BlockCacheKey(this.getFileContext().getHFileName(),<a name="line.361"></a>
-<span class="sourceLineNo">362</span> block.getOffset(), this.isPrimaryReplicaReader());<a name="line.362"></a>
+<span class="sourceLineNo">362</span> block.getOffset(), this.isPrimaryReplicaReader(), block.getBlockType());<a name="line.362"></a>
<span class="sourceLineNo">363</span> blockCache.returnBlock(cacheKey, block);<a name="line.363"></a>
<span class="sourceLineNo">364</span> }<a name="line.364"></a>
<span class="sourceLineNo">365</span> }<a name="line.365"></a>
@@ -1433,7 +1433,7 @@
<span class="sourceLineNo">1425</span> // Check cache for block. If found return.<a name="line.1425"></a>
<span class="sourceLineNo">1426</span> long metaBlockOffset = metaBlockIndexReader.getRootBlockOffset(block);<a name="line.1426"></a>
<span class="sourceLineNo">1427</span> BlockCacheKey cacheKey = new BlockCacheKey(name, metaBlockOffset,<a name="line.1427"></a>
-<span class="sourceLineNo">1428</span> this.isPrimaryReplicaReader());<a name="line.1428"></a>
+<span class="sourceLineNo">1428</span> this.isPrimaryReplicaReader(), BlockType.META);<a name="line.1428"></a>
<span class="sourceLineNo">1429</span><a name="line.1429"></a>
<span class="sourceLineNo">1430</span> cacheBlock &= cacheConf.shouldCacheBlockOnRead(BlockType.META.getCategory());<a name="line.1430"></a>
<span class="sourceLineNo">1431</span> if (cacheConf.isBlockCacheEnabled()) {<a name="line.1431"></a>
@@ -1483,7 +1483,7 @@
<span class="sourceLineNo">1475</span> // from doing).<a name="line.1475"></a>
<span class="sourceLineNo">1476</span><a name="line.1476"></a>
<span class="sourceLineNo">1477</span> BlockCacheKey cacheKey = new BlockCacheKey(name, dataBlockOffset,<a name="line.1477"></a>
-<span class="sourceLineNo">1478</span> this.isPrimaryReplicaReader());<a name="line.1478"></a>
+<span class="sourceLineNo">1478</span> this.isPrimaryReplicaReader(), expectedBlockType);<a name="line.1478"></a>
<span class="sourceLineNo">1479</span><a name="line.1479"></a>
<span class="sourceLineNo">1480</span> boolean useLock = false;<a name="line.1480"></a>
<span class="sourceLineNo">1481</span> IdLock.Entry lockEntry = null;<a name="line.1481"></a>