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:36 UTC
[04/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/io/hfile/TestScannerFromBucketCache.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/TestScannerFromBucketCache.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/TestScannerFromBucketCache.html
index a21fcb7..84d6ae8 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/TestScannerFromBucketCache.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/TestScannerFromBucketCache.html
@@ -96,253 +96,254 @@
<span class="sourceLineNo">088</span> conf.setFloat("hbase.regionserver.global.memstore.size", 0.1f);<a name="line.88"></a>
<span class="sourceLineNo">089</span> }<a name="line.89"></a>
<span class="sourceLineNo">090</span> tableName = TableName.valueOf(name.getMethodName());<a name="line.90"></a>
-<span class="sourceLineNo">091</span> }<a name="line.91"></a>
-<span class="sourceLineNo">092</span><a name="line.92"></a>
-<span class="sourceLineNo">093</span> @After<a name="line.93"></a>
-<span class="sourceLineNo">094</span> public void tearDown() throws Exception {<a name="line.94"></a>
-<span class="sourceLineNo">095</span> EnvironmentEdgeManagerTestHelper.reset();<a name="line.95"></a>
-<span class="sourceLineNo">096</span> LOG.info("Cleaning test directory: " + test_util.getDataTestDir());<a name="line.96"></a>
-<span class="sourceLineNo">097</span> test_util.cleanupTestDir();<a name="line.97"></a>
-<span class="sourceLineNo">098</span> CacheConfig.clearGlobalInstances();<a name="line.98"></a>
-<span class="sourceLineNo">099</span> }<a name="line.99"></a>
-<span class="sourceLineNo">100</span><a name="line.100"></a>
-<span class="sourceLineNo">101</span> String getName() {<a name="line.101"></a>
-<span class="sourceLineNo">102</span> return name.getMethodName();<a name="line.102"></a>
-<span class="sourceLineNo">103</span> }<a name="line.103"></a>
-<span class="sourceLineNo">104</span><a name="line.104"></a>
-<span class="sourceLineNo">105</span> @Test<a name="line.105"></a>
-<span class="sourceLineNo">106</span> public void testBasicScanWithLRUCache() throws IOException {<a name="line.106"></a>
-<span class="sourceLineNo">107</span> setUp(false);<a name="line.107"></a>
-<span class="sourceLineNo">108</span> byte[] row1 = Bytes.toBytes("row1");<a name="line.108"></a>
-<span class="sourceLineNo">109</span> byte[] qf1 = Bytes.toBytes("qualifier1");<a name="line.109"></a>
-<span class="sourceLineNo">110</span> byte[] qf2 = Bytes.toBytes("qualifier2");<a name="line.110"></a>
-<span class="sourceLineNo">111</span> byte[] fam1 = Bytes.toBytes("lrucache");<a name="line.111"></a>
-<span class="sourceLineNo">112</span><a name="line.112"></a>
-<span class="sourceLineNo">113</span> long ts1 = 1; // System.currentTimeMillis();<a name="line.113"></a>
-<span class="sourceLineNo">114</span> long ts2 = ts1 + 1;<a name="line.114"></a>
-<span class="sourceLineNo">115</span> long ts3 = ts1 + 2;<a name="line.115"></a>
-<span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span> // Setting up region<a name="line.117"></a>
-<span class="sourceLineNo">118</span> String method = this.getName();<a name="line.118"></a>
-<span class="sourceLineNo">119</span> this.region = initHRegion(tableName, method, conf, test_util, fam1);<a name="line.119"></a>
-<span class="sourceLineNo">120</span> try {<a name="line.120"></a>
-<span class="sourceLineNo">121</span> List<Cell> expected = insertData(row1, qf1, qf2, fam1, ts1, ts2, ts3, false);<a name="line.121"></a>
-<span class="sourceLineNo">122</span><a name="line.122"></a>
-<span class="sourceLineNo">123</span> List<Cell> actual = performScan(row1, fam1);<a name="line.123"></a>
-<span class="sourceLineNo">124</span> // Verify result<a name="line.124"></a>
-<span class="sourceLineNo">125</span> for (int i = 0; i < expected.size(); i++) {<a name="line.125"></a>
-<span class="sourceLineNo">126</span> assertFalse(actual.get(i) instanceof ByteBufferKeyValue);<a name="line.126"></a>
-<span class="sourceLineNo">127</span> assertTrue(PrivateCellUtil.equalsIgnoreMvccVersion(expected.get(i), actual.get(i)));<a name="line.127"></a>
-<span class="sourceLineNo">128</span> }<a name="line.128"></a>
-<span class="sourceLineNo">129</span> // do the scan again and verify. This time it should be from the lru cache<a name="line.129"></a>
-<span class="sourceLineNo">130</span> actual = performScan(row1, fam1);<a name="line.130"></a>
-<span class="sourceLineNo">131</span> // Verify result<a name="line.131"></a>
-<span class="sourceLineNo">132</span> for (int i = 0; i < expected.size(); i++) {<a name="line.132"></a>
-<span class="sourceLineNo">133</span> assertFalse(actual.get(i) instanceof ByteBufferKeyValue);<a name="line.133"></a>
-<span class="sourceLineNo">134</span> assertTrue(PrivateCellUtil.equalsIgnoreMvccVersion(expected.get(i), actual.get(i)));<a name="line.134"></a>
-<span class="sourceLineNo">135</span> }<a name="line.135"></a>
-<span class="sourceLineNo">136</span><a name="line.136"></a>
-<span class="sourceLineNo">137</span> } finally {<a name="line.137"></a>
-<span class="sourceLineNo">138</span> HBaseTestingUtility.closeRegionAndWAL(this.region);<a name="line.138"></a>
-<span class="sourceLineNo">139</span> this.region = null;<a name="line.139"></a>
-<span class="sourceLineNo">140</span> }<a name="line.140"></a>
-<span class="sourceLineNo">141</span> }<a name="line.141"></a>
-<span class="sourceLineNo">142</span><a name="line.142"></a>
-<span class="sourceLineNo">143</span> @Test<a name="line.143"></a>
-<span class="sourceLineNo">144</span> public void testBasicScanWithOffheapBucketCache() throws IOException {<a name="line.144"></a>
-<span class="sourceLineNo">145</span> setUp(true);<a name="line.145"></a>
-<span class="sourceLineNo">146</span> byte[] row1 = Bytes.toBytes("row1offheap");<a name="line.146"></a>
-<span class="sourceLineNo">147</span> byte[] qf1 = Bytes.toBytes("qualifier1");<a name="line.147"></a>
-<span class="sourceLineNo">148</span> byte[] qf2 = Bytes.toBytes("qualifier2");<a name="line.148"></a>
-<span class="sourceLineNo">149</span> byte[] fam1 = Bytes.toBytes("famoffheap");<a name="line.149"></a>
-<span class="sourceLineNo">150</span><a name="line.150"></a>
-<span class="sourceLineNo">151</span> long ts1 = 1; // System.currentTimeMillis();<a name="line.151"></a>
-<span class="sourceLineNo">152</span> long ts2 = ts1 + 1;<a name="line.152"></a>
-<span class="sourceLineNo">153</span> long ts3 = ts1 + 2;<a name="line.153"></a>
-<span class="sourceLineNo">154</span><a name="line.154"></a>
-<span class="sourceLineNo">155</span> // Setting up region<a name="line.155"></a>
-<span class="sourceLineNo">156</span> String method = this.getName();<a name="line.156"></a>
-<span class="sourceLineNo">157</span> this.region = initHRegion(tableName, method, conf, test_util, fam1);<a name="line.157"></a>
-<span class="sourceLineNo">158</span> try {<a name="line.158"></a>
-<span class="sourceLineNo">159</span> List<Cell> expected = insertData(row1, qf1, qf2, fam1, ts1, ts2, ts3, false);<a name="line.159"></a>
-<span class="sourceLineNo">160</span><a name="line.160"></a>
-<span class="sourceLineNo">161</span> List<Cell> actual = performScan(row1, fam1);<a name="line.161"></a>
-<span class="sourceLineNo">162</span> // Verify result<a name="line.162"></a>
-<span class="sourceLineNo">163</span> for (int i = 0; i < expected.size(); i++) {<a name="line.163"></a>
-<span class="sourceLineNo">164</span> assertFalse(actual.get(i) instanceof ByteBufferKeyValue);<a name="line.164"></a>
-<span class="sourceLineNo">165</span> assertTrue(PrivateCellUtil.equalsIgnoreMvccVersion(expected.get(i), actual.get(i)));<a name="line.165"></a>
-<span class="sourceLineNo">166</span> }<a name="line.166"></a>
-<span class="sourceLineNo">167</span> // Wait for the bucket cache threads to move the data to offheap<a name="line.167"></a>
-<span class="sourceLineNo">168</span> Thread.sleep(500);<a name="line.168"></a>
-<span class="sourceLineNo">169</span> // do the scan again and verify. This time it should be from the bucket cache in offheap mode<a name="line.169"></a>
-<span class="sourceLineNo">170</span> actual = performScan(row1, fam1);<a name="line.170"></a>
-<span class="sourceLineNo">171</span> // Verify result<a name="line.171"></a>
-<span class="sourceLineNo">172</span> for (int i = 0; i < expected.size(); i++) {<a name="line.172"></a>
-<span class="sourceLineNo">173</span> assertTrue(actual.get(i) instanceof ByteBufferKeyValue);<a name="line.173"></a>
-<span class="sourceLineNo">174</span> assertTrue(PrivateCellUtil.equalsIgnoreMvccVersion(expected.get(i), actual.get(i)));<a name="line.174"></a>
-<span class="sourceLineNo">175</span> }<a name="line.175"></a>
-<span class="sourceLineNo">176</span><a name="line.176"></a>
-<span class="sourceLineNo">177</span> } catch (InterruptedException e) {<a name="line.177"></a>
-<span class="sourceLineNo">178</span> } finally {<a name="line.178"></a>
-<span class="sourceLineNo">179</span> HBaseTestingUtility.closeRegionAndWAL(this.region);<a name="line.179"></a>
-<span class="sourceLineNo">180</span> this.region = null;<a name="line.180"></a>
-<span class="sourceLineNo">181</span> }<a name="line.181"></a>
-<span class="sourceLineNo">182</span> }<a name="line.182"></a>
-<span class="sourceLineNo">183</span><a name="line.183"></a>
-<span class="sourceLineNo">184</span> @Test<a name="line.184"></a>
-<span class="sourceLineNo">185</span> public void testBasicScanWithOffheapBucketCacheWithMBB() throws IOException {<a name="line.185"></a>
-<span class="sourceLineNo">186</span> setUp(true);<a name="line.186"></a>
-<span class="sourceLineNo">187</span> byte[] row1 = Bytes.toBytes("row1offheap");<a name="line.187"></a>
-<span class="sourceLineNo">188</span> byte[] qf1 = Bytes.toBytes("qualifier1");<a name="line.188"></a>
-<span class="sourceLineNo">189</span> byte[] qf2 = Bytes.toBytes("qualifier2");<a name="line.189"></a>
-<span class="sourceLineNo">190</span> byte[] fam1 = Bytes.toBytes("famoffheap");<a name="line.190"></a>
-<span class="sourceLineNo">191</span><a name="line.191"></a>
-<span class="sourceLineNo">192</span> long ts1 = 1; // System.currentTimeMillis();<a name="line.192"></a>
-<span class="sourceLineNo">193</span> long ts2 = ts1 + 1;<a name="line.193"></a>
-<span class="sourceLineNo">194</span> long ts3 = ts1 + 2;<a name="line.194"></a>
-<span class="sourceLineNo">195</span><a name="line.195"></a>
-<span class="sourceLineNo">196</span> // Setting up region<a name="line.196"></a>
-<span class="sourceLineNo">197</span> String method = this.getName();<a name="line.197"></a>
-<span class="sourceLineNo">198</span> this.region = initHRegion(tableName, method, conf, test_util, fam1);<a name="line.198"></a>
-<span class="sourceLineNo">199</span> try {<a name="line.199"></a>
-<span class="sourceLineNo">200</span> List<Cell> expected = insertData(row1, qf1, qf2, fam1, ts1, ts2, ts3, true);<a name="line.200"></a>
-<span class="sourceLineNo">201</span><a name="line.201"></a>
-<span class="sourceLineNo">202</span> List<Cell> actual = performScan(row1, fam1);<a name="line.202"></a>
-<span class="sourceLineNo">203</span> // Verify result<a name="line.203"></a>
-<span class="sourceLineNo">204</span> for (int i = 0; i < expected.size(); i++) {<a name="line.204"></a>
-<span class="sourceLineNo">205</span> assertFalse(actual.get(i) instanceof ByteBufferKeyValue);<a name="line.205"></a>
-<span class="sourceLineNo">206</span> assertTrue(PrivateCellUtil.equalsIgnoreMvccVersion(expected.get(i), actual.get(i)));<a name="line.206"></a>
-<span class="sourceLineNo">207</span> }<a name="line.207"></a>
-<span class="sourceLineNo">208</span> // Wait for the bucket cache threads to move the data to offheap<a name="line.208"></a>
-<span class="sourceLineNo">209</span> Thread.sleep(500);<a name="line.209"></a>
-<span class="sourceLineNo">210</span> // do the scan again and verify. This time it should be from the bucket cache in offheap mode<a name="line.210"></a>
-<span class="sourceLineNo">211</span> // but one of the cell will be copied due to the asSubByteBuff call<a name="line.211"></a>
-<span class="sourceLineNo">212</span> Scan scan = new Scan(row1);<a name="line.212"></a>
-<span class="sourceLineNo">213</span> scan.addFamily(fam1);<a name="line.213"></a>
-<span class="sourceLineNo">214</span> scan.setMaxVersions(10);<a name="line.214"></a>
-<span class="sourceLineNo">215</span> actual = new ArrayList<>();<a name="line.215"></a>
-<span class="sourceLineNo">216</span> InternalScanner scanner = region.getScanner(scan);<a name="line.216"></a>
-<span class="sourceLineNo">217</span><a name="line.217"></a>
-<span class="sourceLineNo">218</span> boolean hasNext = scanner.next(actual);<a name="line.218"></a>
-<span class="sourceLineNo">219</span> assertEquals(false, hasNext);<a name="line.219"></a>
-<span class="sourceLineNo">220</span> // Verify result<a name="line.220"></a>
-<span class="sourceLineNo">221</span> for (int i = 0; i < expected.size(); i++) {<a name="line.221"></a>
-<span class="sourceLineNo">222</span> if (i != 5) {<a name="line.222"></a>
-<span class="sourceLineNo">223</span> // the last cell fetched will be of type shareable but not offheap because<a name="line.223"></a>
-<span class="sourceLineNo">224</span> // the MBB is copied to form a single cell<a name="line.224"></a>
-<span class="sourceLineNo">225</span> assertTrue(actual.get(i) instanceof ByteBufferKeyValue);<a name="line.225"></a>
-<span class="sourceLineNo">226</span> }<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> } catch (InterruptedException e) {<a name="line.229"></a>
-<span class="sourceLineNo">230</span> } finally {<a name="line.230"></a>
-<span class="sourceLineNo">231</span> HBaseTestingUtility.closeRegionAndWAL(this.region);<a name="line.231"></a>
-<span class="sourceLineNo">232</span> this.region = null;<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> private List<Cell> insertData(byte[] row1, byte[] qf1, byte[] qf2, byte[] fam1, long ts1,<a name="line.236"></a>
-<span class="sourceLineNo">237</span> long ts2, long ts3, boolean withVal) throws IOException {<a name="line.237"></a>
-<span class="sourceLineNo">238</span> // Putting data in Region<a name="line.238"></a>
-<span class="sourceLineNo">239</span> Put put = null;<a name="line.239"></a>
-<span class="sourceLineNo">240</span> KeyValue kv13 = null;<a name="line.240"></a>
-<span class="sourceLineNo">241</span> KeyValue kv12 = null;<a name="line.241"></a>
-<span class="sourceLineNo">242</span> KeyValue kv11 = null;<a name="line.242"></a>
-<span class="sourceLineNo">243</span><a name="line.243"></a>
-<span class="sourceLineNo">244</span> KeyValue kv23 = null;<a name="line.244"></a>
-<span class="sourceLineNo">245</span> KeyValue kv22 = null;<a name="line.245"></a>
-<span class="sourceLineNo">246</span> KeyValue kv21 = null;<a name="line.246"></a>
-<span class="sourceLineNo">247</span> if (!withVal) {<a name="line.247"></a>
-<span class="sourceLineNo">248</span> kv13 = new KeyValue(row1, fam1, qf1, ts3, KeyValue.Type.Put, null);<a name="line.248"></a>
-<span class="sourceLineNo">249</span> kv12 = new KeyValue(row1, fam1, qf1, ts2, KeyValue.Type.Put, null);<a name="line.249"></a>
-<span class="sourceLineNo">250</span> kv11 = new KeyValue(row1, fam1, qf1, ts1, KeyValue.Type.Put, null);<a name="line.250"></a>
-<span class="sourceLineNo">251</span><a name="line.251"></a>
-<span class="sourceLineNo">252</span> kv23 = new KeyValue(row1, fam1, qf2, ts3, KeyValue.Type.Put, null);<a name="line.252"></a>
-<span class="sourceLineNo">253</span> kv22 = new KeyValue(row1, fam1, qf2, ts2, KeyValue.Type.Put, null);<a name="line.253"></a>
-<span class="sourceLineNo">254</span> kv21 = new KeyValue(row1, fam1, qf2, ts1, KeyValue.Type.Put, null);<a name="line.254"></a>
-<span class="sourceLineNo">255</span> } else {<a name="line.255"></a>
-<span class="sourceLineNo">256</span> kv13 = new KeyValue(row1, fam1, qf1, ts3, KeyValue.Type.Put, val);<a name="line.256"></a>
-<span class="sourceLineNo">257</span> kv12 = new KeyValue(row1, fam1, qf1, ts2, KeyValue.Type.Put, val);<a name="line.257"></a>
-<span class="sourceLineNo">258</span> kv11 = new KeyValue(row1, fam1, qf1, ts1, KeyValue.Type.Put, val);<a name="line.258"></a>
-<span class="sourceLineNo">259</span><a name="line.259"></a>
-<span class="sourceLineNo">260</span> kv23 = new KeyValue(row1, fam1, qf2, ts3, KeyValue.Type.Put, val);<a name="line.260"></a>
-<span class="sourceLineNo">261</span> kv22 = new KeyValue(row1, fam1, qf2, ts2, KeyValue.Type.Put, val);<a name="line.261"></a>
-<span class="sourceLineNo">262</span> kv21 = new KeyValue(row1, fam1, qf2, ts1, KeyValue.Type.Put, val);<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> put = new Put(row1);<a name="line.265"></a>
-<span class="sourceLineNo">266</span> put.add(kv13);<a name="line.266"></a>
-<span class="sourceLineNo">267</span> put.add(kv12);<a name="line.267"></a>
-<span class="sourceLineNo">268</span> put.add(kv11);<a name="line.268"></a>
-<span class="sourceLineNo">269</span> put.add(kv23);<a name="line.269"></a>
-<span class="sourceLineNo">270</span> put.add(kv22);<a name="line.270"></a>
-<span class="sourceLineNo">271</span> put.add(kv21);<a name="line.271"></a>
-<span class="sourceLineNo">272</span> region.put(put);<a name="line.272"></a>
-<span class="sourceLineNo">273</span> region.flush(true);<a name="line.273"></a>
-<span class="sourceLineNo">274</span> HStore store = region.getStore(fam1);<a name="line.274"></a>
-<span class="sourceLineNo">275</span> while (store.getStorefilesCount() <= 0) {<a name="line.275"></a>
-<span class="sourceLineNo">276</span> try {<a name="line.276"></a>
-<span class="sourceLineNo">277</span> Thread.sleep(20);<a name="line.277"></a>
-<span class="sourceLineNo">278</span> } catch (InterruptedException e) {<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>
-<span class="sourceLineNo">282</span> // Expected<a name="line.282"></a>
-<span class="sourceLineNo">283</span> List<Cell> expected = new ArrayList<>();<a name="line.283"></a>
-<span class="sourceLineNo">284</span> expected.add(kv13);<a name="line.284"></a>
-<span class="sourceLineNo">285</span> expected.add(kv12);<a name="line.285"></a>
-<span class="sourceLineNo">286</span> expected.add(kv23);<a name="line.286"></a>
-<span class="sourceLineNo">287</span> expected.add(kv22);<a name="line.287"></a>
-<span class="sourceLineNo">288</span> return expected;<a name="line.288"></a>
-<span class="sourceLineNo">289</span> }<a name="line.289"></a>
-<span class="sourceLineNo">290</span><a name="line.290"></a>
-<span class="sourceLineNo">291</span> private List<Cell> performScan(byte[] row1, byte[] fam1) throws IOException {<a name="line.291"></a>
-<span class="sourceLineNo">292</span> Scan scan = new Scan(row1);<a name="line.292"></a>
-<span class="sourceLineNo">293</span> scan.addFamily(fam1);<a name="line.293"></a>
-<span class="sourceLineNo">294</span> scan.setMaxVersions(MAX_VERSIONS);<a name="line.294"></a>
-<span class="sourceLineNo">295</span> List<Cell> actual = new ArrayList<>();<a name="line.295"></a>
-<span class="sourceLineNo">296</span> InternalScanner scanner = region.getScanner(scan);<a name="line.296"></a>
-<span class="sourceLineNo">297</span><a name="line.297"></a>
-<span class="sourceLineNo">298</span> boolean hasNext = scanner.next(actual);<a name="line.298"></a>
-<span class="sourceLineNo">299</span> assertEquals(false, hasNext);<a name="line.299"></a>
-<span class="sourceLineNo">300</span> return actual;<a name="line.300"></a>
-<span class="sourceLineNo">301</span> }<a name="line.301"></a>
-<span class="sourceLineNo">302</span><a name="line.302"></a>
-<span class="sourceLineNo">303</span> private static HRegion initHRegion(TableName tableName, String callingMethod, Configuration conf,<a name="line.303"></a>
-<span class="sourceLineNo">304</span> HBaseTestingUtility test_util, byte[]... families) throws IOException {<a name="line.304"></a>
-<span class="sourceLineNo">305</span> return initHRegion(tableName, null, null, callingMethod, conf, test_util, false, families);<a name="line.305"></a>
-<span class="sourceLineNo">306</span> }<a name="line.306"></a>
-<span class="sourceLineNo">307</span><a name="line.307"></a>
-<span class="sourceLineNo">308</span> private static HRegion initHRegion(TableName tableName, byte[] startKey, byte[] stopKey,<a name="line.308"></a>
-<span class="sourceLineNo">309</span> String callingMethod, Configuration conf, HBaseTestingUtility test_util, boolean isReadOnly,<a name="line.309"></a>
-<span class="sourceLineNo">310</span> byte[]... families) throws IOException {<a name="line.310"></a>
-<span class="sourceLineNo">311</span> ChunkCreator.initialize(MemStoreLABImpl.CHUNK_SIZE_DEFAULT, false, 0, 0, 0, null);<a name="line.311"></a>
-<span class="sourceLineNo">312</span> Path logDir = test_util.getDataTestDirOnTestFS(callingMethod + ".log");<a name="line.312"></a>
-<span class="sourceLineNo">313</span> HRegionInfo hri = new HRegionInfo(tableName, startKey, stopKey);<a name="line.313"></a>
-<span class="sourceLineNo">314</span> final WAL wal = HBaseTestingUtility.createWal(conf, logDir, hri);<a name="line.314"></a>
-<span class="sourceLineNo">315</span> return initHRegion(tableName, startKey, stopKey, callingMethod, conf, test_util, isReadOnly,<a name="line.315"></a>
-<span class="sourceLineNo">316</span> Durability.SYNC_WAL, wal, families);<a name="line.316"></a>
-<span class="sourceLineNo">317</span> }<a name="line.317"></a>
-<span class="sourceLineNo">318</span><a name="line.318"></a>
-<span class="sourceLineNo">319</span> /**<a name="line.319"></a>
-<span class="sourceLineNo">320</span> * @param tableName<a name="line.320"></a>
-<span class="sourceLineNo">321</span> * @param startKey<a name="line.321"></a>
-<span class="sourceLineNo">322</span> * @param stopKey<a name="line.322"></a>
-<span class="sourceLineNo">323</span> * @param callingMethod<a name="line.323"></a>
-<span class="sourceLineNo">324</span> * @param conf<a name="line.324"></a>
-<span class="sourceLineNo">325</span> * @param isReadOnly<a name="line.325"></a>
-<span class="sourceLineNo">326</span> * @param families<a name="line.326"></a>
-<span class="sourceLineNo">327</span> * @throws IOException<a name="line.327"></a>
-<span class="sourceLineNo">328</span> * @return A region on which you must call {@link HBaseTestingUtility#closeRegionAndWAL(HRegion)}<a name="line.328"></a>
-<span class="sourceLineNo">329</span> * when done.<a name="line.329"></a>
-<span class="sourceLineNo">330</span> */<a name="line.330"></a>
-<span class="sourceLineNo">331</span> private static HRegion initHRegion(TableName tableName, byte[] startKey, byte[] stopKey,<a name="line.331"></a>
-<span class="sourceLineNo">332</span> String callingMethod, Configuration conf, HBaseTestingUtility test_util, boolean isReadOnly,<a name="line.332"></a>
-<span class="sourceLineNo">333</span> Durability durability, WAL wal, byte[]... families) throws IOException {<a name="line.333"></a>
-<span class="sourceLineNo">334</span> return test_util.createLocalHRegion(tableName, startKey, stopKey, isReadOnly, durability, wal,<a name="line.334"></a>
-<span class="sourceLineNo">335</span> families);<a name="line.335"></a>
-<span class="sourceLineNo">336</span> }<a name="line.336"></a>
-<span class="sourceLineNo">337</span>}<a name="line.337"></a>
+<span class="sourceLineNo">091</span> CacheConfig.instantiateBlockCache(conf);<a name="line.91"></a>
+<span class="sourceLineNo">092</span> }<a name="line.92"></a>
+<span class="sourceLineNo">093</span><a name="line.93"></a>
+<span class="sourceLineNo">094</span> @After<a name="line.94"></a>
+<span class="sourceLineNo">095</span> public void tearDown() throws Exception {<a name="line.95"></a>
+<span class="sourceLineNo">096</span> EnvironmentEdgeManagerTestHelper.reset();<a name="line.96"></a>
+<span class="sourceLineNo">097</span> LOG.info("Cleaning test directory: " + test_util.getDataTestDir());<a name="line.97"></a>
+<span class="sourceLineNo">098</span> test_util.cleanupTestDir();<a name="line.98"></a>
+<span class="sourceLineNo">099</span> CacheConfig.clearGlobalInstances();<a name="line.99"></a>
+<span class="sourceLineNo">100</span> }<a name="line.100"></a>
+<span class="sourceLineNo">101</span><a name="line.101"></a>
+<span class="sourceLineNo">102</span> String getName() {<a name="line.102"></a>
+<span class="sourceLineNo">103</span> return name.getMethodName();<a name="line.103"></a>
+<span class="sourceLineNo">104</span> }<a name="line.104"></a>
+<span class="sourceLineNo">105</span><a name="line.105"></a>
+<span class="sourceLineNo">106</span> @Test<a name="line.106"></a>
+<span class="sourceLineNo">107</span> public void testBasicScanWithLRUCache() throws IOException {<a name="line.107"></a>
+<span class="sourceLineNo">108</span> setUp(false);<a name="line.108"></a>
+<span class="sourceLineNo">109</span> byte[] row1 = Bytes.toBytes("row1");<a name="line.109"></a>
+<span class="sourceLineNo">110</span> byte[] qf1 = Bytes.toBytes("qualifier1");<a name="line.110"></a>
+<span class="sourceLineNo">111</span> byte[] qf2 = Bytes.toBytes("qualifier2");<a name="line.111"></a>
+<span class="sourceLineNo">112</span> byte[] fam1 = Bytes.toBytes("lrucache");<a name="line.112"></a>
+<span class="sourceLineNo">113</span><a name="line.113"></a>
+<span class="sourceLineNo">114</span> long ts1 = 1; // System.currentTimeMillis();<a name="line.114"></a>
+<span class="sourceLineNo">115</span> long ts2 = ts1 + 1;<a name="line.115"></a>
+<span class="sourceLineNo">116</span> long ts3 = ts1 + 2;<a name="line.116"></a>
+<span class="sourceLineNo">117</span><a name="line.117"></a>
+<span class="sourceLineNo">118</span> // Setting up region<a name="line.118"></a>
+<span class="sourceLineNo">119</span> String method = this.getName();<a name="line.119"></a>
+<span class="sourceLineNo">120</span> this.region = initHRegion(tableName, method, conf, test_util, fam1);<a name="line.120"></a>
+<span class="sourceLineNo">121</span> try {<a name="line.121"></a>
+<span class="sourceLineNo">122</span> List<Cell> expected = insertData(row1, qf1, qf2, fam1, ts1, ts2, ts3, false);<a name="line.122"></a>
+<span class="sourceLineNo">123</span><a name="line.123"></a>
+<span class="sourceLineNo">124</span> List<Cell> actual = performScan(row1, fam1);<a name="line.124"></a>
+<span class="sourceLineNo">125</span> // Verify result<a name="line.125"></a>
+<span class="sourceLineNo">126</span> for (int i = 0; i < expected.size(); i++) {<a name="line.126"></a>
+<span class="sourceLineNo">127</span> assertFalse(actual.get(i) instanceof ByteBufferKeyValue);<a name="line.127"></a>
+<span class="sourceLineNo">128</span> assertTrue(PrivateCellUtil.equalsIgnoreMvccVersion(expected.get(i), actual.get(i)));<a name="line.128"></a>
+<span class="sourceLineNo">129</span> }<a name="line.129"></a>
+<span class="sourceLineNo">130</span> // do the scan again and verify. This time it should be from the lru cache<a name="line.130"></a>
+<span class="sourceLineNo">131</span> actual = performScan(row1, fam1);<a name="line.131"></a>
+<span class="sourceLineNo">132</span> // Verify result<a name="line.132"></a>
+<span class="sourceLineNo">133</span> for (int i = 0; i < expected.size(); i++) {<a name="line.133"></a>
+<span class="sourceLineNo">134</span> assertFalse(actual.get(i) instanceof ByteBufferKeyValue);<a name="line.134"></a>
+<span class="sourceLineNo">135</span> assertTrue(PrivateCellUtil.equalsIgnoreMvccVersion(expected.get(i), actual.get(i)));<a name="line.135"></a>
+<span class="sourceLineNo">136</span> }<a name="line.136"></a>
+<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">138</span> } finally {<a name="line.138"></a>
+<span class="sourceLineNo">139</span> HBaseTestingUtility.closeRegionAndWAL(this.region);<a name="line.139"></a>
+<span class="sourceLineNo">140</span> this.region = null;<a name="line.140"></a>
+<span class="sourceLineNo">141</span> }<a name="line.141"></a>
+<span class="sourceLineNo">142</span> }<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span> @Test<a name="line.144"></a>
+<span class="sourceLineNo">145</span> public void testBasicScanWithOffheapBucketCache() throws IOException {<a name="line.145"></a>
+<span class="sourceLineNo">146</span> setUp(true);<a name="line.146"></a>
+<span class="sourceLineNo">147</span> byte[] row1 = Bytes.toBytes("row1offheap");<a name="line.147"></a>
+<span class="sourceLineNo">148</span> byte[] qf1 = Bytes.toBytes("qualifier1");<a name="line.148"></a>
+<span class="sourceLineNo">149</span> byte[] qf2 = Bytes.toBytes("qualifier2");<a name="line.149"></a>
+<span class="sourceLineNo">150</span> byte[] fam1 = Bytes.toBytes("famoffheap");<a name="line.150"></a>
+<span class="sourceLineNo">151</span><a name="line.151"></a>
+<span class="sourceLineNo">152</span> long ts1 = 1; // System.currentTimeMillis();<a name="line.152"></a>
+<span class="sourceLineNo">153</span> long ts2 = ts1 + 1;<a name="line.153"></a>
+<span class="sourceLineNo">154</span> long ts3 = ts1 + 2;<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span> // Setting up region<a name="line.156"></a>
+<span class="sourceLineNo">157</span> String method = this.getName();<a name="line.157"></a>
+<span class="sourceLineNo">158</span> this.region = initHRegion(tableName, method, conf, test_util, fam1);<a name="line.158"></a>
+<span class="sourceLineNo">159</span> try {<a name="line.159"></a>
+<span class="sourceLineNo">160</span> List<Cell> expected = insertData(row1, qf1, qf2, fam1, ts1, ts2, ts3, false);<a name="line.160"></a>
+<span class="sourceLineNo">161</span><a name="line.161"></a>
+<span class="sourceLineNo">162</span> List<Cell> actual = performScan(row1, fam1);<a name="line.162"></a>
+<span class="sourceLineNo">163</span> // Verify result<a name="line.163"></a>
+<span class="sourceLineNo">164</span> for (int i = 0; i < expected.size(); i++) {<a name="line.164"></a>
+<span class="sourceLineNo">165</span> assertFalse(actual.get(i) instanceof ByteBufferKeyValue);<a name="line.165"></a>
+<span class="sourceLineNo">166</span> assertTrue(PrivateCellUtil.equalsIgnoreMvccVersion(expected.get(i), actual.get(i)));<a name="line.166"></a>
+<span class="sourceLineNo">167</span> }<a name="line.167"></a>
+<span class="sourceLineNo">168</span> // Wait for the bucket cache threads to move the data to offheap<a name="line.168"></a>
+<span class="sourceLineNo">169</span> Thread.sleep(500);<a name="line.169"></a>
+<span class="sourceLineNo">170</span> // do the scan again and verify. This time it should be from the bucket cache in offheap mode<a name="line.170"></a>
+<span class="sourceLineNo">171</span> actual = performScan(row1, fam1);<a name="line.171"></a>
+<span class="sourceLineNo">172</span> // Verify result<a name="line.172"></a>
+<span class="sourceLineNo">173</span> for (int i = 0; i < expected.size(); i++) {<a name="line.173"></a>
+<span class="sourceLineNo">174</span> assertTrue(actual.get(i) instanceof ByteBufferKeyValue);<a name="line.174"></a>
+<span class="sourceLineNo">175</span> assertTrue(PrivateCellUtil.equalsIgnoreMvccVersion(expected.get(i), actual.get(i)));<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> } catch (InterruptedException e) {<a name="line.178"></a>
+<span class="sourceLineNo">179</span> } finally {<a name="line.179"></a>
+<span class="sourceLineNo">180</span> HBaseTestingUtility.closeRegionAndWAL(this.region);<a name="line.180"></a>
+<span class="sourceLineNo">181</span> this.region = null;<a name="line.181"></a>
+<span class="sourceLineNo">182</span> }<a name="line.182"></a>
+<span class="sourceLineNo">183</span> }<a name="line.183"></a>
+<span class="sourceLineNo">184</span><a name="line.184"></a>
+<span class="sourceLineNo">185</span> @Test<a name="line.185"></a>
+<span class="sourceLineNo">186</span> public void testBasicScanWithOffheapBucketCacheWithMBB() throws IOException {<a name="line.186"></a>
+<span class="sourceLineNo">187</span> setUp(true);<a name="line.187"></a>
+<span class="sourceLineNo">188</span> byte[] row1 = Bytes.toBytes("row1offheap");<a name="line.188"></a>
+<span class="sourceLineNo">189</span> byte[] qf1 = Bytes.toBytes("qualifier1");<a name="line.189"></a>
+<span class="sourceLineNo">190</span> byte[] qf2 = Bytes.toBytes("qualifier2");<a name="line.190"></a>
+<span class="sourceLineNo">191</span> byte[] fam1 = Bytes.toBytes("famoffheap");<a name="line.191"></a>
+<span class="sourceLineNo">192</span><a name="line.192"></a>
+<span class="sourceLineNo">193</span> long ts1 = 1; // System.currentTimeMillis();<a name="line.193"></a>
+<span class="sourceLineNo">194</span> long ts2 = ts1 + 1;<a name="line.194"></a>
+<span class="sourceLineNo">195</span> long ts3 = ts1 + 2;<a name="line.195"></a>
+<span class="sourceLineNo">196</span><a name="line.196"></a>
+<span class="sourceLineNo">197</span> // Setting up region<a name="line.197"></a>
+<span class="sourceLineNo">198</span> String method = this.getName();<a name="line.198"></a>
+<span class="sourceLineNo">199</span> this.region = initHRegion(tableName, method, conf, test_util, fam1);<a name="line.199"></a>
+<span class="sourceLineNo">200</span> try {<a name="line.200"></a>
+<span class="sourceLineNo">201</span> List<Cell> expected = insertData(row1, qf1, qf2, fam1, ts1, ts2, ts3, true);<a name="line.201"></a>
+<span class="sourceLineNo">202</span><a name="line.202"></a>
+<span class="sourceLineNo">203</span> List<Cell> actual = performScan(row1, fam1);<a name="line.203"></a>
+<span class="sourceLineNo">204</span> // Verify result<a name="line.204"></a>
+<span class="sourceLineNo">205</span> for (int i = 0; i < expected.size(); i++) {<a name="line.205"></a>
+<span class="sourceLineNo">206</span> assertFalse(actual.get(i) instanceof ByteBufferKeyValue);<a name="line.206"></a>
+<span class="sourceLineNo">207</span> assertTrue(PrivateCellUtil.equalsIgnoreMvccVersion(expected.get(i), actual.get(i)));<a name="line.207"></a>
+<span class="sourceLineNo">208</span> }<a name="line.208"></a>
+<span class="sourceLineNo">209</span> // Wait for the bucket cache threads to move the data to offheap<a name="line.209"></a>
+<span class="sourceLineNo">210</span> Thread.sleep(500);<a name="line.210"></a>
+<span class="sourceLineNo">211</span> // do the scan again and verify. This time it should be from the bucket cache in offheap mode<a name="line.211"></a>
+<span class="sourceLineNo">212</span> // but one of the cell will be copied due to the asSubByteBuff call<a name="line.212"></a>
+<span class="sourceLineNo">213</span> Scan scan = new Scan(row1);<a name="line.213"></a>
+<span class="sourceLineNo">214</span> scan.addFamily(fam1);<a name="line.214"></a>
+<span class="sourceLineNo">215</span> scan.setMaxVersions(10);<a name="line.215"></a>
+<span class="sourceLineNo">216</span> actual = new ArrayList<>();<a name="line.216"></a>
+<span class="sourceLineNo">217</span> InternalScanner scanner = region.getScanner(scan);<a name="line.217"></a>
+<span class="sourceLineNo">218</span><a name="line.218"></a>
+<span class="sourceLineNo">219</span> boolean hasNext = scanner.next(actual);<a name="line.219"></a>
+<span class="sourceLineNo">220</span> assertEquals(false, hasNext);<a name="line.220"></a>
+<span class="sourceLineNo">221</span> // Verify result<a name="line.221"></a>
+<span class="sourceLineNo">222</span> for (int i = 0; i < expected.size(); i++) {<a name="line.222"></a>
+<span class="sourceLineNo">223</span> if (i != 5) {<a name="line.223"></a>
+<span class="sourceLineNo">224</span> // the last cell fetched will be of type shareable but not offheap because<a name="line.224"></a>
+<span class="sourceLineNo">225</span> // the MBB is copied to form a single cell<a name="line.225"></a>
+<span class="sourceLineNo">226</span> assertTrue(actual.get(i) instanceof ByteBufferKeyValue);<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><a name="line.229"></a>
+<span class="sourceLineNo">230</span> } catch (InterruptedException e) {<a name="line.230"></a>
+<span class="sourceLineNo">231</span> } finally {<a name="line.231"></a>
+<span class="sourceLineNo">232</span> HBaseTestingUtility.closeRegionAndWAL(this.region);<a name="line.232"></a>
+<span class="sourceLineNo">233</span> this.region = null;<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> private List<Cell> insertData(byte[] row1, byte[] qf1, byte[] qf2, byte[] fam1, long ts1,<a name="line.237"></a>
+<span class="sourceLineNo">238</span> long ts2, long ts3, boolean withVal) throws IOException {<a name="line.238"></a>
+<span class="sourceLineNo">239</span> // Putting data in Region<a name="line.239"></a>
+<span class="sourceLineNo">240</span> Put put = null;<a name="line.240"></a>
+<span class="sourceLineNo">241</span> KeyValue kv13 = null;<a name="line.241"></a>
+<span class="sourceLineNo">242</span> KeyValue kv12 = null;<a name="line.242"></a>
+<span class="sourceLineNo">243</span> KeyValue kv11 = null;<a name="line.243"></a>
+<span class="sourceLineNo">244</span><a name="line.244"></a>
+<span class="sourceLineNo">245</span> KeyValue kv23 = null;<a name="line.245"></a>
+<span class="sourceLineNo">246</span> KeyValue kv22 = null;<a name="line.246"></a>
+<span class="sourceLineNo">247</span> KeyValue kv21 = null;<a name="line.247"></a>
+<span class="sourceLineNo">248</span> if (!withVal) {<a name="line.248"></a>
+<span class="sourceLineNo">249</span> kv13 = new KeyValue(row1, fam1, qf1, ts3, KeyValue.Type.Put, null);<a name="line.249"></a>
+<span class="sourceLineNo">250</span> kv12 = new KeyValue(row1, fam1, qf1, ts2, KeyValue.Type.Put, null);<a name="line.250"></a>
+<span class="sourceLineNo">251</span> kv11 = new KeyValue(row1, fam1, qf1, ts1, KeyValue.Type.Put, null);<a name="line.251"></a>
+<span class="sourceLineNo">252</span><a name="line.252"></a>
+<span class="sourceLineNo">253</span> kv23 = new KeyValue(row1, fam1, qf2, ts3, KeyValue.Type.Put, null);<a name="line.253"></a>
+<span class="sourceLineNo">254</span> kv22 = new KeyValue(row1, fam1, qf2, ts2, KeyValue.Type.Put, null);<a name="line.254"></a>
+<span class="sourceLineNo">255</span> kv21 = new KeyValue(row1, fam1, qf2, ts1, KeyValue.Type.Put, null);<a name="line.255"></a>
+<span class="sourceLineNo">256</span> } else {<a name="line.256"></a>
+<span class="sourceLineNo">257</span> kv13 = new KeyValue(row1, fam1, qf1, ts3, KeyValue.Type.Put, val);<a name="line.257"></a>
+<span class="sourceLineNo">258</span> kv12 = new KeyValue(row1, fam1, qf1, ts2, KeyValue.Type.Put, val);<a name="line.258"></a>
+<span class="sourceLineNo">259</span> kv11 = new KeyValue(row1, fam1, qf1, ts1, KeyValue.Type.Put, val);<a name="line.259"></a>
+<span class="sourceLineNo">260</span><a name="line.260"></a>
+<span class="sourceLineNo">261</span> kv23 = new KeyValue(row1, fam1, qf2, ts3, KeyValue.Type.Put, val);<a name="line.261"></a>
+<span class="sourceLineNo">262</span> kv22 = new KeyValue(row1, fam1, qf2, ts2, KeyValue.Type.Put, val);<a name="line.262"></a>
+<span class="sourceLineNo">263</span> kv21 = new KeyValue(row1, fam1, qf2, ts1, KeyValue.Type.Put, val);<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> put = new Put(row1);<a name="line.266"></a>
+<span class="sourceLineNo">267</span> put.add(kv13);<a name="line.267"></a>
+<span class="sourceLineNo">268</span> put.add(kv12);<a name="line.268"></a>
+<span class="sourceLineNo">269</span> put.add(kv11);<a name="line.269"></a>
+<span class="sourceLineNo">270</span> put.add(kv23);<a name="line.270"></a>
+<span class="sourceLineNo">271</span> put.add(kv22);<a name="line.271"></a>
+<span class="sourceLineNo">272</span> put.add(kv21);<a name="line.272"></a>
+<span class="sourceLineNo">273</span> region.put(put);<a name="line.273"></a>
+<span class="sourceLineNo">274</span> region.flush(true);<a name="line.274"></a>
+<span class="sourceLineNo">275</span> HStore store = region.getStore(fam1);<a name="line.275"></a>
+<span class="sourceLineNo">276</span> while (store.getStorefilesCount() <= 0) {<a name="line.276"></a>
+<span class="sourceLineNo">277</span> try {<a name="line.277"></a>
+<span class="sourceLineNo">278</span> Thread.sleep(20);<a name="line.278"></a>
+<span class="sourceLineNo">279</span> } catch (InterruptedException e) {<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">283</span> // Expected<a name="line.283"></a>
+<span class="sourceLineNo">284</span> List<Cell> expected = new ArrayList<>();<a name="line.284"></a>
+<span class="sourceLineNo">285</span> expected.add(kv13);<a name="line.285"></a>
+<span class="sourceLineNo">286</span> expected.add(kv12);<a name="line.286"></a>
+<span class="sourceLineNo">287</span> expected.add(kv23);<a name="line.287"></a>
+<span class="sourceLineNo">288</span> expected.add(kv22);<a name="line.288"></a>
+<span class="sourceLineNo">289</span> return expected;<a name="line.289"></a>
+<span class="sourceLineNo">290</span> }<a name="line.290"></a>
+<span class="sourceLineNo">291</span><a name="line.291"></a>
+<span class="sourceLineNo">292</span> private List<Cell> performScan(byte[] row1, byte[] fam1) throws IOException {<a name="line.292"></a>
+<span class="sourceLineNo">293</span> Scan scan = new Scan(row1);<a name="line.293"></a>
+<span class="sourceLineNo">294</span> scan.addFamily(fam1);<a name="line.294"></a>
+<span class="sourceLineNo">295</span> scan.setMaxVersions(MAX_VERSIONS);<a name="line.295"></a>
+<span class="sourceLineNo">296</span> List<Cell> actual = new ArrayList<>();<a name="line.296"></a>
+<span class="sourceLineNo">297</span> InternalScanner scanner = region.getScanner(scan);<a name="line.297"></a>
+<span class="sourceLineNo">298</span><a name="line.298"></a>
+<span class="sourceLineNo">299</span> boolean hasNext = scanner.next(actual);<a name="line.299"></a>
+<span class="sourceLineNo">300</span> assertEquals(false, hasNext);<a name="line.300"></a>
+<span class="sourceLineNo">301</span> return actual;<a name="line.301"></a>
+<span class="sourceLineNo">302</span> }<a name="line.302"></a>
+<span class="sourceLineNo">303</span><a name="line.303"></a>
+<span class="sourceLineNo">304</span> private static HRegion initHRegion(TableName tableName, String callingMethod, Configuration conf,<a name="line.304"></a>
+<span class="sourceLineNo">305</span> HBaseTestingUtility test_util, byte[]... families) throws IOException {<a name="line.305"></a>
+<span class="sourceLineNo">306</span> return initHRegion(tableName, null, null, callingMethod, conf, test_util, false, families);<a name="line.306"></a>
+<span class="sourceLineNo">307</span> }<a name="line.307"></a>
+<span class="sourceLineNo">308</span><a name="line.308"></a>
+<span class="sourceLineNo">309</span> private static HRegion initHRegion(TableName tableName, byte[] startKey, byte[] stopKey,<a name="line.309"></a>
+<span class="sourceLineNo">310</span> String callingMethod, Configuration conf, HBaseTestingUtility test_util, boolean isReadOnly,<a name="line.310"></a>
+<span class="sourceLineNo">311</span> byte[]... families) throws IOException {<a name="line.311"></a>
+<span class="sourceLineNo">312</span> ChunkCreator.initialize(MemStoreLABImpl.CHUNK_SIZE_DEFAULT, false, 0, 0, 0, null);<a name="line.312"></a>
+<span class="sourceLineNo">313</span> Path logDir = test_util.getDataTestDirOnTestFS(callingMethod + ".log");<a name="line.313"></a>
+<span class="sourceLineNo">314</span> HRegionInfo hri = new HRegionInfo(tableName, startKey, stopKey);<a name="line.314"></a>
+<span class="sourceLineNo">315</span> final WAL wal = HBaseTestingUtility.createWal(conf, logDir, hri);<a name="line.315"></a>
+<span class="sourceLineNo">316</span> return initHRegion(tableName, startKey, stopKey, callingMethod, conf, test_util, isReadOnly,<a name="line.316"></a>
+<span class="sourceLineNo">317</span> Durability.SYNC_WAL, wal, families);<a name="line.317"></a>
+<span class="sourceLineNo">318</span> }<a name="line.318"></a>
+<span class="sourceLineNo">319</span><a name="line.319"></a>
+<span class="sourceLineNo">320</span> /**<a name="line.320"></a>
+<span class="sourceLineNo">321</span> * @param tableName<a name="line.321"></a>
+<span class="sourceLineNo">322</span> * @param startKey<a name="line.322"></a>
+<span class="sourceLineNo">323</span> * @param stopKey<a name="line.323"></a>
+<span class="sourceLineNo">324</span> * @param callingMethod<a name="line.324"></a>
+<span class="sourceLineNo">325</span> * @param conf<a name="line.325"></a>
+<span class="sourceLineNo">326</span> * @param isReadOnly<a name="line.326"></a>
+<span class="sourceLineNo">327</span> * @param families<a name="line.327"></a>
+<span class="sourceLineNo">328</span> * @throws IOException<a name="line.328"></a>
+<span class="sourceLineNo">329</span> * @return A region on which you must call {@link HBaseTestingUtility#closeRegionAndWAL(HRegion)}<a name="line.329"></a>
+<span class="sourceLineNo">330</span> * when done.<a name="line.330"></a>
+<span class="sourceLineNo">331</span> */<a name="line.331"></a>
+<span class="sourceLineNo">332</span> private static HRegion initHRegion(TableName tableName, byte[] startKey, byte[] stopKey,<a name="line.332"></a>
+<span class="sourceLineNo">333</span> String callingMethod, Configuration conf, HBaseTestingUtility test_util, boolean isReadOnly,<a name="line.333"></a>
+<span class="sourceLineNo">334</span> Durability durability, WAL wal, byte[]... families) throws IOException {<a name="line.334"></a>
+<span class="sourceLineNo">335</span> return test_util.createLocalHRegion(tableName, startKey, stopKey, isReadOnly, durability, wal,<a name="line.335"></a>
+<span class="sourceLineNo">336</span> families);<a name="line.336"></a>
+<span class="sourceLineNo">337</span> }<a name="line.337"></a>
+<span class="sourceLineNo">338</span>}<a name="line.338"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/dccdd274/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/TestScannerSelectionUsingKeyRange.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/TestScannerSelectionUsingKeyRange.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/TestScannerSelectionUsingKeyRange.html
index a056034..8a18927 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/TestScannerSelectionUsingKeyRange.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/TestScannerSelectionUsingKeyRange.html
@@ -132,20 +132,21 @@
<span class="sourceLineNo">124</span><a name="line.124"></a>
<span class="sourceLineNo">125</span> Scan scan = new Scan(Bytes.toBytes("aaa"), Bytes.toBytes("aaz"));<a name="line.125"></a>
<span class="sourceLineNo">126</span> CacheConfig.blockCacheDisabled = false;<a name="line.126"></a>
-<span class="sourceLineNo">127</span> CacheConfig cacheConf = new CacheConfig(conf);<a name="line.127"></a>
-<span class="sourceLineNo">128</span> LruBlockCache cache = (LruBlockCache) cacheConf.getBlockCache();<a name="line.128"></a>
-<span class="sourceLineNo">129</span> cache.clearCache();<a name="line.129"></a>
-<span class="sourceLineNo">130</span> InternalScanner scanner = region.getScanner(scan);<a name="line.130"></a>
-<span class="sourceLineNo">131</span> List<Cell> results = new ArrayList<>();<a name="line.131"></a>
-<span class="sourceLineNo">132</span> while (scanner.next(results)) {<a name="line.132"></a>
-<span class="sourceLineNo">133</span> }<a name="line.133"></a>
-<span class="sourceLineNo">134</span> scanner.close();<a name="line.134"></a>
-<span class="sourceLineNo">135</span> assertEquals(0, results.size());<a name="line.135"></a>
-<span class="sourceLineNo">136</span> Set<String> accessedFiles = cache.getCachedFileNamesForTest();<a name="line.136"></a>
-<span class="sourceLineNo">137</span> assertEquals(expectedCount, accessedFiles.size());<a name="line.137"></a>
-<span class="sourceLineNo">138</span> HBaseTestingUtility.closeRegionAndWAL(region);<a name="line.138"></a>
-<span class="sourceLineNo">139</span> }<a name="line.139"></a>
-<span class="sourceLineNo">140</span>}<a name="line.140"></a>
+<span class="sourceLineNo">127</span> CacheConfig.instantiateBlockCache(conf);<a name="line.127"></a>
+<span class="sourceLineNo">128</span> CacheConfig cacheConf = new CacheConfig(conf);<a name="line.128"></a>
+<span class="sourceLineNo">129</span> LruBlockCache cache = (LruBlockCache) cacheConf.getBlockCache();<a name="line.129"></a>
+<span class="sourceLineNo">130</span> cache.clearCache();<a name="line.130"></a>
+<span class="sourceLineNo">131</span> InternalScanner scanner = region.getScanner(scan);<a name="line.131"></a>
+<span class="sourceLineNo">132</span> List<Cell> results = new ArrayList<>();<a name="line.132"></a>
+<span class="sourceLineNo">133</span> while (scanner.next(results)) {<a name="line.133"></a>
+<span class="sourceLineNo">134</span> }<a name="line.134"></a>
+<span class="sourceLineNo">135</span> scanner.close();<a name="line.135"></a>
+<span class="sourceLineNo">136</span> assertEquals(0, results.size());<a name="line.136"></a>
+<span class="sourceLineNo">137</span> Set<String> accessedFiles = cache.getCachedFileNamesForTest();<a name="line.137"></a>
+<span class="sourceLineNo">138</span> assertEquals(expectedCount, accessedFiles.size());<a name="line.138"></a>
+<span class="sourceLineNo">139</span> HBaseTestingUtility.closeRegionAndWAL(region);<a name="line.139"></a>
+<span class="sourceLineNo">140</span> }<a name="line.140"></a>
+<span class="sourceLineNo">141</span>}<a name="line.141"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/dccdd274/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/TestScannerSelectionUsingTTL.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/TestScannerSelectionUsingTTL.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/TestScannerSelectionUsingTTL.html
index 6194ade..70ad44b 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/TestScannerSelectionUsingTTL.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/TestScannerSelectionUsingTTL.html
@@ -112,67 +112,68 @@
<span class="sourceLineNo">104</span> @Test<a name="line.104"></a>
<span class="sourceLineNo">105</span> public void testScannerSelection() throws IOException {<a name="line.105"></a>
<span class="sourceLineNo">106</span> Configuration conf = TEST_UTIL.getConfiguration();<a name="line.106"></a>
-<span class="sourceLineNo">107</span> conf.setBoolean("hbase.store.delete.expired.storefile", false);<a name="line.107"></a>
-<span class="sourceLineNo">108</span> HColumnDescriptor hcd =<a name="line.108"></a>
-<span class="sourceLineNo">109</span> new HColumnDescriptor(FAMILY_BYTES)<a name="line.109"></a>
-<span class="sourceLineNo">110</span> .setMaxVersions(Integer.MAX_VALUE)<a name="line.110"></a>
-<span class="sourceLineNo">111</span> .setTimeToLive(TTL_SECONDS);<a name="line.111"></a>
-<span class="sourceLineNo">112</span> HTableDescriptor htd = new HTableDescriptor(TABLE);<a name="line.112"></a>
-<span class="sourceLineNo">113</span> htd.addFamily(hcd);<a name="line.113"></a>
-<span class="sourceLineNo">114</span> HRegionInfo info = new HRegionInfo(TABLE);<a name="line.114"></a>
-<span class="sourceLineNo">115</span> HRegion region = HBaseTestingUtility.createRegionAndWAL(info,<a name="line.115"></a>
-<span class="sourceLineNo">116</span> TEST_UTIL.getDataTestDir(info.getEncodedName()), conf, htd);<a name="line.116"></a>
-<span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span> long ts = EnvironmentEdgeManager.currentTime();<a name="line.118"></a>
-<span class="sourceLineNo">119</span> long version = 0; //make sure each new set of Put's have a new ts<a name="line.119"></a>
-<span class="sourceLineNo">120</span> for (int iFile = 0; iFile < totalNumFiles; ++iFile) {<a name="line.120"></a>
-<span class="sourceLineNo">121</span> if (iFile == NUM_EXPIRED_FILES) {<a name="line.121"></a>
-<span class="sourceLineNo">122</span> Threads.sleepWithoutInterrupt(TTL_MS);<a name="line.122"></a>
-<span class="sourceLineNo">123</span> version += TTL_MS;<a name="line.123"></a>
-<span class="sourceLineNo">124</span> }<a name="line.124"></a>
-<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span> for (int iRow = 0; iRow < NUM_ROWS; ++iRow) {<a name="line.126"></a>
-<span class="sourceLineNo">127</span> Put put = new Put(Bytes.toBytes("row" + iRow));<a name="line.127"></a>
-<span class="sourceLineNo">128</span> for (int iCol = 0; iCol < NUM_COLS_PER_ROW; ++iCol) {<a name="line.128"></a>
-<span class="sourceLineNo">129</span> put.addColumn(FAMILY_BYTES, Bytes.toBytes("col" + iCol), ts + version,<a name="line.129"></a>
-<span class="sourceLineNo">130</span> Bytes.toBytes("value" + iFile + "_" + iRow + "_" + iCol));<a name="line.130"></a>
-<span class="sourceLineNo">131</span> }<a name="line.131"></a>
-<span class="sourceLineNo">132</span> region.put(put);<a name="line.132"></a>
-<span class="sourceLineNo">133</span> }<a name="line.133"></a>
-<span class="sourceLineNo">134</span> region.flush(true);<a name="line.134"></a>
-<span class="sourceLineNo">135</span> version++;<a name="line.135"></a>
-<span class="sourceLineNo">136</span> }<a name="line.136"></a>
-<span class="sourceLineNo">137</span><a name="line.137"></a>
-<span class="sourceLineNo">138</span> Scan scan = new Scan();<a name="line.138"></a>
-<span class="sourceLineNo">139</span> scan.setMaxVersions(Integer.MAX_VALUE);<a name="line.139"></a>
-<span class="sourceLineNo">140</span> CacheConfig cacheConf = new CacheConfig(conf);<a name="line.140"></a>
-<span class="sourceLineNo">141</span> LruBlockCache cache = (LruBlockCache) cacheConf.getBlockCache();<a name="line.141"></a>
-<span class="sourceLineNo">142</span> cache.clearCache();<a name="line.142"></a>
-<span class="sourceLineNo">143</span> InternalScanner scanner = region.getScanner(scan);<a name="line.143"></a>
-<span class="sourceLineNo">144</span> List<Cell> results = new ArrayList<>();<a name="line.144"></a>
-<span class="sourceLineNo">145</span> final int expectedKVsPerRow = numFreshFiles * NUM_COLS_PER_ROW;<a name="line.145"></a>
-<span class="sourceLineNo">146</span> int numReturnedRows = 0;<a name="line.146"></a>
-<span class="sourceLineNo">147</span> LOG.info("Scanning the entire table");<a name="line.147"></a>
-<span class="sourceLineNo">148</span> while (scanner.next(results) || results.size() > 0) {<a name="line.148"></a>
-<span class="sourceLineNo">149</span> assertEquals(expectedKVsPerRow, results.size());<a name="line.149"></a>
-<span class="sourceLineNo">150</span> ++numReturnedRows;<a name="line.150"></a>
-<span class="sourceLineNo">151</span> results.clear();<a name="line.151"></a>
-<span class="sourceLineNo">152</span> }<a name="line.152"></a>
-<span class="sourceLineNo">153</span> assertEquals(NUM_ROWS, numReturnedRows);<a name="line.153"></a>
-<span class="sourceLineNo">154</span> Set<String> accessedFiles = cache.getCachedFileNamesForTest();<a name="line.154"></a>
-<span class="sourceLineNo">155</span> LOG.debug("Files accessed during scan: " + accessedFiles);<a name="line.155"></a>
-<span class="sourceLineNo">156</span><a name="line.156"></a>
-<span class="sourceLineNo">157</span> // Exercise both compaction codepaths.<a name="line.157"></a>
-<span class="sourceLineNo">158</span> if (explicitCompaction) {<a name="line.158"></a>
-<span class="sourceLineNo">159</span> HStore store = region.getStore(FAMILY_BYTES);<a name="line.159"></a>
-<span class="sourceLineNo">160</span> store.compactRecentForTestingAssumingDefaultPolicy(totalNumFiles);<a name="line.160"></a>
-<span class="sourceLineNo">161</span> } else {<a name="line.161"></a>
-<span class="sourceLineNo">162</span> region.compact(false);<a name="line.162"></a>
-<span class="sourceLineNo">163</span> }<a name="line.163"></a>
-<span class="sourceLineNo">164</span><a name="line.164"></a>
-<span class="sourceLineNo">165</span> HBaseTestingUtility.closeRegionAndWAL(region);<a name="line.165"></a>
-<span class="sourceLineNo">166</span> }<a name="line.166"></a>
-<span class="sourceLineNo">167</span>}<a name="line.167"></a>
+<span class="sourceLineNo">107</span> CacheConfig.instantiateBlockCache(conf);<a name="line.107"></a>
+<span class="sourceLineNo">108</span> conf.setBoolean("hbase.store.delete.expired.storefile", false);<a name="line.108"></a>
+<span class="sourceLineNo">109</span> HColumnDescriptor hcd =<a name="line.109"></a>
+<span class="sourceLineNo">110</span> new HColumnDescriptor(FAMILY_BYTES)<a name="line.110"></a>
+<span class="sourceLineNo">111</span> .setMaxVersions(Integer.MAX_VALUE)<a name="line.111"></a>
+<span class="sourceLineNo">112</span> .setTimeToLive(TTL_SECONDS);<a name="line.112"></a>
+<span class="sourceLineNo">113</span> HTableDescriptor htd = new HTableDescriptor(TABLE);<a name="line.113"></a>
+<span class="sourceLineNo">114</span> htd.addFamily(hcd);<a name="line.114"></a>
+<span class="sourceLineNo">115</span> HRegionInfo info = new HRegionInfo(TABLE);<a name="line.115"></a>
+<span class="sourceLineNo">116</span> HRegion region = HBaseTestingUtility.createRegionAndWAL(info,<a name="line.116"></a>
+<span class="sourceLineNo">117</span> TEST_UTIL.getDataTestDir(info.getEncodedName()), conf, htd);<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span> long ts = EnvironmentEdgeManager.currentTime();<a name="line.119"></a>
+<span class="sourceLineNo">120</span> long version = 0; //make sure each new set of Put's have a new ts<a name="line.120"></a>
+<span class="sourceLineNo">121</span> for (int iFile = 0; iFile < totalNumFiles; ++iFile) {<a name="line.121"></a>
+<span class="sourceLineNo">122</span> if (iFile == NUM_EXPIRED_FILES) {<a name="line.122"></a>
+<span class="sourceLineNo">123</span> Threads.sleepWithoutInterrupt(TTL_MS);<a name="line.123"></a>
+<span class="sourceLineNo">124</span> version += TTL_MS;<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> for (int iRow = 0; iRow < NUM_ROWS; ++iRow) {<a name="line.127"></a>
+<span class="sourceLineNo">128</span> Put put = new Put(Bytes.toBytes("row" + iRow));<a name="line.128"></a>
+<span class="sourceLineNo">129</span> for (int iCol = 0; iCol < NUM_COLS_PER_ROW; ++iCol) {<a name="line.129"></a>
+<span class="sourceLineNo">130</span> put.addColumn(FAMILY_BYTES, Bytes.toBytes("col" + iCol), ts + version,<a name="line.130"></a>
+<span class="sourceLineNo">131</span> Bytes.toBytes("value" + iFile + "_" + iRow + "_" + iCol));<a name="line.131"></a>
+<span class="sourceLineNo">132</span> }<a name="line.132"></a>
+<span class="sourceLineNo">133</span> region.put(put);<a name="line.133"></a>
+<span class="sourceLineNo">134</span> }<a name="line.134"></a>
+<span class="sourceLineNo">135</span> region.flush(true);<a name="line.135"></a>
+<span class="sourceLineNo">136</span> version++;<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> Scan scan = new Scan();<a name="line.139"></a>
+<span class="sourceLineNo">140</span> scan.setMaxVersions(Integer.MAX_VALUE);<a name="line.140"></a>
+<span class="sourceLineNo">141</span> CacheConfig cacheConf = new CacheConfig(conf);<a name="line.141"></a>
+<span class="sourceLineNo">142</span> LruBlockCache cache = (LruBlockCache) cacheConf.getBlockCache();<a name="line.142"></a>
+<span class="sourceLineNo">143</span> cache.clearCache();<a name="line.143"></a>
+<span class="sourceLineNo">144</span> InternalScanner scanner = region.getScanner(scan);<a name="line.144"></a>
+<span class="sourceLineNo">145</span> List<Cell> results = new ArrayList<>();<a name="line.145"></a>
+<span class="sourceLineNo">146</span> final int expectedKVsPerRow = numFreshFiles * NUM_COLS_PER_ROW;<a name="line.146"></a>
+<span class="sourceLineNo">147</span> int numReturnedRows = 0;<a name="line.147"></a>
+<span class="sourceLineNo">148</span> LOG.info("Scanning the entire table");<a name="line.148"></a>
+<span class="sourceLineNo">149</span> while (scanner.next(results) || results.size() > 0) {<a name="line.149"></a>
+<span class="sourceLineNo">150</span> assertEquals(expectedKVsPerRow, results.size());<a name="line.150"></a>
+<span class="sourceLineNo">151</span> ++numReturnedRows;<a name="line.151"></a>
+<span class="sourceLineNo">152</span> results.clear();<a name="line.152"></a>
+<span class="sourceLineNo">153</span> }<a name="line.153"></a>
+<span class="sourceLineNo">154</span> assertEquals(NUM_ROWS, numReturnedRows);<a name="line.154"></a>
+<span class="sourceLineNo">155</span> Set<String> accessedFiles = cache.getCachedFileNamesForTest();<a name="line.155"></a>
+<span class="sourceLineNo">156</span> LOG.debug("Files accessed during scan: " + accessedFiles);<a name="line.156"></a>
+<span class="sourceLineNo">157</span><a name="line.157"></a>
+<span class="sourceLineNo">158</span> // Exercise both compaction codepaths.<a name="line.158"></a>
+<span class="sourceLineNo">159</span> if (explicitCompaction) {<a name="line.159"></a>
+<span class="sourceLineNo">160</span> HStore store = region.getStore(FAMILY_BYTES);<a name="line.160"></a>
+<span class="sourceLineNo">161</span> store.compactRecentForTestingAssumingDefaultPolicy(totalNumFiles);<a name="line.161"></a>
+<span class="sourceLineNo">162</span> } else {<a name="line.162"></a>
+<span class="sourceLineNo">163</span> region.compact(false);<a name="line.163"></a>
+<span class="sourceLineNo">164</span> }<a name="line.164"></a>
+<span class="sourceLineNo">165</span><a name="line.165"></a>
+<span class="sourceLineNo">166</span> HBaseTestingUtility.closeRegionAndWAL(region);<a name="line.166"></a>
+<span class="sourceLineNo">167</span> }<a name="line.167"></a>
+<span class="sourceLineNo">168</span>}<a name="line.168"></a>