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/12/25 14:50:35 UTC
[03/29] hbase-site git commit: Published site at
44dec60054d1c45880d591c74a023f7a534e6d73.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/70f4ddbc/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestStoreScanner.KeyValueHeapWithCount.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestStoreScanner.KeyValueHeapWithCount.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestStoreScanner.KeyValueHeapWithCount.html
index 5982fda..5fda559 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestStoreScanner.KeyValueHeapWithCount.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestStoreScanner.KeyValueHeapWithCount.html
@@ -178,807 +178,813 @@
<span class="sourceLineNo">170</span> if (count == null) {<a name="line.170"></a>
<span class="sourceLineNo">171</span> count = new AtomicInteger(0);<a name="line.171"></a>
<span class="sourceLineNo">172</span> }<a name="line.172"></a>
-<span class="sourceLineNo">173</span> heap = new KeyValueHeapWithCount(scanners, comparator, count);<a name="line.173"></a>
+<span class="sourceLineNo">173</span> heap = newKVHeap(scanners, comparator);<a name="line.173"></a>
<span class="sourceLineNo">174</span> }<a name="line.174"></a>
<span class="sourceLineNo">175</span><a name="line.175"></a>
<span class="sourceLineNo">176</span> @Override<a name="line.176"></a>
-<span class="sourceLineNo">177</span> protected boolean trySkipToNextRow(Cell cell) throws IOException {<a name="line.177"></a>
-<span class="sourceLineNo">178</span> boolean optimized = super.trySkipToNextRow(cell);<a name="line.178"></a>
-<span class="sourceLineNo">179</span> LOG.info("Cell=" + cell + ", nextIndex=" + CellUtil.toString(getNextIndexedKey(), false)<a name="line.179"></a>
-<span class="sourceLineNo">180</span> + ", optimized=" + optimized);<a name="line.180"></a>
-<span class="sourceLineNo">181</span> if (optimized) {<a name="line.181"></a>
-<span class="sourceLineNo">182</span> optimization.incrementAndGet();<a name="line.182"></a>
-<span class="sourceLineNo">183</span> }<a name="line.183"></a>
-<span class="sourceLineNo">184</span> return optimized;<a name="line.184"></a>
-<span class="sourceLineNo">185</span> }<a name="line.185"></a>
-<span class="sourceLineNo">186</span><a name="line.186"></a>
-<span class="sourceLineNo">187</span> @Override<a name="line.187"></a>
-<span class="sourceLineNo">188</span> protected boolean trySkipToNextColumn(Cell cell) throws IOException {<a name="line.188"></a>
-<span class="sourceLineNo">189</span> boolean optimized = super.trySkipToNextColumn(cell);<a name="line.189"></a>
-<span class="sourceLineNo">190</span> LOG.info("Cell=" + cell + ", nextIndex=" + CellUtil.toString(getNextIndexedKey(), false)<a name="line.190"></a>
-<span class="sourceLineNo">191</span> + ", optimized=" + optimized);<a name="line.191"></a>
-<span class="sourceLineNo">192</span> if (optimized) {<a name="line.192"></a>
-<span class="sourceLineNo">193</span> optimization.incrementAndGet();<a name="line.193"></a>
-<span class="sourceLineNo">194</span> }<a name="line.194"></a>
-<span class="sourceLineNo">195</span> return optimized;<a name="line.195"></a>
-<span class="sourceLineNo">196</span> }<a name="line.196"></a>
-<span class="sourceLineNo">197</span><a name="line.197"></a>
-<span class="sourceLineNo">198</span> @Override<a name="line.198"></a>
-<span class="sourceLineNo">199</span> public Cell getNextIndexedKey() {<a name="line.199"></a>
-<span class="sourceLineNo">200</span> // Fake block boundaries by having index of next block change as we go through scan.<a name="line.200"></a>
-<span class="sourceLineNo">201</span> return count.get() > CELL_GRID_BLOCK4_BOUNDARY?<a name="line.201"></a>
-<span class="sourceLineNo">202</span> PrivateCellUtil.createFirstOnRow(CELL_GRID[CELL_GRID_BLOCK5_BOUNDARY]):<a name="line.202"></a>
-<span class="sourceLineNo">203</span> count.get() > CELL_GRID_BLOCK3_BOUNDARY?<a name="line.203"></a>
-<span class="sourceLineNo">204</span> PrivateCellUtil.createFirstOnRow(CELL_GRID[CELL_GRID_BLOCK4_BOUNDARY]):<a name="line.204"></a>
-<span class="sourceLineNo">205</span> count.get() > CELL_GRID_BLOCK2_BOUNDARY?<a name="line.205"></a>
-<span class="sourceLineNo">206</span> PrivateCellUtil.createFirstOnRow(CELL_GRID[CELL_GRID_BLOCK3_BOUNDARY]):<a name="line.206"></a>
-<span class="sourceLineNo">207</span> PrivateCellUtil.createFirstOnRow(CELL_GRID[CELL_GRID_BLOCK2_BOUNDARY]);<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> private static final int CELL_WITH_VERSIONS_BLOCK2_BOUNDARY = 4;<a name="line.211"></a>
-<span class="sourceLineNo">212</span><a name="line.212"></a>
-<span class="sourceLineNo">213</span> private static final Cell[] CELL_WITH_VERSIONS = new Cell [] {<a name="line.213"></a>
-<span class="sourceLineNo">214</span> createCell(ONE, CF, ONE, 2L, KeyValue.Type.Put.getCode(), VALUE),<a name="line.214"></a>
-<span class="sourceLineNo">215</span> createCell(ONE, CF, ONE, 1L, KeyValue.Type.Put.getCode(), VALUE),<a name="line.215"></a>
-<span class="sourceLineNo">216</span> createCell(ONE, CF, TWO, 2L, KeyValue.Type.Put.getCode(), VALUE),<a name="line.216"></a>
-<span class="sourceLineNo">217</span> createCell(ONE, CF, TWO, 1L, KeyValue.Type.Put.getCode(), VALUE),<a name="line.217"></a>
-<span class="sourceLineNo">218</span> // Offset 4 CELL_WITH_VERSIONS_BLOCK2_BOUNDARY<a name="line.218"></a>
-<span class="sourceLineNo">219</span> createCell(TWO, CF, ONE, 1L, KeyValue.Type.Put.getCode(), VALUE),<a name="line.219"></a>
-<span class="sourceLineNo">220</span> createCell(TWO, CF, TWO, 1L, KeyValue.Type.Put.getCode(), VALUE),<a name="line.220"></a>
-<span class="sourceLineNo">221</span> };<a name="line.221"></a>
-<span class="sourceLineNo">222</span><a name="line.222"></a>
-<span class="sourceLineNo">223</span> private static class CellWithVersionsStoreScanner extends StoreScanner {<a name="line.223"></a>
-<span class="sourceLineNo">224</span> // Count of how often optimize is called and of how often it does an optimize.<a name="line.224"></a>
-<span class="sourceLineNo">225</span> final AtomicInteger optimization = new AtomicInteger(0);<a name="line.225"></a>
-<span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span> CellWithVersionsStoreScanner(final Scan scan, ScanInfo scanInfo) throws IOException {<a name="line.227"></a>
-<span class="sourceLineNo">228</span> super(scan, scanInfo, scan.getFamilyMap().get(CF),<a name="line.228"></a>
-<span class="sourceLineNo">229</span> Arrays.<KeyValueScanner> asList(new KeyValueScanner[] {<a name="line.229"></a>
-<span class="sourceLineNo">230</span> new KeyValueScanFixture(CellComparator.getInstance(), CELL_WITH_VERSIONS) }));<a name="line.230"></a>
-<span class="sourceLineNo">231</span> }<a name="line.231"></a>
+<span class="sourceLineNo">177</span> protected KeyValueHeap newKVHeap(List<? extends KeyValueScanner> scanners,<a name="line.177"></a>
+<span class="sourceLineNo">178</span> CellComparator comparator) throws IOException {<a name="line.178"></a>
+<span class="sourceLineNo">179</span> return new KeyValueHeapWithCount(scanners, comparator, count);<a name="line.179"></a>
+<span class="sourceLineNo">180</span> }<a name="line.180"></a>
+<span class="sourceLineNo">181</span><a name="line.181"></a>
+<span class="sourceLineNo">182</span> @Override<a name="line.182"></a>
+<span class="sourceLineNo">183</span> protected boolean trySkipToNextRow(Cell cell) throws IOException {<a name="line.183"></a>
+<span class="sourceLineNo">184</span> boolean optimized = super.trySkipToNextRow(cell);<a name="line.184"></a>
+<span class="sourceLineNo">185</span> LOG.info("Cell=" + cell + ", nextIndex=" + CellUtil.toString(getNextIndexedKey(), false)<a name="line.185"></a>
+<span class="sourceLineNo">186</span> + ", optimized=" + optimized);<a name="line.186"></a>
+<span class="sourceLineNo">187</span> if (optimized) {<a name="line.187"></a>
+<span class="sourceLineNo">188</span> optimization.incrementAndGet();<a name="line.188"></a>
+<span class="sourceLineNo">189</span> }<a name="line.189"></a>
+<span class="sourceLineNo">190</span> return optimized;<a name="line.190"></a>
+<span class="sourceLineNo">191</span> }<a name="line.191"></a>
+<span class="sourceLineNo">192</span><a name="line.192"></a>
+<span class="sourceLineNo">193</span> @Override<a name="line.193"></a>
+<span class="sourceLineNo">194</span> protected boolean trySkipToNextColumn(Cell cell) throws IOException {<a name="line.194"></a>
+<span class="sourceLineNo">195</span> boolean optimized = super.trySkipToNextColumn(cell);<a name="line.195"></a>
+<span class="sourceLineNo">196</span> LOG.info("Cell=" + cell + ", nextIndex=" + CellUtil.toString(getNextIndexedKey(), false)<a name="line.196"></a>
+<span class="sourceLineNo">197</span> + ", optimized=" + optimized);<a name="line.197"></a>
+<span class="sourceLineNo">198</span> if (optimized) {<a name="line.198"></a>
+<span class="sourceLineNo">199</span> optimization.incrementAndGet();<a name="line.199"></a>
+<span class="sourceLineNo">200</span> }<a name="line.200"></a>
+<span class="sourceLineNo">201</span> return optimized;<a name="line.201"></a>
+<span class="sourceLineNo">202</span> }<a name="line.202"></a>
+<span class="sourceLineNo">203</span><a name="line.203"></a>
+<span class="sourceLineNo">204</span> @Override<a name="line.204"></a>
+<span class="sourceLineNo">205</span> public Cell getNextIndexedKey() {<a name="line.205"></a>
+<span class="sourceLineNo">206</span> // Fake block boundaries by having index of next block change as we go through scan.<a name="line.206"></a>
+<span class="sourceLineNo">207</span> return count.get() > CELL_GRID_BLOCK4_BOUNDARY?<a name="line.207"></a>
+<span class="sourceLineNo">208</span> PrivateCellUtil.createFirstOnRow(CELL_GRID[CELL_GRID_BLOCK5_BOUNDARY]):<a name="line.208"></a>
+<span class="sourceLineNo">209</span> count.get() > CELL_GRID_BLOCK3_BOUNDARY?<a name="line.209"></a>
+<span class="sourceLineNo">210</span> PrivateCellUtil.createFirstOnRow(CELL_GRID[CELL_GRID_BLOCK4_BOUNDARY]):<a name="line.210"></a>
+<span class="sourceLineNo">211</span> count.get() > CELL_GRID_BLOCK2_BOUNDARY?<a name="line.211"></a>
+<span class="sourceLineNo">212</span> PrivateCellUtil.createFirstOnRow(CELL_GRID[CELL_GRID_BLOCK3_BOUNDARY]):<a name="line.212"></a>
+<span class="sourceLineNo">213</span> PrivateCellUtil.createFirstOnRow(CELL_GRID[CELL_GRID_BLOCK2_BOUNDARY]);<a name="line.213"></a>
+<span class="sourceLineNo">214</span> }<a name="line.214"></a>
+<span class="sourceLineNo">215</span> }<a name="line.215"></a>
+<span class="sourceLineNo">216</span><a name="line.216"></a>
+<span class="sourceLineNo">217</span> private static final int CELL_WITH_VERSIONS_BLOCK2_BOUNDARY = 4;<a name="line.217"></a>
+<span class="sourceLineNo">218</span><a name="line.218"></a>
+<span class="sourceLineNo">219</span> private static final Cell[] CELL_WITH_VERSIONS = new Cell [] {<a name="line.219"></a>
+<span class="sourceLineNo">220</span> createCell(ONE, CF, ONE, 2L, KeyValue.Type.Put.getCode(), VALUE),<a name="line.220"></a>
+<span class="sourceLineNo">221</span> createCell(ONE, CF, ONE, 1L, KeyValue.Type.Put.getCode(), VALUE),<a name="line.221"></a>
+<span class="sourceLineNo">222</span> createCell(ONE, CF, TWO, 2L, KeyValue.Type.Put.getCode(), VALUE),<a name="line.222"></a>
+<span class="sourceLineNo">223</span> createCell(ONE, CF, TWO, 1L, KeyValue.Type.Put.getCode(), VALUE),<a name="line.223"></a>
+<span class="sourceLineNo">224</span> // Offset 4 CELL_WITH_VERSIONS_BLOCK2_BOUNDARY<a name="line.224"></a>
+<span class="sourceLineNo">225</span> createCell(TWO, CF, ONE, 1L, KeyValue.Type.Put.getCode(), VALUE),<a name="line.225"></a>
+<span class="sourceLineNo">226</span> createCell(TWO, CF, TWO, 1L, KeyValue.Type.Put.getCode(), VALUE),<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> private static class CellWithVersionsStoreScanner extends StoreScanner {<a name="line.229"></a>
+<span class="sourceLineNo">230</span> // Count of how often optimize is called and of how often it does an optimize.<a name="line.230"></a>
+<span class="sourceLineNo">231</span> final AtomicInteger optimization = new AtomicInteger(0);<a name="line.231"></a>
<span class="sourceLineNo">232</span><a name="line.232"></a>
-<span class="sourceLineNo">233</span> @Override<a name="line.233"></a>
-<span class="sourceLineNo">234</span> protected boolean trySkipToNextColumn(Cell cell) throws IOException {<a name="line.234"></a>
-<span class="sourceLineNo">235</span> boolean optimized = super.trySkipToNextColumn(cell);<a name="line.235"></a>
-<span class="sourceLineNo">236</span> LOG.info("Cell=" + cell + ", nextIndex=" + CellUtil.toString(getNextIndexedKey(), false)<a name="line.236"></a>
-<span class="sourceLineNo">237</span> + ", optimized=" + optimized);<a name="line.237"></a>
-<span class="sourceLineNo">238</span> if (optimized) {<a name="line.238"></a>
-<span class="sourceLineNo">239</span> optimization.incrementAndGet();<a name="line.239"></a>
-<span class="sourceLineNo">240</span> }<a name="line.240"></a>
-<span class="sourceLineNo">241</span> return optimized;<a name="line.241"></a>
-<span class="sourceLineNo">242</span> }<a name="line.242"></a>
-<span class="sourceLineNo">243</span><a name="line.243"></a>
-<span class="sourceLineNo">244</span> @Override<a name="line.244"></a>
-<span class="sourceLineNo">245</span> public Cell getNextIndexedKey() {<a name="line.245"></a>
-<span class="sourceLineNo">246</span> // Fake block boundaries by having index of next block change as we go through scan.<a name="line.246"></a>
-<span class="sourceLineNo">247</span> return PrivateCellUtil<a name="line.247"></a>
-<span class="sourceLineNo">248</span> .createFirstOnRow(CELL_WITH_VERSIONS[CELL_WITH_VERSIONS_BLOCK2_BOUNDARY]);<a name="line.248"></a>
-<span class="sourceLineNo">249</span> }<a name="line.249"></a>
-<span class="sourceLineNo">250</span> }<a name="line.250"></a>
-<span class="sourceLineNo">251</span><a name="line.251"></a>
-<span class="sourceLineNo">252</span> private static class CellWithVersionsNoOptimizeStoreScanner extends StoreScanner {<a name="line.252"></a>
-<span class="sourceLineNo">253</span> // Count of how often optimize is called and of how often it does an optimize.<a name="line.253"></a>
-<span class="sourceLineNo">254</span> final AtomicInteger optimization = new AtomicInteger(0);<a name="line.254"></a>
-<span class="sourceLineNo">255</span><a name="line.255"></a>
-<span class="sourceLineNo">256</span> CellWithVersionsNoOptimizeStoreScanner(Scan scan, ScanInfo scanInfo) throws IOException {<a name="line.256"></a>
-<span class="sourceLineNo">257</span> super(scan, scanInfo, scan.getFamilyMap().get(CF),<a name="line.257"></a>
-<span class="sourceLineNo">258</span> Arrays.<KeyValueScanner> asList(new KeyValueScanner[] {<a name="line.258"></a>
-<span class="sourceLineNo">259</span> new KeyValueScanFixture(CellComparator.getInstance(), CELL_WITH_VERSIONS) }));<a name="line.259"></a>
-<span class="sourceLineNo">260</span> }<a name="line.260"></a>
+<span class="sourceLineNo">233</span> CellWithVersionsStoreScanner(final Scan scan, ScanInfo scanInfo) throws IOException {<a name="line.233"></a>
+<span class="sourceLineNo">234</span> super(scan, scanInfo, scan.getFamilyMap().get(CF),<a name="line.234"></a>
+<span class="sourceLineNo">235</span> Arrays.<KeyValueScanner> asList(new KeyValueScanner[] {<a name="line.235"></a>
+<span class="sourceLineNo">236</span> new KeyValueScanFixture(CellComparator.getInstance(), CELL_WITH_VERSIONS) }));<a name="line.236"></a>
+<span class="sourceLineNo">237</span> }<a name="line.237"></a>
+<span class="sourceLineNo">238</span><a name="line.238"></a>
+<span class="sourceLineNo">239</span> @Override<a name="line.239"></a>
+<span class="sourceLineNo">240</span> protected boolean trySkipToNextColumn(Cell cell) throws IOException {<a name="line.240"></a>
+<span class="sourceLineNo">241</span> boolean optimized = super.trySkipToNextColumn(cell);<a name="line.241"></a>
+<span class="sourceLineNo">242</span> LOG.info("Cell=" + cell + ", nextIndex=" + CellUtil.toString(getNextIndexedKey(), false)<a name="line.242"></a>
+<span class="sourceLineNo">243</span> + ", optimized=" + optimized);<a name="line.243"></a>
+<span class="sourceLineNo">244</span> if (optimized) {<a name="line.244"></a>
+<span class="sourceLineNo">245</span> optimization.incrementAndGet();<a name="line.245"></a>
+<span class="sourceLineNo">246</span> }<a name="line.246"></a>
+<span class="sourceLineNo">247</span> return optimized;<a name="line.247"></a>
+<span class="sourceLineNo">248</span> }<a name="line.248"></a>
+<span class="sourceLineNo">249</span><a name="line.249"></a>
+<span class="sourceLineNo">250</span> @Override<a name="line.250"></a>
+<span class="sourceLineNo">251</span> public Cell getNextIndexedKey() {<a name="line.251"></a>
+<span class="sourceLineNo">252</span> // Fake block boundaries by having index of next block change as we go through scan.<a name="line.252"></a>
+<span class="sourceLineNo">253</span> return PrivateCellUtil<a name="line.253"></a>
+<span class="sourceLineNo">254</span> .createFirstOnRow(CELL_WITH_VERSIONS[CELL_WITH_VERSIONS_BLOCK2_BOUNDARY]);<a name="line.254"></a>
+<span class="sourceLineNo">255</span> }<a name="line.255"></a>
+<span class="sourceLineNo">256</span> }<a name="line.256"></a>
+<span class="sourceLineNo">257</span><a name="line.257"></a>
+<span class="sourceLineNo">258</span> private static class CellWithVersionsNoOptimizeStoreScanner extends StoreScanner {<a name="line.258"></a>
+<span class="sourceLineNo">259</span> // Count of how often optimize is called and of how often it does an optimize.<a name="line.259"></a>
+<span class="sourceLineNo">260</span> final AtomicInteger optimization = new AtomicInteger(0);<a name="line.260"></a>
<span class="sourceLineNo">261</span><a name="line.261"></a>
-<span class="sourceLineNo">262</span> @Override<a name="line.262"></a>
-<span class="sourceLineNo">263</span> protected boolean trySkipToNextColumn(Cell cell) throws IOException {<a name="line.263"></a>
-<span class="sourceLineNo">264</span> boolean optimized = super.trySkipToNextColumn(cell);<a name="line.264"></a>
-<span class="sourceLineNo">265</span> LOG.info("Cell=" + cell + ", nextIndex=" + CellUtil.toString(getNextIndexedKey(), false)<a name="line.265"></a>
-<span class="sourceLineNo">266</span> + ", optimized=" + optimized);<a name="line.266"></a>
-<span class="sourceLineNo">267</span> if (optimized) {<a name="line.267"></a>
-<span class="sourceLineNo">268</span> optimization.incrementAndGet();<a name="line.268"></a>
-<span class="sourceLineNo">269</span> }<a name="line.269"></a>
-<span class="sourceLineNo">270</span> return optimized;<a name="line.270"></a>
-<span class="sourceLineNo">271</span> }<a name="line.271"></a>
-<span class="sourceLineNo">272</span><a name="line.272"></a>
-<span class="sourceLineNo">273</span> @Override<a name="line.273"></a>
-<span class="sourceLineNo">274</span> public Cell getNextIndexedKey() {<a name="line.274"></a>
-<span class="sourceLineNo">275</span> return null;<a name="line.275"></a>
-<span class="sourceLineNo">276</span> }<a name="line.276"></a>
-<span class="sourceLineNo">277</span> }<a name="line.277"></a>
+<span class="sourceLineNo">262</span> CellWithVersionsNoOptimizeStoreScanner(Scan scan, ScanInfo scanInfo) throws IOException {<a name="line.262"></a>
+<span class="sourceLineNo">263</span> super(scan, scanInfo, scan.getFamilyMap().get(CF),<a name="line.263"></a>
+<span class="sourceLineNo">264</span> Arrays.<KeyValueScanner> asList(new KeyValueScanner[] {<a name="line.264"></a>
+<span class="sourceLineNo">265</span> new KeyValueScanFixture(CellComparator.getInstance(), CELL_WITH_VERSIONS) }));<a name="line.265"></a>
+<span class="sourceLineNo">266</span> }<a name="line.266"></a>
+<span class="sourceLineNo">267</span><a name="line.267"></a>
+<span class="sourceLineNo">268</span> @Override<a name="line.268"></a>
+<span class="sourceLineNo">269</span> protected boolean trySkipToNextColumn(Cell cell) throws IOException {<a name="line.269"></a>
+<span class="sourceLineNo">270</span> boolean optimized = super.trySkipToNextColumn(cell);<a name="line.270"></a>
+<span class="sourceLineNo">271</span> LOG.info("Cell=" + cell + ", nextIndex=" + CellUtil.toString(getNextIndexedKey(), false)<a name="line.271"></a>
+<span class="sourceLineNo">272</span> + ", optimized=" + optimized);<a name="line.272"></a>
+<span class="sourceLineNo">273</span> if (optimized) {<a name="line.273"></a>
+<span class="sourceLineNo">274</span> optimization.incrementAndGet();<a name="line.274"></a>
+<span class="sourceLineNo">275</span> }<a name="line.275"></a>
+<span class="sourceLineNo">276</span> return optimized;<a name="line.276"></a>
+<span class="sourceLineNo">277</span> }<a name="line.277"></a>
<span class="sourceLineNo">278</span><a name="line.278"></a>
-<span class="sourceLineNo">279</span> @Test<a name="line.279"></a>
-<span class="sourceLineNo">280</span> public void testWithColumnCountGetFilter() throws Exception {<a name="line.280"></a>
-<span class="sourceLineNo">281</span> Get get = new Get(ONE);<a name="line.281"></a>
-<span class="sourceLineNo">282</span> get.readAllVersions();<a name="line.282"></a>
-<span class="sourceLineNo">283</span> get.addFamily(CF);<a name="line.283"></a>
-<span class="sourceLineNo">284</span> get.setFilter(new ColumnCountGetFilter(2));<a name="line.284"></a>
-<span class="sourceLineNo">285</span><a name="line.285"></a>
-<span class="sourceLineNo">286</span> try (CellWithVersionsNoOptimizeStoreScanner scannerNoOptimize =<a name="line.286"></a>
-<span class="sourceLineNo">287</span> new CellWithVersionsNoOptimizeStoreScanner(new Scan(get), this.scanInfo)) {<a name="line.287"></a>
-<span class="sourceLineNo">288</span> List<Cell> results = new ArrayList<>();<a name="line.288"></a>
-<span class="sourceLineNo">289</span> while (scannerNoOptimize.next(results)) {<a name="line.289"></a>
-<span class="sourceLineNo">290</span> continue;<a name="line.290"></a>
-<span class="sourceLineNo">291</span> }<a name="line.291"></a>
-<span class="sourceLineNo">292</span> assertEquals(2, results.size());<a name="line.292"></a>
-<span class="sourceLineNo">293</span> assertTrue(CellUtil.matchingColumn(results.get(0), CELL_WITH_VERSIONS[0]));<a name="line.293"></a>
-<span class="sourceLineNo">294</span> assertTrue(CellUtil.matchingColumn(results.get(1), CELL_WITH_VERSIONS[2]));<a name="line.294"></a>
-<span class="sourceLineNo">295</span> assertTrue("Optimize should do some optimizations",<a name="line.295"></a>
-<span class="sourceLineNo">296</span> scannerNoOptimize.optimization.get() == 0);<a name="line.296"></a>
-<span class="sourceLineNo">297</span> }<a name="line.297"></a>
-<span class="sourceLineNo">298</span><a name="line.298"></a>
-<span class="sourceLineNo">299</span> get.setFilter(new ColumnCountGetFilter(2));<a name="line.299"></a>
-<span class="sourceLineNo">300</span> try (CellWithVersionsStoreScanner scanner =<a name="line.300"></a>
-<span class="sourceLineNo">301</span> new CellWithVersionsStoreScanner(new Scan(get), this.scanInfo)) {<a name="line.301"></a>
-<span class="sourceLineNo">302</span> List<Cell> results = new ArrayList<>();<a name="line.302"></a>
-<span class="sourceLineNo">303</span> while (scanner.next(results)) {<a name="line.303"></a>
-<span class="sourceLineNo">304</span> continue;<a name="line.304"></a>
-<span class="sourceLineNo">305</span> }<a name="line.305"></a>
-<span class="sourceLineNo">306</span> assertEquals(2, results.size());<a name="line.306"></a>
-<span class="sourceLineNo">307</span> assertTrue(CellUtil.matchingColumn(results.get(0), CELL_WITH_VERSIONS[0]));<a name="line.307"></a>
-<span class="sourceLineNo">308</span> assertTrue(CellUtil.matchingColumn(results.get(1), CELL_WITH_VERSIONS[2]));<a name="line.308"></a>
-<span class="sourceLineNo">309</span> assertTrue("Optimize should do some optimizations", scanner.optimization.get() > 0);<a name="line.309"></a>
-<span class="sourceLineNo">310</span> }<a name="line.310"></a>
-<span class="sourceLineNo">311</span> }<a name="line.311"></a>
-<span class="sourceLineNo">312</span><a name="line.312"></a>
-<span class="sourceLineNo">313</span> /*<a name="line.313"></a>
-<span class="sourceLineNo">314</span> * Test utility for building a NavigableSet for scanners.<a name="line.314"></a>
-<span class="sourceLineNo">315</span> * @param strCols<a name="line.315"></a>
-<span class="sourceLineNo">316</span> * @return<a name="line.316"></a>
-<span class="sourceLineNo">317</span> */<a name="line.317"></a>
-<span class="sourceLineNo">318</span> NavigableSet<byte[]> getCols(String ...strCols) {<a name="line.318"></a>
-<span class="sourceLineNo">319</span> NavigableSet<byte[]> cols = new TreeSet<>(Bytes.BYTES_COMPARATOR);<a name="line.319"></a>
-<span class="sourceLineNo">320</span> for (String col : strCols) {<a name="line.320"></a>
-<span class="sourceLineNo">321</span> byte[] bytes = Bytes.toBytes(col);<a name="line.321"></a>
-<span class="sourceLineNo">322</span> cols.add(bytes);<a name="line.322"></a>
-<span class="sourceLineNo">323</span> }<a name="line.323"></a>
-<span class="sourceLineNo">324</span> return cols;<a name="line.324"></a>
-<span class="sourceLineNo">325</span> }<a name="line.325"></a>
-<span class="sourceLineNo">326</span><a name="line.326"></a>
-<span class="sourceLineNo">327</span> @Test<a name="line.327"></a>
-<span class="sourceLineNo">328</span> public void testFullRowGetDoesNotOverreadWhenRowInsideOneBlock() throws IOException {<a name="line.328"></a>
-<span class="sourceLineNo">329</span> // Do a Get against row two. Row two is inside a block that starts with row TWO but ends with<a name="line.329"></a>
-<span class="sourceLineNo">330</span> // row TWO_POINT_TWO. We should read one block only.<a name="line.330"></a>
-<span class="sourceLineNo">331</span> Get get = new Get(TWO);<a name="line.331"></a>
-<span class="sourceLineNo">332</span> Scan scan = new Scan(get);<a name="line.332"></a>
-<span class="sourceLineNo">333</span> try (CellGridStoreScanner scanner = new CellGridStoreScanner(scan, this.scanInfo)) {<a name="line.333"></a>
-<span class="sourceLineNo">334</span> List<Cell> results = new ArrayList<>();<a name="line.334"></a>
-<span class="sourceLineNo">335</span> while (scanner.next(results)) {<a name="line.335"></a>
-<span class="sourceLineNo">336</span> continue;<a name="line.336"></a>
-<span class="sourceLineNo">337</span> }<a name="line.337"></a>
-<span class="sourceLineNo">338</span> // Should be four results of column 1 (though there are 5 rows in the CELL_GRID -- the<a name="line.338"></a>
-<span class="sourceLineNo">339</span> // TWO_POINT_TWO row does not have a a column ONE.<a name="line.339"></a>
-<span class="sourceLineNo">340</span> assertEquals(4, results.size());<a name="line.340"></a>
-<span class="sourceLineNo">341</span> // We should have gone the optimize route 5 times totally... an INCLUDE for the four cells<a name="line.341"></a>
-<span class="sourceLineNo">342</span> // in the row plus the DONE on the end.<a name="line.342"></a>
-<span class="sourceLineNo">343</span> assertEquals(5, scanner.count.get());<a name="line.343"></a>
-<span class="sourceLineNo">344</span> // For a full row Get, there should be no opportunity for scanner optimization.<a name="line.344"></a>
-<span class="sourceLineNo">345</span> assertEquals(0, scanner.optimization.get());<a name="line.345"></a>
-<span class="sourceLineNo">346</span> }<a name="line.346"></a>
-<span class="sourceLineNo">347</span> }<a name="line.347"></a>
-<span class="sourceLineNo">348</span><a name="line.348"></a>
-<span class="sourceLineNo">349</span> @Test<a name="line.349"></a>
-<span class="sourceLineNo">350</span> public void testFullRowSpansBlocks() throws IOException {<a name="line.350"></a>
-<span class="sourceLineNo">351</span> // Do a Get against row FOUR. It spans two blocks.<a name="line.351"></a>
-<span class="sourceLineNo">352</span> Get get = new Get(FOUR);<a name="line.352"></a>
-<span class="sourceLineNo">353</span> Scan scan = new Scan(get);<a name="line.353"></a>
-<span class="sourceLineNo">354</span> try (CellGridStoreScanner scanner = new CellGridStoreScanner(scan, this.scanInfo)) {<a name="line.354"></a>
-<span class="sourceLineNo">355</span> List<Cell> results = new ArrayList<>();<a name="line.355"></a>
-<span class="sourceLineNo">356</span> while (scanner.next(results)) {<a name="line.356"></a>
-<span class="sourceLineNo">357</span> continue;<a name="line.357"></a>
-<span class="sourceLineNo">358</span> }<a name="line.358"></a>
-<span class="sourceLineNo">359</span> // Should be four results of column 1 (though there are 5 rows in the CELL_GRID -- the<a name="line.359"></a>
-<span class="sourceLineNo">360</span> // TWO_POINT_TWO row does not have a a column ONE.<a name="line.360"></a>
-<span class="sourceLineNo">361</span> assertEquals(5, results.size());<a name="line.361"></a>
-<span class="sourceLineNo">362</span> // We should have gone the optimize route 6 times totally... an INCLUDE for the five cells<a name="line.362"></a>
-<span class="sourceLineNo">363</span> // in the row plus the DONE on the end.<a name="line.363"></a>
-<span class="sourceLineNo">364</span> assertEquals(6, scanner.count.get());<a name="line.364"></a>
-<span class="sourceLineNo">365</span> // For a full row Get, there should be no opportunity for scanner optimization.<a name="line.365"></a>
-<span class="sourceLineNo">366</span> assertEquals(0, scanner.optimization.get());<a name="line.366"></a>
-<span class="sourceLineNo">367</span> }<a name="line.367"></a>
-<span class="sourceLineNo">368</span> }<a name="line.368"></a>
-<span class="sourceLineNo">369</span><a name="line.369"></a>
-<span class="sourceLineNo">370</span> /**<a name="line.370"></a>
-<span class="sourceLineNo">371</span> * Test optimize in StoreScanner. Test that we skip to the next 'block' when we it makes sense<a name="line.371"></a>
-<span class="sourceLineNo">372</span> * reading the block 'index'.<a name="line.372"></a>
-<span class="sourceLineNo">373</span> * @throws IOException<a name="line.373"></a>
-<span class="sourceLineNo">374</span> */<a name="line.374"></a>
-<span class="sourceLineNo">375</span> @Test<a name="line.375"></a>
-<span class="sourceLineNo">376</span> public void testOptimize() throws IOException {<a name="line.376"></a>
-<span class="sourceLineNo">377</span> Scan scan = new Scan();<a name="line.377"></a>
-<span class="sourceLineNo">378</span> // A scan that just gets the first qualifier on each row of the CELL_GRID<a name="line.378"></a>
-<span class="sourceLineNo">379</span> scan.addColumn(CF, ONE);<a name="line.379"></a>
-<span class="sourceLineNo">380</span> try (CellGridStoreScanner scanner = new CellGridStoreScanner(scan, this.scanInfo)) {<a name="line.380"></a>
-<span class="sourceLineNo">381</span> List<Cell> results = new ArrayList<>();<a name="line.381"></a>
-<span class="sourceLineNo">382</span> while (scanner.next(results)) {<a name="line.382"></a>
-<span class="sourceLineNo">383</span> continue;<a name="line.383"></a>
-<span class="sourceLineNo">384</span> }<a name="line.384"></a>
-<span class="sourceLineNo">385</span> // Should be four results of column 1 (though there are 5 rows in the CELL_GRID -- the<a name="line.385"></a>
-<span class="sourceLineNo">386</span> // TWO_POINT_TWO row does not have a a column ONE.<a name="line.386"></a>
-<span class="sourceLineNo">387</span> assertEquals(4, results.size());<a name="line.387"></a>
-<span class="sourceLineNo">388</span> for (Cell cell: results) {<a name="line.388"></a>
-<span class="sourceLineNo">389</span> assertTrue(Bytes.equals(ONE, 0, ONE.length,<a name="line.389"></a>
-<span class="sourceLineNo">390</span> cell.getQualifierArray(), cell.getQualifierOffset(), cell.getQualifierLength()));<a name="line.390"></a>
-<span class="sourceLineNo">391</span> }<a name="line.391"></a>
-<span class="sourceLineNo">392</span> assertTrue("Optimize should do some optimizations", scanner.optimization.get() > 0);<a name="line.392"></a>
-<span class="sourceLineNo">393</span> }<a name="line.393"></a>
-<span class="sourceLineNo">394</span> }<a name="line.394"></a>
-<span class="sourceLineNo">395</span><a name="line.395"></a>
-<span class="sourceLineNo">396</span> /**<a name="line.396"></a>
-<span class="sourceLineNo">397</span> * Ensure the optimize Scan method in StoreScanner does not get in the way of a Get doing minimum<a name="line.397"></a>
-<span class="sourceLineNo">398</span> * work... seeking to start of block and then SKIPPING until we find the wanted Cell.<a name="line.398"></a>
-<span class="sourceLineNo">399</span> * This 'simple' scenario mimics case of all Cells fitting inside a single HFileBlock.<a name="line.399"></a>
-<span class="sourceLineNo">400</span> * See HBASE-15392. This test is a little cryptic. Takes a bit of staring to figure what it up to.<a name="line.400"></a>
-<span class="sourceLineNo">401</span> * @throws IOException<a name="line.401"></a>
-<span class="sourceLineNo">402</span> */<a name="line.402"></a>
-<span class="sourceLineNo">403</span> @Test<a name="line.403"></a>
-<span class="sourceLineNo">404</span> public void testOptimizeAndGet() throws IOException {<a name="line.404"></a>
-<span class="sourceLineNo">405</span> // First test a Get of two columns in the row R2. Every Get is a Scan. Get columns named<a name="line.405"></a>
-<span class="sourceLineNo">406</span> // R2 and R3.<a name="line.406"></a>
-<span class="sourceLineNo">407</span> Get get = new Get(TWO);<a name="line.407"></a>
-<span class="sourceLineNo">408</span> get.addColumn(CF, TWO);<a name="line.408"></a>
-<span class="sourceLineNo">409</span> get.addColumn(CF, THREE);<a name="line.409"></a>
-<span class="sourceLineNo">410</span> Scan scan = new Scan(get);<a name="line.410"></a>
-<span class="sourceLineNo">411</span> try (CellGridStoreScanner scanner = new CellGridStoreScanner(scan, this.scanInfo)) {<a name="line.411"></a>
-<span class="sourceLineNo">412</span> List<Cell> results = new ArrayList<>();<a name="line.412"></a>
-<span class="sourceLineNo">413</span> // For a Get there should be no more next's after the first call.<a name="line.413"></a>
-<span class="sourceLineNo">414</span> assertEquals(false, scanner.next(results));<a name="line.414"></a>
-<span class="sourceLineNo">415</span> // Should be one result only.<a name="line.415"></a>
-<span class="sourceLineNo">416</span> assertEquals(2, results.size());<a name="line.416"></a>
-<span class="sourceLineNo">417</span> // And we should have gone through optimize twice only.<a name="line.417"></a>
-<span class="sourceLineNo">418</span> assertEquals("First qcode is SEEK_NEXT_COL and second INCLUDE_AND_SEEK_NEXT_ROW", 3,<a name="line.418"></a>
-<span class="sourceLineNo">419</span> scanner.count.get());<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> /**<a name="line.423"></a>
-<span class="sourceLineNo">424</span> * Ensure that optimize does not cause the Get to do more seeking than required. Optimize<a name="line.424"></a>
-<span class="sourceLineNo">425</span> * (see HBASE-15392) was causing us to seek all Cells in a block when a Get Scan if the next block<a name="line.425"></a>
-<span class="sourceLineNo">426</span> * index/start key was a different row to the current one. A bug. We'd call next too often<a name="line.426"></a>
-<span class="sourceLineNo">427</span> * because we had to exhaust all Cells in the current row making us load the next block just to<a name="line.427"></a>
-<span class="sourceLineNo">428</span> * discard what we read there. This test is a little cryptic. Takes a bit of staring to figure<a name="line.428"></a>
-<span class="sourceLineNo">429</span> * what it up to.<a name="line.429"></a>
-<span class="sourceLineNo">430</span> * @throws IOException<a name="line.430"></a>
-<span class="sourceLineNo">431</span> */<a name="line.431"></a>
-<span class="sourceLineNo">432</span> @Test<a name="line.432"></a>
-<span class="sourceLineNo">433</span> public void testOptimizeAndGetWithFakedNextBlockIndexStart() throws IOException {<a name="line.433"></a>
-<span class="sourceLineNo">434</span> // First test a Get of second column in the row R2. Every Get is a Scan. Second column has a<a name="line.434"></a>
-<span class="sourceLineNo">435</span> // qualifier of R2.<a name="line.435"></a>
-<span class="sourceLineNo">436</span> Get get = new Get(THREE);<a name="line.436"></a>
-<span class="sourceLineNo">437</span> get.addColumn(CF, TWO);<a name="line.437"></a>
-<span class="sourceLineNo">438</span> Scan scan = new Scan(get);<a name="line.438"></a>
-<span class="sourceLineNo">439</span> try (CellGridStoreScanner scanner = new CellGridStoreScanner(scan, this.scanInfo)) {<a name="line.439"></a>
-<span class="sourceLineNo">440</span> List<Cell> results = new ArrayList<>();<a name="line.440"></a>
-<span class="sourceLineNo">441</span> // For a Get there should be no more next's after the first call.<a name="line.441"></a>
-<span class="sourceLineNo">442</span> assertEquals(false, scanner.next(results));<a name="line.442"></a>
-<span class="sourceLineNo">443</span> // Should be one result only.<a name="line.443"></a>
-<span class="sourceLineNo">444</span> assertEquals(1, results.size());<a name="line.444"></a>
-<span class="sourceLineNo">445</span> // And we should have gone through optimize twice only.<a name="line.445"></a>
-<span class="sourceLineNo">446</span> assertEquals("First qcode is SEEK_NEXT_COL and second INCLUDE_AND_SEEK_NEXT_ROW", 2,<a name="line.446"></a>
-<span class="sourceLineNo">447</span> scanner.count.get());<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>
-<span class="sourceLineNo">450</span><a name="line.450"></a>
-<span class="sourceLineNo">451</span> @Test<a name="line.451"></a>
-<span class="sourceLineNo">452</span> public void testScanTimeRange() throws IOException {<a name="line.452"></a>
-<span class="sourceLineNo">453</span> String r1 = "R1";<a name="line.453"></a>
-<span class="sourceLineNo">454</span> // returns only 1 of these 2 even though same timestamp<a name="line.454"></a>
-<span class="sourceLineNo">455</span> KeyValue [] kvs = new KeyValue[] {<a name="line.455"></a>
-<span class="sourceLineNo">456</span> create(r1, CF_STR, "a", 1, KeyValue.Type.Put, "dont-care"),<a name="line.456"></a>
-<span class="sourceLineNo">457</span> create(r1, CF_STR, "a", 2, KeyValue.Type.Put, "dont-care"),<a name="line.457"></a>
-<span class="sourceLineNo">458</span> create(r1, CF_STR, "a", 3, KeyValue.Type.Put, "dont-care"),<a name="line.458"></a>
-<span class="sourceLineNo">459</span> create(r1, CF_STR, "a", 4, KeyValue.Type.Put, "dont-care"),<a name="line.459"></a>
-<span class="sourceLineNo">460</span> create(r1, CF_STR, "a", 5, KeyValue.Type.Put, "dont-care"),<a name="line.460"></a>
-<span class="sourceLineNo">461</span> };<a name="line.461"></a>
-<span class="sourceLineNo">462</span> List<KeyValueScanner> scanners = Arrays.<KeyValueScanner>asList(<a name="line.462"></a>
-<span class="sourceLineNo">463</span> new KeyValueScanner[] {<a name="line.463"></a>
-<span class="sourceLineNo">464</span> new KeyValueScanFixture(CellComparator.getInstance(), kvs)<a name="line.464"></a>
-<span class="sourceLineNo">465</span> });<a name="line.465"></a>
-<span class="sourceLineNo">466</span> Scan scanSpec = new Scan().withStartRow(Bytes.toBytes(r1));<a name="line.466"></a>
-<span class="sourceLineNo">467</span> scanSpec.setTimeRange(0, 6);<a name="line.467"></a>
-<span class="sourceLineNo">468</span> scanSpec.readAllVersions();<a name="line.468"></a>
-<span class="sourceLineNo">469</span> List<Cell> results = null;<a name="line.469"></a>
-<span class="sourceLineNo">470</span> try (StoreScanner scan = new StoreScanner(scanSpec, scanInfo, getCols("a"), scanners)) {<a name="line.470"></a>
-<span class="sourceLineNo">471</span> results = new ArrayList<>();<a name="line.471"></a>
-<span class="sourceLineNo">472</span> assertEquals(true, scan.next(results));<a name="line.472"></a>
-<span class="sourceLineNo">473</span> assertEquals(5, results.size());<a name="line.473"></a>
-<span class="sourceLineNo">474</span> assertEquals(kvs[kvs.length - 1], results.get(0));<a name="line.474"></a>
-<span class="sourceLineNo">475</span> }<a name="line.475"></a>
-<span class="sourceLineNo">476</span> // Scan limited TimeRange<a name="line.476"></a>
-<span class="sourceLineNo">477</span> scanSpec = new Scan().withStartRow(Bytes.toBytes(r1));<a name="line.477"></a>
-<span class="sourceLineNo">478</span> scanSpec.setTimeRange(1, 3);<a name="line.478"></a>
-<span class="sourceLineNo">479</span> scanSpec.readAllVersions();<a name="line.479"></a>
-<span class="sourceLineNo">480</span> try (StoreScanner scan = new StoreScanner(scanSpec, scanInfo, getCols("a"), scanners)) {<a name="line.480"></a>
-<span class="sourceLineNo">481</span> results = new ArrayList<>();<a name="line.481"></a>
-<span class="sourceLineNo">482</span> assertEquals(true, scan.next(results));<a name="line.482"></a>
-<span class="sourceLineNo">483</span> assertEquals(2, results.size());<a name="line.483"></a>
-<span class="sourceLineNo">484</span> }<a name="line.484"></a>
-<span class="sourceLineNo">485</span> // Another range.<a name="line.485"></a>
-<span class="sourceLineNo">486</span> scanSpec = new Scan().withStartRow(Bytes.toBytes(r1));<a name="line.486"></a>
-<span class="sourceLineNo">487</span> scanSpec.setTimeRange(5, 10);<a name="line.487"></a>
-<span class="sourceLineNo">488</span> scanSpec.readAllVersions();<a name="line.488"></a>
-<span class="sourceLineNo">489</span> try (StoreScanner scan = new StoreScanner(scanSpec, scanInfo, getCols("a"), scanners)) {<a name="line.489"></a>
-<span class="sourceLineNo">490</span> results = new ArrayList<>();<a name="line.490"></a>
-<span class="sourceLineNo">491</span> assertEquals(true, scan.next(results));<a name="line.491"></a>
-<span class="sourceLineNo">492</span> assertEquals(1, results.size());<a name="line.492"></a>
-<span class="sourceLineNo">493</span> }<a name="line.493"></a>
-<span class="sourceLineNo">494</span> // See how TimeRange and Versions interact.<a name="line.494"></a>
-<span class="sourceLineNo">495</span> // Another range.<a name="line.495"></a>
-<span class="sourceLineNo">496</span> scanSpec = new Scan().withStartRow(Bytes.toBytes(r1));<a name="line.496"></a>
-<span class="sourceLineNo">497</span> scanSpec.setTimeRange(0, 10);<a name="line.497"></a>
-<span class="sourceLineNo">498</span> scanSpec.readVersions(3);<a name="line.498"></a>
-<span class="sourceLineNo">499</span> try (StoreScanner scan = new StoreScanner(scanSpec, scanInfo, getCols("a"), scanners)) {<a name="line.499"></a>
-<span class="sourceLineNo">500</span> results = new ArrayList<>();<a name="line.500"></a>
-<span class="sourceLineNo">501</span> assertEquals(true, scan.next(results));<a name="line.501"></a>
-<span class="sourceLineNo">502</span> assertEquals(3, results.size());<a name="line.502"></a>
-<span class="sourceLineNo">503</span> }<a name="line.503"></a>
-<span class="sourceLineNo">504</span> }<a name="line.504"></a>
-<span class="sourceLineNo">505</span><a name="line.505"></a>
-<span class="sourceLineNo">506</span> @Test<a name="line.506"></a>
-<span class="sourceLineNo">507</span> public void testScanSameTimestamp() throws IOException {<a name="line.507"></a>
-<span class="sourceLineNo">508</span> // returns only 1 of these 2 even though same timestamp<a name="line.508"></a>
-<span class="sourceLineNo">509</span> KeyValue [] kvs = new KeyValue[] {<a name="line.509"></a>
-<span class="sourceLineNo">510</span> create("R1", "cf", "a", 1, KeyValue.Type.Put, "dont-care"),<a name="line.510"></a>
-<span class="sourceLineNo">511</span> create("R1", "cf", "a", 1, KeyValue.Type.Put, "dont-care"),<a name="line.511"></a>
-<span class="sourceLineNo">512</span> };<a name="line.512"></a>
-<span class="sourceLineNo">513</span> List<KeyValueScanner> scanners = Arrays.asList(<a name="line.513"></a>
-<span class="sourceLineNo">514</span> new KeyValueScanner[] {<a name="line.514"></a>
-<span class="sourceLineNo">515</span> new KeyValueScanFixture(CellComparator.getInstance(), kvs)<a name="line.515"></a>
-<span class="sourceLineNo">516</span> });<a name="line.516"></a>
-<span class="sourceLineNo">517</span><a name="line.517"></a>
-<span class="sourceLineNo">518</span> Scan scanSpec = new Scan().withStartRow(Bytes.toBytes("R1"));<a name="line.518"></a>
-<span class="sourceLineNo">519</span> // this only uses maxVersions (default=1) and TimeRange (default=all)<a name="line.519"></a>
-<span class="sourceLineNo">520</span> try (StoreScanner scan = new StoreScanner(scanSpec, scanInfo, getCols("a"), scanners)) {<a name="line.520"></a>
-<span class="sourceLineNo">521</span> List<Cell> results = new ArrayList<>();<a name="line.521"></a>
-<span class="sourceLineNo">522</span> assertEquals(true, scan.next(results));<a name="line.522"></a>
-<span class="sourceLineNo">523</span> assertEquals(1, results.size());<a name="line.523"></a>
-<span class="sourceLineNo">524</span> assertEquals(kvs[0], results.get(0));<a name="line.524"></a>
-<span class="sourceLineNo">525</span> }<a name="line.525"></a>
-<span class="sourceLineNo">526</span> }<a name="line.526"></a>
-<span class="sourceLineNo">527</span><a name="line.527"></a>
-<span class="sourceLineNo">528</span> /*<a name="line.528"></a>
-<span class="sourceLineNo">529</span> * Test test shows exactly how the matcher's return codes confuses the StoreScanner<a name="line.529"></a>
-<span class="sourceLineNo">530</span> * and prevent it from doing the right thing. Seeking once, then nexting twice<a name="line.530"></a>
-<span class="sourceLineNo">531</span> * should return R1, then R2, but in this case it doesnt.<a name="line.531"></a>
-<span class="sourceLineNo">532</span> * TODO this comment makes no sense above. Appears to do the right thing.<a name="line.532"></a>
-<span class="sourceLineNo">533</span> * @throws IOException<a name="line.533"></a>
-<span class="sourceLineNo">534</span> */<a name="line.534"></a>
-<span class="sourceLineNo">535</span> @Test<a name="line.535"></a>
-<span class="sourceLineNo">536</span> public void testWontNextToNext() throws IOException {<a name="line.536"></a>
-<span class="sourceLineNo">537</span> // build the scan file:<a name="line.537"></a>
-<span class="sourceLineNo">538</span> KeyValue [] kvs = new KeyValue[] {<a name="line.538"></a>
-<span class="sourceLineNo">539</span> create("R1", "cf", "a", 2, KeyValue.Type.Put, "dont-care"),<a name="line.539"></a>
-<span class="sourceLineNo">540</span> create("R1", "cf", "a", 1, KeyValue.Type.Put, "dont-care"),<a name="line.540"></a>
-<span class="sourceLineNo">541</span> create("R2", "cf", "a", 1, KeyValue.Type.Put, "dont-care")<a name="line.541"></a>
-<span class="sourceLineNo">542</span> };<a name="line.542"></a>
-<span class="sourceLineNo">543</span> List<KeyValueScanner> scanners = scanFixture(kvs);<a name="line.543"></a>
-<span class="sourceLineNo">544</span><a name="line.544"></a>
-<span class="sourceLineNo">545</span> Scan scanSpec = new Scan().withStartRow(Bytes.toBytes("R1"));<a name="line.545"></a>
-<span class="sourceLineNo">546</span> // this only uses maxVersions (default=1) and TimeRange (default=all)<a name="line.546"></a>
-<span class="sourceLineNo">547</span> try (StoreScanner scan = new StoreScanner(scanSpec, scanInfo, getCols("a"), scanners)) {<a name="line.547"></a>
-<span class="sourceLineNo">548</span> List<Cell> results = new ArrayList<>();<a name="line.548"></a>
-<span class="sourceLineNo">549</span> scan.next(results);<a name="line.549"></a>
-<span class="sourceLineNo">550</span> assertEquals(1, results.size());<a name="line.550"></a>
-<span class="sourceLineNo">551</span> assertEquals(kvs[0], results.get(0));<a name="line.551"></a>
-<span class="sourceLineNo">552</span> // should be ok...<a name="line.552"></a>
-<span class="sourceLineNo">553</span> // now scan _next_ again.<a name="line.553"></a>
-<span class="sourceLineNo">554</span> results.clear();<a name="line.554"></a>
+<span class="sourceLineNo">279</span> @Override<a name="line.279"></a>
+<span class="sourceLineNo">280</span> public Cell getNextIndexedKey() {<a name="line.280"></a>
+<span class="sourceLineNo">281</span> return null;<a name="line.281"></a>
+<span class="sourceLineNo">282</span> }<a name="line.282"></a>
+<span class="sourceLineNo">283</span> }<a name="line.283"></a>
+<span class="sourceLineNo">284</span><a name="line.284"></a>
+<span class="sourceLineNo">285</span> @Test<a name="line.285"></a>
+<span class="sourceLineNo">286</span> public void testWithColumnCountGetFilter() throws Exception {<a name="line.286"></a>
+<span class="sourceLineNo">287</span> Get get = new Get(ONE);<a name="line.287"></a>
+<span class="sourceLineNo">288</span> get.readAllVersions();<a name="line.288"></a>
+<span class="sourceLineNo">289</span> get.addFamily(CF);<a name="line.289"></a>
+<span class="sourceLineNo">290</span> get.setFilter(new ColumnCountGetFilter(2));<a name="line.290"></a>
+<span class="sourceLineNo">291</span><a name="line.291"></a>
+<span class="sourceLineNo">292</span> try (CellWithVersionsNoOptimizeStoreScanner scannerNoOptimize =<a name="line.292"></a>
+<span class="sourceLineNo">293</span> new CellWithVersionsNoOptimizeStoreScanner(new Scan(get), this.scanInfo)) {<a name="line.293"></a>
+<span class="sourceLineNo">294</span> List<Cell> results = new ArrayList<>();<a name="line.294"></a>
+<span class="sourceLineNo">295</span> while (scannerNoOptimize.next(results)) {<a name="line.295"></a>
+<span class="sourceLineNo">296</span> continue;<a name="line.296"></a>
+<span class="sourceLineNo">297</span> }<a name="line.297"></a>
+<span class="sourceLineNo">298</span> assertEquals(2, results.size());<a name="line.298"></a>
+<span class="sourceLineNo">299</span> assertTrue(CellUtil.matchingColumn(results.get(0), CELL_WITH_VERSIONS[0]));<a name="line.299"></a>
+<span class="sourceLineNo">300</span> assertTrue(CellUtil.matchingColumn(results.get(1), CELL_WITH_VERSIONS[2]));<a name="line.300"></a>
+<span class="sourceLineNo">301</span> assertTrue("Optimize should do some optimizations",<a name="line.301"></a>
+<span class="sourceLineNo">302</span> scannerNoOptimize.optimization.get() == 0);<a name="line.302"></a>
+<span class="sourceLineNo">303</span> }<a name="line.303"></a>
+<span class="sourceLineNo">304</span><a name="line.304"></a>
+<span class="sourceLineNo">305</span> get.setFilter(new ColumnCountGetFilter(2));<a name="line.305"></a>
+<span class="sourceLineNo">306</span> try (CellWithVersionsStoreScanner scanner =<a name="line.306"></a>
+<span class="sourceLineNo">307</span> new CellWithVersionsStoreScanner(new Scan(get), this.scanInfo)) {<a name="line.307"></a>
+<span class="sourceLineNo">308</span> List<Cell> results = new ArrayList<>();<a name="line.308"></a>
+<span class="sourceLineNo">309</span> while (scanner.next(results)) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span> continue;<a name="line.310"></a>
+<span class="sourceLineNo">311</span> }<a name="line.311"></a>
+<span class="sourceLineNo">312</span> assertEquals(2, results.size());<a name="line.312"></a>
+<span class="sourceLineNo">313</span> assertTrue(CellUtil.matchingColumn(results.get(0), CELL_WITH_VERSIONS[0]));<a name="line.313"></a>
+<span class="sourceLineNo">314</span> assertTrue(CellUtil.matchingColumn(results.get(1), CELL_WITH_VERSIONS[2]));<a name="line.314"></a>
+<span class="sourceLineNo">315</span> assertTrue("Optimize should do some optimizations", scanner.optimization.get() > 0);<a name="line.315"></a>
+<span class="sourceLineNo">316</span> }<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> * Test utility for building a NavigableSet for scanners.<a name="line.320"></a>
+<span class="sourceLineNo">321</span> * @param strCols<a name="line.321"></a>
+<span class="sourceLineNo">322</span> * @return<a name="line.322"></a>
+<span class="sourceLineNo">323</span> */<a name="line.323"></a>
+<span class="sourceLineNo">324</span> NavigableSet<byte[]> getCols(String ...strCols) {<a name="line.324"></a>
+<span class="sourceLineNo">325</span> NavigableSet<byte[]> cols = new TreeSet<>(Bytes.BYTES_COMPARATOR);<a name="line.325"></a>
+<span class="sourceLineNo">326</span> for (String col : strCols) {<a name="line.326"></a>
+<span class="sourceLineNo">327</span> byte[] bytes = Bytes.toBytes(col);<a name="line.327"></a>
+<span class="sourceLineNo">328</span> cols.add(bytes);<a name="line.328"></a>
+<span class="sourceLineNo">329</span> }<a name="line.329"></a>
+<span class="sourceLineNo">330</span> return cols;<a name="line.330"></a>
+<span class="sourceLineNo">331</span> }<a name="line.331"></a>
+<span class="sourceLineNo">332</span><a name="line.332"></a>
+<span class="sourceLineNo">333</span> @Test<a name="line.333"></a>
+<span class="sourceLineNo">334</span> public void testFullRowGetDoesNotOverreadWhenRowInsideOneBlock() throws IOException {<a name="line.334"></a>
+<span class="sourceLineNo">335</span> // Do a Get against row two. Row two is inside a block that starts with row TWO but ends with<a name="line.335"></a>
+<span class="sourceLineNo">336</span> // row TWO_POINT_TWO. We should read one block only.<a name="line.336"></a>
+<span class="sourceLineNo">337</span> Get get = new Get(TWO);<a name="line.337"></a>
+<span class="sourceLineNo">338</span> Scan scan = new Scan(get);<a name="line.338"></a>
+<span class="sourceLineNo">339</span> try (CellGridStoreScanner scanner = new CellGridStoreScanner(scan, this.scanInfo)) {<a name="line.339"></a>
+<span class="sourceLineNo">340</span> List<Cell> results = new ArrayList<>();<a name="line.340"></a>
+<span class="sourceLineNo">341</span> while (scanner.next(results)) {<a name="line.341"></a>
+<span class="sourceLineNo">342</span> continue;<a name="line.342"></a>
+<span class="sourceLineNo">343</span> }<a name="line.343"></a>
+<span class="sourceLineNo">344</span> // Should be four results of column 1 (though there are 5 rows in the CELL_GRID -- the<a name="line.344"></a>
+<span class="sourceLineNo">345</span> // TWO_POINT_TWO row does not have a a column ONE.<a name="line.345"></a>
+<span class="sourceLineNo">346</span> assertEquals(4, results.size());<a name="line.346"></a>
+<span class="sourceLineNo">347</span> // We should have gone the optimize route 5 times totally... an INCLUDE for the four cells<a name="line.347"></a>
+<span class="sourceLineNo">348</span> // in the row plus the DONE on the end.<a name="line.348"></a>
+<span class="sourceLineNo">349</span> assertEquals(5, scanner.count.get());<a name="line.349"></a>
+<span class="sourceLineNo">350</span> // For a full row Get, there should be no opportunity for scanner optimization.<a name="line.350"></a>
+<span class="sourceLineNo">351</span> assertEquals(0, scanner.optimization.get());<a name="line.351"></a>
+<span class="sourceLineNo">352</span> }<a name="line.352"></a>
+<span class="sourceLineNo">353</span> }<a name="line.353"></a>
+<span class="sourceLineNo">354</span><a name="line.354"></a>
+<span class="sourceLineNo">355</span> @Test<a name="line.355"></a>
+<span class="sourceLineNo">356</span> public void testFullRowSpansBlocks() throws IOException {<a name="line.356"></a>
+<span class="sourceLineNo">357</span> // Do a Get against row FOUR. It spans two blocks.<a name="line.357"></a>
+<span class="sourceLineNo">358</span> Get get = new Get(FOUR);<a name="line.358"></a>
+<span class="sourceLineNo">359</span> Scan scan = new Scan(get);<a name="line.359"></a>
+<span class="sourceLineNo">360</span> try (CellGridStoreScanner scanner = new CellGridStoreScanner(scan, this.scanInfo)) {<a name="line.360"></a>
+<span class="sourceLineNo">361</span> List<Cell> results = new ArrayList<>();<a name="line.361"></a>
+<span class="sourceLineNo">362</span> while (scanner.next(results)) {<a name="line.362"></a>
+<span class="sourceLineNo">363</span> continue;<a name="line.363"></a>
+<span class="sourceLineNo">364</span> }<a name="line.364"></a>
+<span class="sourceLineNo">365</span> // Should be four results of column 1 (though there are 5 rows in the CELL_GRID -- the<a name="line.365"></a>
+<span class="sourceLineNo">366</span> // TWO_POINT_TWO row does not have a a column ONE.<a name="line.366"></a>
+<span class="sourceLineNo">367</span> assertEquals(5, results.size());<a name="line.367"></a>
+<span class="sourceLineNo">368</span> // We should have gone the optimize route 6 times totally... an INCLUDE for the five cells<a name="line.368"></a>
+<span class="sourceLineNo">369</span> // in the row plus the DONE on the end.<a name="line.369"></a>
+<span class="sourceLineNo">370</span> assertEquals(6, scanner.count.get());<a name="line.370"></a>
+<span class="sourceLineNo">371</span> // For a full row Get, there should be no opportunity for scanner optimization.<a name="line.371"></a>
+<span class="sourceLineNo">372</span> assertEquals(0, scanner.optimization.get());<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> /**<a name="line.376"></a>
+<span class="sourceLineNo">377</span> * Test optimize in StoreScanner. Test that we skip to the next 'block' when we it makes sense<a name="line.377"></a>
+<span class="sourceLineNo">378</span> * reading the block 'index'.<a name="line.378"></a>
+<span class="sourceLineNo">379</span> * @throws IOException<a name="line.379"></a>
+<span class="sourceLineNo">380</span> */<a name="line.380"></a>
+<span class="sourceLineNo">381</span> @Test<a name="line.381"></a>
+<span class="sourceLineNo">382</span> public void testOptimize() throws IOException {<a name="line.382"></a>
+<span class="sourceLineNo">383</span> Scan scan = new Scan();<a name="line.383"></a>
+<span class="sourceLineNo">384</span> // A scan that just gets the first qualifier on each row of the CELL_GRID<a name="line.384"></a>
+<span class="sourceLineNo">385</span> scan.addColumn(CF, ONE);<a name="line.385"></a>
+<span class="sourceLineNo">386</span> try (CellGridStoreScanner scanner = new CellGridStoreScanner(scan, this.scanInfo)) {<a name="line.386"></a>
+<span class="sourceLineNo">387</span> List<Cell> results = new ArrayList<>();<a name="line.387"></a>
+<span class="sourceLineNo">388</span> while (scanner.next(results)) {<a name="line.388"></a>
+<span class="sourceLineNo">389</span> continue;<a name="line.389"></a>
+<span class="sourceLineNo">390</span> }<a name="line.390"></a>
+<span class="sourceLineNo">391</span> // Should be four results of column 1 (though there are 5 rows in the CELL_GRID -- the<a name="line.391"></a>
+<span class="sourceLineNo">392</span> // TWO_POINT_TWO row does not have a a column ONE.<a name="line.392"></a>
+<span class="sourceLineNo">393</span> assertEquals(4, results.size());<a name="line.393"></a>
+<span class="sourceLineNo">394</span> for (Cell cell: results) {<a name="line.394"></a>
+<span class="sourceLineNo">395</span> assertTrue(Bytes.equals(ONE, 0, ONE.length,<a name="line.395"></a>
+<span class="sourceLineNo">396</span> cell.getQualifierArray(), cell.getQualifierOffset(), cell.getQualifierLength()));<a name="line.396"></a>
+<span class="sourceLineNo">397</span> }<a name="line.397"></a>
+<span class="sourceLineNo">398</span> assertTrue("Optimize should do some optimizations", scanner.optimization.get() > 0);<a name="line.398"></a>
+<span class="sourceLineNo">399</span> }<a name="line.399"></a>
+<span class="sourceLineNo">400</span> }<a name="line.400"></a>
+<span class="sourceLineNo">401</span><a name="line.401"></a>
+<span class="sourceLineNo">402</span> /**<a name="line.402"></a>
+<span class="sourceLineNo">403</span> * Ensure the optimize Scan method in StoreScanner does not get in the way of a Get doing minimum<a name="line.403"></a>
+<span class="sourceLineNo">404</span> * work... seeking to start of block and then SKIPPING until we find the wanted Cell.<a name="line.404"></a>
+<span class="sourceLineNo">405</span> * This 'simple' scenario mimics case of all Cells fitting inside a single HFileBlock.<a name="line.405"></a>
+<span class="sourceLineNo">406</span> * See HBASE-15392. This test is a little cryptic. Takes a bit of staring to figure what it up to.<a name="line.406"></a>
+<span class="sourceLineNo">407</span> * @throws IOException<a name="line.407"></a>
+<span class="sourceLineNo">408</span> */<a name="line.408"></a>
+<span class="sourceLineNo">409</span> @Test<a name="line.409"></a>
+<span class="sourceLineNo">410</span> public void testOptimizeAndGet() throws IOException {<a name="line.410"></a>
+<span class="sourceLineNo">411</span> // First test a Get of two columns in the row R2. Every Get is a Scan. Get columns named<a name="line.411"></a>
+<span class="sourceLineNo">412</span> // R2 and R3.<a name="line.412"></a>
+<span class="sourceLineNo">413</span> Get get = new Get(TWO);<a name="line.413"></a>
+<span class="sourceLineNo">414</span> get.addColumn(CF, TWO);<a name="line.414"></a>
+<span class="sourceLineNo">415</span> get.addColumn(CF, THREE);<a name="line.415"></a>
+<span class="sourceLineNo">416</span> Scan scan = new Scan(get);<a name="line.416"></a>
+<span class="sourceLineNo">417</span> try (CellGridStoreScanner scanner = new CellGridStoreScanner(scan, this.scanInfo)) {<a name="line.417"></a>
+<span class="sourceLineNo">418</span> List<Cell> results = new ArrayList<>();<a name="line.418"></a>
+<span class="sourceLineNo">419</span> // For a Get there should be no more next's after the first call.<a name="line.419"></a>
+<span class="sourceLineNo">420</span> assertEquals(false, scanner.next(results));<a name="line.420"></a>
+<span class="sourceLineNo">421</span> // Should be one result only.<a name="line.421"></a>
+<span class="sourceLineNo">422</span> assertEquals(2, results.size());<a name="line.422"></a>
+<span class="sourceLineNo">423</span> // And we should have gone through optimize twice only.<a name="line.423"></a>
+<span class="sourceLineNo">424</span> assertEquals("First qcode is SEEK_NEXT_COL and second INCLUDE_AND_SEEK_NEXT_ROW", 3,<a name="line.424"></a>
+<span class="sourceLineNo">425</span> scanner.count.get());<a name="line.425"></a>
+<span class="sourceLineNo">426</span> }<a name="line.426"></a>
+<span class="sourceLineNo">427</span> }<a name="line.427"></a>
+<span class="sourceLineNo">428</span><a name="line.428"></a>
+<span class="sourceLineNo">429</span> /**<a name="line.429"></a>
+<span class="sourceLineNo">430</span> * Ensure that optimize does not cause the Get to do more seeking than required. Optimize<a name="line.430"></a>
+<span class="sourceLineNo">431</span> * (see HBASE-15392) was causing us to seek all Cells in a block when a Get Scan if the next block<a name="line.431"></a>
+<span class="sourceLineNo">432</span> * index/start key was a different row to the current one. A bug. We'd call next too often<a name="line.432"></a>
+<span class="sourceLineNo">433</span> * because we had to exhaust all Cells in the current row making us load the next block just to<a name="line.433"></a>
+<span class="sourceLineNo">434</span> * discard what we read there. This test is a little cryptic. Takes a bit of staring to figure<a name="line.434"></a>
+<span class="sourceLineNo">435</span> * what it up to.<a name="line.435"></a>
+<span class="sourceLineNo">436</span> * @throws IOException<a name="line.436"></a>
+<span class="sourceLineNo">437</span> */<a name="line.437"></a>
+<span class="sourceLineNo">438</span> @Test<a name="line.438"></a>
+<span class="sourceLineNo">439</span> public void testOptimizeAndGetWithFakedNextBlockIndexStart() throws IOException {<a name="line.439"></a>
+<span class="sourceLineNo">440</span> // First test a Get of second column in the row R2. Every Get is a Scan. Second column has a<a name="line.440"></a>
+<span class="sourceLineNo">441</span> // qualifier of R2.<a name="line.441"></a>
+<span class="sourceLineNo">442</span> Get get = new Get(THREE);<a name="line.442"></a>
+<span class="sourceLineNo">443</span> get.addColumn(CF, TWO);<a name="line.443"></a>
+<span class="sourceLineNo">444</span> Scan scan = new Scan(get);<a name="line.444"></a>
+<span class="sourceLineNo">445</span> try (CellGridStoreScanner scanner = new CellGridStoreScanner(scan, this.scanInfo)) {<a name="line.445"></a>
+<span class="sourceLineNo">446</span> List<Cell> results = new ArrayList<>();<a name="line.446"></a>
+<span class="sourceLineNo">447</span> // For a Get there should be no more next's after the first call.<a name="line.447"></a>
+<span class="sourceLineNo">448</span> assertEquals(false, scanner.next(results));<a name="line.448"></a>
+<span class="sourceLineNo">449</span> // Should be one result only.<a name="line.449"></a>
+<span class="sourceLineNo">450</span> assertEquals(1, results.size());<a name="line.450"></a>
+<span class="sourceLineNo">451</span> // And we should have gone through optimize twice only.<a name="line.451"></a>
+<span class="sourceLineNo">452</span> assertEquals("First qcode is SEEK_NEXT_COL and second INCLUDE_AND_SEEK_NEXT_ROW", 2,<a name="line.452"></a>
+<span class="sourceLineNo">453</span> scanner.count.get());<a name="line.453"></a>
+<span class="sourceLineNo">454</span> }<a name="line.454"></a>
+<span class="sourceLineNo">455</span> }<a name="line.455"></a>
+<span class="sourceLineNo">456</span><a name="line.456"></a>
+<span class="sourceLineNo">457</span> @Test<a name="line.457"></a>
+<span class="sourceLineNo">458</span> public void testScanTimeRange() throws IOException {<a name="line.458"></a>
+<span class="sourceLineNo">459</span> String r1 = "R1";<a name="line.459"></a>
+<span class="sourceLineNo">460</span> // returns only 1 of these 2 even though same timestamp<a name="line.460"></a>
+<span class="sourceLineNo">461</span> KeyValue [] kvs = new KeyValue[] {<a name="line.461"></a>
+<span class="sourceLineNo">462</span> create(r1, CF_STR, "a", 1, KeyValue.Type.Put, "dont-care"),<a name="line.462"></a>
+<span class="sourceLineNo">463</span> create(r1, CF_STR, "a", 2, KeyValue.Type.Put, "dont-care"),<a name="line.463"></a>
+<span class="sourceLineNo">464</span> create(r1, CF_STR, "a", 3, KeyValue.Type.Put, "dont-care"),<a name="line.464"></a>
+<span class="sourceLineNo">465</span> create(r1, CF_STR, "a", 4, KeyValue.Type.Put, "dont-care"),<a name="line.465"></a>
+<span class="sourceLineNo">466</span> create(r1, CF_STR, "a", 5, KeyValue.Type.Put, "dont-care"),<a name="line.466"></a>
+<span class="sourceLineNo">467</span> };<a name="line.467"></a>
+<span class="sourceLineNo">468</span> List<KeyValueScanner> scanners = Arrays.<KeyValueScanner>asList(<a name="line.468"></a>
+<span class="sourceLineNo">469</span> new KeyValueScanner[] {<a name="line.469"></a>
+<span class="sourceLineNo">470</span> new KeyValueScanFixture(CellComparator.getInstance(), kvs)<a name="line.470"></a>
+<span class="sourceLineNo">471</span> });<a name="line.471"></a>
+<span class="sourceLineNo">472</span> Scan scanSpec = new Scan().withStartRow(Bytes.toBytes(r1));<a name="line.472"></a>
+<span class="sourceLineNo">473</span> scanSpec.setTimeRange(0, 6);<a name="line.473"></a>
+<span class="sourceLineNo">474</span> scanSpec.readAllVersions();<a name="line.474"></a>
+<span class="sourceLineNo">475</span> List<Cell> results = null;<a name="line.475"></a>
+<span class="sourceLineNo">476</span> try (StoreScanner scan = new StoreScanner(scanSpec, scanInfo, getCols("a"), scanners)) {<a name="line.476"></a>
+<span class="sourceLineNo">477</span> results = new ArrayList<>();<a name="line.477"></a>
+<span class="sourceLineNo">478</span> assertEquals(true, scan.next(results));<a name="line.478"></a>
+<span class="sourceLineNo">479</span> assertEquals(5, results.size());<a name="line.479"></a>
+<span class="sourceLineNo">480</span> assertEquals(kvs[kvs.length - 1], results.get(0));<a name="line.480"></a>
+<span class="sourceLineNo">481</span> }<a name="line.481"></a>
+<span class="sourceLineNo">482</span> // Scan limited TimeRange<a name="line.482"></a>
+<span class="sourceLineNo">483</span> scanSpec = new Scan().withStartRow(Bytes.toBytes(r1));<a name="line.483"></a>
+<span class="sourceLineNo">484</span> scanSpec.setTimeRange(1, 3);<a name="line.484"></a>
+<span class="sourceLineNo">485</span> scanSpec.readAllVersions();<a name="line.485"></a>
+<span class="sourceLineNo">486</span> try (StoreScanner scan = new StoreScanner(scanSpec, scanInfo, getCols("a"), scanners)) {<a name="line.486"></a>
+<span class="sourceLineNo">487</span> results = new ArrayList<>();<a name="line.487"></a>
+<span class="sourceLineNo">488</span> assertEquals(true, scan.next(results));<a name="line.488"></a>
+<span class="sourceLineNo">489</span> assertEquals(2, results.size());<a name="line.489"></a>
+<span class="sourceLineNo">490</span> }<a name="line.490"></a>
+<span class="sourceLineNo">491</span> // Another range.<a name="line.491"></a>
+<span class="sourceLineNo">492</span> scanSpec = new Scan().withStartRow(Bytes.toBytes(r1));<a name="line.492"></a>
+<span class="sourceLineNo">493</span> scanSpec.setTimeRange(5, 10);<a name="line.493"></a>
+<span class="sourceLineNo">494</span> scanSpec.readAllVersions();<a name="line.494"></a>
+<span class="sourceLineNo">495</span> try (StoreScanner scan = new StoreScanner(scanSpec, scanInfo, getCols("a"), scanners)) {<a name="line.495"></a>
+<span class="sourceLineNo">496</span> results = new ArrayList<>();<a name="line.496"></a>
+<span class="sourceLineNo">497</span> assertEquals(true, scan.next(results));<a name="line.497"></a>
+<span class="sourceLineNo">498</span> assertEquals(1, results.size());<a name="line.498"></a>
+<span class="sourceLineNo">499</span> }<a name="line.499"></a>
+<span class="sourceLineNo">500</span> // See how TimeRange and Versions interact.<a name="line.500"></a>
+<span class="sourceLineNo">501</span> // Another range.<a name="line.501"></a>
+<span class="sourceLineNo">502</span> scanSpec = new Scan().withStartRow(Bytes.toBytes(r1));<a name="line.502"></a>
+<span class="sourceLineNo">503</span> scanSpec.setTimeRange(0, 10);<a name="line.503"></a>
+<span class="sourceLineNo">504</span> scanSpec.readVersions(3);<a name="line.504"></a>
+<span class="sourceLineNo">505</span> try (StoreScanner scan = new StoreScanner(scanSpec, scanInfo, getCols("a"), scanners)) {<a name="line.505"></a>
+<span class="sourceLineNo">506</span> results = new ArrayList<>();<a name="line.506"></a>
+<span class="sourceLineNo">507</span> assertEquals(true, scan.next(results));<a name="line.507"></a>
+<span class="sourceLineNo">508</span> assertEquals(3, results.size());<a name="line.508"></a>
+<span class="sourceLineNo">509</span> }<a name="line.509"></a>
+<span class="sourceLineNo">510</span> }<a name="line.510"></a>
+<span class="sourceLineNo">511</span><a name="line.511"></a>
+<span class="sourceLineNo">512</span> @Test<a name="line.512"></a>
+<span class="sourceLineNo">513</span> public void testScanSameTimestamp() throws IOException {<a name="line.513"></a>
+<span class="sourceLineNo">514</span> // returns only 1 of these 2 even though same timestamp<a name="line.514"></a>
+<span class="sourceLineNo">515</span> KeyValue [] kvs = new KeyValue[] {<a name="line.515"></a>
+<span class="sourceLineNo">516</span> create("R1", "cf", "a", 1, KeyValue.Type.Put, "dont-care"),<a name="line.516"></a>
+<span class="sourceLineNo">517</span> create("R1", "cf", "a", 1, KeyValue.Type.Put, "dont-care"),<a name="line.517"></a>
+<span class="sourceLineNo">518</span> };<a name="line.518"></a>
+<span class="sourceLineNo">519</span> List<KeyValueScanner> scanners = Arrays.asList(<a name="line.519"></a>
+<span class="sourceLineNo">520</span> new KeyValueScanner[] {<a name="line.520"></a>
+<span class="sourceLineNo">521</span> new KeyValueScanFixture(CellComparator.getInstance(), kvs)<a name="line.521"></a>
+<span class="sourceLineNo">522</span> });<a name="line.522"></a>
+<span class="sourceLineNo">523</span><a name="line.523"></a>
+<span class="sourceLineNo">524</span> Scan scanSpec = new Scan().withStartRow(Bytes.toBytes("R1"));<a name="line.524"></a>
+<span class="sourceLineNo">525</span> // this only uses maxVersions (default=1) and TimeRange (default=all)<a name="line.525"></a>
+<span class="sourceLineNo">526</span> try (StoreScanner scan = new StoreScanner(scanSpec, scanInfo, getCols("a"), scanners)) {<a name="line.526"></a>
+<span class="sourceLineNo">527</span> List<Cell> results = new ArrayList<>();<a name="line.527"></a>
+<span class="sourceLineNo">528</span> assertEquals(true, scan.next(results));<a name="line.528"></a>
+<span class="sourceLineNo">529</span> assertEquals(1, results.size());<a name="line.529"></a>
+<span class="sourceLineNo">530</span> assertEquals(kvs[0], results.get(0));<a name="line.530"></a>
+<span class="sourceLineNo">531</span> }<a name="line.531"></a>
+<span class="sourceLineNo">532</span> }<a name="line.532"></a>
+<span class="sourceLineNo">533</span><a name="line.533"></a>
+<span class="sourceLineNo">534</span> /*<a name="line.534"></a>
+<span class="sourceLineNo">535</span> * Test test shows exactly how the matcher's return codes confuses the StoreScanner<a name="line.535"></a>
+<span class="sourceLineNo">536</span> * and prevent it from doing the right thing. Seeking once, then nexting twice<a name="line.536"></a>
+<span class="sourceLineNo">537</span> * should return R1, then R2, but in this case it doesnt.<a name="line.537"></a>
+<span class="sourceLineNo">538</span> * TODO this comment makes no sense above. Appears to do the right thing.<a name="line.538"></a>
+<span class="sourceLineNo">539</span> * @throws IOException<a name="line.539"></a>
+<span class="sourceLineNo">540</span> */<a name="line.540"></a>
+<span class="sourceLineNo">541</span> @Test<a name="line.541"></a>
+<span class="sourceLineNo">542</span> public void testWontNextToNext() throws IOException {<a name="line.542"></a>
+<span class="sourceLineNo">543</span> // build the scan file:<a name="line.543"></a>
+<span class="sourceLineNo">544</span> KeyValue [] kvs = new KeyValue[] {<a name="line.544"></a>
+<span class="sourceLineNo">545</span> create("R1", "cf", "a", 2, KeyValue.Type.Put, "dont-care"),<a name="line.545"></a>
+<span class="sourceLineNo">546</span> create("R1", "cf", "a", 1, KeyValue.Type.Put, "dont-care"),<a name="line.546"></a>
+<span class="sourceLineNo">547</span> create("R2", "cf", "a", 1, KeyValue.Type.Put, "dont-care")<a name="line.547"></a>
+<span class="sourceLineNo">548</span> };<a name="line.548"></a>
+<span class="sourceLineNo">549</span> List<KeyValueScanner> scanners = scanFixture(kvs);<a name="line.549"></a>
+<span class="sourceLineNo">550</span><a name="line.550"></a>
+<span class="sourceLineNo">551</span> Scan scanSpec = new Scan().withStartRow(Bytes.toBytes("R1"));<a name="line.551"></a>
+<span class="sourceLineNo">552</span> // this only uses maxVersions (default=1) and TimeRange (default=all)<a name="line.552"></a>
+<span class="sourceLineNo">553</span> try (StoreScanner scan = new StoreScanner(scanSpec, scanInfo, getCols("a"), scanners)) {<a name="line.553"></a>
+<span class="sourceLineNo">554</span> List<Cell> results = new ArrayList<>();<a name="line.554"></a>
<span class="sourceLineNo">555</span> scan.next(results);<a name="line.555"></a>
<span class="sourceLineNo">556</span> assertEquals(1, results.size());<a name="line.556"></a>
-<span class="sourceLineNo">557</span> assertEquals(kvs[2], results.get(0));<a name="line.557"></a>
-<span class="sourceLineNo">558</span><a name="line.558"></a>
-<span class="sourceLineNo">559</span> results.clear();<a name="line.559"></a>
-<span class="sourceLineNo">560</span> scan.next(results);<a name="line.560"></a>
-<span class="sourceLineNo">561</span> assertEquals(0, results.size());<a name="line.561"></a>
-<span class="sourceLineNo">562</span> }<a name="line.562"></a>
-<span class="sourceLineNo">563</span> }<a name="line.563"></a>
+<span class="sourceLineNo">557</span> assertEquals(kvs[0], results.get(0));<a name="line.557"></a>
+<span class="sourceLineNo">558</span> // should be ok...<a name="line.558"></a>
+<span class="sourceLineNo">559</span> // now scan _next_ again.<a name="line.559"></a>
+<span class="sourceLineNo">560</span> results.clear();<a name="line.560"></a>
+<span class="sourceLineNo">561</span> scan.next(results);<a name="line.561"></a>
+<span class="sourceLineNo">562</span> assertEquals(1, results.size());<a name="line.562"></a>
+<span class="sourceLineNo">563</span> assertEquals(kvs[2], results.get(0));<a name="line.563"></a>
<span class="sourceLineNo">564</span><a name="line.564"></a>
-<span class="sourceLineNo">565</span><a name="line.565"></a>
-<span class="sourceLineNo">566</span> @Test<a name="line.566"></a>
-<span class="sourceLineNo">567</span> public void testDeleteVersionSameTimestamp() throws IOException {<a name="line.567"></a>
-<span class="sourceLineNo">568</span> KeyValue [] kvs = new KeyValue [] {<a name="line.568"></a>
-<span class="sourceLineNo">569</span> create("R1", "cf", "a", 1, KeyValue.Type.Put, "dont-care"),<a name="line.569"></a>
-<span class="sourceLineNo">570</span> create("R1", "cf", "a", 1, KeyValue.Type.Delete, "dont-care"),<a name="line.570"></a>
-<span class="sourceLineNo">571</span> };<a name="line.571"></a>
-<span class="sourceLineNo">572</span> List<KeyValueScanner> scanners = scanFixture(kvs);<a name="line.572"></a>
-<span class="sourceLineNo">573</span> Scan scanSpec = new Scan().withStartRow(Bytes.toBytes("R1"));<a name="line.573"></a>
-<span class="sourceLineNo">574</span> try (StoreScanner scan = new StoreScanner(scanSpec, scanInfo, getCols("a"), scanners)) {<a name="line.574"></a>
-<span class="sourceLineNo">575</span> List<Cell> results = new ArrayList<>();<a name="line.575"></a>
-<span class="sourceLineNo">576</span> assertFalse(scan.next(results));<a name="line.576"></a>
-<span class="sourceLineNo">577</span> assertEquals(0, results.size());<a name="line.577"></a>
-<span class="sourceLineNo">578</span> }<a name="line.578"></a>
-<span class="sourceLineNo">579</span> }<a name="line.579"></a>
-<span class="sourceLineNo">580</span><a name="line.580"></a>
-<span class="sourceLineNo">581</span> /*<a name="line.581"></a>
-<span class="sourceLineNo">582</span> * Test the case where there is a delete row 'in front of' the next row, the scanner<a name="line.582"></a>
-<span class="sourceLineNo">583</span> * will move to the next row.<a name="line.583"></a>
-<span class="sourceLineNo">584</span> */<a name="line.584"></a>
-<span class="sourceLineNo">585</span> @Test<a name="line.585"></a>
-<span class="sourceLineNo">586</span> public void testDeletedRowThenGoodRow() throws IOException {<a name="line.586"></a>
-<span class="sourceLineNo">587</span> KeyValue [] kvs = new KeyValue [] {<a name="line.587"></a>
-<span class="sourceLineNo">588</span> create("R1", "cf", "a", 1, KeyValue.Type.Put, "dont-care"),<a name="line.588"></a>
-<span class="sourceLineNo">589</span> create("R1", "cf", "a", 1, KeyValue.Type.Delete, "dont-care"),<a name="line.589"></a>
-<span class="sourceLineNo">590</span> create("R2", "cf", "a", 20, KeyValue.Type.Put, "dont-care")<a name="line.590"></a>
-<span class="sourceLineNo">591</span> };<a name="line.591"></a>
-<span class="sourceLineNo">592</span> List<KeyValueScanner> scanners = scanFixture(kvs);<a name="line.592"></a>
-<span class="sourceLineNo">593</span> Scan scanSpec = new Scan().withStartRow(Bytes.toBytes("R1"));<a name="line.593"></a>
-<span class="sourceLineNo">594</span> try (StoreScanner scan = new StoreScanner(scanSpec, scanInfo, getCols("a"), scanners)) {<a name="line.594"></a>
-<span class="sourceLineNo">595</span> List<Cell> results = new ArrayList<>();<a name="line.595"></a>
-<span class="sourceLineNo">596</span> assertEquals(true, scan.next(results));<a name="line.596"></a>
-<span class="sourceLineNo">597</span> assertEquals(0, results.size());<a name="line.597"></a>
-<span class="sourceLineNo">598</span><a name="line.598"></a>
-<span class="sourceLineNo">599</span> assertEquals(true, scan.next(results));<a name="line.599"></a>
-<span class="sourceLineNo">600</span> assertEquals(1, results.size());<a name="line.600"></a>
-<span class="sourceLineNo">601</span> assertEquals(kvs[2], results.get(0));<a name="line.601"></a>
-<span class="sourceLineNo">602</span><a name="line.602"></a>
-<span class="sourceLineNo">603</span> assertEquals(false, scan.next(results));<a name="line.603"></a>
-<span class="sourceLineNo">604</span> }<a name="line.604"></a>
-<span class="sourceLineNo">605</span> }<a name="line.605"></a>
-<span class="sourceLineNo">606</span><a name="line.606"></a>
-<span class="sourceLineNo">607</span> @Test<a name="line.607"></a>
-<span class="sourceLineNo">608</span> public void testDeleteVersionMaskingMultiplePuts() throws IOException {<a name="line.608"></a>
-<span class="sourceLineNo">609</span> long now = System.currentTimeMillis();<a name="line.609"></a>
-<span class="sourceLineNo">610</span> KeyValue [] kvs1 = new KeyValue[] {<a name="line.610"></a>
-<span class="sourceLineNo">611</span> create("R1", "cf", "a", now, KeyValue.Type.Put, "dont-care"),<a name="line.611"></a>
-<span class="sourceLineNo">612</span> create("R1", "cf", "a", now, KeyValue.Type.Delete, "dont-care")<a name="line.612"></a>
-<span class="sourceLineNo">613</span> };<a name="line.613"></a>
-<span class="sourceLineNo">614</span> KeyValue [] kvs2 = new KeyValue[] {<a name="line.614"></a>
-<span class="sourceLineNo">615</span> create("R1", "cf", "a", now-500, KeyValue.Type.Put, "dont-care"),<a name="line.615"></a>
-<span class="sourceLineNo">616</span> create("R1", "cf", "a", now-100, KeyValue.Type.Put, "dont-care"),<a name="line.616"></a>
-<span class="sourceLineNo">617</span> create("R1", "cf", "a", now, KeyValue.Type.Put, "dont-care")<a name="line.617"></a>
-<span class="sourceLineNo">618</span> };<a name="line.618"></a>
-<span class="sourceLineNo">619</span> List<KeyValueScanner> scanners = scanFixture(kvs1, kvs2);<a name="line.619"></a>
-<span class="sourceLineNo">620</span><a name="line.620"></a>
-<span class="sourceLineNo">621</span> try (StoreScanner scan = new StoreScanner(new Scan().withStartRow(Bytes.toBytes("R1")),<a name="line.621"></a>
-<span class="sourceLineNo">622</span> scanInfo, getCols("a"), scanners)) {<a name="line.622"></a>
-<span class="sourceLineNo">623</span> List<Cell> results = new ArrayList<>();<a name="line.623"></a>
-<span class="sourceLineNo">624</span> // the two put at ts=now will be masked by the 1 delete, and<a name="line.624"></a>
-<span class="sourceLineNo">625</span> // since the scan default returns 1 version we'll return the newest<a name="line.625"></a>
-<span class="sourceLineNo">626</span> // key, which is kvs[2], now-100.<a name="line.626"></a>
-<span class="sourceLineNo">627</span> assertEquals(true, scan.next(results));<a name="line.627"></a>
-<span class="sourceLineNo">628</span> assertEquals(1, results.size());<a name="line.628"></a>
-<span class="sourceLineNo">629</span> assertEquals(kvs2[1], results.get(0));<a name="line.629"></a>
-<span class="sourceLineNo">630</span> }<a name="line.630"></a>
-<span class="sourceLineNo">631</span> }<a name="line.631"></a>
-<span class="sourceLineNo">632</span><a name="line.632"></a>
-<span class="sourceLineNo">633</span> @Test<a name="line.633"></a>
-<span class="sourceLineNo">634</span> public void testDeleteVersionsMixedAndMultipleVersionReturn() throws IOException {<a name="line.634"></a>
-<span class="sourceLineNo">635</span> long now = System.currentTimeMillis();<a name="line.635"></a>
-<span class="sourceLineNo">636</span> KeyValue [] kvs1 = new KeyValue[] {<a name="line.636"></a>
-<span class="sourceLineNo">637</span> create("R1", "cf", "a", now, KeyValue.Type.Put, "dont-care"),<a name="line.637"></a>
-<span class="sourceLineNo">638</span> create("R1", "cf", "a", now, KeyValue.Type.Delete, "dont-care")<a name="line.638"></a>
-<span class="sourceLineNo">639</span> };<a name="line.639"></a>
-<span class="sourceLineNo">640</span> KeyValue [] kvs2 = new KeyValue[] {<a name="line.640"></a>
-<span class="sourceLineNo">641</span> create("R1", "cf", "a", now-500, KeyValue.Type.Put, "dont-care"),<a name="line.641"></a>
-<span class="sourceLineNo">642</span> create("R1", "cf", "a", now+500, KeyValue.Type.Put, "dont-care"),<a name="line.642"></a>
+<span class="sourceLineNo">565</span> results.clear();<a name="line.565"></a>
+<span class="sourceLineNo">566</span> scan.next(results);<a name="line.566"></a>
+<span class="sourceLineNo">567</span> assert
<TRUNCATED>