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:24 UTC
[22/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/MemcachedBlockCache.HFileBlockTranscoder.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/MemcachedBlockCache.HFileBlockTranscoder.html b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/MemcachedBlockCache.HFileBlockTranscoder.html
index c1acfe2..28b6c6b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/MemcachedBlockCache.HFileBlockTranscoder.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/MemcachedBlockCache.HFileBlockTranscoder.html
@@ -157,137 +157,136 @@
<span class="sourceLineNo">149</span> // Update stats if this request doesn't have it turned off 100% of the time<a name="line.149"></a>
<span class="sourceLineNo">150</span> if (updateCacheMetrics) {<a name="line.150"></a>
<span class="sourceLineNo">151</span> if (result == null) {<a name="line.151"></a>
-<span class="sourceLineNo">152</span> cacheStats.miss(caching, cacheKey.isPrimary());<a name="line.152"></a>
+<span class="sourceLineNo">152</span> cacheStats.miss(caching, cacheKey.isPrimary(), cacheKey.getBlockType());<a name="line.152"></a>
<span class="sourceLineNo">153</span> } else {<a name="line.153"></a>
-<span class="sourceLineNo">154</span> cacheStats.hit(caching, cacheKey.isPrimary());<a name="line.154"></a>
+<span class="sourceLineNo">154</span> cacheStats.hit(caching, cacheKey.isPrimary(), cacheKey.getBlockType());<a name="line.154"></a>
<span class="sourceLineNo">155</span> }<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><a name="line.158"></a>
-<span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span> return result;<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 boolean evictBlock(BlockCacheKey cacheKey) {<a name="line.164"></a>
-<span class="sourceLineNo">165</span> try {<a name="line.165"></a>
-<span class="sourceLineNo">166</span> cacheStats.evict();<a name="line.166"></a>
-<span class="sourceLineNo">167</span> return client.delete(cacheKey.toString()).get();<a name="line.167"></a>
-<span class="sourceLineNo">168</span> } catch (InterruptedException e) {<a name="line.168"></a>
-<span class="sourceLineNo">169</span> LOG.warn("Error deleting " + cacheKey.toString(), e);<a name="line.169"></a>
-<span class="sourceLineNo">170</span> Thread.currentThread().interrupt();<a name="line.170"></a>
-<span class="sourceLineNo">171</span> } catch (ExecutionException e) {<a name="line.171"></a>
-<span class="sourceLineNo">172</span> if (LOG.isDebugEnabled()) {<a name="line.172"></a>
-<span class="sourceLineNo">173</span> LOG.debug("Error deleting " + cacheKey.toString(), e);<a name="line.173"></a>
-<span class="sourceLineNo">174</span> }<a name="line.174"></a>
-<span class="sourceLineNo">175</span> }<a name="line.175"></a>
-<span class="sourceLineNo">176</span> return false;<a name="line.176"></a>
-<span class="sourceLineNo">177</span> }<a name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span> /**<a name="line.179"></a>
-<span class="sourceLineNo">180</span> * This method does nothing so that memcached can handle all evictions.<a name="line.180"></a>
-<span class="sourceLineNo">181</span> */<a name="line.181"></a>
-<span class="sourceLineNo">182</span> @Override<a name="line.182"></a>
-<span class="sourceLineNo">183</span> public int evictBlocksByHfileName(String hfileName) {<a name="line.183"></a>
-<span class="sourceLineNo">184</span> return 0;<a name="line.184"></a>
-<span class="sourceLineNo">185</span> }<a name="line.185"></a>
-<span class="sourceLineNo">186</span><a name="line.186"></a>
-<span class="sourceLineNo">187</span> @Override<a name="line.187"></a>
-<span class="sourceLineNo">188</span> public CacheStats getStats() {<a name="line.188"></a>
-<span class="sourceLineNo">189</span> return cacheStats;<a name="line.189"></a>
-<span class="sourceLineNo">190</span> }<a name="line.190"></a>
-<span class="sourceLineNo">191</span><a name="line.191"></a>
-<span class="sourceLineNo">192</span> @Override<a name="line.192"></a>
-<span class="sourceLineNo">193</span> public void shutdown() {<a name="line.193"></a>
-<span class="sourceLineNo">194</span> client.shutdown();<a name="line.194"></a>
-<span class="sourceLineNo">195</span> }<a name="line.195"></a>
-<span class="sourceLineNo">196</span><a name="line.196"></a>
-<span class="sourceLineNo">197</span> @Override<a name="line.197"></a>
-<span class="sourceLineNo">198</span> public long size() {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> return 0;<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 long getFreeSize() {<a name="line.203"></a>
-<span class="sourceLineNo">204</span> return 0;<a name="line.204"></a>
-<span class="sourceLineNo">205</span> }<a name="line.205"></a>
-<span class="sourceLineNo">206</span><a name="line.206"></a>
-<span class="sourceLineNo">207</span> @Override<a name="line.207"></a>
-<span class="sourceLineNo">208</span> public long getCurrentSize() {<a name="line.208"></a>
-<span class="sourceLineNo">209</span> return 0;<a name="line.209"></a>
-<span class="sourceLineNo">210</span> }<a name="line.210"></a>
-<span class="sourceLineNo">211</span><a name="line.211"></a>
-<span class="sourceLineNo">212</span> @Override<a name="line.212"></a>
-<span class="sourceLineNo">213</span> public long getBlockCount() {<a name="line.213"></a>
-<span class="sourceLineNo">214</span> return 0;<a name="line.214"></a>
-<span class="sourceLineNo">215</span> }<a name="line.215"></a>
-<span class="sourceLineNo">216</span><a name="line.216"></a>
-<span class="sourceLineNo">217</span> @Override<a name="line.217"></a>
-<span class="sourceLineNo">218</span> public Iterator<CachedBlock> iterator() {<a name="line.218"></a>
-<span class="sourceLineNo">219</span> return new Iterator<CachedBlock>() {<a name="line.219"></a>
-<span class="sourceLineNo">220</span> @Override<a name="line.220"></a>
-<span class="sourceLineNo">221</span> public boolean hasNext() {<a name="line.221"></a>
-<span class="sourceLineNo">222</span> return false;<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">225</span> @Override<a name="line.225"></a>
-<span class="sourceLineNo">226</span> public CachedBlock next() {<a name="line.226"></a>
-<span class="sourceLineNo">227</span> throw new NoSuchElementException("MemcachedBlockCache can't iterate over blocks.");<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 void remove() {<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">234</span> };<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> @Override<a name="line.237"></a>
-<span class="sourceLineNo">238</span> public BlockCache[] getBlockCaches() {<a name="line.238"></a>
-<span class="sourceLineNo">239</span> return null;<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> /**<a name="line.242"></a>
-<span class="sourceLineNo">243</span> * Class to encode and decode an HFileBlock to and from memecached's resulting byte arrays.<a name="line.243"></a>
-<span class="sourceLineNo">244</span> */<a name="line.244"></a>
-<span class="sourceLineNo">245</span> private static class HFileBlockTranscoder implements Transcoder<HFileBlock> {<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 boolean asyncDecode(CachedData d) {<a name="line.248"></a>
-<span class="sourceLineNo">249</span> return false;<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> @Override<a name="line.252"></a>
-<span class="sourceLineNo">253</span> public CachedData encode(HFileBlock block) {<a name="line.253"></a>
-<span class="sourceLineNo">254</span> ByteBuffer bb = ByteBuffer.allocate(block.getSerializedLength());<a name="line.254"></a>
-<span class="sourceLineNo">255</span> block.serialize(bb);<a name="line.255"></a>
-<span class="sourceLineNo">256</span> return new CachedData(0, bb.array(), CachedData.MAX_SIZE);<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 HFileBlock decode(CachedData d) {<a name="line.260"></a>
-<span class="sourceLineNo">261</span> try {<a name="line.261"></a>
-<span class="sourceLineNo">262</span> ByteBuff buf = new SingleByteBuff(ByteBuffer.wrap(d.getData()));<a name="line.262"></a>
-<span class="sourceLineNo">263</span> return (HFileBlock) HFileBlock.BLOCK_DESERIALIZER.deserialize(buf, true,<a name="line.263"></a>
-<span class="sourceLineNo">264</span> MemoryType.EXCLUSIVE);<a name="line.264"></a>
-<span class="sourceLineNo">265</span> } catch (IOException e) {<a name="line.265"></a>
-<span class="sourceLineNo">266</span> LOG.warn("Error deserializing data from memcached",e);<a name="line.266"></a>
-<span class="sourceLineNo">267</span> }<a name="line.267"></a>
-<span class="sourceLineNo">268</span> return null;<a name="line.268"></a>
-<span class="sourceLineNo">269</span> }<a name="line.269"></a>
-<span class="sourceLineNo">270</span><a name="line.270"></a>
-<span class="sourceLineNo">271</span> @Override<a name="line.271"></a>
-<span class="sourceLineNo">272</span> public int getMaxSize() {<a name="line.272"></a>
-<span class="sourceLineNo">273</span> return MAX_SIZE;<a name="line.273"></a>
-<span class="sourceLineNo">274</span> }<a name="line.274"></a>
-<span class="sourceLineNo">275</span> }<a name="line.275"></a>
-<span class="sourceLineNo">276</span><a name="line.276"></a>
-<span class="sourceLineNo">277</span> @Override<a name="line.277"></a>
-<span class="sourceLineNo">278</span> public void returnBlock(BlockCacheKey cacheKey, Cacheable block) {<a name="line.278"></a>
-<span class="sourceLineNo">279</span> // Not doing reference counting. All blocks here are EXCLUSIVE<a name="line.279"></a>
-<span class="sourceLineNo">280</span> }<a name="line.280"></a>
-<span class="sourceLineNo">281</span><a name="line.281"></a>
-<span class="sourceLineNo">282</span>}<a name="line.282"></a>
+<span class="sourceLineNo">159</span> return result;<a name="line.159"></a>
+<span class="sourceLineNo">160</span> }<a name="line.160"></a>
+<span class="sourceLineNo">161</span><a name="line.161"></a>
+<span class="sourceLineNo">162</span> @Override<a name="line.162"></a>
+<span class="sourceLineNo">163</span> public boolean evictBlock(BlockCacheKey cacheKey) {<a name="line.163"></a>
+<span class="sourceLineNo">164</span> try {<a name="line.164"></a>
+<span class="sourceLineNo">165</span> cacheStats.evict();<a name="line.165"></a>
+<span class="sourceLineNo">166</span> return client.delete(cacheKey.toString()).get();<a name="line.166"></a>
+<span class="sourceLineNo">167</span> } catch (InterruptedException e) {<a name="line.167"></a>
+<span class="sourceLineNo">168</span> LOG.warn("Error deleting " + cacheKey.toString(), e);<a name="line.168"></a>
+<span class="sourceLineNo">169</span> Thread.currentThread().interrupt();<a name="line.169"></a>
+<span class="sourceLineNo">170</span> } catch (ExecutionException e) {<a name="line.170"></a>
+<span class="sourceLineNo">171</span> if (LOG.isDebugEnabled()) {<a name="line.171"></a>
+<span class="sourceLineNo">172</span> LOG.debug("Error deleting " + cacheKey.toString(), e);<a name="line.172"></a>
+<span class="sourceLineNo">173</span> }<a name="line.173"></a>
+<span class="sourceLineNo">174</span> }<a name="line.174"></a>
+<span class="sourceLineNo">175</span> return false;<a name="line.175"></a>
+<span class="sourceLineNo">176</span> }<a name="line.176"></a>
+<span class="sourceLineNo">177</span><a name="line.177"></a>
+<span class="sourceLineNo">178</span> /**<a name="line.178"></a>
+<span class="sourceLineNo">179</span> * This method does nothing so that memcached can handle all evictions.<a name="line.179"></a>
+<span class="sourceLineNo">180</span> */<a name="line.180"></a>
+<span class="sourceLineNo">181</span> @Override<a name="line.181"></a>
+<span class="sourceLineNo">182</span> public int evictBlocksByHfileName(String hfileName) {<a name="line.182"></a>
+<span class="sourceLineNo">183</span> return 0;<a name="line.183"></a>
+<span class="sourceLineNo">184</span> }<a name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span> @Override<a name="line.186"></a>
+<span class="sourceLineNo">187</span> public CacheStats getStats() {<a name="line.187"></a>
+<span class="sourceLineNo">188</span> return cacheStats;<a name="line.188"></a>
+<span class="sourceLineNo">189</span> }<a name="line.189"></a>
+<span class="sourceLineNo">190</span><a name="line.190"></a>
+<span class="sourceLineNo">191</span> @Override<a name="line.191"></a>
+<span class="sourceLineNo">192</span> public void shutdown() {<a name="line.192"></a>
+<span class="sourceLineNo">193</span> client.shutdown();<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 size() {<a name="line.197"></a>
+<span class="sourceLineNo">198</span> return 0;<a name="line.198"></a>
+<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">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">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 getBlockCount() {<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 Iterator<CachedBlock> iterator() {<a name="line.217"></a>
+<span class="sourceLineNo">218</span> return new Iterator<CachedBlock>() {<a name="line.218"></a>
+<span class="sourceLineNo">219</span> @Override<a name="line.219"></a>
+<span class="sourceLineNo">220</span> public boolean hasNext() {<a name="line.220"></a>
+<span class="sourceLineNo">221</span> return false;<a name="line.221"></a>
+<span class="sourceLineNo">222</span> }<a name="line.222"></a>
+<span class="sourceLineNo">223</span><a name="line.223"></a>
+<span class="sourceLineNo">224</span> @Override<a name="line.224"></a>
+<span class="sourceLineNo">225</span> public CachedBlock next() {<a name="line.225"></a>
+<span class="sourceLineNo">226</span> throw new NoSuchElementException("MemcachedBlockCache can't iterate over blocks.");<a name="line.226"></a>
+<span class="sourceLineNo">227</span> }<a name="line.227"></a>
+<span class="sourceLineNo">228</span><a name="line.228"></a>
+<span class="sourceLineNo">229</span> @Override<a name="line.229"></a>
+<span class="sourceLineNo">230</span> public void remove() {<a name="line.230"></a>
+<span class="sourceLineNo">231</span><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">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 BlockCache[] getBlockCaches() {<a name="line.237"></a>
+<span class="sourceLineNo">238</span> return null;<a name="line.238"></a>
+<span class="sourceLineNo">239</span> }<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> * Class to encode and decode an HFileBlock to and from memecached's resulting byte arrays.<a name="line.242"></a>
+<span class="sourceLineNo">243</span> */<a name="line.243"></a>
+<span class="sourceLineNo">244</span> private static class HFileBlockTranscoder implements Transcoder<HFileBlock> {<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 boolean asyncDecode(CachedData d) {<a name="line.247"></a>
+<span class="sourceLineNo">248</span> return false;<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> @Override<a name="line.251"></a>
+<span class="sourceLineNo">252</span> public CachedData encode(HFileBlock block) {<a name="line.252"></a>
+<span class="sourceLineNo">253</span> ByteBuffer bb = ByteBuffer.allocate(block.getSerializedLength());<a name="line.253"></a>
+<span class="sourceLineNo">254</span> block.serialize(bb);<a name="line.254"></a>
+<span class="sourceLineNo">255</span> return new CachedData(0, bb.array(), CachedData.MAX_SIZE);<a name="line.255"></a>
+<span class="sourceLineNo">256</span> }<a name="line.256"></a>
+<span class="sourceLineNo">257</span><a name="line.257"></a>
+<span class="sourceLineNo">258</span> @Override<a name="line.258"></a>
+<span class="sourceLineNo">259</span> public HFileBlock decode(CachedData d) {<a name="line.259"></a>
+<span class="sourceLineNo">260</span> try {<a name="line.260"></a>
+<span class="sourceLineNo">261</span> ByteBuff buf = new SingleByteBuff(ByteBuffer.wrap(d.getData()));<a name="line.261"></a>
+<span class="sourceLineNo">262</span> return (HFileBlock) HFileBlock.BLOCK_DESERIALIZER.deserialize(buf, true,<a name="line.262"></a>
+<span class="sourceLineNo">263</span> MemoryType.EXCLUSIVE);<a name="line.263"></a>
+<span class="sourceLineNo">264</span> } catch (IOException e) {<a name="line.264"></a>
+<span class="sourceLineNo">265</span> LOG.warn("Error deserializing data from memcached",e);<a name="line.265"></a>
+<span class="sourceLineNo">266</span> }<a name="line.266"></a>
+<span class="sourceLineNo">267</span> return null;<a name="line.267"></a>
+<span class="sourceLineNo">268</span> }<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span> @Override<a name="line.270"></a>
+<span class="sourceLineNo">271</span> public int getMaxSize() {<a name="line.271"></a>
+<span class="sourceLineNo">272</span> return MAX_SIZE;<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><a name="line.275"></a>
+<span class="sourceLineNo">276</span> @Override<a name="line.276"></a>
+<span class="sourceLineNo">277</span> public void returnBlock(BlockCacheKey cacheKey, Cacheable block) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span> // Not doing reference counting. All blocks here are EXCLUSIVE<a name="line.278"></a>
+<span class="sourceLineNo">279</span> }<a name="line.279"></a>
+<span class="sourceLineNo">280</span><a name="line.280"></a>
+<span class="sourceLineNo">281</span>}<a name="line.281"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f8d69509/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 c1acfe2..28b6c6b 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
@@ -157,137 +157,136 @@
<span class="sourceLineNo">149</span> // Update stats if this request doesn't have it turned off 100% of the time<a name="line.149"></a>
<span class="sourceLineNo">150</span> if (updateCacheMetrics) {<a name="line.150"></a>
<span class="sourceLineNo">151</span> if (result == null) {<a name="line.151"></a>
-<span class="sourceLineNo">152</span> cacheStats.miss(caching, cacheKey.isPrimary());<a name="line.152"></a>
+<span class="sourceLineNo">152</span> cacheStats.miss(caching, cacheKey.isPrimary(), cacheKey.getBlockType());<a name="line.152"></a>
<span class="sourceLineNo">153</span> } else {<a name="line.153"></a>
-<span class="sourceLineNo">154</span> cacheStats.hit(caching, cacheKey.isPrimary());<a name="line.154"></a>
+<span class="sourceLineNo">154</span> cacheStats.hit(caching, cacheKey.isPrimary(), cacheKey.getBlockType());<a name="line.154"></a>
<span class="sourceLineNo">155</span> }<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><a name="line.158"></a>
-<span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span> return result;<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 boolean evictBlock(BlockCacheKey cacheKey) {<a name="line.164"></a>
-<span class="sourceLineNo">165</span> try {<a name="line.165"></a>
-<span class="sourceLineNo">166</span> cacheStats.evict();<a name="line.166"></a>
-<span class="sourceLineNo">167</span> return client.delete(cacheKey.toString()).get();<a name="line.167"></a>
-<span class="sourceLineNo">168</span> } catch (InterruptedException e) {<a name="line.168"></a>
-<span class="sourceLineNo">169</span> LOG.warn("Error deleting " + cacheKey.toString(), e);<a name="line.169"></a>
-<span class="sourceLineNo">170</span> Thread.currentThread().interrupt();<a name="line.170"></a>
-<span class="sourceLineNo">171</span> } catch (ExecutionException e) {<a name="line.171"></a>
-<span class="sourceLineNo">172</span> if (LOG.isDebugEnabled()) {<a name="line.172"></a>
-<span class="sourceLineNo">173</span> LOG.debug("Error deleting " + cacheKey.toString(), e);<a name="line.173"></a>
-<span class="sourceLineNo">174</span> }<a name="line.174"></a>
-<span class="sourceLineNo">175</span> }<a name="line.175"></a>
-<span class="sourceLineNo">176</span> return false;<a name="line.176"></a>
-<span class="sourceLineNo">177</span> }<a name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span> /**<a name="line.179"></a>
-<span class="sourceLineNo">180</span> * This method does nothing so that memcached can handle all evictions.<a name="line.180"></a>
-<span class="sourceLineNo">181</span> */<a name="line.181"></a>
-<span class="sourceLineNo">182</span> @Override<a name="line.182"></a>
-<span class="sourceLineNo">183</span> public int evictBlocksByHfileName(String hfileName) {<a name="line.183"></a>
-<span class="sourceLineNo">184</span> return 0;<a name="line.184"></a>
-<span class="sourceLineNo">185</span> }<a name="line.185"></a>
-<span class="sourceLineNo">186</span><a name="line.186"></a>
-<span class="sourceLineNo">187</span> @Override<a name="line.187"></a>
-<span class="sourceLineNo">188</span> public CacheStats getStats() {<a name="line.188"></a>
-<span class="sourceLineNo">189</span> return cacheStats;<a name="line.189"></a>
-<span class="sourceLineNo">190</span> }<a name="line.190"></a>
-<span class="sourceLineNo">191</span><a name="line.191"></a>
-<span class="sourceLineNo">192</span> @Override<a name="line.192"></a>
-<span class="sourceLineNo">193</span> public void shutdown() {<a name="line.193"></a>
-<span class="sourceLineNo">194</span> client.shutdown();<a name="line.194"></a>
-<span class="sourceLineNo">195</span> }<a name="line.195"></a>
-<span class="sourceLineNo">196</span><a name="line.196"></a>
-<span class="sourceLineNo">197</span> @Override<a name="line.197"></a>
-<span class="sourceLineNo">198</span> public long size() {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> return 0;<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 long getFreeSize() {<a name="line.203"></a>
-<span class="sourceLineNo">204</span> return 0;<a name="line.204"></a>
-<span class="sourceLineNo">205</span> }<a name="line.205"></a>
-<span class="sourceLineNo">206</span><a name="line.206"></a>
-<span class="sourceLineNo">207</span> @Override<a name="line.207"></a>
-<span class="sourceLineNo">208</span> public long getCurrentSize() {<a name="line.208"></a>
-<span class="sourceLineNo">209</span> return 0;<a name="line.209"></a>
-<span class="sourceLineNo">210</span> }<a name="line.210"></a>
-<span class="sourceLineNo">211</span><a name="line.211"></a>
-<span class="sourceLineNo">212</span> @Override<a name="line.212"></a>
-<span class="sourceLineNo">213</span> public long getBlockCount() {<a name="line.213"></a>
-<span class="sourceLineNo">214</span> return 0;<a name="line.214"></a>
-<span class="sourceLineNo">215</span> }<a name="line.215"></a>
-<span class="sourceLineNo">216</span><a name="line.216"></a>
-<span class="sourceLineNo">217</span> @Override<a name="line.217"></a>
-<span class="sourceLineNo">218</span> public Iterator<CachedBlock> iterator() {<a name="line.218"></a>
-<span class="sourceLineNo">219</span> return new Iterator<CachedBlock>() {<a name="line.219"></a>
-<span class="sourceLineNo">220</span> @Override<a name="line.220"></a>
-<span class="sourceLineNo">221</span> public boolean hasNext() {<a name="line.221"></a>
-<span class="sourceLineNo">222</span> return false;<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">225</span> @Override<a name="line.225"></a>
-<span class="sourceLineNo">226</span> public CachedBlock next() {<a name="line.226"></a>
-<span class="sourceLineNo">227</span> throw new NoSuchElementException("MemcachedBlockCache can't iterate over blocks.");<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 void remove() {<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">234</span> };<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> @Override<a name="line.237"></a>
-<span class="sourceLineNo">238</span> public BlockCache[] getBlockCaches() {<a name="line.238"></a>
-<span class="sourceLineNo">239</span> return null;<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> /**<a name="line.242"></a>
-<span class="sourceLineNo">243</span> * Class to encode and decode an HFileBlock to and from memecached's resulting byte arrays.<a name="line.243"></a>
-<span class="sourceLineNo">244</span> */<a name="line.244"></a>
-<span class="sourceLineNo">245</span> private static class HFileBlockTranscoder implements Transcoder<HFileBlock> {<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 boolean asyncDecode(CachedData d) {<a name="line.248"></a>
-<span class="sourceLineNo">249</span> return false;<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> @Override<a name="line.252"></a>
-<span class="sourceLineNo">253</span> public CachedData encode(HFileBlock block) {<a name="line.253"></a>
-<span class="sourceLineNo">254</span> ByteBuffer bb = ByteBuffer.allocate(block.getSerializedLength());<a name="line.254"></a>
-<span class="sourceLineNo">255</span> block.serialize(bb);<a name="line.255"></a>
-<span class="sourceLineNo">256</span> return new CachedData(0, bb.array(), CachedData.MAX_SIZE);<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 HFileBlock decode(CachedData d) {<a name="line.260"></a>
-<span class="sourceLineNo">261</span> try {<a name="line.261"></a>
-<span class="sourceLineNo">262</span> ByteBuff buf = new SingleByteBuff(ByteBuffer.wrap(d.getData()));<a name="line.262"></a>
-<span class="sourceLineNo">263</span> return (HFileBlock) HFileBlock.BLOCK_DESERIALIZER.deserialize(buf, true,<a name="line.263"></a>
-<span class="sourceLineNo">264</span> MemoryType.EXCLUSIVE);<a name="line.264"></a>
-<span class="sourceLineNo">265</span> } catch (IOException e) {<a name="line.265"></a>
-<span class="sourceLineNo">266</span> LOG.warn("Error deserializing data from memcached",e);<a name="line.266"></a>
-<span class="sourceLineNo">267</span> }<a name="line.267"></a>
-<span class="sourceLineNo">268</span> return null;<a name="line.268"></a>
-<span class="sourceLineNo">269</span> }<a name="line.269"></a>
-<span class="sourceLineNo">270</span><a name="line.270"></a>
-<span class="sourceLineNo">271</span> @Override<a name="line.271"></a>
-<span class="sourceLineNo">272</span> public int getMaxSize() {<a name="line.272"></a>
-<span class="sourceLineNo">273</span> return MAX_SIZE;<a name="line.273"></a>
-<span class="sourceLineNo">274</span> }<a name="line.274"></a>
-<span class="sourceLineNo">275</span> }<a name="line.275"></a>
-<span class="sourceLineNo">276</span><a name="line.276"></a>
-<span class="sourceLineNo">277</span> @Override<a name="line.277"></a>
-<span class="sourceLineNo">278</span> public void returnBlock(BlockCacheKey cacheKey, Cacheable block) {<a name="line.278"></a>
-<span class="sourceLineNo">279</span> // Not doing reference counting. All blocks here are EXCLUSIVE<a name="line.279"></a>
-<span class="sourceLineNo">280</span> }<a name="line.280"></a>
-<span class="sourceLineNo">281</span><a name="line.281"></a>
-<span class="sourceLineNo">282</span>}<a name="line.282"></a>
+<span class="sourceLineNo">159</span> return result;<a name="line.159"></a>
+<span class="sourceLineNo">160</span> }<a name="line.160"></a>
+<span class="sourceLineNo">161</span><a name="line.161"></a>
+<span class="sourceLineNo">162</span> @Override<a name="line.162"></a>
+<span class="sourceLineNo">163</span> public boolean evictBlock(BlockCacheKey cacheKey) {<a name="line.163"></a>
+<span class="sourceLineNo">164</span> try {<a name="line.164"></a>
+<span class="sourceLineNo">165</span> cacheStats.evict();<a name="line.165"></a>
+<span class="sourceLineNo">166</span> return client.delete(cacheKey.toString()).get();<a name="line.166"></a>
+<span class="sourceLineNo">167</span> } catch (InterruptedException e) {<a name="line.167"></a>
+<span class="sourceLineNo">168</span> LOG.warn("Error deleting " + cacheKey.toString(), e);<a name="line.168"></a>
+<span class="sourceLineNo">169</span> Thread.currentThread().interrupt();<a name="line.169"></a>
+<span class="sourceLineNo">170</span> } catch (ExecutionException e) {<a name="line.170"></a>
+<span class="sourceLineNo">171</span> if (LOG.isDebugEnabled()) {<a name="line.171"></a>
+<span class="sourceLineNo">172</span> LOG.debug("Error deleting " + cacheKey.toString(), e);<a name="line.172"></a>
+<span class="sourceLineNo">173</span> }<a name="line.173"></a>
+<span class="sourceLineNo">174</span> }<a name="line.174"></a>
+<span class="sourceLineNo">175</span> return false;<a name="line.175"></a>
+<span class="sourceLineNo">176</span> }<a name="line.176"></a>
+<span class="sourceLineNo">177</span><a name="line.177"></a>
+<span class="sourceLineNo">178</span> /**<a name="line.178"></a>
+<span class="sourceLineNo">179</span> * This method does nothing so that memcached can handle all evictions.<a name="line.179"></a>
+<span class="sourceLineNo">180</span> */<a name="line.180"></a>
+<span class="sourceLineNo">181</span> @Override<a name="line.181"></a>
+<span class="sourceLineNo">182</span> public int evictBlocksByHfileName(String hfileName) {<a name="line.182"></a>
+<span class="sourceLineNo">183</span> return 0;<a name="line.183"></a>
+<span class="sourceLineNo">184</span> }<a name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span> @Override<a name="line.186"></a>
+<span class="sourceLineNo">187</span> public CacheStats getStats() {<a name="line.187"></a>
+<span class="sourceLineNo">188</span> return cacheStats;<a name="line.188"></a>
+<span class="sourceLineNo">189</span> }<a name="line.189"></a>
+<span class="sourceLineNo">190</span><a name="line.190"></a>
+<span class="sourceLineNo">191</span> @Override<a name="line.191"></a>
+<span class="sourceLineNo">192</span> public void shutdown() {<a name="line.192"></a>
+<span class="sourceLineNo">193</span> client.shutdown();<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 size() {<a name="line.197"></a>
+<span class="sourceLineNo">198</span> return 0;<a name="line.198"></a>
+<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">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">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 getBlockCount() {<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 Iterator<CachedBlock> iterator() {<a name="line.217"></a>
+<span class="sourceLineNo">218</span> return new Iterator<CachedBlock>() {<a name="line.218"></a>
+<span class="sourceLineNo">219</span> @Override<a name="line.219"></a>
+<span class="sourceLineNo">220</span> public boolean hasNext() {<a name="line.220"></a>
+<span class="sourceLineNo">221</span> return false;<a name="line.221"></a>
+<span class="sourceLineNo">222</span> }<a name="line.222"></a>
+<span class="sourceLineNo">223</span><a name="line.223"></a>
+<span class="sourceLineNo">224</span> @Override<a name="line.224"></a>
+<span class="sourceLineNo">225</span> public CachedBlock next() {<a name="line.225"></a>
+<span class="sourceLineNo">226</span> throw new NoSuchElementException("MemcachedBlockCache can't iterate over blocks.");<a name="line.226"></a>
+<span class="sourceLineNo">227</span> }<a name="line.227"></a>
+<span class="sourceLineNo">228</span><a name="line.228"></a>
+<span class="sourceLineNo">229</span> @Override<a name="line.229"></a>
+<span class="sourceLineNo">230</span> public void remove() {<a name="line.230"></a>
+<span class="sourceLineNo">231</span><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">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 BlockCache[] getBlockCaches() {<a name="line.237"></a>
+<span class="sourceLineNo">238</span> return null;<a name="line.238"></a>
+<span class="sourceLineNo">239</span> }<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> * Class to encode and decode an HFileBlock to and from memecached's resulting byte arrays.<a name="line.242"></a>
+<span class="sourceLineNo">243</span> */<a name="line.243"></a>
+<span class="sourceLineNo">244</span> private static class HFileBlockTranscoder implements Transcoder<HFileBlock> {<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 boolean asyncDecode(CachedData d) {<a name="line.247"></a>
+<span class="sourceLineNo">248</span> return false;<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> @Override<a name="line.251"></a>
+<span class="sourceLineNo">252</span> public CachedData encode(HFileBlock block) {<a name="line.252"></a>
+<span class="sourceLineNo">253</span> ByteBuffer bb = ByteBuffer.allocate(block.getSerializedLength());<a name="line.253"></a>
+<span class="sourceLineNo">254</span> block.serialize(bb);<a name="line.254"></a>
+<span class="sourceLineNo">255</span> return new CachedData(0, bb.array(), CachedData.MAX_SIZE);<a name="line.255"></a>
+<span class="sourceLineNo">256</span> }<a name="line.256"></a>
+<span class="sourceLineNo">257</span><a name="line.257"></a>
+<span class="sourceLineNo">258</span> @Override<a name="line.258"></a>
+<span class="sourceLineNo">259</span> public HFileBlock decode(CachedData d) {<a name="line.259"></a>
+<span class="sourceLineNo">260</span> try {<a name="line.260"></a>
+<span class="sourceLineNo">261</span> ByteBuff buf = new SingleByteBuff(ByteBuffer.wrap(d.getData()));<a name="line.261"></a>
+<span class="sourceLineNo">262</span> return (HFileBlock) HFileBlock.BLOCK_DESERIALIZER.deserialize(buf, true,<a name="line.262"></a>
+<span class="sourceLineNo">263</span> MemoryType.EXCLUSIVE);<a name="line.263"></a>
+<span class="sourceLineNo">264</span> } catch (IOException e) {<a name="line.264"></a>
+<span class="sourceLineNo">265</span> LOG.warn("Error deserializing data from memcached",e);<a name="line.265"></a>
+<span class="sourceLineNo">266</span> }<a name="line.266"></a>
+<span class="sourceLineNo">267</span> return null;<a name="line.267"></a>
+<span class="sourceLineNo">268</span> }<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span> @Override<a name="line.270"></a>
+<span class="sourceLineNo">271</span> public int getMaxSize() {<a name="line.271"></a>
+<span class="sourceLineNo">272</span> return MAX_SIZE;<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><a name="line.275"></a>
+<span class="sourceLineNo">276</span> @Override<a name="line.276"></a>
+<span class="sourceLineNo">277</span> public void returnBlock(BlockCacheKey cacheKey, Cacheable block) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span> // Not doing reference counting. All blocks here are EXCLUSIVE<a name="line.278"></a>
+<span class="sourceLineNo">279</span> }<a name="line.279"></a>
+<span class="sourceLineNo">280</span><a name="line.280"></a>
+<span class="sourceLineNo">281</span>}<a name="line.281"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f8d69509/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.BucketEntry.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.BucketEntry.html b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.BucketEntry.html
index 97d9682..7f44ba4 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.BucketEntry.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.BucketEntry.html
@@ -413,7 +413,7 @@
<span class="sourceLineNo">405</span> RAMQueueEntry re = ramCache.get(key);<a name="line.405"></a>
<span class="sourceLineNo">406</span> if (re != null) {<a name="line.406"></a>
<span class="sourceLineNo">407</span> if (updateCacheMetrics) {<a name="line.407"></a>
-<span class="sourceLineNo">408</span> cacheStats.hit(caching, key.isPrimary());<a name="line.408"></a>
+<span class="sourceLineNo">408</span> cacheStats.hit(caching, key.isPrimary(), key.getBlockType());<a name="line.408"></a>
<span class="sourceLineNo">409</span> }<a name="line.409"></a>
<span class="sourceLineNo">410</span> re.access(accessCount.incrementAndGet());<a name="line.410"></a>
<span class="sourceLineNo">411</span> return re.getData();<a name="line.411"></a>
@@ -438,7 +438,7 @@
<span class="sourceLineNo">430</span> bucketEntry.deserializerReference(this.deserialiserMap));<a name="line.430"></a>
<span class="sourceLineNo">431</span> long timeTaken = System.nanoTime() - start;<a name="line.431"></a>
<span class="sourceLineNo">432</span> if (updateCacheMetrics) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span> cacheStats.hit(caching, key.isPrimary());<a name="line.433"></a>
+<span class="sourceLineNo">433</span> cacheStats.hit(caching, key.isPrimary(), key.getBlockType());<a name="line.433"></a>
<span class="sourceLineNo">434</span> cacheStats.ioHit(timeTaken);<a name="line.434"></a>
<span class="sourceLineNo">435</span> }<a name="line.435"></a>
<span class="sourceLineNo">436</span> if (cachedBlock.getMemoryType() == MemoryType.SHARED) {<a name="line.436"></a>
@@ -458,7 +458,7 @@
<span class="sourceLineNo">450</span> }<a name="line.450"></a>
<span class="sourceLineNo">451</span> }<a name="line.451"></a>
<span class="sourceLineNo">452</span> if (!repeat && updateCacheMetrics) {<a name="line.452"></a>
-<span class="sourceLineNo">453</span> cacheStats.miss(caching, key.isPrimary());<a name="line.453"></a>
+<span class="sourceLineNo">453</span> cacheStats.miss(caching, key.isPrimary(), key.getBlockType());<a name="line.453"></a>
<span class="sourceLineNo">454</span> }<a name="line.454"></a>
<span class="sourceLineNo">455</span> return null;<a name="line.455"></a>
<span class="sourceLineNo">456</span> }<a name="line.456"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f8d69509/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.BucketEntryGroup.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.BucketEntryGroup.html b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.BucketEntryGroup.html
index 97d9682..7f44ba4 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.BucketEntryGroup.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.BucketEntryGroup.html
@@ -413,7 +413,7 @@
<span class="sourceLineNo">405</span> RAMQueueEntry re = ramCache.get(key);<a name="line.405"></a>
<span class="sourceLineNo">406</span> if (re != null) {<a name="line.406"></a>
<span class="sourceLineNo">407</span> if (updateCacheMetrics) {<a name="line.407"></a>
-<span class="sourceLineNo">408</span> cacheStats.hit(caching, key.isPrimary());<a name="line.408"></a>
+<span class="sourceLineNo">408</span> cacheStats.hit(caching, key.isPrimary(), key.getBlockType());<a name="line.408"></a>
<span class="sourceLineNo">409</span> }<a name="line.409"></a>
<span class="sourceLineNo">410</span> re.access(accessCount.incrementAndGet());<a name="line.410"></a>
<span class="sourceLineNo">411</span> return re.getData();<a name="line.411"></a>
@@ -438,7 +438,7 @@
<span class="sourceLineNo">430</span> bucketEntry.deserializerReference(this.deserialiserMap));<a name="line.430"></a>
<span class="sourceLineNo">431</span> long timeTaken = System.nanoTime() - start;<a name="line.431"></a>
<span class="sourceLineNo">432</span> if (updateCacheMetrics) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span> cacheStats.hit(caching, key.isPrimary());<a name="line.433"></a>
+<span class="sourceLineNo">433</span> cacheStats.hit(caching, key.isPrimary(), key.getBlockType());<a name="line.433"></a>
<span class="sourceLineNo">434</span> cacheStats.ioHit(timeTaken);<a name="line.434"></a>
<span class="sourceLineNo">435</span> }<a name="line.435"></a>
<span class="sourceLineNo">436</span> if (cachedBlock.getMemoryType() == MemoryType.SHARED) {<a name="line.436"></a>
@@ -458,7 +458,7 @@
<span class="sourceLineNo">450</span> }<a name="line.450"></a>
<span class="sourceLineNo">451</span> }<a name="line.451"></a>
<span class="sourceLineNo">452</span> if (!repeat && updateCacheMetrics) {<a name="line.452"></a>
-<span class="sourceLineNo">453</span> cacheStats.miss(caching, key.isPrimary());<a name="line.453"></a>
+<span class="sourceLineNo">453</span> cacheStats.miss(caching, key.isPrimary(), key.getBlockType());<a name="line.453"></a>
<span class="sourceLineNo">454</span> }<a name="line.454"></a>
<span class="sourceLineNo">455</span> return null;<a name="line.455"></a>
<span class="sourceLineNo">456</span> }<a name="line.456"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f8d69509/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.RAMQueueEntry.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.RAMQueueEntry.html b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.RAMQueueEntry.html
index 97d9682..7f44ba4 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.RAMQueueEntry.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.RAMQueueEntry.html
@@ -413,7 +413,7 @@
<span class="sourceLineNo">405</span> RAMQueueEntry re = ramCache.get(key);<a name="line.405"></a>
<span class="sourceLineNo">406</span> if (re != null) {<a name="line.406"></a>
<span class="sourceLineNo">407</span> if (updateCacheMetrics) {<a name="line.407"></a>
-<span class="sourceLineNo">408</span> cacheStats.hit(caching, key.isPrimary());<a name="line.408"></a>
+<span class="sourceLineNo">408</span> cacheStats.hit(caching, key.isPrimary(), key.getBlockType());<a name="line.408"></a>
<span class="sourceLineNo">409</span> }<a name="line.409"></a>
<span class="sourceLineNo">410</span> re.access(accessCount.incrementAndGet());<a name="line.410"></a>
<span class="sourceLineNo">411</span> return re.getData();<a name="line.411"></a>
@@ -438,7 +438,7 @@
<span class="sourceLineNo">430</span> bucketEntry.deserializerReference(this.deserialiserMap));<a name="line.430"></a>
<span class="sourceLineNo">431</span> long timeTaken = System.nanoTime() - start;<a name="line.431"></a>
<span class="sourceLineNo">432</span> if (updateCacheMetrics) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span> cacheStats.hit(caching, key.isPrimary());<a name="line.433"></a>
+<span class="sourceLineNo">433</span> cacheStats.hit(caching, key.isPrimary(), key.getBlockType());<a name="line.433"></a>
<span class="sourceLineNo">434</span> cacheStats.ioHit(timeTaken);<a name="line.434"></a>
<span class="sourceLineNo">435</span> }<a name="line.435"></a>
<span class="sourceLineNo">436</span> if (cachedBlock.getMemoryType() == MemoryType.SHARED) {<a name="line.436"></a>
@@ -458,7 +458,7 @@
<span class="sourceLineNo">450</span> }<a name="line.450"></a>
<span class="sourceLineNo">451</span> }<a name="line.451"></a>
<span class="sourceLineNo">452</span> if (!repeat && updateCacheMetrics) {<a name="line.452"></a>
-<span class="sourceLineNo">453</span> cacheStats.miss(caching, key.isPrimary());<a name="line.453"></a>
+<span class="sourceLineNo">453</span> cacheStats.miss(caching, key.isPrimary(), key.getBlockType());<a name="line.453"></a>
<span class="sourceLineNo">454</span> }<a name="line.454"></a>
<span class="sourceLineNo">455</span> return null;<a name="line.455"></a>
<span class="sourceLineNo">456</span> }<a name="line.456"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f8d69509/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.StatisticsThread.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.StatisticsThread.html b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.StatisticsThread.html
index 97d9682..7f44ba4 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.StatisticsThread.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.StatisticsThread.html
@@ -413,7 +413,7 @@
<span class="sourceLineNo">405</span> RAMQueueEntry re = ramCache.get(key);<a name="line.405"></a>
<span class="sourceLineNo">406</span> if (re != null) {<a name="line.406"></a>
<span class="sourceLineNo">407</span> if (updateCacheMetrics) {<a name="line.407"></a>
-<span class="sourceLineNo">408</span> cacheStats.hit(caching, key.isPrimary());<a name="line.408"></a>
+<span class="sourceLineNo">408</span> cacheStats.hit(caching, key.isPrimary(), key.getBlockType());<a name="line.408"></a>
<span class="sourceLineNo">409</span> }<a name="line.409"></a>
<span class="sourceLineNo">410</span> re.access(accessCount.incrementAndGet());<a name="line.410"></a>
<span class="sourceLineNo">411</span> return re.getData();<a name="line.411"></a>
@@ -438,7 +438,7 @@
<span class="sourceLineNo">430</span> bucketEntry.deserializerReference(this.deserialiserMap));<a name="line.430"></a>
<span class="sourceLineNo">431</span> long timeTaken = System.nanoTime() - start;<a name="line.431"></a>
<span class="sourceLineNo">432</span> if (updateCacheMetrics) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span> cacheStats.hit(caching, key.isPrimary());<a name="line.433"></a>
+<span class="sourceLineNo">433</span> cacheStats.hit(caching, key.isPrimary(), key.getBlockType());<a name="line.433"></a>
<span class="sourceLineNo">434</span> cacheStats.ioHit(timeTaken);<a name="line.434"></a>
<span class="sourceLineNo">435</span> }<a name="line.435"></a>
<span class="sourceLineNo">436</span> if (cachedBlock.getMemoryType() == MemoryType.SHARED) {<a name="line.436"></a>
@@ -458,7 +458,7 @@
<span class="sourceLineNo">450</span> }<a name="line.450"></a>
<span class="sourceLineNo">451</span> }<a name="line.451"></a>
<span class="sourceLineNo">452</span> if (!repeat && updateCacheMetrics) {<a name="line.452"></a>
-<span class="sourceLineNo">453</span> cacheStats.miss(caching, key.isPrimary());<a name="line.453"></a>
+<span class="sourceLineNo">453</span> cacheStats.miss(caching, key.isPrimary(), key.getBlockType());<a name="line.453"></a>
<span class="sourceLineNo">454</span> }<a name="line.454"></a>
<span class="sourceLineNo">455</span> return null;<a name="line.455"></a>
<span class="sourceLineNo">456</span> }<a name="line.456"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f8d69509/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.WriterThread.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.WriterThread.html b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.WriterThread.html
index 97d9682..7f44ba4 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.WriterThread.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.WriterThread.html
@@ -413,7 +413,7 @@
<span class="sourceLineNo">405</span> RAMQueueEntry re = ramCache.get(key);<a name="line.405"></a>
<span class="sourceLineNo">406</span> if (re != null) {<a name="line.406"></a>
<span class="sourceLineNo">407</span> if (updateCacheMetrics) {<a name="line.407"></a>
-<span class="sourceLineNo">408</span> cacheStats.hit(caching, key.isPrimary());<a name="line.408"></a>
+<span class="sourceLineNo">408</span> cacheStats.hit(caching, key.isPrimary(), key.getBlockType());<a name="line.408"></a>
<span class="sourceLineNo">409</span> }<a name="line.409"></a>
<span class="sourceLineNo">410</span> re.access(accessCount.incrementAndGet());<a name="line.410"></a>
<span class="sourceLineNo">411</span> return re.getData();<a name="line.411"></a>
@@ -438,7 +438,7 @@
<span class="sourceLineNo">430</span> bucketEntry.deserializerReference(this.deserialiserMap));<a name="line.430"></a>
<span class="sourceLineNo">431</span> long timeTaken = System.nanoTime() - start;<a name="line.431"></a>
<span class="sourceLineNo">432</span> if (updateCacheMetrics) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span> cacheStats.hit(caching, key.isPrimary());<a name="line.433"></a>
+<span class="sourceLineNo">433</span> cacheStats.hit(caching, key.isPrimary(), key.getBlockType());<a name="line.433"></a>
<span class="sourceLineNo">434</span> cacheStats.ioHit(timeTaken);<a name="line.434"></a>
<span class="sourceLineNo">435</span> }<a name="line.435"></a>
<span class="sourceLineNo">436</span> if (cachedBlock.getMemoryType() == MemoryType.SHARED) {<a name="line.436"></a>
@@ -458,7 +458,7 @@
<span class="sourceLineNo">450</span> }<a name="line.450"></a>
<span class="sourceLineNo">451</span> }<a name="line.451"></a>
<span class="sourceLineNo">452</span> if (!repeat && updateCacheMetrics) {<a name="line.452"></a>
-<span class="sourceLineNo">453</span> cacheStats.miss(caching, key.isPrimary());<a name="line.453"></a>
+<span class="sourceLineNo">453</span> cacheStats.miss(caching, key.isPrimary(), key.getBlockType());<a name="line.453"></a>
<span class="sourceLineNo">454</span> }<a name="line.454"></a>
<span class="sourceLineNo">455</span> return null;<a name="line.455"></a>
<span class="sourceLineNo">456</span> }<a name="line.456"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f8d69509/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.html b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.html
index 97d9682..7f44ba4 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.html
@@ -413,7 +413,7 @@
<span class="sourceLineNo">405</span> RAMQueueEntry re = ramCache.get(key);<a name="line.405"></a>
<span class="sourceLineNo">406</span> if (re != null) {<a name="line.406"></a>
<span class="sourceLineNo">407</span> if (updateCacheMetrics) {<a name="line.407"></a>
-<span class="sourceLineNo">408</span> cacheStats.hit(caching, key.isPrimary());<a name="line.408"></a>
+<span class="sourceLineNo">408</span> cacheStats.hit(caching, key.isPrimary(), key.getBlockType());<a name="line.408"></a>
<span class="sourceLineNo">409</span> }<a name="line.409"></a>
<span class="sourceLineNo">410</span> re.access(accessCount.incrementAndGet());<a name="line.410"></a>
<span class="sourceLineNo">411</span> return re.getData();<a name="line.411"></a>
@@ -438,7 +438,7 @@
<span class="sourceLineNo">430</span> bucketEntry.deserializerReference(this.deserialiserMap));<a name="line.430"></a>
<span class="sourceLineNo">431</span> long timeTaken = System.nanoTime() - start;<a name="line.431"></a>
<span class="sourceLineNo">432</span> if (updateCacheMetrics) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span> cacheStats.hit(caching, key.isPrimary());<a name="line.433"></a>
+<span class="sourceLineNo">433</span> cacheStats.hit(caching, key.isPrimary(), key.getBlockType());<a name="line.433"></a>
<span class="sourceLineNo">434</span> cacheStats.ioHit(timeTaken);<a name="line.434"></a>
<span class="sourceLineNo">435</span> }<a name="line.435"></a>
<span class="sourceLineNo">436</span> if (cachedBlock.getMemoryType() == MemoryType.SHARED) {<a name="line.436"></a>
@@ -458,7 +458,7 @@
<span class="sourceLineNo">450</span> }<a name="line.450"></a>
<span class="sourceLineNo">451</span> }<a name="line.451"></a>
<span class="sourceLineNo">452</span> if (!repeat && updateCacheMetrics) {<a name="line.452"></a>
-<span class="sourceLineNo">453</span> cacheStats.miss(caching, key.isPrimary());<a name="line.453"></a>
+<span class="sourceLineNo">453</span> cacheStats.miss(caching, key.isPrimary(), key.getBlockType());<a name="line.453"></a>
<span class="sourceLineNo">454</span> }<a name="line.454"></a>
<span class="sourceLineNo">455</span> return null;<a name="line.455"></a>
<span class="sourceLineNo">456</span> }<a name="line.456"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f8d69509/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/ConstantSizeRegionSplitPolicy.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/ConstantSizeRegionSplitPolicy.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/ConstantSizeRegionSplitPolicy.html
index c0fd8a6..b719dc6 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/ConstantSizeRegionSplitPolicy.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/ConstantSizeRegionSplitPolicy.html
@@ -25,70 +25,86 @@
<span class="sourceLineNo">017</span> */<a name="line.17"></a>
<span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.regionserver;<a name="line.18"></a>
<span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import org.apache.hadoop.conf.Configuration;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import org.apache.hadoop.hbase.HBaseInterfaceAudience;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.hadoop.hbase.HConstants;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.HTableDescriptor;<a name="line.24"></a>
-<span class="sourceLineNo">025</span><a name="line.25"></a>
-<span class="sourceLineNo">026</span>import java.util.Random;<a name="line.26"></a>
-<span class="sourceLineNo">027</span><a name="line.27"></a>
-<span class="sourceLineNo">028</span>/**<a name="line.28"></a>
-<span class="sourceLineNo">029</span> * A {@link RegionSplitPolicy} implementation which splits a region<a name="line.29"></a>
-<span class="sourceLineNo">030</span> * as soon as any of its store files exceeds a maximum configurable<a name="line.30"></a>
-<span class="sourceLineNo">031</span> * size.<a name="line.31"></a>
-<span class="sourceLineNo">032</span> * <p><a name="line.32"></a>
-<span class="sourceLineNo">033</span> * This is the default split policy. From 0.94.0 on the default split policy has<a name="line.33"></a>
-<span class="sourceLineNo">034</span> * changed to {@link IncreasingToUpperBoundRegionSplitPolicy}<a name="line.34"></a>
-<span class="sourceLineNo">035</span> * </p><a name="line.35"></a>
-<span class="sourceLineNo">036</span> */<a name="line.36"></a>
-<span class="sourceLineNo">037</span>@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.CONFIG)<a name="line.37"></a>
-<span class="sourceLineNo">038</span>public class ConstantSizeRegionSplitPolicy extends RegionSplitPolicy {<a name="line.38"></a>
-<span class="sourceLineNo">039</span> private static final Random RANDOM = new Random();<a name="line.39"></a>
-<span class="sourceLineNo">040</span><a name="line.40"></a>
-<span class="sourceLineNo">041</span> private long desiredMaxFileSize;<a name="line.41"></a>
-<span class="sourceLineNo">042</span><a name="line.42"></a>
-<span class="sourceLineNo">043</span> @Override<a name="line.43"></a>
-<span class="sourceLineNo">044</span> protected void configureForRegion(HRegion region) {<a name="line.44"></a>
-<span class="sourceLineNo">045</span> super.configureForRegion(region);<a name="line.45"></a>
-<span class="sourceLineNo">046</span> Configuration conf = getConf();<a name="line.46"></a>
-<span class="sourceLineNo">047</span> HTableDescriptor desc = region.getTableDesc();<a name="line.47"></a>
-<span class="sourceLineNo">048</span> if (desc != null) {<a name="line.48"></a>
-<span class="sourceLineNo">049</span> this.desiredMaxFileSize = desc.getMaxFileSize();<a name="line.49"></a>
-<span class="sourceLineNo">050</span> }<a name="line.50"></a>
-<span class="sourceLineNo">051</span> if (this.desiredMaxFileSize <= 0) {<a name="line.51"></a>
-<span class="sourceLineNo">052</span> this.desiredMaxFileSize = conf.getLong(HConstants.HREGION_MAX_FILESIZE,<a name="line.52"></a>
-<span class="sourceLineNo">053</span> HConstants.DEFAULT_MAX_FILE_SIZE);<a name="line.53"></a>
+<span class="sourceLineNo">020</span>import com.google.common.annotations.VisibleForTesting;<a name="line.20"></a>
+<span class="sourceLineNo">021</span><a name="line.21"></a>
+<span class="sourceLineNo">022</span>import java.util.Random;<a name="line.22"></a>
+<span class="sourceLineNo">023</span><a name="line.23"></a>
+<span class="sourceLineNo">024</span>import org.apache.hadoop.conf.Configuration;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.HBaseInterfaceAudience;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.HConstants;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.HTableDescriptor;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.28"></a>
+<span class="sourceLineNo">029</span><a name="line.29"></a>
+<span class="sourceLineNo">030</span>/**<a name="line.30"></a>
+<span class="sourceLineNo">031</span> * A {@link RegionSplitPolicy} implementation which splits a region<a name="line.31"></a>
+<span class="sourceLineNo">032</span> * as soon as any of its store files exceeds a maximum configurable<a name="line.32"></a>
+<span class="sourceLineNo">033</span> * size.<a name="line.33"></a>
+<span class="sourceLineNo">034</span> * <p><a name="line.34"></a>
+<span class="sourceLineNo">035</span> * This is the default split policy. From 0.94.0 on the default split policy has<a name="line.35"></a>
+<span class="sourceLineNo">036</span> * changed to {@link IncreasingToUpperBoundRegionSplitPolicy}<a name="line.36"></a>
+<span class="sourceLineNo">037</span> * </p><a name="line.37"></a>
+<span class="sourceLineNo">038</span> */<a name="line.38"></a>
+<span class="sourceLineNo">039</span>@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.CONFIG)<a name="line.39"></a>
+<span class="sourceLineNo">040</span>public class ConstantSizeRegionSplitPolicy extends RegionSplitPolicy {<a name="line.40"></a>
+<span class="sourceLineNo">041</span> private static final Random RANDOM = new Random();<a name="line.41"></a>
+<span class="sourceLineNo">042</span> private static final double EPSILON = 1E-6;<a name="line.42"></a>
+<span class="sourceLineNo">043</span><a name="line.43"></a>
+<span class="sourceLineNo">044</span> private long desiredMaxFileSize;<a name="line.44"></a>
+<span class="sourceLineNo">045</span> private double jitterRate;<a name="line.45"></a>
+<span class="sourceLineNo">046</span><a name="line.46"></a>
+<span class="sourceLineNo">047</span> @Override<a name="line.47"></a>
+<span class="sourceLineNo">048</span> protected void configureForRegion(HRegion region) {<a name="line.48"></a>
+<span class="sourceLineNo">049</span> super.configureForRegion(region);<a name="line.49"></a>
+<span class="sourceLineNo">050</span> Configuration conf = getConf();<a name="line.50"></a>
+<span class="sourceLineNo">051</span> HTableDescriptor desc = region.getTableDesc();<a name="line.51"></a>
+<span class="sourceLineNo">052</span> if (desc != null) {<a name="line.52"></a>
+<span class="sourceLineNo">053</span> this.desiredMaxFileSize = desc.getMaxFileSize();<a name="line.53"></a>
<span class="sourceLineNo">054</span> }<a name="line.54"></a>
-<span class="sourceLineNo">055</span> double jitter = conf.getDouble("hbase.hregion.max.filesize.jitter", 0.25D);<a name="line.55"></a>
-<span class="sourceLineNo">056</span> this.desiredMaxFileSize += (long)(desiredMaxFileSize * (RANDOM.nextFloat() - 0.5D) * jitter);<a name="line.56"></a>
-<span class="sourceLineNo">057</span> }<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span> @Override<a name="line.59"></a>
-<span class="sourceLineNo">060</span> protected boolean shouldSplit() {<a name="line.60"></a>
-<span class="sourceLineNo">061</span> boolean force = region.shouldForceSplit();<a name="line.61"></a>
-<span class="sourceLineNo">062</span> boolean foundABigStore = false;<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span> for (Store store : region.getStores()) {<a name="line.64"></a>
-<span class="sourceLineNo">065</span> // If any of the stores are unable to split (eg they contain reference files)<a name="line.65"></a>
-<span class="sourceLineNo">066</span> // then don't split<a name="line.66"></a>
-<span class="sourceLineNo">067</span> if ((!store.canSplit())) {<a name="line.67"></a>
-<span class="sourceLineNo">068</span> return false;<a name="line.68"></a>
-<span class="sourceLineNo">069</span> }<a name="line.69"></a>
-<span class="sourceLineNo">070</span><a name="line.70"></a>
-<span class="sourceLineNo">071</span> // Mark if any store is big enough<a name="line.71"></a>
-<span class="sourceLineNo">072</span> if (store.getSize() > desiredMaxFileSize) {<a name="line.72"></a>
-<span class="sourceLineNo">073</span> foundABigStore = true;<a name="line.73"></a>
-<span class="sourceLineNo">074</span> }<a name="line.74"></a>
-<span class="sourceLineNo">075</span> }<a name="line.75"></a>
-<span class="sourceLineNo">076</span><a name="line.76"></a>
-<span class="sourceLineNo">077</span> return foundABigStore || force;<a name="line.77"></a>
-<span class="sourceLineNo">078</span> }<a name="line.78"></a>
-<span class="sourceLineNo">079</span><a name="line.79"></a>
-<span class="sourceLineNo">080</span> long getDesiredMaxFileSize() {<a name="line.80"></a>
-<span class="sourceLineNo">081</span> return desiredMaxFileSize;<a name="line.81"></a>
-<span class="sourceLineNo">082</span> }<a name="line.82"></a>
-<span class="sourceLineNo">083</span>}<a name="line.83"></a>
+<span class="sourceLineNo">055</span> if (this.desiredMaxFileSize <= 0) {<a name="line.55"></a>
+<span class="sourceLineNo">056</span> this.desiredMaxFileSize = conf.getLong(HConstants.HREGION_MAX_FILESIZE,<a name="line.56"></a>
+<span class="sourceLineNo">057</span> HConstants.DEFAULT_MAX_FILE_SIZE);<a name="line.57"></a>
+<span class="sourceLineNo">058</span> }<a name="line.58"></a>
+<span class="sourceLineNo">059</span> double jitter = conf.getDouble("hbase.hregion.max.filesize.jitter", 0.25D);<a name="line.59"></a>
+<span class="sourceLineNo">060</span> this.jitterRate = (RANDOM.nextFloat() - 0.5D) * jitter;<a name="line.60"></a>
+<span class="sourceLineNo">061</span> long jitterValue = (long) (this.desiredMaxFileSize * this.jitterRate);<a name="line.61"></a>
+<span class="sourceLineNo">062</span> // make sure the long value won't overflow with jitter<a name="line.62"></a>
+<span class="sourceLineNo">063</span> if (this.jitterRate > EPSILON && jitterValue > (Long.MAX_VALUE - this.desiredMaxFileSize)) {<a name="line.63"></a>
+<span class="sourceLineNo">064</span> this.desiredMaxFileSize = Long.MAX_VALUE;<a name="line.64"></a>
+<span class="sourceLineNo">065</span> } else {<a name="line.65"></a>
+<span class="sourceLineNo">066</span> this.desiredMaxFileSize += jitterValue;<a name="line.66"></a>
+<span class="sourceLineNo">067</span> }<a name="line.67"></a>
+<span class="sourceLineNo">068</span> }<a name="line.68"></a>
+<span class="sourceLineNo">069</span><a name="line.69"></a>
+<span class="sourceLineNo">070</span> @Override<a name="line.70"></a>
+<span class="sourceLineNo">071</span> protected boolean shouldSplit() {<a name="line.71"></a>
+<span class="sourceLineNo">072</span> boolean force = region.shouldForceSplit();<a name="line.72"></a>
+<span class="sourceLineNo">073</span> boolean foundABigStore = false;<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span> for (Store store : region.getStores()) {<a name="line.75"></a>
+<span class="sourceLineNo">076</span> // If any of the stores are unable to split (eg they contain reference files)<a name="line.76"></a>
+<span class="sourceLineNo">077</span> // then don't split<a name="line.77"></a>
+<span class="sourceLineNo">078</span> if ((!store.canSplit())) {<a name="line.78"></a>
+<span class="sourceLineNo">079</span> return false;<a name="line.79"></a>
+<span class="sourceLineNo">080</span> }<a name="line.80"></a>
+<span class="sourceLineNo">081</span><a name="line.81"></a>
+<span class="sourceLineNo">082</span> // Mark if any store is big enough<a name="line.82"></a>
+<span class="sourceLineNo">083</span> if (store.getSize() > desiredMaxFileSize) {<a name="line.83"></a>
+<span class="sourceLineNo">084</span> foundABigStore = true;<a name="line.84"></a>
+<span class="sourceLineNo">085</span> }<a name="line.85"></a>
+<span class="sourceLineNo">086</span> }<a name="line.86"></a>
+<span class="sourceLineNo">087</span><a name="line.87"></a>
+<span class="sourceLineNo">088</span> return foundABigStore || force;<a name="line.88"></a>
+<span class="sourceLineNo">089</span> }<a name="line.89"></a>
+<span class="sourceLineNo">090</span><a name="line.90"></a>
+<span class="sourceLineNo">091</span> long getDesiredMaxFileSize() {<a name="line.91"></a>
+<span class="sourceLineNo">092</span> return desiredMaxFileSize;<a name="line.92"></a>
+<span class="sourceLineNo">093</span> }<a name="line.93"></a>
+<span class="sourceLineNo">094</span><a name="line.94"></a>
+<span class="sourceLineNo">095</span> @VisibleForTesting<a name="line.95"></a>
+<span class="sourceLineNo">096</span> public boolean positiveJitterRate() {<a name="line.96"></a>
+<span class="sourceLineNo">097</span> return this.jitterRate > EPSILON;<a name="line.97"></a>
+<span class="sourceLineNo">098</span> }<a name="line.98"></a>
+<span class="sourceLineNo">099</span>}<a name="line.99"></a>