You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mi...@apache.org on 2016/03/24 16:54:45 UTC
[05/51] [partial] hbase-site git commit: Published site at
52fd70500e0a00e273e2ec0c09d7c914b89432ce.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f30982bd/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestStoreScanner.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestStoreScanner.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestStoreScanner.html
index 50ed506..be50739 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestStoreScanner.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestStoreScanner.html
@@ -28,593 +28,835 @@
<span class="sourceLineNo">020</span>package org.apache.hadoop.hbase.regionserver;<a name="line.20"></a>
<span class="sourceLineNo">021</span><a name="line.21"></a>
<span class="sourceLineNo">022</span>import static org.apache.hadoop.hbase.regionserver.KeyValueScanFixture.scanFixture;<a name="line.22"></a>
-<span class="sourceLineNo">023</span><a name="line.23"></a>
-<span class="sourceLineNo">024</span>import java.io.IOException;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import java.util.ArrayList;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import java.util.Arrays;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import java.util.List;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import java.util.NavigableSet;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import java.util.TreeSet;<a name="line.29"></a>
-<span class="sourceLineNo">030</span><a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.conf.Configuration;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.CategoryBasedTimeout;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.Cell;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.CellComparator;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.HConstants;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.KeepDeletedCells;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.KeyValueTestUtil;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.client.Scan;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.testclassification.RegionServerTests;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.util.EnvironmentEdge;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.util.EnvironmentEdgeManagerTestHelper;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.junit.Assert;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.junit.Rule;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.junit.Test;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.junit.experimental.categories.Category;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.junit.rules.TestName;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.junit.rules.TestRule;<a name="line.51"></a>
-<span class="sourceLineNo">052</span><a name="line.52"></a>
-<span class="sourceLineNo">053</span>// Can't be small as it plays with EnvironmentEdgeManager<a name="line.53"></a>
-<span class="sourceLineNo">054</span>@Category({RegionServerTests.class, MediumTests.class})<a name="line.54"></a>
-<span class="sourceLineNo">055</span>public class TestStoreScanner {<a name="line.55"></a>
-<span class="sourceLineNo">056</span> @Rule public TestName name = new TestName();<a name="line.56"></a>
-<span class="sourceLineNo">057</span> @Rule public final TestRule timeout = CategoryBasedTimeout.builder().withTimeout(this.getClass()).<a name="line.57"></a>
-<span class="sourceLineNo">058</span> withLookingForStuckThread(true).build();<a name="line.58"></a>
-<span class="sourceLineNo">059</span> private static final String CF_STR = "cf";<a name="line.59"></a>
-<span class="sourceLineNo">060</span> final byte [] CF = Bytes.toBytes(CF_STR);<a name="line.60"></a>
-<span class="sourceLineNo">061</span> static Configuration CONF = HBaseConfiguration.create();<a name="line.61"></a>
-<span class="sourceLineNo">062</span> private ScanInfo scanInfo = new ScanInfo(CONF, CF, 0, Integer.MAX_VALUE,<a name="line.62"></a>
-<span class="sourceLineNo">063</span> Long.MAX_VALUE, KeepDeletedCells.FALSE, 0, CellComparator.COMPARATOR);<a name="line.63"></a>
-<span class="sourceLineNo">064</span> private ScanType scanType = ScanType.USER_SCAN;<a name="line.64"></a>
-<span class="sourceLineNo">065</span><a name="line.65"></a>
-<span class="sourceLineNo">066</span> /*<a name="line.66"></a>
-<span class="sourceLineNo">067</span> * Test utility for building a NavigableSet for scanners.<a name="line.67"></a>
-<span class="sourceLineNo">068</span> * @param strCols<a name="line.68"></a>
-<span class="sourceLineNo">069</span> * @return<a name="line.69"></a>
-<span class="sourceLineNo">070</span> */<a name="line.70"></a>
-<span class="sourceLineNo">071</span> NavigableSet<byte[]> getCols(String ...strCols) {<a name="line.71"></a>
-<span class="sourceLineNo">072</span> NavigableSet<byte[]> cols = new TreeSet<byte[]>(Bytes.BYTES_COMPARATOR);<a name="line.72"></a>
-<span class="sourceLineNo">073</span> for (String col : strCols) {<a name="line.73"></a>
-<span class="sourceLineNo">074</span> byte[] bytes = Bytes.toBytes(col);<a name="line.74"></a>
-<span class="sourceLineNo">075</span> cols.add(bytes);<a name="line.75"></a>
-<span class="sourceLineNo">076</span> }<a name="line.76"></a>
-<span class="sourceLineNo">077</span> return cols;<a name="line.77"></a>
-<span class="sourceLineNo">078</span> }<a name="line.78"></a>
-<span class="sourceLineNo">079</span><a name="line.79"></a>
-<span class="sourceLineNo">080</span> @Test<a name="line.80"></a>
-<span class="sourceLineNo">081</span> public void testScanTimeRange() throws IOException {<a name="line.81"></a>
-<span class="sourceLineNo">082</span> String r1 = "R1";<a name="line.82"></a>
-<span class="sourceLineNo">083</span> // returns only 1 of these 2 even though same timestamp<a name="line.83"></a>
-<span class="sourceLineNo">084</span> KeyValue [] kvs = new KeyValue[] {<a name="line.84"></a>
-<span class="sourceLineNo">085</span> KeyValueTestUtil.create(r1, CF_STR, "a", 1, KeyValue.Type.Put, "dont-care"),<a name="line.85"></a>
-<span class="sourceLineNo">086</span> KeyValueTestUtil.create(r1, CF_STR, "a", 2, KeyValue.Type.Put, "dont-care"),<a name="line.86"></a>
-<span class="sourceLineNo">087</span> KeyValueTestUtil.create(r1, CF_STR, "a", 3, KeyValue.Type.Put, "dont-care"),<a name="line.87"></a>
-<span class="sourceLineNo">088</span> KeyValueTestUtil.create(r1, CF_STR, "a", 4, KeyValue.Type.Put, "dont-care"),<a name="line.88"></a>
-<span class="sourceLineNo">089</span> KeyValueTestUtil.create(r1, CF_STR, "a", 5, KeyValue.Type.Put, "dont-care"),<a name="line.89"></a>
-<span class="sourceLineNo">090</span> };<a name="line.90"></a>
-<span class="sourceLineNo">091</span> List<KeyValueScanner> scanners = Arrays.<KeyValueScanner>asList(<a name="line.91"></a>
-<span class="sourceLineNo">092</span> new KeyValueScanner[] {<a name="line.92"></a>
-<span class="sourceLineNo">093</span> new KeyValueScanFixture(CellComparator.COMPARATOR, kvs)<a name="line.93"></a>
-<span class="sourceLineNo">094</span> });<a name="line.94"></a>
-<span class="sourceLineNo">095</span> Scan scanSpec = new Scan(Bytes.toBytes(r1));<a name="line.95"></a>
-<span class="sourceLineNo">096</span> scanSpec.setTimeRange(0, 6);<a name="line.96"></a>
-<span class="sourceLineNo">097</span> scanSpec.setMaxVersions();<a name="line.97"></a>
-<span class="sourceLineNo">098</span> List<Cell> results = null;<a name="line.98"></a>
-<span class="sourceLineNo">099</span> try (StoreScanner scan =<a name="line.99"></a>
-<span class="sourceLineNo">100</span> new StoreScanner(scanSpec, scanInfo, scanType, getCols("a"), scanners)) {<a name="line.100"></a>
-<span class="sourceLineNo">101</span> results = new ArrayList<Cell>();<a name="line.101"></a>
-<span class="sourceLineNo">102</span> Assert.assertEquals(true, scan.next(results));<a name="line.102"></a>
-<span class="sourceLineNo">103</span> Assert.assertEquals(5, results.size());<a name="line.103"></a>
-<span class="sourceLineNo">104</span> Assert.assertEquals(kvs[kvs.length - 1], results.get(0));<a name="line.104"></a>
-<span class="sourceLineNo">105</span> }<a name="line.105"></a>
-<span class="sourceLineNo">106</span> // Scan limited TimeRange<a name="line.106"></a>
-<span class="sourceLineNo">107</span> scanSpec = new Scan(Bytes.toBytes(r1));<a name="line.107"></a>
-<span class="sourceLineNo">108</span> scanSpec.setTimeRange(1, 3);<a name="line.108"></a>
-<span class="sourceLineNo">109</span> scanSpec.setMaxVersions();<a name="line.109"></a>
-<span class="sourceLineNo">110</span> try (StoreScanner scan =<a name="line.110"></a>
-<span class="sourceLineNo">111</span> new StoreScanner(scanSpec, scanInfo, scanType, getCols("a"), scanners)) {<a name="line.111"></a>
-<span class="sourceLineNo">112</span> results = new ArrayList<Cell>();<a name="line.112"></a>
-<span class="sourceLineNo">113</span> Assert.assertEquals(true, scan.next(results));<a name="line.113"></a>
-<span class="sourceLineNo">114</span> Assert.assertEquals(2, results.size());<a name="line.114"></a>
-<span class="sourceLineNo">115</span> }<a name="line.115"></a>
-<span class="sourceLineNo">116</span> // Another range.<a name="line.116"></a>
-<span class="sourceLineNo">117</span> scanSpec = new Scan(Bytes.toBytes(r1));<a name="line.117"></a>
-<span class="sourceLineNo">118</span> scanSpec.setTimeRange(5, 10);<a name="line.118"></a>
-<span class="sourceLineNo">119</span> scanSpec.setMaxVersions();<a name="line.119"></a>
-<span class="sourceLineNo">120</span> try (StoreScanner scan =<a name="line.120"></a>
-<span class="sourceLineNo">121</span> new StoreScanner(scanSpec, scanInfo, scanType, getCols("a"), scanners)) {<a name="line.121"></a>
-<span class="sourceLineNo">122</span> results = new ArrayList<Cell>();<a name="line.122"></a>
-<span class="sourceLineNo">123</span> Assert.assertEquals(true, scan.next(results));<a name="line.123"></a>
-<span class="sourceLineNo">124</span> Assert.assertEquals(1, results.size());<a name="line.124"></a>
-<span class="sourceLineNo">125</span> }<a name="line.125"></a>
-<span class="sourceLineNo">126</span> // See how TimeRange and Versions interact.<a name="line.126"></a>
-<span class="sourceLineNo">127</span> // Another range.<a name="line.127"></a>
-<span class="sourceLineNo">128</span> scanSpec = new Scan(Bytes.toBytes(r1));<a name="line.128"></a>
-<span class="sourceLineNo">129</span> scanSpec.setTimeRange(0, 10);<a name="line.129"></a>
-<span class="sourceLineNo">130</span> scanSpec.setMaxVersions(3);<a name="line.130"></a>
-<span class="sourceLineNo">131</span> try (StoreScanner scan = new StoreScanner(scanSpec, scanInfo, scanType, getCols("a"),<a name="line.131"></a>
-<span class="sourceLineNo">132</span> scanners)) {<a name="line.132"></a>
-<span class="sourceLineNo">133</span> results = new ArrayList<Cell>();<a name="line.133"></a>
-<span class="sourceLineNo">134</span> Assert.assertEquals(true, scan.next(results));<a name="line.134"></a>
-<span class="sourceLineNo">135</span> Assert.assertEquals(3, results.size());<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><a name="line.138"></a>
-<span class="sourceLineNo">139</span> @Test<a name="line.139"></a>
-<span class="sourceLineNo">140</span> public void testScanSameTimestamp() throws IOException {<a name="line.140"></a>
-<span class="sourceLineNo">141</span> // returns only 1 of these 2 even though same timestamp<a name="line.141"></a>
-<span class="sourceLineNo">142</span> KeyValue [] kvs = new KeyValue[] {<a name="line.142"></a>
-<span class="sourceLineNo">143</span> KeyValueTestUtil.create("R1", "cf", "a", 1, KeyValue.Type.Put, "dont-care"),<a name="line.143"></a>
-<span class="sourceLineNo">144</span> KeyValueTestUtil.create("R1", "cf", "a", 1, KeyValue.Type.Put, "dont-care"),<a name="line.144"></a>
-<span class="sourceLineNo">145</span> };<a name="line.145"></a>
-<span class="sourceLineNo">146</span> List<KeyValueScanner> scanners = Arrays.asList(<a name="line.146"></a>
-<span class="sourceLineNo">147</span> new KeyValueScanner[] {<a name="line.147"></a>
-<span class="sourceLineNo">148</span> new KeyValueScanFixture(CellComparator.COMPARATOR, kvs)<a name="line.148"></a>
-<span class="sourceLineNo">149</span> });<a name="line.149"></a>
-<span class="sourceLineNo">150</span><a name="line.150"></a>
-<span class="sourceLineNo">151</span> Scan scanSpec = new Scan(Bytes.toBytes("R1"));<a name="line.151"></a>
-<span class="sourceLineNo">152</span> // this only uses maxVersions (default=1) and TimeRange (default=all)<a name="line.152"></a>
-<span class="sourceLineNo">153</span> try (StoreScanner scan =<a name="line.153"></a>
-<span class="sourceLineNo">154</span> new StoreScanner(scanSpec, scanInfo, scanType, getCols("a"), scanners)) {<a name="line.154"></a>
-<span class="sourceLineNo">155</span> List<Cell> results = new ArrayList<Cell>();<a name="line.155"></a>
-<span class="sourceLineNo">156</span> Assert.assertEquals(true, scan.next(results));<a name="line.156"></a>
-<span class="sourceLineNo">157</span> Assert.assertEquals(1, results.size());<a name="line.157"></a>
-<span class="sourceLineNo">158</span> Assert.assertEquals(kvs[0], results.get(0));<a name="line.158"></a>
-<span class="sourceLineNo">159</span> }<a name="line.159"></a>
-<span class="sourceLineNo">160</span> }<a name="line.160"></a>
-<span class="sourceLineNo">161</span><a name="line.161"></a>
-<span class="sourceLineNo">162</span> /*<a name="line.162"></a>
-<span class="sourceLineNo">163</span> * Test test shows exactly how the matcher's return codes confuses the StoreScanner<a name="line.163"></a>
-<span class="sourceLineNo">164</span> * and prevent it from doing the right thing. Seeking once, then nexting twice<a name="line.164"></a>
-<span class="sourceLineNo">165</span> * should return R1, then R2, but in this case it doesnt.<a name="line.165"></a>
-<span class="sourceLineNo">166</span> * TODO this comment makes no sense above. Appears to do the right thing.<a name="line.166"></a>
-<span class="sourceLineNo">167</span> * @throws IOException<a name="line.167"></a>
-<span class="sourceLineNo">168</span> */<a name="line.168"></a>
-<span class="sourceLineNo">169</span> @Test<a name="line.169"></a>
-<span class="sourceLineNo">170</span> public void testWontNextToNext() throws IOException {<a name="line.170"></a>
-<span class="sourceLineNo">171</span> // build the scan file:<a name="line.171"></a>
-<span class="sourceLineNo">172</span> KeyValue [] kvs = new KeyValue[] {<a name="line.172"></a>
-<span class="sourceLineNo">173</span> KeyValueTestUtil.create("R1", "cf", "a", 2, KeyValue.Type.Put, "dont-care"),<a name="line.173"></a>
-<span class="sourceLineNo">174</span> KeyValueTestUtil.create("R1", "cf", "a", 1, KeyValue.Type.Put, "dont-care"),<a name="line.174"></a>
-<span class="sourceLineNo">175</span> KeyValueTestUtil.create("R2", "cf", "a", 1, KeyValue.Type.Put, "dont-care")<a name="line.175"></a>
-<span class="sourceLineNo">176</span> };<a name="line.176"></a>
-<span class="sourceLineNo">177</span> List<KeyValueScanner> scanners = scanFixture(kvs);<a name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span> Scan scanSpec = new Scan(Bytes.toBytes("R1"));<a name="line.179"></a>
-<span class="sourceLineNo">180</span> // this only uses maxVersions (default=1) and TimeRange (default=all)<a name="line.180"></a>
-<span class="sourceLineNo">181</span> try (StoreScanner scan =<a name="line.181"></a>
-<span class="sourceLineNo">182</span> new StoreScanner(scanSpec, scanInfo, scanType, getCols("a"), scanners)) {<a name="line.182"></a>
-<span class="sourceLineNo">183</span> List<Cell> results = new ArrayList<Cell>();<a name="line.183"></a>
-<span class="sourceLineNo">184</span> scan.next(results);<a name="line.184"></a>
-<span class="sourceLineNo">185</span> Assert.assertEquals(1, results.size());<a name="line.185"></a>
-<span class="sourceLineNo">186</span> Assert.assertEquals(kvs[0], results.get(0));<a name="line.186"></a>
-<span class="sourceLineNo">187</span> // should be ok...<a name="line.187"></a>
-<span class="sourceLineNo">188</span> // now scan _next_ again.<a name="line.188"></a>
-<span class="sourceLineNo">189</span> results.clear();<a name="line.189"></a>
-<span class="sourceLineNo">190</span> scan.next(results);<a name="line.190"></a>
-<span class="sourceLineNo">191</span> Assert.assertEquals(1, results.size());<a name="line.191"></a>
-<span class="sourceLineNo">192</span> Assert.assertEquals(kvs[2], results.get(0));<a name="line.192"></a>
-<span class="sourceLineNo">193</span><a name="line.193"></a>
-<span class="sourceLineNo">194</span> results.clear();<a name="line.194"></a>
-<span class="sourceLineNo">195</span> scan.next(results);<a name="line.195"></a>
-<span class="sourceLineNo">196</span> Assert.assertEquals(0, results.size());<a name="line.196"></a>
-<span class="sourceLineNo">197</span> }<a name="line.197"></a>
-<span class="sourceLineNo">198</span> }<a name="line.198"></a>
-<span class="sourceLineNo">199</span><a name="line.199"></a>
-<span class="sourceLineNo">200</span><a name="line.200"></a>
-<span class="sourceLineNo">201</span> @Test<a name="line.201"></a>
-<span class="sourceLineNo">202</span> public void testDeleteVersionSameTimestamp() throws IOException {<a name="line.202"></a>
-<span class="sourceLineNo">203</span> KeyValue [] kvs = new KeyValue [] {<a name="line.203"></a>
-<span class="sourceLineNo">204</span> KeyValueTestUtil.create("R1", "cf", "a", 1, KeyValue.Type.Put, "dont-care"),<a name="line.204"></a>
-<span class="sourceLineNo">205</span> KeyValueTestUtil.create("R1", "cf", "a", 1, KeyValue.Type.Delete, "dont-care"),<a name="line.205"></a>
-<span class="sourceLineNo">206</span> };<a name="line.206"></a>
-<span class="sourceLineNo">207</span> List<KeyValueScanner> scanners = scanFixture(kvs);<a name="line.207"></a>
-<span class="sourceLineNo">208</span> Scan scanSpec = new Scan(Bytes.toBytes("R1"));<a name="line.208"></a>
-<span class="sourceLineNo">209</span> try (StoreScanner scan =<a name="line.209"></a>
-<span class="sourceLineNo">210</span> new StoreScanner(scanSpec, scanInfo, scanType, getCols("a"), scanners)) {<a name="line.210"></a>
-<span class="sourceLineNo">211</span> List<Cell> results = new ArrayList<Cell>();<a name="line.211"></a>
-<span class="sourceLineNo">212</span> Assert.assertFalse(scan.next(results));<a name="line.212"></a>
-<span class="sourceLineNo">213</span> Assert.assertEquals(0, results.size());<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> /*<a name="line.217"></a>
-<span class="sourceLineNo">218</span> * Test the case where there is a delete row 'in front of' the next row, the scanner<a name="line.218"></a>
-<span class="sourceLineNo">219</span> * will move to the next row.<a name="line.219"></a>
-<span class="sourceLineNo">220</span> */<a name="line.220"></a>
-<span class="sourceLineNo">221</span> @Test<a name="line.221"></a>
-<span class="sourceLineNo">222</span> public void testDeletedRowThenGoodRow() throws IOException {<a name="line.222"></a>
-<span class="sourceLineNo">223</span> KeyValue [] kvs = new KeyValue [] {<a name="line.223"></a>
-<span class="sourceLineNo">224</span> KeyValueTestUtil.create("R1", "cf", "a", 1, KeyValue.Type.Put, "dont-care"),<a name="line.224"></a>
-<span class="sourceLineNo">225</span> KeyValueTestUtil.create("R1", "cf", "a", 1, KeyValue.Type.Delete, "dont-care"),<a name="line.225"></a>
-<span class="sourceLineNo">226</span> KeyValueTestUtil.create("R2", "cf", "a", 20, KeyValue.Type.Put, "dont-care")<a name="line.226"></a>
-<span class="sourceLineNo">227</span> };<a name="line.227"></a>
-<span class="sourceLineNo">228</span> List<KeyValueScanner> scanners = scanFixture(kvs);<a name="line.228"></a>
-<span class="sourceLineNo">229</span> Scan scanSpec = new Scan(Bytes.toBytes("R1"));<a name="line.229"></a>
-<span class="sourceLineNo">230</span> try (StoreScanner scan =<a name="line.230"></a>
-<span class="sourceLineNo">231</span> new StoreScanner(scanSpec, scanInfo, scanType, getCols("a"), scanners)) {<a name="line.231"></a>
-<span class="sourceLineNo">232</span> List<Cell> results = new ArrayList<Cell>();<a name="line.232"></a>
-<span class="sourceLineNo">233</span> Assert.assertEquals(true, scan.next(results));<a name="line.233"></a>
-<span class="sourceLineNo">234</span> Assert.assertEquals(0, results.size());<a name="line.234"></a>
-<span class="sourceLineNo">235</span><a name="line.235"></a>
-<span class="sourceLineNo">236</span> Assert.assertEquals(true, scan.next(results));<a name="line.236"></a>
-<span class="sourceLineNo">237</span> Assert.assertEquals(1, results.size());<a name="line.237"></a>
-<span class="sourceLineNo">238</span> Assert.assertEquals(kvs[2], results.get(0));<a name="line.238"></a>
-<span class="sourceLineNo">239</span><a name="line.239"></a>
-<span class="sourceLineNo">240</span> Assert.assertEquals(false, scan.next(results));<a name="line.240"></a>
-<span class="sourceLineNo">241</span> }<a name="line.241"></a>
-<span class="sourceLineNo">242</span> }<a name="line.242"></a>
-<span class="sourceLineNo">243</span><a name="line.243"></a>
-<span class="sourceLineNo">244</span> public void testDeleteVersionMaskingMultiplePuts() throws IOException {<a name="line.244"></a>
-<span class="sourceLineNo">245</span> long now = System.currentTimeMillis();<a name="line.245"></a>
-<span class="sourceLineNo">246</span> KeyValue [] kvs1 = new KeyValue[] {<a name="line.246"></a>
-<span class="sourceLineNo">247</span> KeyValueTestUtil.create("R1", "cf", "a", now, KeyValue.Type.Put, "dont-care"),<a name="line.247"></a>
-<span class="sourceLineNo">248</span> KeyValueTestUtil.create("R1", "cf", "a", now, KeyValue.Type.Delete, "dont-care")<a name="line.248"></a>
-<span class="sourceLineNo">249</span> };<a name="line.249"></a>
-<span class="sourceLineNo">250</span> KeyValue [] kvs2 = new KeyValue[] {<a name="line.250"></a>
-<span class="sourceLineNo">251</span> KeyValueTestUtil.create("R1", "cf", "a", now-500, KeyValue.Type.Put, "dont-care"),<a name="line.251"></a>
-<span class="sourceLineNo">252</span> KeyValueTestUtil.create("R1", "cf", "a", now-100, KeyValue.Type.Put, "dont-care"),<a name="line.252"></a>
-<span class="sourceLineNo">253</span> KeyValueTestUtil.create("R1", "cf", "a", now, KeyValue.Type.Put, "dont-care")<a name="line.253"></a>
-<span class="sourceLineNo">254</span> };<a name="line.254"></a>
-<span class="sourceLineNo">255</span> List<KeyValueScanner> scanners = scanFixture(kvs1, kvs2);<a name="line.255"></a>
-<span class="sourceLineNo">256</span><a name="line.256"></a>
-<span class="sourceLineNo">257</span> try (StoreScanner scan = new StoreScanner(new Scan(Bytes.toBytes("R1")), scanInfo, scanType,<a name="line.257"></a>
-<span class="sourceLineNo">258</span> getCols("a"), scanners)) {<a name="line.258"></a>
-<span class="sourceLineNo">259</span> List<Cell> results = new ArrayList<Cell>();<a name="line.259"></a>
-<span class="sourceLineNo">260</span> // the two put at ts=now will be masked by the 1 delete, and<a name="line.260"></a>
-<span class="sourceLineNo">261</span> // since the scan default returns 1 version we'll return the newest<a name="line.261"></a>
-<span class="sourceLineNo">262</span> // key, which is kvs[2], now-100.<a name="line.262"></a>
-<span class="sourceLineNo">263</span> Assert.assertEquals(true, scan.next(results));<a name="line.263"></a>
-<span class="sourceLineNo">264</span> Assert.assertEquals(1, results.size());<a name="line.264"></a>
-<span class="sourceLineNo">265</span> Assert.assertEquals(kvs2[1], results.get(0));<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> public void testDeleteVersionsMixedAndMultipleVersionReturn() throws IOException {<a name="line.268"></a>
-<span class="sourceLineNo">269</span> long now = System.currentTimeMillis();<a name="line.269"></a>
-<span class="sourceLineNo">270</span> KeyValue [] kvs1 = new KeyValue[] {<a name="line.270"></a>
-<span class="sourceLineNo">271</span> KeyValueTestUtil.create("R1", "cf", "a", now, KeyValue.Type.Put, "dont-care"),<a name="line.271"></a>
-<span class="sourceLineNo">272</span> KeyValueTestUtil.create("R1", "cf", "a", now, KeyValue.Type.Delete, "dont-care")<a name="line.272"></a>
-<span class="sourceLineNo">273</span> };<a name="line.273"></a>
-<span class="sourceLineNo">274</span> KeyValue [] kvs2 = new KeyValue[] {<a name="line.274"></a>
-<span class="sourceLineNo">275</span> KeyValueTestUtil.create("R1", "cf", "a", now-500, KeyValue.Type.Put, "dont-care"),<a name="line.275"></a>
-<span class="sourceLineNo">276</span> KeyValueTestUtil.create("R1", "cf", "a", now+500, KeyValue.Type.Put, "dont-care"),<a name="line.276"></a>
-<span class="sourceLineNo">277</span> KeyValueTestUtil.create("R1", "cf", "a", now, KeyValue.Type.Put, "dont-care"),<a name="line.277"></a>
-<span class="sourceLineNo">278</span> KeyValueTestUtil.create("R2", "cf", "z", now, KeyValue.Type.Put, "dont-care")<a name="line.278"></a>
-<span class="sourceLineNo">279</span> };<a name="line.279"></a>
-<span class="sourceLineNo">280</span> List<KeyValueScanner> scanners = scanFixture(kvs1, kvs2);<a name="line.280"></a>
-<span class="sourceLineNo">281</span><a name="line.281"></a>
-<span class="sourceLineNo">282</span> Scan scanSpec = new Scan(Bytes.toBytes("R1")).setMaxVersions(2);<a name="line.282"></a>
-<span class="sourceLineNo">283</span> try (StoreScanner scan = new StoreScanner(scanSpec, scanInfo, scanType,<a name="line.283"></a>
-<span class="sourceLineNo">284</span> getCols("a"), scanners)) {<a name="line.284"></a>
-<span class="sourceLineNo">285</span> List<Cell> results = new ArrayList<Cell>();<a name="line.285"></a>
-<span class="sourceLineNo">286</span> Assert.assertEquals(true, scan.next(results));<a name="line.286"></a>
-<span class="sourceLineNo">287</span> Assert.assertEquals(2, results.size());<a name="line.287"></a>
-<span class="sourceLineNo">288</span> Assert.assertEquals(kvs2[1], results.get(0));<a name="line.288"></a>
-<span class="sourceLineNo">289</span> Assert.assertEquals(kvs2[0], results.get(1));<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><a name="line.292"></a>
-<span class="sourceLineNo">293</span> @Test<a name="line.293"></a>
-<span class="sourceLineNo">294</span> public void testWildCardOneVersionScan() throws IOException {<a name="line.294"></a>
-<span class="sourceLineNo">295</span> KeyValue [] kvs = new KeyValue [] {<a name="line.295"></a>
-<span class="sourceLineNo">296</span> KeyValueTestUtil.create("R1", "cf", "a", 2, KeyValue.Type.Put, "dont-care"),<a name="line.296"></a>
-<span class="sourceLineNo">297</span> KeyValueTestUtil.create("R1", "cf", "b", 1, KeyValue.Type.Put, "dont-care"),<a name="line.297"></a>
-<span class="sourceLineNo">298</span> KeyValueTestUtil.create("R1", "cf", "a", 1, KeyValue.Type.DeleteColumn, "dont-care"),<a name="line.298"></a>
-<span class="sourceLineNo">299</span> };<a name="line.299"></a>
-<span class="sourceLineNo">300</span> List<KeyValueScanner> scanners = scanFixture(kvs);<a name="line.300"></a>
-<span class="sourceLineNo">301</span> try (StoreScanner scan =<a name="line.301"></a>
-<span class="sourceLineNo">302</span> new StoreScanner(new Scan(Bytes.toBytes("R1")), scanInfo, scanType, null, scanners)) {<a name="line.302"></a>
-<span class="sourceLineNo">303</span> List<Cell> results = new ArrayList<Cell>();<a name="line.303"></a>
-<span class="sourceLineNo">304</span> Assert.assertEquals(true, scan.next(results));<a name="line.304"></a>
-<span class="sourceLineNo">305</span> Assert.assertEquals(2, results.size());<a name="line.305"></a>
-<span class="sourceLineNo">306</span> Assert.assertEquals(kvs[0], results.get(0));<a name="line.306"></a>
-<span class="sourceLineNo">307</span> Assert.assertEquals(kvs[1], results.get(1));<a name="line.307"></a>
-<span class="sourceLineNo">308</span> }<a name="line.308"></a>
-<span class="sourceLineNo">309</span> }<a name="line.309"></a>
-<span class="sourceLineNo">310</span><a name="line.310"></a>
-<span class="sourceLineNo">311</span> @Test<a name="line.311"></a>
-<span class="sourceLineNo">312</span> public void testWildCardScannerUnderDeletes() throws IOException {<a name="line.312"></a>
-<span class="sourceLineNo">313</span> KeyValue [] kvs = new KeyValue [] {<a name="line.313"></a>
-<span class="sourceLineNo">314</span> KeyValueTestUtil.create("R1", "cf", "a", 2, KeyValue.Type.Put, "dont-care"), // inc<a name="line.314"></a>
-<span class="sourceLineNo">315</span> // orphaned delete column.<a name="line.315"></a>
-<span class="sourceLineNo">316</span> KeyValueTestUtil.create("R1", "cf", "a", 1, KeyValue.Type.DeleteColumn, "dont-care"),<a name="line.316"></a>
-<span class="sourceLineNo">317</span> // column b<a name="line.317"></a>
-<span class="sourceLineNo">318</span> KeyValueTestUtil.create("R1", "cf", "b", 2, KeyValue.Type.Put, "dont-care"), // inc<a name="line.318"></a>
-<span class="sourceLineNo">319</span> KeyValueTestUtil.create("R1", "cf", "b", 1, KeyValue.Type.Put, "dont-care"), // inc<a name="line.319"></a>
-<span class="sourceLineNo">320</span> // column c<a name="line.320"></a>
-<span class="sourceLineNo">321</span> KeyValueTestUtil.create("R1", "cf", "c", 10, KeyValue.Type.Delete, "dont-care"),<a name="line.321"></a>
-<span class="sourceLineNo">322</span> KeyValueTestUtil.create("R1", "cf", "c", 10, KeyValue.Type.Put, "dont-care"), // no<a name="line.322"></a>
-<span class="sourceLineNo">323</span> KeyValueTestUtil.create("R1", "cf", "c", 9, KeyValue.Type.Put, "dont-care"), // inc<a name="line.323"></a>
-<span class="sourceLineNo">324</span> // column d<a name="line.324"></a>
-<span class="sourceLineNo">325</span> KeyValueTestUtil.create("R1", "cf", "d", 11, KeyValue.Type.Put, "dont-care"), // inc<a name="line.325"></a>
-<span class="sourceLineNo">326</span> KeyValueTestUtil.create("R1", "cf", "d", 10, KeyValue.Type.DeleteColumn, "dont-care"),<a name="line.326"></a>
-<span class="sourceLineNo">327</span> KeyValueTestUtil.create("R1", "cf", "d", 9, KeyValue.Type.Put, "dont-care"), // no<a name="line.327"></a>
-<span class="sourceLineNo">328</span> KeyValueTestUtil.create("R1", "cf", "d", 8, KeyValue.Type.Put, "dont-care"), // no<a name="line.328"></a>
-<span class="sourceLineNo">329</span><a name="line.329"></a>
-<span class="sourceLineNo">330</span> };<a name="line.330"></a>
-<span class="sourceLineNo">331</span> List<KeyValueScanner> scanners = scanFixture(kvs);<a name="line.331"></a>
-<span class="sourceLineNo">332</span> try (StoreScanner scan = new StoreScanner(new Scan().setMaxVersions(2),<a name="line.332"></a>
-<span class="sourceLineNo">333</span> scanInfo, scanType, null, scanners)) {<a name="line.333"></a>
-<span class="sourceLineNo">334</span> List<Cell> results = new ArrayList<Cell>();<a name="line.334"></a>
-<span class="sourceLineNo">335</span> Assert.assertEquals(true, scan.next(results));<a name="line.335"></a>
-<span class="sourceLineNo">336</span> Assert.assertEquals(5, results.size());<a name="line.336"></a>
-<span class="sourceLineNo">337</span> Assert.assertEquals(kvs[0], results.get(0));<a name="line.337"></a>
-<span class="sourceLineNo">338</span> Assert.assertEquals(kvs[2], results.get(1));<a name="line.338"></a>
-<span class="sourceLineNo">339</span> Assert.assertEquals(kvs[3], results.get(2));<a name="line.339"></a>
-<span class="sourceLineNo">340</span> Assert.assertEquals(kvs[6], results.get(3));<a name="line.340"></a>
-<span class="sourceLineNo">341</span> Assert.assertEquals(kvs[7], results.get(4));<a name="line.341"></a>
-<span class="sourceLineNo">342</span> }<a name="line.342"></a>
-<span class="sourceLineNo">343</span> }<a name="line.343"></a>
-<span class="sourceLineNo">344</span><a name="line.344"></a>
-<span class="sourceLineNo">345</span> @Test<a name="line.345"></a>
-<span class="sourceLineNo">346</span> public void testDeleteFamily() throws IOException {<a name="line.346"></a>
-<span class="sourceLineNo">347</span> KeyValue [] kvs = new KeyValue[] {<a name="line.347"></a>
-<span class="sourceLineNo">348</span> KeyValueTestUtil.create("R1", "cf", "a", 100, KeyValue.Type.DeleteFamily, "dont-care"),<a name="line.348"></a>
-<span class="sourceLineNo">349</span> KeyValueTestUtil.create("R1", "cf", "b", 11, KeyValue.Type.Put, "dont-care"),<a name="line.349"></a>
-<span class="sourceLineNo">350</span> KeyValueTestUtil.create("R1", "cf", "c", 11, KeyValue.Type.Put, "dont-care"),<a name="line.350"></a>
-<span class="sourceLineNo">351</span> KeyValueTestUtil.create("R1", "cf", "d", 11, KeyValue.Type.Put, "dont-care"),<a name="line.351"></a>
-<span class="sourceLineNo">352</span> KeyValueTestUtil.create("R1", "cf", "e", 11, KeyValue.Type.Put, "dont-care"),<a name="line.352"></a>
-<span class="sourceLineNo">353</span> KeyValueTestUtil.create("R1", "cf", "e", 11, KeyValue.Type.DeleteColumn, "dont-care"),<a name="line.353"></a>
-<span class="sourceLineNo">354</span> KeyValueTestUtil.create("R1", "cf", "f", 11, KeyValue.Type.Put, "dont-care"),<a name="line.354"></a>
-<span class="sourceLineNo">355</span> KeyValueTestUtil.create("R1", "cf", "g", 11, KeyValue.Type.Put, "dont-care"),<a name="line.355"></a>
-<span class="sourceLineNo">356</span> KeyValueTestUtil.create("R1", "cf", "g", 11, KeyValue.Type.Delete, "dont-care"),<a name="line.356"></a>
-<span class="sourceLineNo">357</span> KeyValueTestUtil.create("R1", "cf", "h", 11, KeyValue.Type.Put, "dont-care"),<a name="line.357"></a>
-<span class="sourceLineNo">358</span> KeyValueTestUtil.create("R1", "cf", "i", 11, KeyValue.Type.Put, "dont-care"),<a name="line.358"></a>
-<span class="sourceLineNo">359</span> KeyValueTestUtil.create("R2", "cf", "a", 11, KeyValue.Type.Put, "dont-care"),<a name="line.359"></a>
-<span class="sourceLineNo">360</span> };<a name="line.360"></a>
-<span class="sourceLineNo">361</span> List<KeyValueScanner> scanners = scanFixture(kvs);<a name="line.361"></a>
+<span class="sourceLineNo">023</span>import static org.junit.Assert.*;<a name="line.23"></a>
+<span class="sourceLineNo">024</span><a name="line.24"></a>
+<span class="sourceLineNo">025</span>import java.io.IOException;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import java.util.ArrayList;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import java.util.Arrays;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import java.util.List;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import java.util.NavigableSet;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import java.util.TreeSet;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import java.util.concurrent.atomic.AtomicInteger;<a name="line.31"></a>
+<span class="sourceLineNo">032</span><a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.commons.logging.Log;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.commons.logging.LogFactory;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.conf.Configuration;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.CategoryBasedTimeout;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.Cell;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.CellComparator;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.CellUtil;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.HConstants;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.KeepDeletedCells;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.KeyValueTestUtil;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.client.Get;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.client.Scan;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.testclassification.RegionServerTests;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.util.EnvironmentEdge;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.util.EnvironmentEdgeManagerTestHelper;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.junit.Assert;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.junit.Rule;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.junit.Test;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.junit.experimental.categories.Category;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.junit.rules.TestName;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.junit.rules.TestRule;<a name="line.57"></a>
+<span class="sourceLineNo">058</span><a name="line.58"></a>
+<span class="sourceLineNo">059</span>// Can't be small as it plays with EnvironmentEdgeManager<a name="line.59"></a>
+<span class="sourceLineNo">060</span>@Category({RegionServerTests.class, MediumTests.class})<a name="line.60"></a>
+<span class="sourceLineNo">061</span>public class TestStoreScanner {<a name="line.61"></a>
+<span class="sourceLineNo">062</span> private static final Log LOG = LogFactory.getLog(TestStoreScanner.class);<a name="line.62"></a>
+<span class="sourceLineNo">063</span> @Rule public TestName name = new TestName();<a name="line.63"></a>
+<span class="sourceLineNo">064</span> @Rule public final TestRule timeout = CategoryBasedTimeout.builder().withTimeout(this.getClass()).<a name="line.64"></a>
+<span class="sourceLineNo">065</span> withLookingForStuckThread(true).build();<a name="line.65"></a>
+<span class="sourceLineNo">066</span> private static final String CF_STR = "cf";<a name="line.66"></a>
+<span class="sourceLineNo">067</span> private static final byte [] CF = Bytes.toBytes(CF_STR);<a name="line.67"></a>
+<span class="sourceLineNo">068</span> static Configuration CONF = HBaseConfiguration.create();<a name="line.68"></a>
+<span class="sourceLineNo">069</span> private ScanInfo scanInfo = new ScanInfo(CONF, CF, 0, Integer.MAX_VALUE,<a name="line.69"></a>
+<span class="sourceLineNo">070</span> Long.MAX_VALUE, KeepDeletedCells.FALSE, 0, CellComparator.COMPARATOR);<a name="line.70"></a>
+<span class="sourceLineNo">071</span> private ScanType scanType = ScanType.USER_SCAN;<a name="line.71"></a>
+<span class="sourceLineNo">072</span><a name="line.72"></a>
+<span class="sourceLineNo">073</span> /**<a name="line.73"></a>
+<span class="sourceLineNo">074</span> * From here on down, we have a bunch of defines and specific CELL_GRID of Cells. The<a name="line.74"></a>
+<span class="sourceLineNo">075</span> * CELL_GRID then has a Scanner that can fake out 'block' transitions. All this elaborate<a name="line.75"></a>
+<span class="sourceLineNo">076</span> * setup is for tests that ensure we don't overread, and that the<a name="line.76"></a>
+<span class="sourceLineNo">077</span> * {@link StoreScanner#optimize(org.apache.hadoop.hbase.regionserver.ScanQueryMatcher.MatchCode,<a name="line.77"></a>
+<span class="sourceLineNo">078</span> * Cell)} is not overly enthusiastic.<a name="line.78"></a>
+<span class="sourceLineNo">079</span> */<a name="line.79"></a>
+<span class="sourceLineNo">080</span> private static final byte [] ZERO = new byte [] {'0'};<a name="line.80"></a>
+<span class="sourceLineNo">081</span> private static final byte [] ZERO_POINT_ZERO = new byte [] {'0', '.', '0'};<a name="line.81"></a>
+<span class="sourceLineNo">082</span> private static final byte [] ONE = new byte [] {'1'};<a name="line.82"></a>
+<span class="sourceLineNo">083</span> private static final byte [] TWO = new byte [] {'2'};<a name="line.83"></a>
+<span class="sourceLineNo">084</span> private static final byte [] TWO_POINT_TWO = new byte [] {'2', '.', '2'};<a name="line.84"></a>
+<span class="sourceLineNo">085</span> private static final byte [] THREE = new byte [] {'3'};<a name="line.85"></a>
+<span class="sourceLineNo">086</span> private static final byte [] FOUR = new byte [] {'4'};<a name="line.86"></a>
+<span class="sourceLineNo">087</span> private static final byte [] FIVE = new byte [] {'5'};<a name="line.87"></a>
+<span class="sourceLineNo">088</span> private static final byte [] VALUE = new byte [] {'v'};<a name="line.88"></a>
+<span class="sourceLineNo">089</span> private static final int CELL_GRID_BLOCK2_BOUNDARY = 4;<a name="line.89"></a>
+<span class="sourceLineNo">090</span> private static final int CELL_GRID_BLOCK3_BOUNDARY = 11;<a name="line.90"></a>
+<span class="sourceLineNo">091</span> private static final int CELL_GRID_BLOCK4_BOUNDARY = 15;<a name="line.91"></a>
+<span class="sourceLineNo">092</span> private static final int CELL_GRID_BLOCK5_BOUNDARY = 19;<a name="line.92"></a>
+<span class="sourceLineNo">093</span><a name="line.93"></a>
+<span class="sourceLineNo">094</span> /**<a name="line.94"></a>
+<span class="sourceLineNo">095</span> * Five rows by four columns distinguished by column qualifier (column qualifier is one of the<a name="line.95"></a>
+<span class="sourceLineNo">096</span> * four rows... ONE, TWO, etc.). Exceptions are a weird row after TWO; it is TWO_POINT_TWO.<a name="line.96"></a>
+<span class="sourceLineNo">097</span> * And then row FOUR has five columns finishing w/ row FIVE having a single column.<a name="line.97"></a>
+<span class="sourceLineNo">098</span> * We will use this to test scan does the right thing as it<a name="line.98"></a>
+<span class="sourceLineNo">099</span> * we do Gets, StoreScanner#optimize, and what we do on (faked) block boundaries.<a name="line.99"></a>
+<span class="sourceLineNo">100</span> */<a name="line.100"></a>
+<span class="sourceLineNo">101</span> private static final Cell [] CELL_GRID = new Cell [] {<a name="line.101"></a>
+<span class="sourceLineNo">102</span> CellUtil.createCell(ONE, CF, ONE, 1L, KeyValue.Type.Put.getCode(), VALUE),<a name="line.102"></a>
+<span class="sourceLineNo">103</span> CellUtil.createCell(ONE, CF, TWO, 1L, KeyValue.Type.Put.getCode(), VALUE),<a name="line.103"></a>
+<span class="sourceLineNo">104</span> CellUtil.createCell(ONE, CF, THREE, 1L, KeyValue.Type.Put.getCode(), VALUE),<a name="line.104"></a>
+<span class="sourceLineNo">105</span> CellUtil.createCell(ONE, CF, FOUR, 1L, KeyValue.Type.Put.getCode(), VALUE),<a name="line.105"></a>
+<span class="sourceLineNo">106</span> // Offset 4 CELL_GRID_BLOCK2_BOUNDARY<a name="line.106"></a>
+<span class="sourceLineNo">107</span> CellUtil.createCell(TWO, CF, ONE, 1L, KeyValue.Type.Put.getCode(), VALUE),<a name="line.107"></a>
+<span class="sourceLineNo">108</span> CellUtil.createCell(TWO, CF, TWO, 1L, KeyValue.Type.Put.getCode(), VALUE),<a name="line.108"></a>
+<span class="sourceLineNo">109</span> CellUtil.createCell(TWO, CF, THREE, 1L, KeyValue.Type.Put.getCode(), VALUE),<a name="line.109"></a>
+<span class="sourceLineNo">110</span> CellUtil.createCell(TWO, CF, FOUR, 1L, KeyValue.Type.Put.getCode(), VALUE),<a name="line.110"></a>
+<span class="sourceLineNo">111</span> CellUtil.createCell(TWO_POINT_TWO, CF, ZERO, 1L, KeyValue.Type.Put.getCode(), VALUE),<a name="line.111"></a>
+<span class="sourceLineNo">112</span> CellUtil.createCell(TWO_POINT_TWO, CF, ZERO_POINT_ZERO, 1L, KeyValue.Type.Put.getCode(), VALUE),<a name="line.112"></a>
+<span class="sourceLineNo">113</span> CellUtil.createCell(TWO_POINT_TWO, CF, FIVE, 1L, KeyValue.Type.Put.getCode(), VALUE),<a name="line.113"></a>
+<span class="sourceLineNo">114</span> // Offset 11! CELL_GRID_BLOCK3_BOUNDARY<a name="line.114"></a>
+<span class="sourceLineNo">115</span> CellUtil.createCell(THREE, CF, ONE, 1L, KeyValue.Type.Put.getCode(), VALUE),<a name="line.115"></a>
+<span class="sourceLineNo">116</span> CellUtil.createCell(THREE, CF, TWO, 1L, KeyValue.Type.Put.getCode(), VALUE),<a name="line.116"></a>
+<span class="sourceLineNo">117</span> CellUtil.createCell(THREE, CF, THREE, 1L, KeyValue.Type.Put.getCode(), VALUE),<a name="line.117"></a>
+<span class="sourceLineNo">118</span> CellUtil.createCell(THREE, CF, FOUR, 1L, KeyValue.Type.Put.getCode(), VALUE),<a name="line.118"></a>
+<span class="sourceLineNo">119</span> // Offset 15 CELL_GRID_BLOCK4_BOUNDARY<a name="line.119"></a>
+<span class="sourceLineNo">120</span> CellUtil.createCell(FOUR, CF, ONE, 1L, KeyValue.Type.Put.getCode(), VALUE),<a name="line.120"></a>
+<span class="sourceLineNo">121</span> CellUtil.createCell(FOUR, CF, TWO, 1L, KeyValue.Type.Put.getCode(), VALUE),<a name="line.121"></a>
+<span class="sourceLineNo">122</span> CellUtil.createCell(FOUR, CF, THREE, 1L, KeyValue.Type.Put.getCode(), VALUE),<a name="line.122"></a>
+<span class="sourceLineNo">123</span> CellUtil.createCell(FOUR, CF, FOUR, 1L, KeyValue.Type.Put.getCode(), VALUE),<a name="line.123"></a>
+<span class="sourceLineNo">124</span> // Offset 19 CELL_GRID_BLOCK5_BOUNDARY<a name="line.124"></a>
+<span class="sourceLineNo">125</span> CellUtil.createCell(FOUR, CF, FIVE, 1L, KeyValue.Type.Put.getCode(), VALUE),<a name="line.125"></a>
+<span class="sourceLineNo">126</span> CellUtil.createCell(FIVE, CF, ZERO, 1L, KeyValue.Type.Put.getCode(), VALUE),<a name="line.126"></a>
+<span class="sourceLineNo">127</span> };<a name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span> /**<a name="line.129"></a>
+<span class="sourceLineNo">130</span> * A StoreScanner for our CELL_GRID above. Fakes the block transitions. Does counts of<a name="line.130"></a>
+<span class="sourceLineNo">131</span> * calls to optimize and counts of when optimize actually did an optimize.<a name="line.131"></a>
+<span class="sourceLineNo">132</span> */<a name="line.132"></a>
+<span class="sourceLineNo">133</span> private static class CellGridStoreScanner extends StoreScanner {<a name="line.133"></a>
+<span class="sourceLineNo">134</span> // Count of how often optimize is called and of how often it does an optimize.<a name="line.134"></a>
+<span class="sourceLineNo">135</span> final AtomicInteger count = new AtomicInteger(0);<a name="line.135"></a>
+<span class="sourceLineNo">136</span> final AtomicInteger optimization = new AtomicInteger(0);<a name="line.136"></a>
+<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">138</span> CellGridStoreScanner(final Scan scan, ScanInfo scanInfo, ScanType scanType)<a name="line.138"></a>
+<span class="sourceLineNo">139</span> throws IOException {<a name="line.139"></a>
+<span class="sourceLineNo">140</span> super(scan, scanInfo, scanType, scan.getFamilyMap().get(CF),<a name="line.140"></a>
+<span class="sourceLineNo">141</span> Arrays.<KeyValueScanner>asList(<a name="line.141"></a>
+<span class="sourceLineNo">142</span> new KeyValueScanner[] {new KeyValueScanFixture(CellComparator.COMPARATOR, CELL_GRID)}));<a name="line.142"></a>
+<span class="sourceLineNo">143</span> }<a name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span> protected ScanQueryMatcher.MatchCode optimize(ScanQueryMatcher.MatchCode qcode, Cell cell) {<a name="line.145"></a>
+<span class="sourceLineNo">146</span> count.incrementAndGet();<a name="line.146"></a>
+<span class="sourceLineNo">147</span> ScanQueryMatcher.MatchCode after = super.optimize(qcode, cell);<a name="line.147"></a>
+<span class="sourceLineNo">148</span> LOG.info("Cell=" + cell + ", nextIndex=" + CellUtil.toString(getNextIndexedKey(), false) +<a name="line.148"></a>
+<span class="sourceLineNo">149</span> ", before=" + qcode + ", after=" + after);<a name="line.149"></a>
+<span class="sourceLineNo">150</span> if (qcode != after) {<a name="line.150"></a>
+<span class="sourceLineNo">151</span> optimization.incrementAndGet();<a name="line.151"></a>
+<span class="sourceLineNo">152</span> }<a name="line.152"></a>
+<span class="sourceLineNo">153</span> return after;<a name="line.153"></a>
+<span class="sourceLineNo">154</span> };<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span> @Override<a name="line.156"></a>
+<span class="sourceLineNo">157</span> public Cell getNextIndexedKey() {<a name="line.157"></a>
+<span class="sourceLineNo">158</span> // Fake block boundaries by having index of next block change as we go through scan.<a name="line.158"></a>
+<span class="sourceLineNo">159</span> return count.get() > CELL_GRID_BLOCK4_BOUNDARY?<a name="line.159"></a>
+<span class="sourceLineNo">160</span> CellUtil.createFirstOnRow(CELL_GRID[CELL_GRID_BLOCK5_BOUNDARY]):<a name="line.160"></a>
+<span class="sourceLineNo">161</span> count.get() > CELL_GRID_BLOCK3_BOUNDARY?<a name="line.161"></a>
+<span class="sourceLineNo">162</span> CellUtil.createFirstOnRow(CELL_GRID[CELL_GRID_BLOCK4_BOUNDARY]):<a name="line.162"></a>
+<span class="sourceLineNo">163</span> count.get() > CELL_GRID_BLOCK2_BOUNDARY?<a name="line.163"></a>
+<span class="sourceLineNo">164</span> CellUtil.createFirstOnRow(CELL_GRID[CELL_GRID_BLOCK3_BOUNDARY]):<a name="line.164"></a>
+<span class="sourceLineNo">165</span> CellUtil.createFirstOnRow(CELL_GRID[CELL_GRID_BLOCK2_BOUNDARY]);<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">168</span><a name="line.168"></a>
+<span class="sourceLineNo">169</span> /*<a name="line.169"></a>
+<span class="sourceLineNo">170</span> * Test utility for building a NavigableSet for scanners.<a name="line.170"></a>
+<span class="sourceLineNo">171</span> * @param strCols<a name="line.171"></a>
+<span class="sourceLineNo">172</span> * @return<a name="line.172"></a>
+<span class="sourceLineNo">173</span> */<a name="line.173"></a>
+<span class="sourceLineNo">174</span> NavigableSet<byte[]> getCols(String ...strCols) {<a name="line.174"></a>
+<span class="sourceLineNo">175</span> NavigableSet<byte[]> cols = new TreeSet<byte[]>(Bytes.BYTES_COMPARATOR);<a name="line.175"></a>
+<span class="sourceLineNo">176</span> for (String col : strCols) {<a name="line.176"></a>
+<span class="sourceLineNo">177</span> byte[] bytes = Bytes.toBytes(col);<a name="line.177"></a>
+<span class="sourceLineNo">178</span> cols.add(bytes);<a name="line.178"></a>
+<span class="sourceLineNo">179</span> }<a name="line.179"></a>
+<span class="sourceLineNo">180</span> return cols;<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> @Test<a name="line.183"></a>
+<span class="sourceLineNo">184</span> public void testFullRowGetDoesNotOverreadWhenRowInsideOneBlock() throws IOException {<a name="line.184"></a>
+<span class="sourceLineNo">185</span> // Do a Get against row two. Row two is inside a block that starts with row TWO but ends with<a name="line.185"></a>
+<span class="sourceLineNo">186</span> // row TWO_POINT_TWO. We should read one block only.<a name="line.186"></a>
+<span class="sourceLineNo">187</span> Get get = new Get(TWO);<a name="line.187"></a>
+<span class="sourceLineNo">188</span> Scan scan = new Scan(get);<a name="line.188"></a>
+<span class="sourceLineNo">189</span> CellGridStoreScanner scanner = new CellGridStoreScanner(scan, this.scanInfo, this.scanType);<a name="line.189"></a>
+<span class="sourceLineNo">190</span> try {<a name="line.190"></a>
+<span class="sourceLineNo">191</span> List<Cell> results = new ArrayList<Cell>();<a name="line.191"></a>
+<span class="sourceLineNo">192</span> while (scanner.next(results)) {<a name="line.192"></a>
+<span class="sourceLineNo">193</span> continue;<a name="line.193"></a>
+<span class="sourceLineNo">194</span> }<a name="line.194"></a>
+<span class="sourceLineNo">195</span> // Should be four results of column 1 (though there are 5 rows in the CELL_GRID -- the<a name="line.195"></a>
+<span class="sourceLineNo">196</span> // TWO_POINT_TWO row does not have a a column ONE.<a name="line.196"></a>
+<span class="sourceLineNo">197</span> Assert.assertEquals(4, results.size());<a name="line.197"></a>
+<span class="sourceLineNo">198</span> // We should have gone the optimize route 5 times totally... an INCLUDE for the four cells<a name="line.198"></a>
+<span class="sourceLineNo">199</span> // in the row plus the DONE on the end.<a name="line.199"></a>
+<span class="sourceLineNo">200</span> Assert.assertEquals(5, scanner.count.get());<a name="line.200"></a>
+<span class="sourceLineNo">201</span> // For a full row Get, there should be no opportunity for scanner optimization.<a name="line.201"></a>
+<span class="sourceLineNo">202</span> Assert.assertEquals(0, scanner.optimization.get());<a name="line.202"></a>
+<span class="sourceLineNo">203</span> } finally {<a name="line.203"></a>
+<span class="sourceLineNo">204</span> scanner.close();<a name="line.204"></a>
+<span class="sourceLineNo">205</span> }<a name="line.205"></a>
+<span class="sourceLineNo">206</span> }<a name="line.206"></a>
+<span class="sourceLineNo">207</span><a name="line.207"></a>
+<span class="sourceLineNo">208</span> @Test<a name="line.208"></a>
+<span class="sourceLineNo">209</span> public void testFullRowSpansBlocks() throws IOException {<a name="line.209"></a>
+<span class="sourceLineNo">210</span> // Do a Get against row FOUR. It spans two blocks.<a name="line.210"></a>
+<span class="sourceLineNo">211</span> Get get = new Get(FOUR);<a name="line.211"></a>
+<span class="sourceLineNo">212</span> Scan scan = new Scan(get);<a name="line.212"></a>
+<span class="sourceLineNo">213</span> CellGridStoreScanner scanner = new CellGridStoreScanner(scan, this.scanInfo, this.scanType);<a name="line.213"></a>
+<span class="sourceLineNo">214</span> try {<a name="line.214"></a>
+<span class="sourceLineNo">215</span> List<Cell> results = new ArrayList<Cell>();<a name="line.215"></a>
+<span class="sourceLineNo">216</span> while (scanner.next(results)) {<a name="line.216"></a>
+<span class="sourceLineNo">217</span> continue;<a name="line.217"></a>
+<span class="sourceLineNo">218</span> }<a name="line.218"></a>
+<span class="sourceLineNo">219</span> // Should be four results of column 1 (though there are 5 rows in the CELL_GRID -- the<a name="line.219"></a>
+<span class="sourceLineNo">220</span> // TWO_POINT_TWO row does not have a a column ONE.<a name="line.220"></a>
+<span class="sourceLineNo">221</span> Assert.assertEquals(5, results.size());<a name="line.221"></a>
+<span class="sourceLineNo">222</span> // We should have gone the optimize route 6 times totally... an INCLUDE for the five cells<a name="line.222"></a>
+<span class="sourceLineNo">223</span> // in the row plus the DONE on the end.<a name="line.223"></a>
+<span class="sourceLineNo">224</span> Assert.assertEquals(6, scanner.count.get());<a name="line.224"></a>
+<span class="sourceLineNo">225</span> // For a full row Get, there should be no opportunity for scanner optimization.<a name="line.225"></a>
+<span class="sourceLineNo">226</span> Assert.assertEquals(0, scanner.optimization.get());<a name="line.226"></a>
+<span class="sourceLineNo">227</span> } finally {<a name="line.227"></a>
+<span class="sourceLineNo">228</span> scanner.close();<a name="line.228"></a>
+<span class="sourceLineNo">229</span> }<a name="line.229"></a>
+<span class="sourceLineNo">230</span> }<a name="line.230"></a>
+<span class="sourceLineNo">231</span><a name="line.231"></a>
+<span class="sourceLineNo">232</span> /**<a name="line.232"></a>
+<span class="sourceLineNo">233</span> * Test optimize in StoreScanner. Test that we skip to the next 'block' when we it makes sense<a name="line.233"></a>
+<span class="sourceLineNo">234</span> * reading the block 'index'.<a name="line.234"></a>
+<span class="sourceLineNo">235</span> * @throws IOException<a name="line.235"></a>
+<span class="sourceLineNo">236</span> */<a name="line.236"></a>
+<span class="sourceLineNo">237</span> @Test<a name="line.237"></a>
+<span class="sourceLineNo">238</span> public void testOptimize() throws IOException {<a name="line.238"></a>
+<span class="sourceLineNo">239</span> Scan scan = new Scan();<a name="line.239"></a>
+<span class="sourceLineNo">240</span> // A scan that just gets the first qualifier on each row of the CELL_GRID<a name="line.240"></a>
+<span class="sourceLineNo">241</span> scan.addColumn(CF, ONE);<a name="line.241"></a>
+<span class="sourceLineNo">242</span> CellGridStoreScanner scanner = new CellGridStoreScanner(scan, this.scanInfo, this.scanType);<a name="line.242"></a>
+<span class="sourceLineNo">243</span> try {<a name="line.243"></a>
+<span class="sourceLineNo">244</span> List<Cell> results = new ArrayList<Cell>();<a name="line.244"></a>
+<span class="sourceLineNo">245</span> while (scanner.next(results)) {<a name="line.245"></a>
+<span class="sourceLineNo">246</span> continue;<a name="line.246"></a>
+<span class="sourceLineNo">247</span> }<a name="line.247"></a>
+<span class="sourceLineNo">248</span> // Should be four results of column 1 (though there are 5 rows in the CELL_GRID -- the<a name="line.248"></a>
+<span class="sourceLineNo">249</span> // TWO_POINT_TWO row does not have a a column ONE.<a name="line.249"></a>
+<span class="sourceLineNo">250</span> Assert.assertEquals(4, results.size());<a name="line.250"></a>
+<span class="sourceLineNo">251</span> for (Cell cell: results) {<a name="line.251"></a>
+<span class="sourceLineNo">252</span> assertTrue(Bytes.equals(ONE, 0, ONE.length,<a name="line.252"></a>
+<span class="sourceLineNo">253</span> cell.getQualifierArray(), cell.getQualifierOffset(), cell.getQualifierLength()));<a name="line.253"></a>
+<span class="sourceLineNo">254</span> }<a name="line.254"></a>
+<span class="sourceLineNo">255</span> Assert.assertTrue("Optimize should do some optimizations", scanner.optimization.get() > 0);<a name="line.255"></a>
+<span class="sourceLineNo">256</span> } finally {<a name="line.256"></a>
+<span class="sourceLineNo">257</span> scanner.close();<a name="line.257"></a>
+<span class="sourceLineNo">258</span> }<a name="line.258"></a>
+<span class="sourceLineNo">259</span> }<a name="line.259"></a>
+<span class="sourceLineNo">260</span><a name="line.260"></a>
+<span class="sourceLineNo">261</span> /**<a name="line.261"></a>
+<span class="sourceLineNo">262</span> * Ensure the optimize Scan method in StoreScanner does not get in the way of a Get doing minimum<a name="line.262"></a>
+<span class="sourceLineNo">263</span> * work... seeking to start of block and then SKIPPING until we find the wanted Cell.<a name="line.263"></a>
+<span class="sourceLineNo">264</span> * This 'simple' scenario mimics case of all Cells fitting inside a single HFileBlock.<a name="line.264"></a>
+<span class="sourceLineNo">265</span> * See HBASE-15392. This test is a little cryptic. Takes a bit of staring to figure what it up to.<a name="line.265"></a>
+<span class="sourceLineNo">266</span> * @throws IOException<a name="line.266"></a>
+<span class="sourceLineNo">267</span> */<a name="line.267"></a>
+<span class="sourceLineNo">268</span> @Test<a name="line.268"></a>
+<span class="sourceLineNo">269</span> public void testOptimizeAndGet() throws IOException {<a name="line.269"></a>
+<span class="sourceLineNo">270</span> // First test a Get of two columns in the row R2. Every Get is a Scan. Get columns named<a name="line.270"></a>
+<span class="sourceLineNo">271</span> // R2 and R3.<a name="line.271"></a>
+<span class="sourceLineNo">272</span> Get get = new Get(TWO);<a name="line.272"></a>
+<span class="sourceLineNo">273</span> get.addColumn(CF, TWO);<a name="line.273"></a>
+<span class="sourceLineNo">274</span> get.addColumn(CF, THREE);<a name="line.274"></a>
+<span class="sourceLineNo">275</span> Scan scan = new Scan(get);<a name="line.275"></a>
+<span class="sourceLineNo">276</span> CellGridStoreScanner scanner = new CellGridStoreScanner(scan, this.scanInfo, this.scanType);<a name="line.276"></a>
+<span class="sourceLineNo">277</span> try {<a name="line.277"></a>
+<span class="sourceLineNo">278</span> List<Cell> results = new ArrayList<Cell>();<a name="line.278"></a>
+<span class="sourceLineNo">279</span> // For a Get there should be no more next's after the first call.<a name="line.279"></a>
+<span class="sourceLineNo">280</span> Assert.assertEquals(false, scanner.next(results));<a name="line.280"></a>
+<span class="sourceLineNo">281</span> // Should be one result only.<a name="line.281"></a>
+<span class="sourceLineNo">282</span> Assert.assertEquals(2, results.size());<a name="line.282"></a>
+<span class="sourceLineNo">283</span> // And we should have gone through optimize twice only.<a name="line.283"></a>
+<span class="sourceLineNo">284</span> Assert.assertEquals("First qcode is SEEK_NEXT_COL and second INCLUDE_AND_SEEK_NEXT_ROW",<a name="line.284"></a>
+<span class="sourceLineNo">285</span> 3, scanner.count.get());<a name="line.285"></a>
+<span class="sourceLineNo">286</span> } finally {<a name="line.286"></a>
+<span class="sourceLineNo">287</span> scanner.close();<a name="line.287"></a>
+<span class="sourceLineNo">288</span> }<a name="line.288"></a>
+<span class="sourceLineNo">289</span> }<a name="line.289"></a>
+<span class="sourceLineNo">290</span><a name="line.290"></a>
+<span class="sourceLineNo">291</span> /**<a name="line.291"></a>
+<span class="sourceLineNo">292</span> * Ensure that optimize does not cause the Get to do more seeking than required. Optimize<a name="line.292"></a>
+<span class="sourceLineNo">293</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.293"></a>
+<span class="sourceLineNo">294</span> * index/start key was a different row to the current one. A bug. We'd call next too often<a name="line.294"></a>
+<span class="sourceLineNo">295</span> * because we had to exhaust all Cells in the current row making us load the next block just to<a name="line.295"></a>
+<span class="sourceLineNo">296</span> * discard what we read there. This test is a little cryptic. Takes a bit of staring to figure<a name="line.296"></a>
+<span class="sourceLineNo">297</span> * what it up to.<a name="line.297"></a>
+<span class="sourceLineNo">298</span> * @throws IOException<a name="line.298"></a>
+<span class="sourceLineNo">299</span> */<a name="line.299"></a>
+<span class="sourceLineNo">300</span> @Test<a name="line.300"></a>
+<span class="sourceLineNo">301</span> public void testOptimizeAndGetWithFakedNextBlockIndexStart() throws IOException {<a name="line.301"></a>
+<span class="sourceLineNo">302</span> // First test a Get of second column in the row R2. Every Get is a Scan. Second column has a<a name="line.302"></a>
+<span class="sourceLineNo">303</span> // qualifier of R2.<a name="line.303"></a>
+<span class="sourceLineNo">304</span> Get get = new Get(THREE);<a name="line.304"></a>
+<span class="sourceLineNo">305</span> get.addColumn(CF, TWO);<a name="line.305"></a>
+<span class="sourceLineNo">306</span> Scan scan = new Scan(get);<a name="line.306"></a>
+<span class="sourceLineNo">307</span> CellGridStoreScanner scanner = new CellGridStoreScanner(scan, this.scanInfo, this.scanType);<a name="line.307"></a>
+<span class="sourceLineNo">308</span> try {<a name="line.308"></a>
+<span class="sourceLineNo">309</span> List<Cell> results = new ArrayList<Cell>();<a name="line.309"></a>
+<span class="sourceLineNo">310</span> // For a Get there should be no more next's after the first call.<a name="line.310"></a>
+<span class="sourceLineNo">311</span> Assert.assertEquals(false, scanner.next(results));<a name="line.311"></a>
+<span class="sourceLineNo">312</span> // Should be one result only.<a name="line.312"></a>
+<span class="sourceLineNo">313</span> Assert.assertEquals(1, results.size());<a name="line.313"></a>
+<span class="sourceLineNo">314</span> // And we should have gone through optimize twice only.<a name="line.314"></a>
+<span class="sourceLineNo">315</span> Assert.assertEquals("First qcode is SEEK_NEXT_COL and second INCLUDE_AND_SEEK_NEXT_ROW",<a name="line.315"></a>
+<span class="sourceLineNo">316</span> 2, scanner.count.get());<a name="line.316"></a>
+<span class="sourceLineNo">317</span> } finally {<a name="line.317"></a>
+<span class="sourceLineNo">318</span> scanner.close();<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><a name="line.321"></a>
+<span class="sourceLineNo">322</span> @Test<a name="line.322"></a>
+<span class="sourceLineNo">323</span> public void testScanTimeRange() throws IOException {<a name="line.323"></a>
+<span class="sourceLineNo">324</span> String r1 = "R1";<a name="line.324"></a>
+<span class="sourceLineNo">325</span> // returns only 1 of these 2 even though same timestamp<a name="line.325"></a>
+<span class="sourceLineNo">326</span> KeyValue [] kvs = new KeyValue[] {<a name="line.326"></a>
+<span class="sourceLineNo">327</span> KeyValueTestUtil.create(r1, CF_STR, "a", 1, KeyValue.Type.Put, "dont-care"),<a name="line.327"></a>
+<span class="sourceLineNo">328</span> KeyValueTestUtil.create(r1, CF_STR, "a", 2, KeyValue.Type.Put, "dont-care"),<a name="line.328"></a>
+<span class="sourceLineNo">329</span> KeyValueTestUtil.create(r1, CF_STR, "a", 3, KeyValue.Type.Put, "dont-care"),<a name="line.329"></a>
+<span class="sourceLineNo">330</span> KeyValueTestUtil.create(r1, CF_STR, "a", 4, KeyValue.Type.Put, "dont-care"),<a name="line.330"></a>
+<span class="sourceLineNo">331</span> KeyValueTestUtil.create(r1, CF_STR, "a", 5, KeyValue.Type.Put, "dont-care"),<a name="line.331"></a>
+<span class="sourceLineNo">332</span> };<a name="line.332"></a>
+<span class="sourceLineNo">333</span> List<KeyValueScanner> scanners = Arrays.<KeyValueScanner>asList(<a name="line.333"></a>
+<span class="sourceLineNo">334</span> new KeyValueScanner[] {<a name="line.334"></a>
+<span class="sourceLineNo">335</span> new KeyValueScanFixture(CellComparator.COMPARATOR, kvs)<a name="line.335"></a>
+<span class="sourceLineNo">336</span> });<a name="line.336"></a>
+<span class="sourceLineNo">337</span> Scan scanSpec = new Scan(Bytes.toBytes(r1));<a name="line.337"></a>
+<span class="sourceLineNo">338</span> scanSpec.setTimeRange(0, 6);<a name="line.338"></a>
+<span class="sourceLineNo">339</span> scanSpec.setMaxVersions();<a name="line.339"></a>
+<span class="sourceLineNo">340</span> List<Cell> results = null;<a name="line.340"></a>
+<span class="sourceLineNo">341</span> try (StoreScanner scan =<a name="line.341"></a>
+<span class="sourceLineNo">342</span> new StoreScanner(scanSpec, scanInfo, scanType, getCols("a"), scanners)) {<a name="line.342"></a>
+<span class="sourceLineNo">343</span> results = new ArrayList<Cell>();<a name="line.343"></a>
+<span class="sourceLineNo">344</span> Assert.assertEquals(true, scan.next(results));<a name="line.344"></a>
+<span class="sourceLineNo">345</span> Assert.assertEquals(5, results.size());<a name="line.345"></a>
+<span class="sourceLineNo">346</span> Assert.assertEquals(kvs[kvs.length - 1], results.get(0));<a name="line.346"></a>
+<span class="sourceLineNo">347</span> }<a name="line.347"></a>
+<span class="sourceLineNo">348</span> // Scan limited TimeRange<a name="line.348"></a>
+<span class="sourceLineNo">349</span> scanSpec = new Scan(Bytes.toBytes(r1));<a name="line.349"></a>
+<span class="sourceLineNo">350</span> scanSpec.setTimeRange(1, 3);<a name="line.350"></a>
+<span class="sourceLineNo">351</span> scanSpec.setMaxVersions();<a name="line.351"></a>
+<span class="sourceLineNo">352</span> try (StoreScanner scan =<a name="line.352"></a>
+<span class="sourceLineNo">353</span> new StoreScanner(scanSpec, scanInfo, scanType, getCols("a"), scanners)) {<a name="line.353"></a>
+<span class="sourceLineNo">354</span> results = new ArrayList<Cell>();<a name="line.354"></a>
+<span class="sourceLineNo">355</span> Assert.assertEquals(true, scan.next(results));<a name="line.355"></a>
+<span class="sourceLineNo">356</span> Assert.assertEquals(2, results.size());<a name="line.356"></a>
+<span class="sourceLineNo">357</span> }<a name="line.357"></a>
+<span class="sourceLineNo">358</span> // Another range.<a name="line.358"></a>
+<span class="sourceLineNo">359</span> scanSpec = new Scan(Bytes.toBytes(r1));<a name="line.359"></a>
+<span class="sourceLineNo">360</span> scanSpec.setTimeRange(5, 10);<a name="line.360"></a>
+<span class="sourceLineNo">361</span> scanSpec.setMaxVersions();<a name="line.361"></a>
<span class="sourceLineNo">362</span> try (StoreScanner scan =<a name="line.362"></a>
-<span class="sourceLineNo">363</span> new StoreScanner(new Scan().setMaxVersions(Integer.MAX_VALUE), scanInfo, scanType, null,<a name="line.363"></a>
-<span class="sourceLineNo">364</span> scanners)) {<a name="line.364"></a>
-<span class="sourceLineNo">365</span> List<Cell> results = new ArrayList<Cell>();<a name="line.365"></a>
-<span class="sourceLineNo">366</span> Assert.assertEquals(true, scan.next(results));<a name="line.366"></a>
-<span class="sourceLineNo">367</span> Assert.assertEquals(0, results.size());<a name="line.367"></a>
-<span class="sourceLineNo">368</span> Assert.assertEquals(true, scan.next(results));<a name="line.368"></a>
-<span class="sourceLineNo">369</span> Assert.assertEquals(1, results.size());<a name="line.369"></a>
-<span class="sourceLineNo">370</span> Assert.assertEquals(kvs[kvs.length-1], results.get(0));<a name="line.370"></a>
-<span class="sourceLineNo">371</span><a name="line.371"></a>
-<span class="sourceLineNo">372</span> Assert.assertEquals(false, scan.next(results));<a name="line.372"></a>
-<span class="sourceLineNo">373</span> }<a name="line.373"></a>
-<span class="sourceLineNo">374</span> }<a name="line.374"></a>
-<span class="sourceLineNo">375</span><a name="line.375"></a>
-<span class="sourceLineNo">376</span> @Test<a name="line.376"></a>
-<span class="sourceLineNo">377</span> public void testDeleteColumn() throws IOException {<a name="line.377"></a>
-<span class="sourceLineNo">378</span> KeyValue [] kvs = new KeyValue[] {<a name="line.378"></a>
-<span class="sourceLineNo">379</span> KeyValueTestUtil.create("R1", "cf", "a", 10, KeyValue.Type.DeleteColumn, "dont-care"),<a name="line.379"></a>
-<span class="sourceLineNo">380</span> KeyValueTestUtil.create("R1", "cf", "a", 9, KeyValue.Type.Delete, "dont-care"),<a name="line.380"></a>
-<span class="sourceLineNo">381</span> KeyValueTestUtil.create("R1", "cf", "a", 8, KeyValue.Type.Put, "dont-care"),<a name="line.381"></a>
-<span class="sourceLineNo">382</span> KeyValueTestUtil.create("R1", "cf", "b", 5, KeyValue.Type.Put, "dont-care")<a name="line.382"></a>
-<span class="sourceLineNo">383</span> };<a name="line.383"></a>
-<span class="sourceLineNo">384</span> List<KeyValueScanner> scanners = scanFixture(kvs);<a name="line.384"></a>
-<span class="sourceLineNo">385</span> try (StoreScanner scan = new StoreScanner(new Scan(), scanInfo, scanType, null,<a name="line.385"></a>
-<span class="sourceLineNo">386</span> scanners)) {<a name="line.386"></a>
-<span class="sourceLineNo">387</span> List<Cell> results = new ArrayList<Cell>();<a name="line.387"></a>
-<span class="sourceLineNo">388</span> Assert.assertEquals(true, scan.next(results));<a name="line.388"></a>
-<span class="sourceLineNo">389</span> Assert.assertEquals(1, results.size());<a name="line.389"></a>
-<span class="sourceLineNo">390</span> Assert.assertEquals(kvs[3], results.get(0));<a name="line.390"></a>
-<span class="sourceLineNo">391</span> }<a name="line.391"></a>
-<span class="sourceLineNo">392</span> }<a name="line.392"></a>
-<span class="sourceLineNo">393</span><a name="line.393"></a>
-<span class="sourceLineNo">394</span> private static final KeyValue [] kvs = new KeyValue[] {<a name="line.394"></a>
-<span class="sourceLineNo">395</span> KeyValueTestUtil.create("R1", "cf", "a", 11, KeyValue.Type.Put, "dont-care"),<a name="line.395"></a>
-<span class="sourceLineNo">396</span> KeyValueTestUtil.create("R1", "cf", "b", 11, KeyValue.Type.Put, "dont-care"),<a name="line.396"></a>
-<span class="sourceLineNo">397</span> KeyValueTestUtil.create("R1", "cf", "c", 11, KeyValue.Type.Put, "dont-care"),<a name="line.397"></a>
-<span class="sourceLineNo">398</span> KeyValueTestUtil.create("R1", "cf", "d", 11, KeyValue.Type.Put, "dont-care"),<a name="line.398"></a>
-<span class="sourceLineNo">399</span> KeyValueTestUtil.create("R1", "cf", "e", 11, KeyValue.Type.Put, "dont-care"),<a name="line.399"></a>
-<span class="sourceLineNo">400</span> KeyValueTestUtil.create("R1", "cf", "f", 11, KeyValue.Type.Put, "dont-care"),<a name="line.400"></a>
-<span class="sourceLineNo">401</span> KeyValueTestUtil.create("R1", "cf", "g", 11, KeyValue.Type.Put, "dont-care"),<a name="line.401"></a>
-<span class="sourceLineNo">402</span> KeyValueTestUtil.create("R1", "cf", "h", 11, KeyValue.Type.Put, "dont-care"),<a name="line.402"></a>
-<span class="sourceLineNo">403</span> KeyValueTestUtil.create("R1", "cf", "i", 11, KeyValue.Type.Put, "dont-care"),<a name="line.403"></a>
-<span class="sourceLineNo">404</span> KeyValueTestUtil.create("R2", "cf", "a", 11, KeyValue.Type.Put, "dont-care"),<a name="line.404"></a>
-<span class="sourceLineNo">405</span> };<a name="line.405"></a>
-<span class="sourceLineNo">406</span><a name="line.406"></a>
-<span class="sourceLineNo">407</span> @Test<a name="line.407"></a>
-<span class="sourceLineNo">408</span> public void testSkipColumn() throws IOException {<a name="line.408"></a>
-<span class="sourceLineNo">409</span> List<KeyValueScanner> scanners = scanFixture(kvs);<a name="line.409"></a>
-<span class="sourceLineNo">410</span> try (StoreScanner scan =<a name="line.410"></a>
-<span class="sourceLineNo">411</span> new StoreScanner(new Scan(), scanInfo, scanType, getCols("a", "d"), scanners)) {<a name="line.411"></a>
-<span class="sourceLineNo">412</span> List<Cell> results = new ArrayList<Cell>();<a name="line.412"></a>
-<span class="sourceLineNo">413</span> Assert.assertEquals(true, scan.next(results));<a name="line.413"></a>
-<span class="sourceLineNo">414</span> Assert.assertEquals(2, results.size());<a name="line.414"></a>
-<span class="sourceLineNo">415</span> Assert.assertEquals(kvs[0], results.get(0));<a name="line.415"></a>
-<span class="sourceLineNo">416</span> Assert.assertEquals(kvs[3], results.get(1));<a name="line.416"></a>
-<span class="sourceLineNo">417</span> results.clear();<a name="line.417"></a>
-<span class="sourceLineNo">418</span><a name="line.418"></a>
-<span class="sourceLineNo">419</span> Assert.assertEquals(true, scan.next(results));<a name="line.419"></a>
-<span class="sourceLineNo">420</span> Assert.assertEquals(1, results.size());<a name="line.420"></a>
-<span class="sourceLineNo">421</span> Assert.assertEquals(kvs[kvs.length-1], results.get(0));<a name="line.421"></a>
-<span class="sourceLineNo">422</span><a name="line.422"></a>
-<span class="sourceLineNo">423</span> results.clear();<a name="line.423"></a>
-<span class="sourceLineNo">424</span> Assert.assertEquals(false, scan.next(results));<a name="line.424"></a>
-<span class="sourceLineNo">425</span> }<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> * Test expiration of KeyValues in combination with a configured TTL for<a name="line.429"></a>
-<span class="sourceLineNo">430</span> * a column family (as should be triggered in a major compaction).<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 testWildCardTtlScan() throws IOException {<a name="line.433"></a>
-<span class="sourceLineNo">434</span> long now = System.currentTimeMillis();<a name="line.434"></a>
-<span class="sourceLineNo">435</span> KeyValue [] kvs = new KeyValue[] {<a name="line.435"></a>
-<span class="sourceLineNo">436</span> KeyValueTestUtil.create("R1", "cf", "a", now-1000, KeyValue.Type.Put, "dont-care"),<a name="line.436"></a>
-<span class="sourceLineNo">437</span> KeyValueTestUtil.create("R1", "cf", "b", now-10, KeyValue.Type.Put, "dont-care"),<a name="line.437"></a>
-<span class="sourceLineNo">438</span> KeyValueTestUtil.create("R1", "cf", "c", now-200, KeyValue.Type.Put, "dont-care"),<a name="line.438"></a>
-<span class="sourceLineNo">439</span> KeyValueTestUtil.create("R1", "cf", "d", now-10000, KeyValue.Type.Put, "dont-care"),<a name="line.439"></a>
-<span class="sourceLineNo">440</span> KeyValueTestUtil.create("R2", "cf", "a", now, KeyValue.Type.Put, "dont-care"),<a name="line.440"></a>
-<span class="sourceLineNo">441</span> KeyValueTestUtil.create("R2", "cf", "b", now-10, KeyValue.Type.Put, "dont-care"),<a name="line.441"></a>
-<span class="sourceLineNo">442</span> KeyValueTestUtil.create("R2", "cf", "c", now-200, KeyValue.Type.Put, "dont-care"),<a name="line.442"></a>
-<span class="sourceLineNo">443</span> KeyValueTestUtil.create("R2", "cf", "c", now-1000, KeyValue.Type.Put, "dont-care")<a name="line.443"></a>
-<span class="sourceLineNo">444</span> };<a name="line.444"></a>
-<span class="sourceLineNo">445</span> List<KeyValueScanner> scanners = scanFixture(kvs);<a name="line.445"></a>
-<span class="sourceLineNo">446</span> Scan scan = new Scan();<a name="line.446"></a>
-<span class="sourceLineNo">447</span> scan.setMaxVersions(1);<a name="line.447"></a>
-<span class="sourceLineNo">448</span> ScanInfo scanInfo = new ScanInfo(CONF, CF, 0, 1, 500, KeepDeletedCells.FALSE, 0,<a name="line.448"></a>
-<span class="sourceLineNo">449</span> CellComparator.COMPARATOR);<a name="line.449"></a>
-<span class="sourceLineNo">450</span> ScanType scanType = ScanType.USER_SCAN;<a name="line.450"></a>
-<span class="sourceLineNo">451</span> try (StoreScanner scanner = new StoreScanner(scan, scanInfo, scanType, null, scanners)) {<a name="line.451"></a>
-<span class="sourceLineNo">452</span> List<Cell> results = new ArrayList<Cell>();<a name="line.452"></a>
-<span class="sourceLineNo">453</span> Assert.assertEquals(true, scanner.next(results));<a name="line.453"></a>
-<span class="sourceLineNo">454</span> Assert.assertEquals(2, results.size());<a name="line.454"></a>
-<span class="sourceLineNo">455</span> Assert.assertEquals(kvs[1], results.get(0));<a name="line.455"></a>
-<span class="sourceLineNo">456</span> Assert.assertEquals(kvs[2], results.get(1));<a name="line.456"></a>
-<span class="sourceLineNo">457</span> results.clear();<a name="line.457"></a>
+<span class="sourceLineNo">363</span> new StoreScanner(scanSpec, scanInfo, scanType, getCols("a"), scanners)) {<a name="line.363"></a>
+<span class="sourceLineNo">364</span> results = new ArrayList<Cell>();<a name="line.364"></a>
+<span class="sourceLineNo">365</span> Assert.assertEquals(true, scan.next(results));<a name="line.365"></a>
+<span class="sourceLineNo">366</span> Assert.assertEquals(1, results.size());<a name="line.366"></a>
+<span class="sourceLineNo">367</span> }<a name="line.367"></a>
+<span class="sourceLineNo">368</span> // See how TimeRange and Versions interact.<a name="line.368"></a>
+<span class="sourceLineNo">369</span> // Another range.<a name="line.369"></a>
+<span class="sourceLineNo">370</span> scanSpec = new Scan(Bytes.toBytes(r1));<a name="line.370"></a>
+<span class="sourceLineNo">371</span> scanSpec.setTimeRange(0, 10);<a name="line.371"></a>
+<span class="sourceLineNo">372</span> scanSpec.setMaxVersions(3);<a name="line.372"></a>
+<span class="sourceLineNo">373</span> try (StoreScanner scan = new StoreScanner(scanSpec, scanInfo, scanType, getCols("a"),<a name="line.373"></a>
+<span class="sourceLineNo">374</span> scanners)) {<a name="line.374"></a>
+<span class="sourceLineNo">375</span> results = new ArrayList<Cell>();<a name="line.375"></a>
+<span class="sourceLineNo">376</span> Assert.assertEquals(true, scan.next(results));<a name="line.376"></a>
+<span class="sourceLineNo">377</span> Assert.assertEquals(3, results.size());<a name="line.377"></a>
+<span class="sourceLineNo">378</span> }<a name="line.378"></a>
+<span class="sourceLineNo">379</span> }<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 testScanSameTimestamp() throws IOException {<a name="line.382"></a>
+<span class="sourceLineNo">383</span> // returns only 1 of these 2 even though same timestamp<a name="line.383"></a>
+<span class="sourceLineNo">384</span> KeyValue [] kvs = new KeyValue[] {<a name="line.384"></a>
+<span class="sourceLineNo">385</span> KeyValueTestUtil.create("R1", "cf", "a", 1, KeyValue.Type.Put, "dont-care"),<a name="line.385"></a>
+<span class="sourceLineNo">386</span> KeyValueTestUtil.create("R1", "cf", "a", 1, KeyValue.Type.Put, "dont-care"),<a name="line.386"></a>
+<span class="sourceLineNo">387</span> };<a name="line.387"></a>
+<span class="sourceLineNo">388</span> List<KeyValueScanner> scanners = Arrays.asList(<a name="line.388"></a>
+<span class="sourceLineNo">389</span> new KeyValueScanner[] {<a name="line.389"></a>
+<span class="sourceLineNo">390</span> new KeyValueScanFixture(CellComparator.COMPARATOR, kvs)<a name="line.390"></a>
+<span class="sourceLineNo">391</span> });<a name="line.391"></a>
+<span class="sourceLineNo">392</span><a name="line.392"></a>
+<span class="sourceLineNo">393</span> Scan scanSpec = new Scan(Bytes.toBytes("R1"));<a name="line.393"></a>
+<span class="sourceLineNo">394</span> // this only uses maxVersions (default=1) and TimeRange (default=all)<a name="line.394"></a>
+<span class="sourceLineNo">395</span> try (StoreScanner scan =<a name="line.395"></a>
+<span class="sourceLineNo">396</span> new StoreScanner(scanSpec, scanInfo, scanType, getCols("a"), scanners)) {<a name="line.396"></a>
+<span class="sourceLineNo">397</span> List<Cell> results = new ArrayList<Cell>();<a name="line.397"></a>
+<span class="sourceLineNo">398</span> Assert.assertEquals(true, scan.next(results));<a name="line.398"></a>
+<span class="sourceLineNo">399</span> Assert.assertEquals(1, results.size());<a name="line.399"></a>
+<span class="sourceLineNo">400</span> Assert.assertEquals(kvs[0], results.get(0));<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><a name="line.403"></a>
+<span class="sourceLineNo">404</span> /*<a name="line.404"></a>
+<span class="sourceLineNo">405</span> * Test test shows exactly how the matcher's return codes confuses the StoreScanner<a name="line.405"></a>
+<span class="sourceLineNo">406</span> * and prevent it from doing the right thing. Seeking once, then nexting twice<a name="line.406"></a>
+<span class="sourceLineNo">407</span> * should return R1, then R2, but in this case it doesnt.<a name="line.407"></a>
+<span class="sourceLineNo">408</span> * TODO this comment makes no sense above. Appears to do the right thing.<a name="line.408"></a>
+<span class="sourceLineNo">409</span> * @throws IOException<a name="line.409"></a>
+<span class="sourceLineNo">410</span> */<a name="line.410"></a>
+<span class="sourceLineNo">411</span> @Test<a name="line.411"></a>
+<span class="sourceLineNo">412</span> public void testWontNextToNext() throws IOException {<a name="line.412"></a>
+<span class="sourceLineNo">413</span> // build the scan file:<a name="line.413"></a>
+<span class="sourceLineNo">414</span> KeyValue [] kvs = new KeyValue[] {<a name="line.414"></a>
+<span class="sourceLineNo">415</span> KeyValueTestUtil.create("R1", "cf", "a", 2, KeyValue.Type.Put, "dont-care"),<a nam
<TRUNCATED>