You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2018/11/27 14:52:35 UTC
[03/26] hbase-site git commit: Published site at
6f15cecaed2f1f76bfe1880b7c578ed369daa5d5.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/dccdd274/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestBlocksRead.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestBlocksRead.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestBlocksRead.html
index 1077518..f3faf1a 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestBlocksRead.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestBlocksRead.html
@@ -84,376 +84,377 @@
<span class="sourceLineNo">076</span> public static void setUp() throws Exception {<a name="line.76"></a>
<span class="sourceLineNo">077</span> // disable compactions in this test.<a name="line.77"></a>
<span class="sourceLineNo">078</span> TEST_UTIL.getConfiguration().setInt("hbase.hstore.compactionThreshold", 10000);<a name="line.78"></a>
-<span class="sourceLineNo">079</span> }<a name="line.79"></a>
-<span class="sourceLineNo">080</span><a name="line.80"></a>
-<span class="sourceLineNo">081</span> @AfterClass<a name="line.81"></a>
-<span class="sourceLineNo">082</span> public static void tearDown() throws Exception {<a name="line.82"></a>
-<span class="sourceLineNo">083</span> EnvironmentEdgeManagerTestHelper.reset();<a name="line.83"></a>
-<span class="sourceLineNo">084</span> }<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> * Callers must afterward call {@link HBaseTestingUtility#closeRegionAndWAL(HRegion)}<a name="line.87"></a>
-<span class="sourceLineNo">088</span> * @param tableName<a name="line.88"></a>
-<span class="sourceLineNo">089</span> * @param callingMethod<a name="line.89"></a>
-<span class="sourceLineNo">090</span> * @param conf<a name="line.90"></a>
-<span class="sourceLineNo">091</span> * @param family<a name="line.91"></a>
-<span class="sourceLineNo">092</span> * @throws IOException<a name="line.92"></a>
-<span class="sourceLineNo">093</span> * @return created and initialized region.<a name="line.93"></a>
-<span class="sourceLineNo">094</span> */<a name="line.94"></a>
-<span class="sourceLineNo">095</span> private HRegion initHRegion(byte[] tableName, String callingMethod,<a name="line.95"></a>
-<span class="sourceLineNo">096</span> Configuration conf, String family) throws IOException {<a name="line.96"></a>
-<span class="sourceLineNo">097</span> HTableDescriptor htd = new HTableDescriptor(TableName.valueOf(tableName));<a name="line.97"></a>
-<span class="sourceLineNo">098</span> HColumnDescriptor familyDesc;<a name="line.98"></a>
-<span class="sourceLineNo">099</span> for (int i = 0; i < BLOOM_TYPE.length; i++) {<a name="line.99"></a>
-<span class="sourceLineNo">100</span> BloomType bloomType = BLOOM_TYPE[i];<a name="line.100"></a>
-<span class="sourceLineNo">101</span> familyDesc = new HColumnDescriptor(family + "_" + bloomType)<a name="line.101"></a>
-<span class="sourceLineNo">102</span> .setBlocksize(1)<a name="line.102"></a>
-<span class="sourceLineNo">103</span> .setBloomFilterType(BLOOM_TYPE[i]);<a name="line.103"></a>
-<span class="sourceLineNo">104</span> htd.addFamily(familyDesc);<a name="line.104"></a>
-<span class="sourceLineNo">105</span> }<a name="line.105"></a>
-<span class="sourceLineNo">106</span><a name="line.106"></a>
-<span class="sourceLineNo">107</span> HRegionInfo info = new HRegionInfo(htd.getTableName(), null, null, false);<a name="line.107"></a>
-<span class="sourceLineNo">108</span> Path path = new Path(DIR + callingMethod);<a name="line.108"></a>
-<span class="sourceLineNo">109</span> HRegion r = HBaseTestingUtility.createRegionAndWAL(info, path, conf, htd);<a name="line.109"></a>
-<span class="sourceLineNo">110</span> blockCache = new CacheConfig(conf).getBlockCache();<a name="line.110"></a>
-<span class="sourceLineNo">111</span> return r;<a name="line.111"></a>
-<span class="sourceLineNo">112</span> }<a name="line.112"></a>
-<span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span> private void putData(String family, String row, String col, long version)<a name="line.114"></a>
-<span class="sourceLineNo">115</span> throws IOException {<a name="line.115"></a>
-<span class="sourceLineNo">116</span> for (int i = 0; i < BLOOM_TYPE.length; i++) {<a name="line.116"></a>
-<span class="sourceLineNo">117</span> putData(Bytes.toBytes(family + "_" + BLOOM_TYPE[i]), row, col, version,<a name="line.117"></a>
-<span class="sourceLineNo">118</span> version);<a name="line.118"></a>
-<span class="sourceLineNo">119</span> }<a name="line.119"></a>
-<span class="sourceLineNo">120</span> }<a name="line.120"></a>
-<span class="sourceLineNo">121</span><a name="line.121"></a>
-<span class="sourceLineNo">122</span> // generates a value to put for a row/col/version.<a name="line.122"></a>
-<span class="sourceLineNo">123</span> private static byte[] genValue(String row, String col, long version) {<a name="line.123"></a>
-<span class="sourceLineNo">124</span> return Bytes.toBytes("Value:" + row + "#" + col + "#" + version);<a name="line.124"></a>
-<span class="sourceLineNo">125</span> }<a name="line.125"></a>
-<span class="sourceLineNo">126</span><a name="line.126"></a>
-<span class="sourceLineNo">127</span> private void putData(byte[] cf, String row, String col, long versionStart,<a name="line.127"></a>
-<span class="sourceLineNo">128</span> long versionEnd) throws IOException {<a name="line.128"></a>
-<span class="sourceLineNo">129</span> byte columnBytes[] = Bytes.toBytes(col);<a name="line.129"></a>
-<span class="sourceLineNo">130</span> Put put = new Put(Bytes.toBytes(row));<a name="line.130"></a>
-<span class="sourceLineNo">131</span> put.setDurability(Durability.SKIP_WAL);<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span> for (long version = versionStart; version <= versionEnd; version++) {<a name="line.133"></a>
-<span class="sourceLineNo">134</span> put.addColumn(cf, columnBytes, version, genValue(row, col, version));<a name="line.134"></a>
-<span class="sourceLineNo">135</span> }<a name="line.135"></a>
-<span class="sourceLineNo">136</span> region.put(put);<a name="line.136"></a>
-<span class="sourceLineNo">137</span> }<a name="line.137"></a>
-<span class="sourceLineNo">138</span><a name="line.138"></a>
-<span class="sourceLineNo">139</span> private Cell[] getData(String family, String row, List<String> columns,<a name="line.139"></a>
-<span class="sourceLineNo">140</span> int expBlocks) throws IOException {<a name="line.140"></a>
-<span class="sourceLineNo">141</span> return getData(family, row, columns, expBlocks, expBlocks, expBlocks);<a name="line.141"></a>
-<span class="sourceLineNo">142</span> }<a name="line.142"></a>
-<span class="sourceLineNo">143</span><a name="line.143"></a>
-<span class="sourceLineNo">144</span> private Cell[] getData(String family, String row, List<String> columns,<a name="line.144"></a>
-<span class="sourceLineNo">145</span> int expBlocksRowCol, int expBlocksRow, int expBlocksNone)<a name="line.145"></a>
-<span class="sourceLineNo">146</span> throws IOException {<a name="line.146"></a>
-<span class="sourceLineNo">147</span> int[] expBlocks = new int[] { expBlocksRowCol, expBlocksRow, expBlocksNone };<a name="line.147"></a>
-<span class="sourceLineNo">148</span> Cell[] kvs = null;<a name="line.148"></a>
-<span class="sourceLineNo">149</span><a name="line.149"></a>
-<span class="sourceLineNo">150</span> for (int i = 0; i < BLOOM_TYPE.length; i++) {<a name="line.150"></a>
-<span class="sourceLineNo">151</span> BloomType bloomType = BLOOM_TYPE[i];<a name="line.151"></a>
-<span class="sourceLineNo">152</span> byte[] cf = Bytes.toBytes(family + "_" + bloomType);<a name="line.152"></a>
-<span class="sourceLineNo">153</span> long blocksStart = getBlkAccessCount(cf);<a name="line.153"></a>
-<span class="sourceLineNo">154</span> Get get = new Get(Bytes.toBytes(row));<a name="line.154"></a>
-<span class="sourceLineNo">155</span><a name="line.155"></a>
-<span class="sourceLineNo">156</span> for (String column : columns) {<a name="line.156"></a>
-<span class="sourceLineNo">157</span> get.addColumn(cf, Bytes.toBytes(column));<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> kvs = region.get(get).rawCells();<a name="line.160"></a>
-<span class="sourceLineNo">161</span> long blocksEnd = getBlkAccessCount(cf);<a name="line.161"></a>
-<span class="sourceLineNo">162</span> if (expBlocks[i] != -1) {<a name="line.162"></a>
-<span class="sourceLineNo">163</span> assertEquals("Blocks Read Check for Bloom: " + bloomType, expBlocks[i],<a name="line.163"></a>
-<span class="sourceLineNo">164</span> blocksEnd - blocksStart);<a name="line.164"></a>
-<span class="sourceLineNo">165</span> }<a name="line.165"></a>
-<span class="sourceLineNo">166</span> System.out.println("Blocks Read for Bloom: " + bloomType + " = "<a name="line.166"></a>
-<span class="sourceLineNo">167</span> + (blocksEnd - blocksStart) + "Expected = " + expBlocks[i]);<a name="line.167"></a>
-<span class="sourceLineNo">168</span> }<a name="line.168"></a>
-<span class="sourceLineNo">169</span> return kvs;<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> private Cell[] getData(String family, String row, String column,<a name="line.172"></a>
-<span class="sourceLineNo">173</span> int expBlocks) throws IOException {<a name="line.173"></a>
-<span class="sourceLineNo">174</span> return getData(family, row, Arrays.asList(column), expBlocks, expBlocks,<a name="line.174"></a>
-<span class="sourceLineNo">175</span> expBlocks);<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> private Cell[] getData(String family, String row, String column,<a name="line.178"></a>
-<span class="sourceLineNo">179</span> int expBlocksRowCol, int expBlocksRow, int expBlocksNone)<a name="line.179"></a>
-<span class="sourceLineNo">180</span> throws IOException {<a name="line.180"></a>
-<span class="sourceLineNo">181</span> return getData(family, row, Arrays.asList(column), expBlocksRowCol,<a name="line.181"></a>
-<span class="sourceLineNo">182</span> expBlocksRow, expBlocksNone);<a name="line.182"></a>
-<span class="sourceLineNo">183</span> }<a name="line.183"></a>
-<span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span> private void deleteFamily(String family, String row, long version)<a name="line.185"></a>
-<span class="sourceLineNo">186</span> throws IOException {<a name="line.186"></a>
-<span class="sourceLineNo">187</span> Delete del = new Delete(Bytes.toBytes(row));<a name="line.187"></a>
-<span class="sourceLineNo">188</span> del.addFamily(Bytes.toBytes(family + "_ROWCOL"), version);<a name="line.188"></a>
-<span class="sourceLineNo">189</span> del.addFamily(Bytes.toBytes(family + "_ROW"), version);<a name="line.189"></a>
-<span class="sourceLineNo">190</span> del.addFamily(Bytes.toBytes(family + "_NONE"), version);<a name="line.190"></a>
-<span class="sourceLineNo">191</span> region.delete(del);<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> private static void verifyData(Cell kv, String expectedRow,<a name="line.194"></a>
-<span class="sourceLineNo">195</span> String expectedCol, long expectedVersion) {<a name="line.195"></a>
-<span class="sourceLineNo">196</span> assertTrue("RowCheck", CellUtil.matchingRows(kv, Bytes.toBytes(expectedRow)));<a name="line.196"></a>
-<span class="sourceLineNo">197</span> assertTrue("ColumnCheck", CellUtil.matchingQualifier(kv, Bytes.toBytes(expectedCol)));<a name="line.197"></a>
-<span class="sourceLineNo">198</span> assertEquals("TSCheck", expectedVersion, kv.getTimestamp());<a name="line.198"></a>
-<span class="sourceLineNo">199</span> assertTrue("ValueCheck", CellUtil.matchingValue(kv, genValue(expectedRow, expectedCol, expectedVersion)));<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> private static long getBlkAccessCount(byte[] cf) {<a name="line.202"></a>
-<span class="sourceLineNo">203</span> return HFile.DATABLOCK_READ_COUNT.sum();<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> private static long getBlkCount() {<a name="line.206"></a>
-<span class="sourceLineNo">207</span> return blockCache.getBlockCount();<a name="line.207"></a>
-<span class="sourceLineNo">208</span> }<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> * Test # of blocks read for some simple seek cases.<a name="line.211"></a>
-<span class="sourceLineNo">212</span> *<a name="line.212"></a>
-<span class="sourceLineNo">213</span> * @throws Exception<a name="line.213"></a>
-<span class="sourceLineNo">214</span> */<a name="line.214"></a>
-<span class="sourceLineNo">215</span> @Test<a name="line.215"></a>
-<span class="sourceLineNo">216</span> public void testBlocksRead() throws Exception {<a name="line.216"></a>
-<span class="sourceLineNo">217</span> byte[] TABLE = Bytes.toBytes("testBlocksRead");<a name="line.217"></a>
-<span class="sourceLineNo">218</span> String FAMILY = "cf1";<a name="line.218"></a>
-<span class="sourceLineNo">219</span> Cell kvs[];<a name="line.219"></a>
-<span class="sourceLineNo">220</span> this.region = initHRegion(TABLE, testName.getMethodName(), conf, FAMILY);<a name="line.220"></a>
-<span class="sourceLineNo">221</span><a name="line.221"></a>
-<span class="sourceLineNo">222</span> try {<a name="line.222"></a>
-<span class="sourceLineNo">223</span> putData(FAMILY, "row", "col1", 1);<a name="line.223"></a>
-<span class="sourceLineNo">224</span> putData(FAMILY, "row", "col2", 2);<a name="line.224"></a>
-<span class="sourceLineNo">225</span> putData(FAMILY, "row", "col3", 3);<a name="line.225"></a>
-<span class="sourceLineNo">226</span> putData(FAMILY, "row", "col4", 4);<a name="line.226"></a>
-<span class="sourceLineNo">227</span> putData(FAMILY, "row", "col5", 5);<a name="line.227"></a>
-<span class="sourceLineNo">228</span> putData(FAMILY, "row", "col6", 6);<a name="line.228"></a>
-<span class="sourceLineNo">229</span> putData(FAMILY, "row", "col7", 7);<a name="line.229"></a>
-<span class="sourceLineNo">230</span> region.flush(true);<a name="line.230"></a>
-<span class="sourceLineNo">231</span><a name="line.231"></a>
-<span class="sourceLineNo">232</span> // Expected block reads: 1<a name="line.232"></a>
-<span class="sourceLineNo">233</span> // The top block has the KV we are<a name="line.233"></a>
-<span class="sourceLineNo">234</span> // interested. So only 1 seek is needed.<a name="line.234"></a>
-<span class="sourceLineNo">235</span> kvs = getData(FAMILY, "row", "col1", 1);<a name="line.235"></a>
-<span class="sourceLineNo">236</span> assertEquals(1, kvs.length);<a name="line.236"></a>
-<span class="sourceLineNo">237</span> verifyData(kvs[0], "row", "col1", 1);<a name="line.237"></a>
-<span class="sourceLineNo">238</span><a name="line.238"></a>
-<span class="sourceLineNo">239</span> // Expected block reads: 2<a name="line.239"></a>
-<span class="sourceLineNo">240</span> // The top block and next block has the KVs we are<a name="line.240"></a>
-<span class="sourceLineNo">241</span> // interested. So only 2 seek is needed.<a name="line.241"></a>
-<span class="sourceLineNo">242</span> kvs = getData(FAMILY, "row", Arrays.asList("col1", "col2"), 2);<a name="line.242"></a>
-<span class="sourceLineNo">243</span> assertEquals(2, kvs.length);<a name="line.243"></a>
-<span class="sourceLineNo">244</span> verifyData(kvs[0], "row", "col1", 1);<a name="line.244"></a>
-<span class="sourceLineNo">245</span> verifyData(kvs[1], "row", "col2", 2);<a name="line.245"></a>
-<span class="sourceLineNo">246</span><a name="line.246"></a>
-<span class="sourceLineNo">247</span> // Expected block reads: 3<a name="line.247"></a>
-<span class="sourceLineNo">248</span> // The first 2 seeks is to find out col2. [HBASE-4443]<a name="line.248"></a>
-<span class="sourceLineNo">249</span> // One additional seek for col3<a name="line.249"></a>
-<span class="sourceLineNo">250</span> // So 3 seeks are needed.<a name="line.250"></a>
-<span class="sourceLineNo">251</span> kvs = getData(FAMILY, "row", Arrays.asList("col2", "col3"), 2);<a name="line.251"></a>
-<span class="sourceLineNo">252</span> assertEquals(2, kvs.length);<a name="line.252"></a>
-<span class="sourceLineNo">253</span> verifyData(kvs[0], "row", "col2", 2);<a name="line.253"></a>
-<span class="sourceLineNo">254</span> verifyData(kvs[1], "row", "col3", 3);<a name="line.254"></a>
-<span class="sourceLineNo">255</span><a name="line.255"></a>
-<span class="sourceLineNo">256</span> // Expected block reads: 1. [HBASE-4443]&[HBASE-7845]<a name="line.256"></a>
-<span class="sourceLineNo">257</span> kvs = getData(FAMILY, "row", Arrays.asList("col5"), 1);<a name="line.257"></a>
-<span class="sourceLineNo">258</span> assertEquals(1, kvs.length);<a name="line.258"></a>
-<span class="sourceLineNo">259</span> verifyData(kvs[0], "row", "col5", 5);<a name="line.259"></a>
-<span class="sourceLineNo">260</span> } finally {<a name="line.260"></a>
-<span class="sourceLineNo">261</span> HBaseTestingUtility.closeRegionAndWAL(this.region);<a name="line.261"></a>
-<span class="sourceLineNo">262</span> this.region = null;<a name="line.262"></a>
-<span class="sourceLineNo">263</span> }<a name="line.263"></a>
-<span class="sourceLineNo">264</span> }<a name="line.264"></a>
-<span class="sourceLineNo">265</span><a name="line.265"></a>
-<span class="sourceLineNo">266</span> /**<a name="line.266"></a>
-<span class="sourceLineNo">267</span> * Test # of blocks read (targeted at some of the cases Lazy Seek optimizes).<a name="line.267"></a>
-<span class="sourceLineNo">268</span> *<a name="line.268"></a>
-<span class="sourceLineNo">269</span> * @throws Exception<a name="line.269"></a>
-<span class="sourceLineNo">270</span> */<a name="line.270"></a>
-<span class="sourceLineNo">271</span> @Test<a name="line.271"></a>
-<span class="sourceLineNo">272</span> public void testLazySeekBlocksRead() throws Exception {<a name="line.272"></a>
-<span class="sourceLineNo">273</span> byte[] TABLE = Bytes.toBytes("testLazySeekBlocksRead");<a name="line.273"></a>
-<span class="sourceLineNo">274</span> String FAMILY = "cf1";<a name="line.274"></a>
-<span class="sourceLineNo">275</span> Cell kvs[];<a name="line.275"></a>
-<span class="sourceLineNo">276</span> this.region = initHRegion(TABLE, testName.getMethodName(), conf, FAMILY);<a name="line.276"></a>
-<span class="sourceLineNo">277</span><a name="line.277"></a>
-<span class="sourceLineNo">278</span> try {<a name="line.278"></a>
-<span class="sourceLineNo">279</span> // File 1<a name="line.279"></a>
-<span class="sourceLineNo">280</span> putData(FAMILY, "row", "col1", 1);<a name="line.280"></a>
-<span class="sourceLineNo">281</span> putData(FAMILY, "row", "col2", 2);<a name="line.281"></a>
-<span class="sourceLineNo">282</span> region.flush(true);<a name="line.282"></a>
-<span class="sourceLineNo">283</span><a name="line.283"></a>
-<span class="sourceLineNo">284</span> // File 2<a name="line.284"></a>
-<span class="sourceLineNo">285</span> putData(FAMILY, "row", "col1", 3);<a name="line.285"></a>
-<span class="sourceLineNo">286</span> putData(FAMILY, "row", "col2", 4);<a name="line.286"></a>
-<span class="sourceLineNo">287</span> region.flush(true);<a name="line.287"></a>
-<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span> // Expected blocks read: 1.<a name="line.289"></a>
-<span class="sourceLineNo">290</span> // File 2's top block is also the KV we are<a name="line.290"></a>
-<span class="sourceLineNo">291</span> // interested. So only 1 seek is needed.<a name="line.291"></a>
-<span class="sourceLineNo">292</span> kvs = getData(FAMILY, "row", Arrays.asList("col1"), 1);<a name="line.292"></a>
-<span class="sourceLineNo">293</span> assertEquals(1, kvs.length);<a name="line.293"></a>
-<span class="sourceLineNo">294</span> verifyData(kvs[0], "row", "col1", 3);<a name="line.294"></a>
-<span class="sourceLineNo">295</span><a name="line.295"></a>
-<span class="sourceLineNo">296</span> // Expected blocks read: 2<a name="line.296"></a>
-<span class="sourceLineNo">297</span> // File 2's top block has the "col1" KV we are<a name="line.297"></a>
-<span class="sourceLineNo">298</span> // interested. We also need "col2" which is in a block<a name="line.298"></a>
-<span class="sourceLineNo">299</span> // of its own. So, we need that block as well.<a name="line.299"></a>
-<span class="sourceLineNo">300</span> kvs = getData(FAMILY, "row", Arrays.asList("col1", "col2"), 2);<a name="line.300"></a>
-<span class="sourceLineNo">301</span> assertEquals(2, kvs.length);<a name="line.301"></a>
-<span class="sourceLineNo">302</span> verifyData(kvs[0], "row", "col1", 3);<a name="line.302"></a>
-<span class="sourceLineNo">303</span> verifyData(kvs[1], "row", "col2", 4);<a name="line.303"></a>
-<span class="sourceLineNo">304</span><a name="line.304"></a>
-<span class="sourceLineNo">305</span> // File 3: Add another column<a name="line.305"></a>
-<span class="sourceLineNo">306</span> putData(FAMILY, "row", "col3", 5);<a name="line.306"></a>
-<span class="sourceLineNo">307</span> region.flush(true);<a name="line.307"></a>
-<span class="sourceLineNo">308</span><a name="line.308"></a>
-<span class="sourceLineNo">309</span> // Expected blocks read: 1<a name="line.309"></a>
-<span class="sourceLineNo">310</span> // File 3's top block has the "col3" KV we are<a name="line.310"></a>
-<span class="sourceLineNo">311</span> // interested. So only 1 seek is needed.<a name="line.311"></a>
-<span class="sourceLineNo">312</span> kvs = getData(FAMILY, "row", "col3", 1);<a name="line.312"></a>
-<span class="sourceLineNo">313</span> assertEquals(1, kvs.length);<a name="line.313"></a>
-<span class="sourceLineNo">314</span> verifyData(kvs[0], "row", "col3", 5);<a name="line.314"></a>
-<span class="sourceLineNo">315</span><a name="line.315"></a>
-<span class="sourceLineNo">316</span> // Get a column from older file.<a name="line.316"></a>
-<span class="sourceLineNo">317</span> // For ROWCOL Bloom filter: Expected blocks read: 1.<a name="line.317"></a>
-<span class="sourceLineNo">318</span> // For ROW Bloom filter: Expected blocks read: 2.<a name="line.318"></a>
-<span class="sourceLineNo">319</span> // For NONE Bloom filter: Expected blocks read: 2.<a name="line.319"></a>
-<span class="sourceLineNo">320</span> kvs = getData(FAMILY, "row", Arrays.asList("col1"), 1, 2, 2);<a name="line.320"></a>
-<span class="sourceLineNo">321</span> assertEquals(1, kvs.length);<a name="line.321"></a>
-<span class="sourceLineNo">322</span> verifyData(kvs[0], "row", "col1", 3);<a name="line.322"></a>
-<span class="sourceLineNo">323</span><a name="line.323"></a>
-<span class="sourceLineNo">324</span> // File 4: Delete the entire row.<a name="line.324"></a>
-<span class="sourceLineNo">325</span> deleteFamily(FAMILY, "row", 6);<a name="line.325"></a>
-<span class="sourceLineNo">326</span> region.flush(true);<a name="line.326"></a>
-<span class="sourceLineNo">327</span><a name="line.327"></a>
-<span class="sourceLineNo">328</span> // For ROWCOL Bloom filter: Expected blocks read: 2.<a name="line.328"></a>
-<span class="sourceLineNo">329</span> // For ROW Bloom filter: Expected blocks read: 3.<a name="line.329"></a>
-<span class="sourceLineNo">330</span> // For NONE Bloom filter: Expected blocks read: 3.<a name="line.330"></a>
-<span class="sourceLineNo">331</span> kvs = getData(FAMILY, "row", "col1", 2, 3, 3);<a name="line.331"></a>
-<span class="sourceLineNo">332</span> assertEquals(0, kvs.length);<a name="line.332"></a>
-<span class="sourceLineNo">333</span> kvs = getData(FAMILY, "row", "col2", 2, 3, 3);<a name="line.333"></a>
-<span class="sourceLineNo">334</span> assertEquals(0, kvs.length);<a name="line.334"></a>
-<span class="sourceLineNo">335</span> kvs = getData(FAMILY, "row", "col3", 2);<a name="line.335"></a>
-<span class="sourceLineNo">336</span> assertEquals(0, kvs.length);<a name="line.336"></a>
-<span class="sourceLineNo">337</span> kvs = getData(FAMILY, "row", Arrays.asList("col1", "col2", "col3"), 4);<a name="line.337"></a>
-<span class="sourceLineNo">338</span> assertEquals(0, kvs.length);<a name="line.338"></a>
-<span class="sourceLineNo">339</span><a name="line.339"></a>
-<span class="sourceLineNo">340</span> // File 5: Delete<a name="line.340"></a>
-<span class="sourceLineNo">341</span> deleteFamily(FAMILY, "row", 10);<a name="line.341"></a>
-<span class="sourceLineNo">342</span> region.flush(true);<a name="line.342"></a>
-<span class="sourceLineNo">343</span><a name="line.343"></a>
-<span class="sourceLineNo">344</span> // File 6: some more puts, but with timestamps older than the<a name="line.344"></a>
-<span class="sourceLineNo">345</span> // previous delete.<a name="line.345"></a>
-<span class="sourceLineNo">346</span> putData(FAMILY, "row", "col1", 7);<a name="line.346"></a>
-<span class="sourceLineNo">347</span> putData(FAMILY, "row", "col2", 8);<a name="line.347"></a>
-<span class="sourceLineNo">348</span> putData(FAMILY, "row", "col3", 9);<a name="line.348"></a>
-<span class="sourceLineNo">349</span> region.flush(true);<a name="line.349"></a>
-<span class="sourceLineNo">350</span><a name="line.350"></a>
-<span class="sourceLineNo">351</span> // Baseline expected blocks read: 6. [HBASE-4532]<a name="line.351"></a>
-<span class="sourceLineNo">352</span> kvs = getData(FAMILY, "row", Arrays.asList("col1", "col2", "col3"), 6, 7, 7);<a name="line.352"></a>
-<span class="sourceLineNo">353</span> assertEquals(0, kvs.length);<a name="line.353"></a>
-<span class="sourceLineNo">354</span><a name="line.354"></a>
-<span class="sourceLineNo">355</span> // File 7: Put back new data<a name="line.355"></a>
-<span class="sourceLineNo">356</span> putData(FAMILY, "row", "col1", 11);<a name="line.356"></a>
-<span class="sourceLineNo">357</span> putData(FAMILY, "row", "col2", 12);<a name="line.357"></a>
-<span class="sourceLineNo">358</span> putData(FAMILY, "row", "col3", 13);<a name="line.358"></a>
-<span class="sourceLineNo">359</span> region.flush(true);<a name="line.359"></a>
-<span class="sourceLineNo">360</span><a name="line.360"></a>
+<span class="sourceLineNo">079</span> CacheConfig.instantiateBlockCache(TEST_UTIL.getConfiguration());<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> @AfterClass<a name="line.82"></a>
+<span class="sourceLineNo">083</span> public static void tearDown() throws Exception {<a name="line.83"></a>
+<span class="sourceLineNo">084</span> EnvironmentEdgeManagerTestHelper.reset();<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> * Callers must afterward call {@link HBaseTestingUtility#closeRegionAndWAL(HRegion)}<a name="line.88"></a>
+<span class="sourceLineNo">089</span> * @param tableName<a name="line.89"></a>
+<span class="sourceLineNo">090</span> * @param callingMethod<a name="line.90"></a>
+<span class="sourceLineNo">091</span> * @param conf<a name="line.91"></a>
+<span class="sourceLineNo">092</span> * @param family<a name="line.92"></a>
+<span class="sourceLineNo">093</span> * @throws IOException<a name="line.93"></a>
+<span class="sourceLineNo">094</span> * @return created and initialized region.<a name="line.94"></a>
+<span class="sourceLineNo">095</span> */<a name="line.95"></a>
+<span class="sourceLineNo">096</span> private HRegion initHRegion(byte[] tableName, String callingMethod,<a name="line.96"></a>
+<span class="sourceLineNo">097</span> Configuration conf, String family) throws IOException {<a name="line.97"></a>
+<span class="sourceLineNo">098</span> HTableDescriptor htd = new HTableDescriptor(TableName.valueOf(tableName));<a name="line.98"></a>
+<span class="sourceLineNo">099</span> HColumnDescriptor familyDesc;<a name="line.99"></a>
+<span class="sourceLineNo">100</span> for (int i = 0; i < BLOOM_TYPE.length; i++) {<a name="line.100"></a>
+<span class="sourceLineNo">101</span> BloomType bloomType = BLOOM_TYPE[i];<a name="line.101"></a>
+<span class="sourceLineNo">102</span> familyDesc = new HColumnDescriptor(family + "_" + bloomType)<a name="line.102"></a>
+<span class="sourceLineNo">103</span> .setBlocksize(1)<a name="line.103"></a>
+<span class="sourceLineNo">104</span> .setBloomFilterType(BLOOM_TYPE[i]);<a name="line.104"></a>
+<span class="sourceLineNo">105</span> htd.addFamily(familyDesc);<a name="line.105"></a>
+<span class="sourceLineNo">106</span> }<a name="line.106"></a>
+<span class="sourceLineNo">107</span><a name="line.107"></a>
+<span class="sourceLineNo">108</span> HRegionInfo info = new HRegionInfo(htd.getTableName(), null, null, false);<a name="line.108"></a>
+<span class="sourceLineNo">109</span> Path path = new Path(DIR + callingMethod);<a name="line.109"></a>
+<span class="sourceLineNo">110</span> HRegion r = HBaseTestingUtility.createRegionAndWAL(info, path, conf, htd);<a name="line.110"></a>
+<span class="sourceLineNo">111</span> blockCache = new CacheConfig(conf).getBlockCache();<a name="line.111"></a>
+<span class="sourceLineNo">112</span> return r;<a name="line.112"></a>
+<span class="sourceLineNo">113</span> }<a name="line.113"></a>
+<span class="sourceLineNo">114</span><a name="line.114"></a>
+<span class="sourceLineNo">115</span> private void putData(String family, String row, String col, long version)<a name="line.115"></a>
+<span class="sourceLineNo">116</span> throws IOException {<a name="line.116"></a>
+<span class="sourceLineNo">117</span> for (int i = 0; i < BLOOM_TYPE.length; i++) {<a name="line.117"></a>
+<span class="sourceLineNo">118</span> putData(Bytes.toBytes(family + "_" + BLOOM_TYPE[i]), row, col, version,<a name="line.118"></a>
+<span class="sourceLineNo">119</span> version);<a name="line.119"></a>
+<span class="sourceLineNo">120</span> }<a name="line.120"></a>
+<span class="sourceLineNo">121</span> }<a name="line.121"></a>
+<span class="sourceLineNo">122</span><a name="line.122"></a>
+<span class="sourceLineNo">123</span> // generates a value to put for a row/col/version.<a name="line.123"></a>
+<span class="sourceLineNo">124</span> private static byte[] genValue(String row, String col, long version) {<a name="line.124"></a>
+<span class="sourceLineNo">125</span> return Bytes.toBytes("Value:" + row + "#" + col + "#" + version);<a name="line.125"></a>
+<span class="sourceLineNo">126</span> }<a name="line.126"></a>
+<span class="sourceLineNo">127</span><a name="line.127"></a>
+<span class="sourceLineNo">128</span> private void putData(byte[] cf, String row, String col, long versionStart,<a name="line.128"></a>
+<span class="sourceLineNo">129</span> long versionEnd) throws IOException {<a name="line.129"></a>
+<span class="sourceLineNo">130</span> byte columnBytes[] = Bytes.toBytes(col);<a name="line.130"></a>
+<span class="sourceLineNo">131</span> Put put = new Put(Bytes.toBytes(row));<a name="line.131"></a>
+<span class="sourceLineNo">132</span> put.setDurability(Durability.SKIP_WAL);<a name="line.132"></a>
+<span class="sourceLineNo">133</span><a name="line.133"></a>
+<span class="sourceLineNo">134</span> for (long version = versionStart; version <= versionEnd; version++) {<a name="line.134"></a>
+<span class="sourceLineNo">135</span> put.addColumn(cf, columnBytes, version, genValue(row, col, version));<a name="line.135"></a>
+<span class="sourceLineNo">136</span> }<a name="line.136"></a>
+<span class="sourceLineNo">137</span> region.put(put);<a name="line.137"></a>
+<span class="sourceLineNo">138</span> }<a name="line.138"></a>
+<span class="sourceLineNo">139</span><a name="line.139"></a>
+<span class="sourceLineNo">140</span> private Cell[] getData(String family, String row, List<String> columns,<a name="line.140"></a>
+<span class="sourceLineNo">141</span> int expBlocks) throws IOException {<a name="line.141"></a>
+<span class="sourceLineNo">142</span> return getData(family, row, columns, expBlocks, expBlocks, expBlocks);<a name="line.142"></a>
+<span class="sourceLineNo">143</span> }<a name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span> private Cell[] getData(String family, String row, List<String> columns,<a name="line.145"></a>
+<span class="sourceLineNo">146</span> int expBlocksRowCol, int expBlocksRow, int expBlocksNone)<a name="line.146"></a>
+<span class="sourceLineNo">147</span> throws IOException {<a name="line.147"></a>
+<span class="sourceLineNo">148</span> int[] expBlocks = new int[] { expBlocksRowCol, expBlocksRow, expBlocksNone };<a name="line.148"></a>
+<span class="sourceLineNo">149</span> Cell[] kvs = null;<a name="line.149"></a>
+<span class="sourceLineNo">150</span><a name="line.150"></a>
+<span class="sourceLineNo">151</span> for (int i = 0; i < BLOOM_TYPE.length; i++) {<a name="line.151"></a>
+<span class="sourceLineNo">152</span> BloomType bloomType = BLOOM_TYPE[i];<a name="line.152"></a>
+<span class="sourceLineNo">153</span> byte[] cf = Bytes.toBytes(family + "_" + bloomType);<a name="line.153"></a>
+<span class="sourceLineNo">154</span> long blocksStart = getBlkAccessCount(cf);<a name="line.154"></a>
+<span class="sourceLineNo">155</span> Get get = new Get(Bytes.toBytes(row));<a name="line.155"></a>
+<span class="sourceLineNo">156</span><a name="line.156"></a>
+<span class="sourceLineNo">157</span> for (String column : columns) {<a name="line.157"></a>
+<span class="sourceLineNo">158</span> get.addColumn(cf, Bytes.toBytes(column));<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> kvs = region.get(get).rawCells();<a name="line.161"></a>
+<span class="sourceLineNo">162</span> long blocksEnd = getBlkAccessCount(cf);<a name="line.162"></a>
+<span class="sourceLineNo">163</span> if (expBlocks[i] != -1) {<a name="line.163"></a>
+<span class="sourceLineNo">164</span> assertEquals("Blocks Read Check for Bloom: " + bloomType, expBlocks[i],<a name="line.164"></a>
+<span class="sourceLineNo">165</span> blocksEnd - blocksStart);<a name="line.165"></a>
+<span class="sourceLineNo">166</span> }<a name="line.166"></a>
+<span class="sourceLineNo">167</span> System.out.println("Blocks Read for Bloom: " + bloomType + " = "<a name="line.167"></a>
+<span class="sourceLineNo">168</span> + (blocksEnd - blocksStart) + "Expected = " + expBlocks[i]);<a name="line.168"></a>
+<span class="sourceLineNo">169</span> }<a name="line.169"></a>
+<span class="sourceLineNo">170</span> return kvs;<a name="line.170"></a>
+<span class="sourceLineNo">171</span> }<a name="line.171"></a>
+<span class="sourceLineNo">172</span><a name="line.172"></a>
+<span class="sourceLineNo">173</span> private Cell[] getData(String family, String row, String column,<a name="line.173"></a>
+<span class="sourceLineNo">174</span> int expBlocks) throws IOException {<a name="line.174"></a>
+<span class="sourceLineNo">175</span> return getData(family, row, Arrays.asList(column), expBlocks, expBlocks,<a name="line.175"></a>
+<span class="sourceLineNo">176</span> expBlocks);<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> private Cell[] getData(String family, String row, String column,<a name="line.179"></a>
+<span class="sourceLineNo">180</span> int expBlocksRowCol, int expBlocksRow, int expBlocksNone)<a name="line.180"></a>
+<span class="sourceLineNo">181</span> throws IOException {<a name="line.181"></a>
+<span class="sourceLineNo">182</span> return getData(family, row, Arrays.asList(column), expBlocksRowCol,<a name="line.182"></a>
+<span class="sourceLineNo">183</span> expBlocksRow, expBlocksNone);<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> private void deleteFamily(String family, String row, long version)<a name="line.186"></a>
+<span class="sourceLineNo">187</span> throws IOException {<a name="line.187"></a>
+<span class="sourceLineNo">188</span> Delete del = new Delete(Bytes.toBytes(row));<a name="line.188"></a>
+<span class="sourceLineNo">189</span> del.addFamily(Bytes.toBytes(family + "_ROWCOL"), version);<a name="line.189"></a>
+<span class="sourceLineNo">190</span> del.addFamily(Bytes.toBytes(family + "_ROW"), version);<a name="line.190"></a>
+<span class="sourceLineNo">191</span> del.addFamily(Bytes.toBytes(family + "_NONE"), version);<a name="line.191"></a>
+<span class="sourceLineNo">192</span> region.delete(del);<a name="line.192"></a>
+<span class="sourceLineNo">193</span> }<a name="line.193"></a>
+<span class="sourceLineNo">194</span><a name="line.194"></a>
+<span class="sourceLineNo">195</span> private static void verifyData(Cell kv, String expectedRow,<a name="line.195"></a>
+<span class="sourceLineNo">196</span> String expectedCol, long expectedVersion) {<a name="line.196"></a>
+<span class="sourceLineNo">197</span> assertTrue("RowCheck", CellUtil.matchingRows(kv, Bytes.toBytes(expectedRow)));<a name="line.197"></a>
+<span class="sourceLineNo">198</span> assertTrue("ColumnCheck", CellUtil.matchingQualifier(kv, Bytes.toBytes(expectedCol)));<a name="line.198"></a>
+<span class="sourceLineNo">199</span> assertEquals("TSCheck", expectedVersion, kv.getTimestamp());<a name="line.199"></a>
+<span class="sourceLineNo">200</span> assertTrue("ValueCheck", CellUtil.matchingValue(kv, genValue(expectedRow, expectedCol, expectedVersion)));<a name="line.200"></a>
+<span class="sourceLineNo">201</span> }<a name="line.201"></a>
+<span class="sourceLineNo">202</span><a name="line.202"></a>
+<span class="sourceLineNo">203</span> private static long getBlkAccessCount(byte[] cf) {<a name="line.203"></a>
+<span class="sourceLineNo">204</span> return HFile.DATABLOCK_READ_COUNT.sum();<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> private static long getBlkCount() {<a name="line.207"></a>
+<span class="sourceLineNo">208</span> return blockCache.getBlockCount();<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> /**<a name="line.211"></a>
+<span class="sourceLineNo">212</span> * Test # of blocks read for some simple seek cases.<a name="line.212"></a>
+<span class="sourceLineNo">213</span> *<a name="line.213"></a>
+<span class="sourceLineNo">214</span> * @throws Exception<a name="line.214"></a>
+<span class="sourceLineNo">215</span> */<a name="line.215"></a>
+<span class="sourceLineNo">216</span> @Test<a name="line.216"></a>
+<span class="sourceLineNo">217</span> public void testBlocksRead() throws Exception {<a name="line.217"></a>
+<span class="sourceLineNo">218</span> byte[] TABLE = Bytes.toBytes("testBlocksRead");<a name="line.218"></a>
+<span class="sourceLineNo">219</span> String FAMILY = "cf1";<a name="line.219"></a>
+<span class="sourceLineNo">220</span> Cell kvs[];<a name="line.220"></a>
+<span class="sourceLineNo">221</span> this.region = initHRegion(TABLE, testName.getMethodName(), conf, FAMILY);<a name="line.221"></a>
+<span class="sourceLineNo">222</span><a name="line.222"></a>
+<span class="sourceLineNo">223</span> try {<a name="line.223"></a>
+<span class="sourceLineNo">224</span> putData(FAMILY, "row", "col1", 1);<a name="line.224"></a>
+<span class="sourceLineNo">225</span> putData(FAMILY, "row", "col2", 2);<a name="line.225"></a>
+<span class="sourceLineNo">226</span> putData(FAMILY, "row", "col3", 3);<a name="line.226"></a>
+<span class="sourceLineNo">227</span> putData(FAMILY, "row", "col4", 4);<a name="line.227"></a>
+<span class="sourceLineNo">228</span> putData(FAMILY, "row", "col5", 5);<a name="line.228"></a>
+<span class="sourceLineNo">229</span> putData(FAMILY, "row", "col6", 6);<a name="line.229"></a>
+<span class="sourceLineNo">230</span> putData(FAMILY, "row", "col7", 7);<a name="line.230"></a>
+<span class="sourceLineNo">231</span> region.flush(true);<a name="line.231"></a>
+<span class="sourceLineNo">232</span><a name="line.232"></a>
+<span class="sourceLineNo">233</span> // Expected block reads: 1<a name="line.233"></a>
+<span class="sourceLineNo">234</span> // The top block has the KV we are<a name="line.234"></a>
+<span class="sourceLineNo">235</span> // interested. So only 1 seek is needed.<a name="line.235"></a>
+<span class="sourceLineNo">236</span> kvs = getData(FAMILY, "row", "col1", 1);<a name="line.236"></a>
+<span class="sourceLineNo">237</span> assertEquals(1, kvs.length);<a name="line.237"></a>
+<span class="sourceLineNo">238</span> verifyData(kvs[0], "row", "col1", 1);<a name="line.238"></a>
+<span class="sourceLineNo">239</span><a name="line.239"></a>
+<span class="sourceLineNo">240</span> // Expected block reads: 2<a name="line.240"></a>
+<span class="sourceLineNo">241</span> // The top block and next block has the KVs we are<a name="line.241"></a>
+<span class="sourceLineNo">242</span> // interested. So only 2 seek is needed.<a name="line.242"></a>
+<span class="sourceLineNo">243</span> kvs = getData(FAMILY, "row", Arrays.asList("col1", "col2"), 2);<a name="line.243"></a>
+<span class="sourceLineNo">244</span> assertEquals(2, kvs.length);<a name="line.244"></a>
+<span class="sourceLineNo">245</span> verifyData(kvs[0], "row", "col1", 1);<a name="line.245"></a>
+<span class="sourceLineNo">246</span> verifyData(kvs[1], "row", "col2", 2);<a name="line.246"></a>
+<span class="sourceLineNo">247</span><a name="line.247"></a>
+<span class="sourceLineNo">248</span> // Expected block reads: 3<a name="line.248"></a>
+<span class="sourceLineNo">249</span> // The first 2 seeks is to find out col2. [HBASE-4443]<a name="line.249"></a>
+<span class="sourceLineNo">250</span> // One additional seek for col3<a name="line.250"></a>
+<span class="sourceLineNo">251</span> // So 3 seeks are needed.<a name="line.251"></a>
+<span class="sourceLineNo">252</span> kvs = getData(FAMILY, "row", Arrays.asList("col2", "col3"), 2);<a name="line.252"></a>
+<span class="sourceLineNo">253</span> assertEquals(2, kvs.length);<a name="line.253"></a>
+<span class="sourceLineNo">254</span> verifyData(kvs[0], "row", "col2", 2);<a name="line.254"></a>
+<span class="sourceLineNo">255</span> verifyData(kvs[1], "row", "col3", 3);<a name="line.255"></a>
+<span class="sourceLineNo">256</span><a name="line.256"></a>
+<span class="sourceLineNo">257</span> // Expected block reads: 1. [HBASE-4443]&[HBASE-7845]<a name="line.257"></a>
+<span class="sourceLineNo">258</span> kvs = getData(FAMILY, "row", Arrays.asList("col5"), 1);<a name="line.258"></a>
+<span class="sourceLineNo">259</span> assertEquals(1, kvs.length);<a name="line.259"></a>
+<span class="sourceLineNo">260</span> verifyData(kvs[0], "row", "col5", 5);<a name="line.260"></a>
+<span class="sourceLineNo">261</span> } finally {<a name="line.261"></a>
+<span class="sourceLineNo">262</span> HBaseTestingUtility.closeRegionAndWAL(this.region);<a name="line.262"></a>
+<span class="sourceLineNo">263</span> this.region = null;<a name="line.263"></a>
+<span class="sourceLineNo">264</span> }<a name="line.264"></a>
+<span class="sourceLineNo">265</span> }<a name="line.265"></a>
+<span class="sourceLineNo">266</span><a name="line.266"></a>
+<span class="sourceLineNo">267</span> /**<a name="line.267"></a>
+<span class="sourceLineNo">268</span> * Test # of blocks read (targeted at some of the cases Lazy Seek optimizes).<a name="line.268"></a>
+<span class="sourceLineNo">269</span> *<a name="line.269"></a>
+<span class="sourceLineNo">270</span> * @throws Exception<a name="line.270"></a>
+<span class="sourceLineNo">271</span> */<a name="line.271"></a>
+<span class="sourceLineNo">272</span> @Test<a name="line.272"></a>
+<span class="sourceLineNo">273</span> public void testLazySeekBlocksRead() throws Exception {<a name="line.273"></a>
+<span class="sourceLineNo">274</span> byte[] TABLE = Bytes.toBytes("testLazySeekBlocksRead");<a name="line.274"></a>
+<span class="sourceLineNo">275</span> String FAMILY = "cf1";<a name="line.275"></a>
+<span class="sourceLineNo">276</span> Cell kvs[];<a name="line.276"></a>
+<span class="sourceLineNo">277</span> this.region = initHRegion(TABLE, testName.getMethodName(), conf, FAMILY);<a name="line.277"></a>
+<span class="sourceLineNo">278</span><a name="line.278"></a>
+<span class="sourceLineNo">279</span> try {<a name="line.279"></a>
+<span class="sourceLineNo">280</span> // File 1<a name="line.280"></a>
+<span class="sourceLineNo">281</span> putData(FAMILY, "row", "col1", 1);<a name="line.281"></a>
+<span class="sourceLineNo">282</span> putData(FAMILY, "row", "col2", 2);<a name="line.282"></a>
+<span class="sourceLineNo">283</span> region.flush(true);<a name="line.283"></a>
+<span class="sourceLineNo">284</span><a name="line.284"></a>
+<span class="sourceLineNo">285</span> // File 2<a name="line.285"></a>
+<span class="sourceLineNo">286</span> putData(FAMILY, "row", "col1", 3);<a name="line.286"></a>
+<span class="sourceLineNo">287</span> putData(FAMILY, "row", "col2", 4);<a name="line.287"></a>
+<span class="sourceLineNo">288</span> region.flush(true);<a name="line.288"></a>
+<span class="sourceLineNo">289</span><a name="line.289"></a>
+<span class="sourceLineNo">290</span> // Expected blocks read: 1.<a name="line.290"></a>
+<span class="sourceLineNo">291</span> // File 2's top block is also the KV we are<a name="line.291"></a>
+<span class="sourceLineNo">292</span> // interested. So only 1 seek is needed.<a name="line.292"></a>
+<span class="sourceLineNo">293</span> kvs = getData(FAMILY, "row", Arrays.asList("col1"), 1);<a name="line.293"></a>
+<span class="sourceLineNo">294</span> assertEquals(1, kvs.length);<a name="line.294"></a>
+<span class="sourceLineNo">295</span> verifyData(kvs[0], "row", "col1", 3);<a name="line.295"></a>
+<span class="sourceLineNo">296</span><a name="line.296"></a>
+<span class="sourceLineNo">297</span> // Expected blocks read: 2<a name="line.297"></a>
+<span class="sourceLineNo">298</span> // File 2's top block has the "col1" KV we are<a name="line.298"></a>
+<span class="sourceLineNo">299</span> // interested. We also need "col2" which is in a block<a name="line.299"></a>
+<span class="sourceLineNo">300</span> // of its own. So, we need that block as well.<a name="line.300"></a>
+<span class="sourceLineNo">301</span> kvs = getData(FAMILY, "row", Arrays.asList("col1", "col2"), 2);<a name="line.301"></a>
+<span class="sourceLineNo">302</span> assertEquals(2, kvs.length);<a name="line.302"></a>
+<span class="sourceLineNo">303</span> verifyData(kvs[0], "row", "col1", 3);<a name="line.303"></a>
+<span class="sourceLineNo">304</span> verifyData(kvs[1], "row", "col2", 4);<a name="line.304"></a>
+<span class="sourceLineNo">305</span><a name="line.305"></a>
+<span class="sourceLineNo">306</span> // File 3: Add another column<a name="line.306"></a>
+<span class="sourceLineNo">307</span> putData(FAMILY, "row", "col3", 5);<a name="line.307"></a>
+<span class="sourceLineNo">308</span> region.flush(true);<a name="line.308"></a>
+<span class="sourceLineNo">309</span><a name="line.309"></a>
+<span class="sourceLineNo">310</span> // Expected blocks read: 1<a name="line.310"></a>
+<span class="sourceLineNo">311</span> // File 3's top block has the "col3" KV we are<a name="line.311"></a>
+<span class="sourceLineNo">312</span> // interested. So only 1 seek is needed.<a name="line.312"></a>
+<span class="sourceLineNo">313</span> kvs = getData(FAMILY, "row", "col3", 1);<a name="line.313"></a>
+<span class="sourceLineNo">314</span> assertEquals(1, kvs.length);<a name="line.314"></a>
+<span class="sourceLineNo">315</span> verifyData(kvs[0], "row", "col3", 5);<a name="line.315"></a>
+<span class="sourceLineNo">316</span><a name="line.316"></a>
+<span class="sourceLineNo">317</span> // Get a column from older file.<a name="line.317"></a>
+<span class="sourceLineNo">318</span> // For ROWCOL Bloom filter: Expected blocks read: 1.<a name="line.318"></a>
+<span class="sourceLineNo">319</span> // For ROW Bloom filter: Expected blocks read: 2.<a name="line.319"></a>
+<span class="sourceLineNo">320</span> // For NONE Bloom filter: Expected blocks read: 2.<a name="line.320"></a>
+<span class="sourceLineNo">321</span> kvs = getData(FAMILY, "row", Arrays.asList("col1"), 1, 2, 2);<a name="line.321"></a>
+<span class="sourceLineNo">322</span> assertEquals(1, kvs.length);<a name="line.322"></a>
+<span class="sourceLineNo">323</span> verifyData(kvs[0], "row", "col1", 3);<a name="line.323"></a>
+<span class="sourceLineNo">324</span><a name="line.324"></a>
+<span class="sourceLineNo">325</span> // File 4: Delete the entire row.<a name="line.325"></a>
+<span class="sourceLineNo">326</span> deleteFamily(FAMILY, "row", 6);<a name="line.326"></a>
+<span class="sourceLineNo">327</span> region.flush(true);<a name="line.327"></a>
+<span class="sourceLineNo">328</span><a name="line.328"></a>
+<span class="sourceLineNo">329</span> // For ROWCOL Bloom filter: Expected blocks read: 2.<a name="line.329"></a>
+<span class="sourceLineNo">330</span> // For ROW Bloom filter: Expected blocks read: 3.<a name="line.330"></a>
+<span class="sourceLineNo">331</span> // For NONE Bloom filter: Expected blocks read: 3.<a name="line.331"></a>
+<span class="sourceLineNo">332</span> kvs = getData(FAMILY, "row", "col1", 2, 3, 3);<a name="line.332"></a>
+<span class="sourceLineNo">333</span> assertEquals(0, kvs.length);<a name="line.333"></a>
+<span class="sourceLineNo">334</span> kvs = getData(FAMILY, "row", "col2", 2, 3, 3);<a name="line.334"></a>
+<span class="sourceLineNo">335</span> assertEquals(0, kvs.length);<a name="line.335"></a>
+<span class="sourceLineNo">336</span> kvs = getData(FAMILY, "row", "col3", 2);<a name="line.336"></a>
+<span class="sourceLineNo">337</span> assertEquals(0, kvs.length);<a name="line.337"></a>
+<span class="sourceLineNo">338</span> kvs = getData(FAMILY, "row", Arrays.asList("col1", "col2", "col3"), 4);<a name="line.338"></a>
+<span class="sourceLineNo">339</span> assertEquals(0, kvs.length);<a name="line.339"></a>
+<span class="sourceLineNo">340</span><a name="line.340"></a>
+<span class="sourceLineNo">341</span> // File 5: Delete<a name="line.341"></a>
+<span class="sourceLineNo">342</span> deleteFamily(FAMILY, "row", 10);<a name="line.342"></a>
+<span class="sourceLineNo">343</span> region.flush(true);<a name="line.343"></a>
+<span class="sourceLineNo">344</span><a name="line.344"></a>
+<span class="sourceLineNo">345</span> // File 6: some more puts, but with timestamps older than the<a name="line.345"></a>
+<span class="sourceLineNo">346</span> // previous delete.<a name="line.346"></a>
+<span class="sourceLineNo">347</span> putData(FAMILY, "row", "col1", 7);<a name="line.347"></a>
+<span class="sourceLineNo">348</span> putData(FAMILY, "row", "col2", 8);<a name="line.348"></a>
+<span class="sourceLineNo">349</span> putData(FAMILY, "row", "col3", 9);<a name="line.349"></a>
+<span class="sourceLineNo">350</span> region.flush(true);<a name="line.350"></a>
+<span class="sourceLineNo">351</span><a name="line.351"></a>
+<span class="sourceLineNo">352</span> // Baseline expected blocks read: 6. [HBASE-4532]<a name="line.352"></a>
+<span class="sourceLineNo">353</span> kvs = getData(FAMILY, "row", Arrays.asList("col1", "col2", "col3"), 6, 7, 7);<a name="line.353"></a>
+<span class="sourceLineNo">354</span> assertEquals(0, kvs.length);<a name="line.354"></a>
+<span class="sourceLineNo">355</span><a name="line.355"></a>
+<span class="sourceLineNo">356</span> // File 7: Put back new data<a name="line.356"></a>
+<span class="sourceLineNo">357</span> putData(FAMILY, "row", "col1", 11);<a name="line.357"></a>
+<span class="sourceLineNo">358</span> putData(FAMILY, "row", "col2", 12);<a name="line.358"></a>
+<span class="sourceLineNo">359</span> putData(FAMILY, "row", "col3", 13);<a name="line.359"></a>
+<span class="sourceLineNo">360</span> region.flush(true);<a name="line.360"></a>
<span class="sourceLineNo">361</span><a name="line.361"></a>
-<span class="sourceLineNo">362</span> // Expected blocks read: 8. [HBASE-4585, HBASE-13109]<a name="line.362"></a>
-<span class="sourceLineNo">363</span> kvs = getData(FAMILY, "row", Arrays.asList("col1", "col2", "col3"), 8, 9, 9);<a name="line.363"></a>
-<span class="sourceLineNo">364</span> assertEquals(3, kvs.length);<a name="line.364"></a>
-<span class="sourceLineNo">365</span> verifyData(kvs[0], "row", "col1", 11);<a name="line.365"></a>
-<span class="sourceLineNo">366</span> verifyData(kvs[1], "row", "col2", 12);<a name="line.366"></a>
-<span class="sourceLineNo">367</span> verifyData(kvs[2], "row", "col3", 13);<a name="line.367"></a>
-<span class="sourceLineNo">368</span> } finally {<a name="line.368"></a>
-<span class="sourceLineNo">369</span> HBaseTestingUtility.closeRegionAndWAL(this.region);<a name="line.369"></a>
-<span class="sourceLineNo">370</span> this.region = null;<a name="line.370"></a>
-<span class="sourceLineNo">371</span> }<a name="line.371"></a>
-<span class="sourceLineNo">372</span> }<a name="line.372"></a>
-<span class="sourceLineNo">373</span><a name="line.373"></a>
-<span class="sourceLineNo">374</span> /**<a name="line.374"></a>
-<span class="sourceLineNo">375</span> * Test # of blocks read to ensure disabling cache-fill on Scan works.<a name="line.375"></a>
-<span class="sourceLineNo">376</span> * @throws Exception<a name="line.376"></a>
-<span class="sourceLineNo">377</span> */<a name="line.377"></a>
-<span class="sourceLineNo">378</span> @Test<a name="line.378"></a>
-<span class="sourceLineNo">379</span> public void testBlocksStoredWhenCachingDisabled() throws Exception {<a name="line.379"></a>
-<span class="sourceLineNo">380</span> byte [] TABLE = Bytes.toBytes("testBlocksReadWhenCachingDisabled");<a name="line.380"></a>
-<span class="sourceLineNo">381</span> String FAMILY = "cf1";<a name="line.381"></a>
-<span class="sourceLineNo">382</span><a name="line.382"></a>
-<span class="sourceLineNo">383</span> this.region = initHRegion(TABLE, testName.getMethodName(), conf, FAMILY);<a name="line.383"></a>
-<span class="sourceLineNo">384</span><a name="line.384"></a>
-<span class="sourceLineNo">385</span> try {<a name="line.385"></a>
-<span class="sourceLineNo">386</span> putData(FAMILY, "row", "col1", 1);<a name="line.386"></a>
-<span class="sourceLineNo">387</span> putData(FAMILY, "row", "col2", 2);<a name="line.387"></a>
-<span class="sourceLineNo">388</span> region.flush(true);<a name="line.388"></a>
-<span class="sourceLineNo">389</span><a name="line.389"></a>
-<span class="sourceLineNo">390</span> // Execute a scan with caching turned off<a name="line.390"></a>
-<span class="sourceLineNo">391</span> // Expected blocks stored: 0<a name="line.391"></a>
-<span class="sourceLineNo">392</span> long blocksStart = getBlkCount();<a name="line.392"></a>
-<span class="sourceLineNo">393</span> Scan scan = new Scan();<a name="line.393"></a>
-<span class="sourceLineNo">394</span> scan.setCacheBlocks(false);<a name="line.394"></a>
-<span class="sourceLineNo">395</span> RegionScanner rs = region.getScanner(scan);<a name="line.395"></a>
-<span class="sourceLineNo">396</span> List<Cell> result = new ArrayList<>(2);<a name="line.396"></a>
-<span class="sourceLineNo">397</span> rs.next(result);<a name="line.397"></a>
-<span class="sourceLineNo">398</span> assertEquals(2 * BLOOM_TYPE.length, result.size());<a name="line.398"></a>
-<span class="sourceLineNo">399</span> rs.close();<a name="line.399"></a>
-<span class="sourceLineNo">400</span> long blocksEnd = getBlkCount();<a name="line.400"></a>
-<span class="sourceLineNo">401</span><a name="line.401"></a>
-<span class="sourceLineNo">402</span> assertEquals(blocksStart, blocksEnd);<a name="line.402"></a>
-<span class="sourceLineNo">403</span><a name="line.403"></a>
-<span class="sourceLineNo">404</span> // Execute with caching turned on<a name="line.404"></a>
-<span class="sourceLineNo">405</span> // Expected blocks stored: 2<a name="line.405"></a>
-<span class="sourceLineNo">406</span> blocksStart = blocksEnd;<a name="line.406"></a>
-<span class="sourceLineNo">407</span> scan.setCacheBlocks(true);<a name="line.407"></a>
-<span class="sourceLineNo">408</span> rs = region.getScanner(scan);<a name="line.408"></a>
-<span class="sourceLineNo">409</span> result = new ArrayList<>(2);<a name="line.409"></a>
-<span class="sourceLineNo">410</span> rs.next(result);<a name="line.410"></a>
-<span class="sourceLineNo">411</span> assertEquals(2 * BLOOM_TYPE.length, result.size());<a name="line.411"></a>
-<span class="sourceLineNo">412</span> rs.close();<a name="line.412"></a>
-<span class="sourceLineNo">413</span> blocksEnd = getBlkCount();<a name="line.413"></a>
-<span class="sourceLineNo">414</span><a name="line.414"></a>
-<span class="sourceLineNo">415</span> assertEquals(2 * BLOOM_TYPE.length, blocksEnd - blocksStart);<a name="line.415"></a>
-<span class="sourceLineNo">416</span> } finally {<a name="line.416"></a>
-<span class="sourceLineNo">417</span> HBaseTestingUtility.closeRegionAndWAL(this.region);<a name="line.417"></a>
-<span class="sourceLineNo">418</span> this.region = null;<a name="line.418"></a>
-<span class="sourceLineNo">419</span> }<a name="line.419"></a>
-<span class="sourceLineNo">420</span> }<a name="line.420"></a>
-<span class="sourceLineNo">421</span><a name="line.421"></a>
-<span class="sourceLineNo">422</span> @Test<a name="line.422"></a>
-<span class="sourceLineNo">423</span> public void testLazySeekBlocksReadWithDelete() throws Exception {<a name="line.423"></a>
-<span class="sourceLineNo">424</span> byte[] TABLE = Bytes.toBytes("testLazySeekBlocksReadWithDelete");<a name="line.424"></a>
-<span class="sourceLineNo">425</span> String FAMILY = "cf1";<a name="line.425"></a>
-<span class="sourceLineNo">426</span> Cell kvs[];<a name="line.426"></a>
-<span class="sourceLineNo">427</span> this.region = initHRegion(TABLE, testName.getMethodName(), conf, FAMILY);<a name="line.427"></a>
-<span class="sourceLineNo">428</span> try {<a name="line.428"></a>
-<span class="sourceLineNo">429</span> deleteFamily(FAMILY, "row", 200);<a name="line.429"></a>
-<span class="sourceLineNo">430</span> for (int i = 0; i < 100; i++) {<a name="line.430"></a>
-<span class="sourceLineNo">431</span> putData(FAMILY, "row", "col" + i, i);<a name="line.431"></a>
-<span class="sourceLineNo">432</span> }<a name="line.432"></a>
-<span class="sourceLineNo">433</span> putData(FAMILY, "row", "col99", 201);<a name="line.433"></a>
-<span class="sourceLineNo">434</span> region.flush(true);<a name="line.434"></a>
-<span class="sourceLineNo">435</span><a name="line.435"></a>
-<span class="sourceLineNo">436</span> kvs = getData(FAMILY, "row", Arrays.asList("col0"), 2);<a name="line.436"></a>
-<span class="sourceLineNo">437</span> assertEquals(0, kvs.length);<a name="line.437"></a>
-<span class="sourceLineNo">438</span><a name="line.438"></a>
-<span class="sourceLineNo">439</span> kvs = getData(FAMILY, "row", Arrays.asList("col99"), 2);<a name="line.439"></a>
-<span class="sourceLineNo">440</span> assertEquals(1, kvs.length);<a name="line.440"></a>
-<span class="sourceLineNo">441</span> verifyData(kvs[0], "row", "col99", 201);<a name="line.441"></a>
-<span class="sourceLineNo">442</span> } finally {<a name="line.442"></a>
-<span class="sourceLineNo">443</span> HBaseTestingUtility.closeRegionAndWAL(this.region);<a name="line.443"></a>
-<span class="sourceLineNo">444</span> this.region = null;<a name="line.444"></a>
-<span class="sourceLineNo">445</span> }<a name="line.445"></a>
-<span class="sourceLineNo">446</span> }<a name="line.446"></a>
-<span class="sourceLineNo">447</span><a name="line.447"></a>
-<span class="sourceLineNo">448</span>}<a name="line.448"></a>
+<span class="sourceLineNo">362</span><a name="line.362"></a>
+<span class="sourceLineNo">363</span> // Expected blocks read: 8. [HBASE-4585, HBASE-13109]<a name="line.363"></a>
+<span class="sourceLineNo">364</span> kvs = getData(FAMILY, "row", Arrays.asList("col1", "col2", "col3"), 8, 9, 9);<a name="line.364"></a>
+<span class="sourceLineNo">365</span> assertEquals(3, kvs.length);<a name="line.365"></a>
+<span class="sourceLineNo">366</span> verifyData(kvs[0], "row", "col1", 11);<a name="line.366"></a>
+<span class="sourceLineNo">367</span> verifyData(kvs[1], "row", "col2", 12);<a name="line.367"></a>
+<span class="sourceLineNo">368</span> verifyData(kvs[2], "row", "col3", 13);<a name="line.368"></a>
+<span class="sourceLineNo">369</span> } finally {<a name="line.369"></a>
+<span class="sourceLineNo">370</span> HBaseTestingUtility.closeRegionAndWAL(this.region);<a name="line.370"></a>
+<span class="sourceLineNo">371</span> this.region = null;<a name="line.371"></a>
+<span class="sourceLineNo">372</span> }<a name="line.372"></a>
+<span class="sourceLineNo">373</span> }<a name="line.373"></a>
+<span class="sourceLineNo">374</span><a name="line.374"></a>
+<span class="sourceLineNo">375</span> /**<a name="line.375"></a>
+<span class="sourceLineNo">376</span> * Test # of blocks read to ensure disabling cache-fill on Scan works.<a name="line.376"></a>
+<span class="sourceLineNo">377</span> * @throws Exception<a name="line.377"></a>
+<span class="sourceLineNo">378</span> */<a name="line.378"></a>
+<span class="sourceLineNo">379</span> @Test<a name="line.379"></a>
+<span class="sourceLineNo">380</span> public void testBlocksStoredWhenCachingDisabled() throws Exception {<a name="line.380"></a>
+<span class="sourceLineNo">381</span> byte [] TABLE = Bytes.toBytes("testBlocksReadWhenCachingDisabled");<a name="line.381"></a>
+<span class="sourceLineNo">382</span> String FAMILY = "cf1";<a name="line.382"></a>
+<span class="sourceLineNo">383</span><a name="line.383"></a>
+<span class="sourceLineNo">384</span> this.region = initHRegion(TABLE, testName.getMethodName(), conf, FAMILY);<a name="line.384"></a>
+<span class="sourceLineNo">385</span><a name="line.385"></a>
+<span class="sourceLineNo">386</span> try {<a name="line.386"></a>
+<span class="sourceLineNo">387</span> putData(FAMILY, "row", "col1", 1);<a name="line.387"></a>
+<span class="sourceLineNo">388</span> putData(FAMILY, "row", "col2", 2);<a name="line.388"></a>
+<span class="sourceLineNo">389</span> region.flush(true);<a name="line.389"></a>
+<span class="sourceLineNo">390</span><a name="line.390"></a>
+<span class="sourceLineNo">391</span> // Execute a scan with caching turned off<a name="line.391"></a>
+<span class="sourceLineNo">392</span> // Expected blocks stored: 0<a name="line.392"></a>
+<span class="sourceLineNo">393</span> long blocksStart = getBlkCount();<a name="line.393"></a>
+<span class="sourceLineNo">394</span> Scan scan = new Scan();<a name="line.394"></a>
+<span class="sourceLineNo">395</span> scan.setCacheBlocks(false);<a name="line.395"></a>
+<span class="sourceLineNo">396</span> RegionScanner rs = region.getScanner(scan);<a name="line.396"></a>
+<span class="sourceLineNo">397</span> List<Cell> result = new ArrayList<>(2);<a name="line.397"></a>
+<span class="sourceLineNo">398</span> rs.next(result);<a name="line.398"></a>
+<span class="sourceLineNo">399</span> assertEquals(2 * BLOOM_TYPE.length, result.size());<a name="line.399"></a>
+<span class="sourceLineNo">400</span> rs.close();<a name="line.400"></a>
+<span class="sourceLineNo">401</span> long blocksEnd = getBlkCount();<a name="line.401"></a>
+<span class="sourceLineNo">402</span><a name="line.402"></a>
+<span class="sourceLineNo">403</span> assertEquals(blocksStart, blocksEnd);<a name="line.403"></a>
+<span class="sourceLineNo">404</span><a name="line.404"></a>
+<span class="sourceLineNo">405</span> // Execute with caching turned on<a name="line.405"></a>
+<span class="sourceLineNo">406</span> // Expected blocks stored: 2<a name="line.406"></a>
+<span class="sourceLineNo">407</span> blocksStart = blocksEnd;<a name="line.407"></a>
+<span class="sourceLineNo">408</span> scan.setCacheBlocks(true);<a name="line.408"></a>
+<span class="sourceLineNo">409</span> rs = region.getScanner(scan);<a name="line.409"></a>
+<span class="sourceLineNo">410</span> result = new ArrayList<>(2);<a name="line.410"></a>
+<span class="sourceLineNo">411</span> rs.next(result);<a name="line.411"></a>
+<span class="sourceLineNo">412</span> assertEquals(2 * BLOOM_TYPE.length, result.size());<a name="line.412"></a>
+<span class="sourceLineNo">413</span> rs.close();<a name="line.413"></a>
+<span class="sourceLineNo">414</span> blocksEnd = getBlkCount();<a name="line.414"></a>
+<span class="sourceLineNo">415</span><a name="line.415"></a>
+<span class="sourceLineNo">416</span> assertEquals(2 * BLOOM_TYPE.length, blocksEnd - blocksStart);<a name="line.416"></a>
+<span class="sourceLineNo">417</span> } finally {<a name="line.417"></a>
+<span class="sourceLineNo">418</span> HBaseTestingUtility.closeRegionAndWAL(this.region);<a name="line.418"></a>
+<span class="sourceLineNo">419</span> this.region = null;<a name="line.419"></a>
+<span class="sourceLineNo">420</span> }<a name="line.420"></a>
+<span class="sourceLineNo">421</span> }<a name="line.421"></a>
+<span class="sourceLineNo">422</span><a name="line.422"></a>
+<span class="sourceLineNo">423</span> @Test<a name="line.423"></a>
+<span class="sourceLineNo">424</span> public void testLazySeekBlocksReadWithDelete() throws Exception {<a name="line.424"></a>
+<span class="sourceLineNo">425</span> byte[] TABLE = Bytes.toBytes("testLazySeekBlocksReadWithDelete");<a name="line.425"></a>
+<span class="sourceLineNo">426</span> String FAMILY = "cf1";<a name="line.426"></a>
+<span class="sourceLineNo">427</span> Cell kvs[];<a name="line.427"></a>
+<span class="sourceLineNo">428</span> this.region = initHRegion(TABLE, testName.getMethodName(), conf, FAMILY);<a name="line.428"></a>
+<span class="sourceLineNo">429</span> try {<a name="line.429"></a>
+<span class="sourceLineNo">430</span> deleteFamily(FAMILY, "row", 200);<a name="line.430"></a>
+<span class="sourceLineNo">431</span> for (int i = 0; i < 100; i++) {<a name="line.431"></a>
+<span class="sourceLineNo">432</span> putData(FAMILY, "row", "col" + i, i);<a name="line.432"></a>
+<span class="sourceLineNo">433</span> }<a name="line.433"></a>
+<span class="sourceLineNo">434</span> putData(FAMILY, "row", "col99", 201);<a name="line.434"></a>
+<span class="sourceLineNo">435</span> region.flush(true);<a name="line.435"></a>
+<span class="sourceLineNo">436</span><a name="line.436"></a>
+<span class="sourceLineNo">437</span> kvs = getData(FAMILY, "row", Arrays.asList("col0"), 2);<a name="line.437"></a>
+<span class="sourceLineNo">438</span> assertEquals(0, kvs.length);<a name="line.438"></a>
+<span class="sourceLineNo">439</span><a name="line.439"></a>
+<span class="sourceLineNo">440</span> kvs = getData(FAMILY, "row", Arrays.asList("col99"), 2);<a name="line.440"></a>
+<span class="sourceLineNo">441</span> assertEquals(1, kvs.length);<a name="line.441"></a>
+<span class="sourceLineNo">442</span> verifyData(kvs[0], "row", "col99", 201);<a name="line.442"></a>
+<span class="sourceLineNo">443</span> } finally {<a name="line.443"></a>
+<span class="sourceLineNo">444</span> HBaseTestingUtility.closeRegionAndWAL(this.region);<a name="line.444"></a>
+<span class="sourceLineNo">445</span> this.region = null;<a name="line.445"></a>
+<span class="sourceLineNo">446</span> }<a name="line.446"></a>
+<span class="sourceLineNo">447</span> }<a name="line.447"></a>
+<span class="sourceLineNo">448</span><a name="line.448"></a>
+<span class="sourceLineNo">449</span>}<a name="line.449"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/dccdd274/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestBlocksScanned.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestBlocksScanned.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestBlocksScanned.html
index 5596067..45fb978 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestBlocksScanned.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestBlocksScanned.html
@@ -69,8 +69,8 @@
<span class="sourceLineNo">061</span> @Before<a name="line.61"></a>
<span class="sourceLineNo">062</span> public void setUp() throws Exception {<a name="line.62"></a>
<span class="sourceLineNo">063</span> super.setUp();<a name="line.63"></a>
-<span class="sourceLineNo">064</span><a name="line.64"></a>
-<span class="sourceLineNo">065</span> TEST_UTIL = new HBaseTestingUtility();<a name="line.65"></a>
+<span class="sourceLineNo">064</span> TEST_UTIL = new HBaseTestingUtility();<a name="line.64"></a>
+<span class="sourceLineNo">065</span> CacheConfig.instantiateBlockCache(TEST_UTIL.getConfiguration());<a name="line.65"></a>
<span class="sourceLineNo">066</span> }<a name="line.66"></a>
<span class="sourceLineNo">067</span><a name="line.67"></a>
<span class="sourceLineNo">068</span> @Test<a name="line.68"></a>