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/09/22 14:51:06 UTC
[03/43] hbase-site git commit: Published site at
7ab77518a2569e2416a50020393aa386e7734501.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/bbe517ae/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.html
index 05d2079..cab6957 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.html
@@ -53,446 +53,449 @@
<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.io.compress.Compression;<a name="line.45"></a>
<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.46"></a>
<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.testclassification.RegionServerTests;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.junit.After;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.junit.Before;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.junit.ClassRule;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.junit.Test;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import org.junit.experimental.categories.Category;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import org.junit.runner.RunWith;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import org.junit.runners.Parameterized;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>import org.junit.runners.Parameterized.Parameters;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>import org.slf4j.Logger;<a name="line.57"></a>
-<span class="sourceLineNo">058</span>import org.slf4j.LoggerFactory;<a name="line.58"></a>
-<span class="sourceLineNo">059</span><a name="line.59"></a>
-<span class="sourceLineNo">060</span>/**<a name="line.60"></a>
-<span class="sourceLineNo">061</span> * Test various seek optimizations for correctness and check if they are<a name="line.61"></a>
-<span class="sourceLineNo">062</span> * actually saving I/O operations.<a name="line.62"></a>
-<span class="sourceLineNo">063</span> */<a name="line.63"></a>
-<span class="sourceLineNo">064</span>@RunWith(Parameterized.class)<a name="line.64"></a>
-<span class="sourceLineNo">065</span>@Category({RegionServerTests.class, MediumTests.class})<a name="line.65"></a>
-<span class="sourceLineNo">066</span>public class TestSeekOptimizations {<a name="line.66"></a>
-<span class="sourceLineNo">067</span><a name="line.67"></a>
-<span class="sourceLineNo">068</span> @ClassRule<a name="line.68"></a>
-<span class="sourceLineNo">069</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.69"></a>
-<span class="sourceLineNo">070</span> HBaseClassTestRule.forClass(TestSeekOptimizations.class);<a name="line.70"></a>
-<span class="sourceLineNo">071</span><a name="line.71"></a>
-<span class="sourceLineNo">072</span> private static final Logger LOG =<a name="line.72"></a>
-<span class="sourceLineNo">073</span> LoggerFactory.getLogger(TestSeekOptimizations.class);<a name="line.73"></a>
-<span class="sourceLineNo">074</span><a name="line.74"></a>
-<span class="sourceLineNo">075</span> // Constants<a name="line.75"></a>
-<span class="sourceLineNo">076</span> private static final String FAMILY = "myCF";<a name="line.76"></a>
-<span class="sourceLineNo">077</span> private static final byte[] FAMILY_BYTES = Bytes.toBytes(FAMILY);<a name="line.77"></a>
-<span class="sourceLineNo">078</span><a name="line.78"></a>
-<span class="sourceLineNo">079</span> private static final int PUTS_PER_ROW_COL = 50;<a name="line.79"></a>
-<span class="sourceLineNo">080</span> private static final int DELETES_PER_ROW_COL = 10;<a name="line.80"></a>
-<span class="sourceLineNo">081</span><a name="line.81"></a>
-<span class="sourceLineNo">082</span> private static final int NUM_ROWS = 3;<a name="line.82"></a>
-<span class="sourceLineNo">083</span> private static final int NUM_COLS = 3;<a name="line.83"></a>
-<span class="sourceLineNo">084</span><a name="line.84"></a>
-<span class="sourceLineNo">085</span> private static final boolean VERBOSE = false;<a name="line.85"></a>
-<span class="sourceLineNo">086</span><a name="line.86"></a>
-<span class="sourceLineNo">087</span> /**<a name="line.87"></a>
-<span class="sourceLineNo">088</span> * Disable this when this test fails hopelessly and you need to debug a<a name="line.88"></a>
-<span class="sourceLineNo">089</span> * simpler case.<a name="line.89"></a>
-<span class="sourceLineNo">090</span> */<a name="line.90"></a>
-<span class="sourceLineNo">091</span> private static final boolean USE_MANY_STORE_FILES = true;<a name="line.91"></a>
-<span class="sourceLineNo">092</span><a name="line.92"></a>
-<span class="sourceLineNo">093</span> private static final int[][] COLUMN_SETS = new int[][] {<a name="line.93"></a>
-<span class="sourceLineNo">094</span> {}, // All columns<a name="line.94"></a>
-<span class="sourceLineNo">095</span> {0},<a name="line.95"></a>
-<span class="sourceLineNo">096</span> {1},<a name="line.96"></a>
-<span class="sourceLineNo">097</span> {0, 2},<a name="line.97"></a>
-<span class="sourceLineNo">098</span> {1, 2},<a name="line.98"></a>
-<span class="sourceLineNo">099</span> {0, 1, 2},<a name="line.99"></a>
-<span class="sourceLineNo">100</span> };<a name="line.100"></a>
-<span class="sourceLineNo">101</span><a name="line.101"></a>
-<span class="sourceLineNo">102</span> // Both start row and end row are inclusive here for the purposes of this<a name="line.102"></a>
-<span class="sourceLineNo">103</span> // test.<a name="line.103"></a>
-<span class="sourceLineNo">104</span> private static final int[][] ROW_RANGES = new int[][] {<a name="line.104"></a>
-<span class="sourceLineNo">105</span> {-1, -1},<a name="line.105"></a>
-<span class="sourceLineNo">106</span> {0, 1},<a name="line.106"></a>
-<span class="sourceLineNo">107</span> {1, 1},<a name="line.107"></a>
-<span class="sourceLineNo">108</span> {1, 2},<a name="line.108"></a>
-<span class="sourceLineNo">109</span> {0, 2}<a name="line.109"></a>
-<span class="sourceLineNo">110</span> };<a name="line.110"></a>
-<span class="sourceLineNo">111</span><a name="line.111"></a>
-<span class="sourceLineNo">112</span> private static final int[] MAX_VERSIONS_VALUES = new int[] { 1, 2 };<a name="line.112"></a>
-<span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span> // Instance variables<a name="line.114"></a>
-<span class="sourceLineNo">115</span> private HRegion region;<a name="line.115"></a>
-<span class="sourceLineNo">116</span> private Put put;<a name="line.116"></a>
-<span class="sourceLineNo">117</span> private Delete del;<a name="line.117"></a>
-<span class="sourceLineNo">118</span> private Random rand;<a name="line.118"></a>
-<span class="sourceLineNo">119</span> private Set<Long> putTimestamps = new HashSet<>();<a name="line.119"></a>
-<span class="sourceLineNo">120</span> private Set<Long> delTimestamps = new HashSet<>();<a name="line.120"></a>
-<span class="sourceLineNo">121</span> private List<Cell> expectedKVs = new ArrayList<>();<a name="line.121"></a>
-<span class="sourceLineNo">122</span><a name="line.122"></a>
-<span class="sourceLineNo">123</span> private Compression.Algorithm comprAlgo;<a name="line.123"></a>
-<span class="sourceLineNo">124</span> private BloomType bloomType;<a name="line.124"></a>
-<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span> private long totalSeekDiligent, totalSeekLazy;<a name="line.126"></a>
-<span class="sourceLineNo">127</span><a name="line.127"></a>
-<span class="sourceLineNo">128</span> private final static HBaseTestingUtility TEST_UTIL = HBaseTestingUtility.createLocalHTU();<a name="line.128"></a>
-<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span> @Parameters<a name="line.130"></a>
-<span class="sourceLineNo">131</span> public static final Collection<Object[]> parameters() {<a name="line.131"></a>
-<span class="sourceLineNo">132</span> return HBaseTestingUtility.BLOOM_AND_COMPRESSION_COMBINATIONS;<a name="line.132"></a>
-<span class="sourceLineNo">133</span> }<a name="line.133"></a>
-<span class="sourceLineNo">134</span><a name="line.134"></a>
-<span class="sourceLineNo">135</span> public TestSeekOptimizations(Compression.Algorithm comprAlgo,<a name="line.135"></a>
-<span class="sourceLineNo">136</span> BloomType bloomType) {<a name="line.136"></a>
-<span class="sourceLineNo">137</span> this.comprAlgo = comprAlgo;<a name="line.137"></a>
-<span class="sourceLineNo">138</span> this.bloomType = bloomType;<a name="line.138"></a>
-<span class="sourceLineNo">139</span> }<a name="line.139"></a>
-<span class="sourceLineNo">140</span><a name="line.140"></a>
-<span class="sourceLineNo">141</span> @Before<a name="line.141"></a>
-<span class="sourceLineNo">142</span> public void setUp() {<a name="line.142"></a>
-<span class="sourceLineNo">143</span> rand = new Random(91238123L);<a name="line.143"></a>
-<span class="sourceLineNo">144</span> expectedKVs.clear();<a name="line.144"></a>
-<span class="sourceLineNo">145</span> }<a name="line.145"></a>
-<span class="sourceLineNo">146</span><a name="line.146"></a>
-<span class="sourceLineNo">147</span> @Test<a name="line.147"></a>
-<span class="sourceLineNo">148</span> public void testMultipleTimestampRanges() throws IOException {<a name="line.148"></a>
-<span class="sourceLineNo">149</span> // enable seek counting<a name="line.149"></a>
-<span class="sourceLineNo">150</span> StoreFileScanner.instrument();<a name="line.150"></a>
-<span class="sourceLineNo">151</span><a name="line.151"></a>
-<span class="sourceLineNo">152</span> region = TEST_UTIL.createTestRegion("testMultipleTimestampRanges",<a name="line.152"></a>
-<span class="sourceLineNo">153</span> new HColumnDescriptor(FAMILY)<a name="line.153"></a>
-<span class="sourceLineNo">154</span> .setCompressionType(comprAlgo)<a name="line.154"></a>
-<span class="sourceLineNo">155</span> .setBloomFilterType(bloomType)<a name="line.155"></a>
-<span class="sourceLineNo">156</span> .setMaxVersions(3)<a name="line.156"></a>
-<span class="sourceLineNo">157</span> );<a name="line.157"></a>
-<span class="sourceLineNo">158</span><a name="line.158"></a>
-<span class="sourceLineNo">159</span> // Delete the given timestamp and everything before.<a name="line.159"></a>
-<span class="sourceLineNo">160</span> final long latestDelTS = USE_MANY_STORE_FILES ? 1397 : -1;<a name="line.160"></a>
+<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.util.BloomFilterUtil;<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.junit.After;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.junit.Before;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.junit.ClassRule;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.junit.Test;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.junit.experimental.categories.Category;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.junit.runner.RunWith;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.junit.runners.Parameterized;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.junit.runners.Parameterized.Parameters;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import org.slf4j.Logger;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import org.slf4j.LoggerFactory;<a name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span>/**<a name="line.61"></a>
+<span class="sourceLineNo">062</span> * Test various seek optimizations for correctness and check if they are<a name="line.62"></a>
+<span class="sourceLineNo">063</span> * actually saving I/O operations.<a name="line.63"></a>
+<span class="sourceLineNo">064</span> */<a name="line.64"></a>
+<span class="sourceLineNo">065</span>@RunWith(Parameterized.class)<a name="line.65"></a>
+<span class="sourceLineNo">066</span>@Category({RegionServerTests.class, MediumTests.class})<a name="line.66"></a>
+<span class="sourceLineNo">067</span>public class TestSeekOptimizations {<a name="line.67"></a>
+<span class="sourceLineNo">068</span><a name="line.68"></a>
+<span class="sourceLineNo">069</span> @ClassRule<a name="line.69"></a>
+<span class="sourceLineNo">070</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.70"></a>
+<span class="sourceLineNo">071</span> HBaseClassTestRule.forClass(TestSeekOptimizations.class);<a name="line.71"></a>
+<span class="sourceLineNo">072</span><a name="line.72"></a>
+<span class="sourceLineNo">073</span> private static final Logger LOG =<a name="line.73"></a>
+<span class="sourceLineNo">074</span> LoggerFactory.getLogger(TestSeekOptimizations.class);<a name="line.74"></a>
+<span class="sourceLineNo">075</span><a name="line.75"></a>
+<span class="sourceLineNo">076</span> // Constants<a name="line.76"></a>
+<span class="sourceLineNo">077</span> private static final String FAMILY = "myCF";<a name="line.77"></a>
+<span class="sourceLineNo">078</span> private static final byte[] FAMILY_BYTES = Bytes.toBytes(FAMILY);<a name="line.78"></a>
+<span class="sourceLineNo">079</span><a name="line.79"></a>
+<span class="sourceLineNo">080</span> private static final int PUTS_PER_ROW_COL = 50;<a name="line.80"></a>
+<span class="sourceLineNo">081</span> private static final int DELETES_PER_ROW_COL = 10;<a name="line.81"></a>
+<span class="sourceLineNo">082</span><a name="line.82"></a>
+<span class="sourceLineNo">083</span> private static final int NUM_ROWS = 3;<a name="line.83"></a>
+<span class="sourceLineNo">084</span> private static final int NUM_COLS = 3;<a name="line.84"></a>
+<span class="sourceLineNo">085</span><a name="line.85"></a>
+<span class="sourceLineNo">086</span> private static final boolean VERBOSE = false;<a name="line.86"></a>
+<span class="sourceLineNo">087</span><a name="line.87"></a>
+<span class="sourceLineNo">088</span> /**<a name="line.88"></a>
+<span class="sourceLineNo">089</span> * Disable this when this test fails hopelessly and you need to debug a<a name="line.89"></a>
+<span class="sourceLineNo">090</span> * simpler case.<a name="line.90"></a>
+<span class="sourceLineNo">091</span> */<a name="line.91"></a>
+<span class="sourceLineNo">092</span> private static final boolean USE_MANY_STORE_FILES = true;<a name="line.92"></a>
+<span class="sourceLineNo">093</span><a name="line.93"></a>
+<span class="sourceLineNo">094</span> private static final int[][] COLUMN_SETS = new int[][] {<a name="line.94"></a>
+<span class="sourceLineNo">095</span> {}, // All columns<a name="line.95"></a>
+<span class="sourceLineNo">096</span> {0},<a name="line.96"></a>
+<span class="sourceLineNo">097</span> {1},<a name="line.97"></a>
+<span class="sourceLineNo">098</span> {0, 2},<a name="line.98"></a>
+<span class="sourceLineNo">099</span> {1, 2},<a name="line.99"></a>
+<span class="sourceLineNo">100</span> {0, 1, 2},<a name="line.100"></a>
+<span class="sourceLineNo">101</span> };<a name="line.101"></a>
+<span class="sourceLineNo">102</span><a name="line.102"></a>
+<span class="sourceLineNo">103</span> // Both start row and end row are inclusive here for the purposes of this<a name="line.103"></a>
+<span class="sourceLineNo">104</span> // test.<a name="line.104"></a>
+<span class="sourceLineNo">105</span> private static final int[][] ROW_RANGES = new int[][] {<a name="line.105"></a>
+<span class="sourceLineNo">106</span> {-1, -1},<a name="line.106"></a>
+<span class="sourceLineNo">107</span> {0, 1},<a name="line.107"></a>
+<span class="sourceLineNo">108</span> {1, 1},<a name="line.108"></a>
+<span class="sourceLineNo">109</span> {1, 2},<a name="line.109"></a>
+<span class="sourceLineNo">110</span> {0, 2}<a name="line.110"></a>
+<span class="sourceLineNo">111</span> };<a name="line.111"></a>
+<span class="sourceLineNo">112</span><a name="line.112"></a>
+<span class="sourceLineNo">113</span> private static final int[] MAX_VERSIONS_VALUES = new int[] { 1, 2 };<a name="line.113"></a>
+<span class="sourceLineNo">114</span><a name="line.114"></a>
+<span class="sourceLineNo">115</span> // Instance variables<a name="line.115"></a>
+<span class="sourceLineNo">116</span> private HRegion region;<a name="line.116"></a>
+<span class="sourceLineNo">117</span> private Put put;<a name="line.117"></a>
+<span class="sourceLineNo">118</span> private Delete del;<a name="line.118"></a>
+<span class="sourceLineNo">119</span> private Random rand;<a name="line.119"></a>
+<span class="sourceLineNo">120</span> private Set<Long> putTimestamps = new HashSet<>();<a name="line.120"></a>
+<span class="sourceLineNo">121</span> private Set<Long> delTimestamps = new HashSet<>();<a name="line.121"></a>
+<span class="sourceLineNo">122</span> private List<Cell> expectedKVs = new ArrayList<>();<a name="line.122"></a>
+<span class="sourceLineNo">123</span><a name="line.123"></a>
+<span class="sourceLineNo">124</span> private Compression.Algorithm comprAlgo;<a name="line.124"></a>
+<span class="sourceLineNo">125</span> private BloomType bloomType;<a name="line.125"></a>
+<span class="sourceLineNo">126</span><a name="line.126"></a>
+<span class="sourceLineNo">127</span> private long totalSeekDiligent, totalSeekLazy;<a name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span> private final static HBaseTestingUtility TEST_UTIL = HBaseTestingUtility.createLocalHTU();<a name="line.129"></a>
+<span class="sourceLineNo">130</span><a name="line.130"></a>
+<span class="sourceLineNo">131</span> @Parameters<a name="line.131"></a>
+<span class="sourceLineNo">132</span> public static final Collection<Object[]> parameters() {<a name="line.132"></a>
+<span class="sourceLineNo">133</span> return HBaseTestingUtility.BLOOM_AND_COMPRESSION_COMBINATIONS;<a name="line.133"></a>
+<span class="sourceLineNo">134</span> }<a name="line.134"></a>
+<span class="sourceLineNo">135</span><a name="line.135"></a>
+<span class="sourceLineNo">136</span> public TestSeekOptimizations(Compression.Algorithm comprAlgo,<a name="line.136"></a>
+<span class="sourceLineNo">137</span> BloomType bloomType) {<a name="line.137"></a>
+<span class="sourceLineNo">138</span> this.comprAlgo = comprAlgo;<a name="line.138"></a>
+<span class="sourceLineNo">139</span> this.bloomType = bloomType;<a name="line.139"></a>
+<span class="sourceLineNo">140</span> }<a name="line.140"></a>
+<span class="sourceLineNo">141</span><a name="line.141"></a>
+<span class="sourceLineNo">142</span> @Before<a name="line.142"></a>
+<span class="sourceLineNo">143</span> public void setUp() {<a name="line.143"></a>
+<span class="sourceLineNo">144</span> rand = new Random(91238123L);<a name="line.144"></a>
+<span class="sourceLineNo">145</span> expectedKVs.clear();<a name="line.145"></a>
+<span class="sourceLineNo">146</span> TEST_UTIL.getConfiguration().setInt(BloomFilterUtil.PREFIX_LENGTH_KEY, 10);<a name="line.146"></a>
+<span class="sourceLineNo">147</span> TEST_UTIL.getConfiguration().set(BloomFilterUtil.DELIMITER_KEY, "#");<a name="line.147"></a>
+<span class="sourceLineNo">148</span> }<a name="line.148"></a>
+<span class="sourceLineNo">149</span><a name="line.149"></a>
+<span class="sourceLineNo">150</span> @Test<a name="line.150"></a>
+<span class="sourceLineNo">151</span> public void testMultipleTimestampRanges() throws IOException {<a name="line.151"></a>
+<span class="sourceLineNo">152</span> // enable seek counting<a name="line.152"></a>
+<span class="sourceLineNo">153</span> StoreFileScanner.instrument();<a name="line.153"></a>
+<span class="sourceLineNo">154</span><a name="line.154"></a>
+<span class="sourceLineNo">155</span> region = TEST_UTIL.createTestRegion("testMultipleTimestampRanges",<a name="line.155"></a>
+<span class="sourceLineNo">156</span> new HColumnDescriptor(FAMILY)<a name="line.156"></a>
+<span class="sourceLineNo">157</span> .setCompressionType(comprAlgo)<a name="line.157"></a>
+<span class="sourceLineNo">158</span> .setBloomFilterType(bloomType)<a name="line.158"></a>
+<span class="sourceLineNo">159</span> .setMaxVersions(3)<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> createTimestampRange(1, 50, -1);<a name="line.162"></a>
-<span class="sourceLineNo">163</span> createTimestampRange(51, 100, -1);<a name="line.163"></a>
-<span class="sourceLineNo">164</span> if (USE_MANY_STORE_FILES) {<a name="line.164"></a>
-<span class="sourceLineNo">165</span> createTimestampRange(100, 500, 127);<a name="line.165"></a>
-<span class="sourceLineNo">166</span> createTimestampRange(900, 1300, -1);<a name="line.166"></a>
-<span class="sourceLineNo">167</span> createTimestampRange(1301, 2500, latestDelTS);<a name="line.167"></a>
-<span class="sourceLineNo">168</span> createTimestampRange(2502, 2598, -1);<a name="line.168"></a>
-<span class="sourceLineNo">169</span> createTimestampRange(2599, 2999, -1);<a name="line.169"></a>
-<span class="sourceLineNo">170</span> }<a name="line.170"></a>
-<span class="sourceLineNo">171</span><a name="line.171"></a>
-<span class="sourceLineNo">172</span> prepareExpectedKVs(latestDelTS);<a name="line.172"></a>
-<span class="sourceLineNo">173</span><a name="line.173"></a>
-<span class="sourceLineNo">174</span> for (int[] columnArr : COLUMN_SETS) {<a name="line.174"></a>
-<span class="sourceLineNo">175</span> for (int[] rowRange : ROW_RANGES) {<a name="line.175"></a>
-<span class="sourceLineNo">176</span> for (int maxVersions : MAX_VERSIONS_VALUES) {<a name="line.176"></a>
-<span class="sourceLineNo">177</span> for (boolean lazySeekEnabled : new boolean[] { false, true }) {<a name="line.177"></a>
-<span class="sourceLineNo">178</span> testScan(columnArr, lazySeekEnabled, rowRange[0], rowRange[1],<a name="line.178"></a>
-<span class="sourceLineNo">179</span> maxVersions);<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> }<a name="line.182"></a>
-<span class="sourceLineNo">183</span> }<a name="line.183"></a>
-<span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span> final double seekSavings = 1 - totalSeekLazy * 1.0 / totalSeekDiligent;<a name="line.185"></a>
-<span class="sourceLineNo">186</span> System.err.println("For bloom=" + bloomType + ", compr=" + comprAlgo +<a name="line.186"></a>
-<span class="sourceLineNo">187</span> " total seeks without optimization: " + totalSeekDiligent<a name="line.187"></a>
-<span class="sourceLineNo">188</span> + ", with optimization: " + totalSeekLazy + " (" +<a name="line.188"></a>
-<span class="sourceLineNo">189</span> String.format("%.2f%%", totalSeekLazy * 100.0 / totalSeekDiligent) +<a name="line.189"></a>
-<span class="sourceLineNo">190</span> "), savings: " + String.format("%.2f%%",<a name="line.190"></a>
-<span class="sourceLineNo">191</span> 100.0 * seekSavings) + "\n");<a name="line.191"></a>
-<span class="sourceLineNo">192</span><a name="line.192"></a>
-<span class="sourceLineNo">193</span> // Test that lazy seeks are buying us something. Without the actual<a name="line.193"></a>
-<span class="sourceLineNo">194</span> // implementation of the lazy seek optimization this will be 0.<a name="line.194"></a>
-<span class="sourceLineNo">195</span> final double expectedSeekSavings = 0.0;<a name="line.195"></a>
-<span class="sourceLineNo">196</span> assertTrue("Lazy seek is only saving " +<a name="line.196"></a>
-<span class="sourceLineNo">197</span> String.format("%.2f%%", seekSavings * 100) + " seeks but should " +<a name="line.197"></a>
-<span class="sourceLineNo">198</span> "save at least " + String.format("%.2f%%", expectedSeekSavings * 100),<a name="line.198"></a>
-<span class="sourceLineNo">199</span> seekSavings >= expectedSeekSavings);<a name="line.199"></a>
-<span class="sourceLineNo">200</span> }<a name="line.200"></a>
-<span class="sourceLineNo">201</span><a name="line.201"></a>
-<span class="sourceLineNo">202</span> private void testScan(final int[] columnArr, final boolean lazySeekEnabled,<a name="line.202"></a>
-<span class="sourceLineNo">203</span> final int startRow, final int endRow, int maxVersions)<a name="line.203"></a>
-<span class="sourceLineNo">204</span> throws IOException {<a name="line.204"></a>
-<span class="sourceLineNo">205</span> StoreScanner.enableLazySeekGlobally(lazySeekEnabled);<a name="line.205"></a>
-<span class="sourceLineNo">206</span> final Scan scan = new Scan();<a name="line.206"></a>
-<span class="sourceLineNo">207</span> final Set<String> qualSet = new HashSet<>();<a name="line.207"></a>
-<span class="sourceLineNo">208</span> for (int iColumn : columnArr) {<a name="line.208"></a>
-<span class="sourceLineNo">209</span> String qualStr = getQualStr(iColumn);<a name="line.209"></a>
-<span class="sourceLineNo">210</span> scan.addColumn(FAMILY_BYTES, Bytes.toBytes(qualStr));<a name="line.210"></a>
-<span class="sourceLineNo">211</span> qualSet.add(qualStr);<a name="line.211"></a>
-<span class="sourceLineNo">212</span> }<a name="line.212"></a>
-<span class="sourceLineNo">213</span> scan.setMaxVersions(maxVersions);<a name="line.213"></a>
-<span class="sourceLineNo">214</span> scan.setStartRow(rowBytes(startRow));<a name="line.214"></a>
-<span class="sourceLineNo">215</span><a name="line.215"></a>
-<span class="sourceLineNo">216</span> // Adjust for the fact that for multi-row queries the end row is exclusive.<a name="line.216"></a>
-<span class="sourceLineNo">217</span> {<a name="line.217"></a>
-<span class="sourceLineNo">218</span> final byte[] scannerStopRow =<a name="line.218"></a>
-<span class="sourceLineNo">219</span> rowBytes(endRow + (startRow != endRow ? 1 : 0));<a name="line.219"></a>
-<span class="sourceLineNo">220</span> scan.setStopRow(scannerStopRow);<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> final long initialSeekCount = StoreFileScanner.getSeekCount();<a name="line.223"></a>
-<span class="sourceLineNo">224</span> final InternalScanner scanner = region.getScanner(scan);<a name="line.224"></a>
-<span class="sourceLineNo">225</span> final List<Cell> results = new ArrayList<>();<a name="line.225"></a>
-<span class="sourceLineNo">226</span> final List<Cell> actualKVs = new ArrayList<>();<a name="line.226"></a>
-<span class="sourceLineNo">227</span><a name="line.227"></a>
-<span class="sourceLineNo">228</span> // Such a clumsy do-while loop appears to be the official way to use an<a name="line.228"></a>
-<span class="sourceLineNo">229</span> // internalScanner. scanner.next() return value refers to the _next_<a name="line.229"></a>
-<span class="sourceLineNo">230</span> // result, not to the one already returned in results.<a name="line.230"></a>
-<span class="sourceLineNo">231</span> boolean hasNext;<a name="line.231"></a>
-<span class="sourceLineNo">232</span> do {<a name="line.232"></a>
-<span class="sourceLineNo">233</span> hasNext = scanner.next(results);<a name="line.233"></a>
-<span class="sourceLineNo">234</span> actualKVs.addAll(results);<a name="line.234"></a>
-<span class="sourceLineNo">235</span> results.clear();<a name="line.235"></a>
-<span class="sourceLineNo">236</span> } while (hasNext);<a name="line.236"></a>
-<span class="sourceLineNo">237</span><a name="line.237"></a>
-<span class="sourceLineNo">238</span> List<Cell> filteredKVs = filterExpectedResults(qualSet,<a name="line.238"></a>
-<span class="sourceLineNo">239</span> rowBytes(startRow), rowBytes(endRow), maxVersions);<a name="line.239"></a>
-<span class="sourceLineNo">240</span> final String rowRestrictionStr =<a name="line.240"></a>
-<span class="sourceLineNo">241</span> (startRow == -1 && endRow == -1) ? "all rows" : (<a name="line.241"></a>
-<span class="sourceLineNo">242</span> startRow == endRow ? ("row=" + startRow) : ("startRow="<a name="line.242"></a>
-<span class="sourceLineNo">243</span> + startRow + ", " + "endRow=" + endRow));<a name="line.243"></a>
-<span class="sourceLineNo">244</span> final String columnRestrictionStr =<a name="line.244"></a>
-<span class="sourceLineNo">245</span> columnArr.length == 0 ? "all columns"<a name="line.245"></a>
-<span class="sourceLineNo">246</span> : ("columns=" + Arrays.toString(columnArr));<a name="line.246"></a>
-<span class="sourceLineNo">247</span> final String testDesc =<a name="line.247"></a>
-<span class="sourceLineNo">248</span> "Bloom=" + bloomType + ", compr=" + comprAlgo + ", "<a name="line.248"></a>
-<span class="sourceLineNo">249</span> + (scan.isGetScan() ? "Get" : "Scan") + ": "<a name="line.249"></a>
-<span class="sourceLineNo">250</span> + columnRestrictionStr + ", " + rowRestrictionStr<a name="line.250"></a>
-<span class="sourceLineNo">251</span> + ", maxVersions=" + maxVersions + ", lazySeek=" + lazySeekEnabled;<a name="line.251"></a>
-<span class="sourceLineNo">252</span> long seekCount = StoreFileScanner.getSeekCount() - initialSeekCount;<a name="line.252"></a>
-<span class="sourceLineNo">253</span> if (VERBOSE) {<a name="line.253"></a>
-<span class="sourceLineNo">254</span> System.err.println("Seek count: " + seekCount + ", KVs returned: "<a name="line.254"></a>
-<span class="sourceLineNo">255</span> + actualKVs.size() + ". " + testDesc +<a name="line.255"></a>
-<span class="sourceLineNo">256</span> (lazySeekEnabled ? "\n" : ""));<a name="line.256"></a>
-<span class="sourceLineNo">257</span> }<a name="line.257"></a>
-<span class="sourceLineNo">258</span> if (lazySeekEnabled) {<a name="line.258"></a>
-<span class="sourceLineNo">259</span> totalSeekLazy += seekCount;<a name="line.259"></a>
-<span class="sourceLineNo">260</span> } else {<a name="line.260"></a>
-<span class="sourceLineNo">261</span> totalSeekDiligent += seekCount;<a name="line.261"></a>
-<span class="sourceLineNo">262</span> }<a name="line.262"></a>
-<span class="sourceLineNo">263</span> assertKVListsEqual(testDesc, filteredKVs, actualKVs);<a name="line.263"></a>
-<span class="sourceLineNo">264</span> }<a name="line.264"></a>
-<span class="sourceLineNo">265</span><a name="line.265"></a>
-<span class="sourceLineNo">266</span> private List<Cell> filterExpectedResults(Set<String> qualSet,<a name="line.266"></a>
-<span class="sourceLineNo">267</span> byte[] startRow, byte[] endRow, int maxVersions) {<a name="line.267"></a>
-<span class="sourceLineNo">268</span> final List<Cell> filteredKVs = new ArrayList<>();<a name="line.268"></a>
-<span class="sourceLineNo">269</span> final Map<String, Integer> verCount = new HashMap<>();<a name="line.269"></a>
-<span class="sourceLineNo">270</span> for (Cell kv : expectedKVs) {<a name="line.270"></a>
-<span class="sourceLineNo">271</span> if (startRow.length > 0 &&<a name="line.271"></a>
-<span class="sourceLineNo">272</span> Bytes.compareTo(kv.getRowArray(), kv.getRowOffset(), kv.getRowLength(),<a name="line.272"></a>
-<span class="sourceLineNo">273</span> startRow, 0, startRow.length) < 0) {<a name="line.273"></a>
-<span class="sourceLineNo">274</span> continue;<a name="line.274"></a>
-<span class="sourceLineNo">275</span> }<a name="line.275"></a>
-<span class="sourceLineNo">276</span><a name="line.276"></a>
-<span class="sourceLineNo">277</span> // In this unit test the end row is always inclusive.<a name="line.277"></a>
-<span class="sourceLineNo">278</span> if (endRow.length > 0 &&<a name="line.278"></a>
-<span class="sourceLineNo">279</span> Bytes.compareTo(kv.getRowArray(), kv.getRowOffset(), kv.getRowLength(),<a name="line.279"></a>
-<span class="sourceLineNo">280</span> endRow, 0, endRow.length) > 0) {<a name="line.280"></a>
-<span class="sourceLineNo">281</span> continue;<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> if (!qualSet.isEmpty() && (!CellUtil.matchingFamily(kv, FAMILY_BYTES)<a name="line.284"></a>
-<span class="sourceLineNo">285</span> || !qualSet.contains(Bytes.toString(CellUtil.cloneQualifier(kv))))) {<a name="line.285"></a>
-<span class="sourceLineNo">286</span> continue;<a name="line.286"></a>
-<span class="sourceLineNo">287</span> }<a name="line.287"></a>
-<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span> final String rowColStr =<a name="line.289"></a>
-<span class="sourceLineNo">290</span> Bytes.toStringBinary(CellUtil.cloneRow(kv)) + "/"<a name="line.290"></a>
-<span class="sourceLineNo">291</span> + Bytes.toStringBinary(CellUtil.cloneFamily(kv)) + ":"<a name="line.291"></a>
-<span class="sourceLineNo">292</span> + Bytes.toStringBinary(CellUtil.cloneQualifier(kv));<a name="line.292"></a>
-<span class="sourceLineNo">293</span> final Integer curNumVer = verCount.get(rowColStr);<a name="line.293"></a>
-<span class="sourceLineNo">294</span> final int newNumVer = curNumVer != null ? (curNumVer + 1) : 1;<a name="line.294"></a>
-<span class="sourceLineNo">295</span> if (newNumVer <= maxVersions) {<a name="line.295"></a>
-<span class="sourceLineNo">296</span> filteredKVs.add(kv);<a name="line.296"></a>
-<span class="sourceLineNo">297</span> verCount.put(rowColStr, newNumVer);<a name="line.297"></a>
-<span class="sourceLineNo">298</span> }<a name="line.298"></a>
-<span class="sourceLineNo">299</span> }<a name="line.299"></a>
-<span class="sourceLineNo">300</span><a name="line.300"></a>
-<span class="sourceLineNo">301</span> return filteredKVs;<a name="line.301"></a>
-<span class="sourceLineNo">302</span> }<a name="line.302"></a>
+<span class="sourceLineNo">162</span> // Delete the given timestamp and everything before.<a name="line.162"></a>
+<span class="sourceLineNo">163</span> final long latestDelTS = USE_MANY_STORE_FILES ? 1397 : -1;<a name="line.163"></a>
+<span class="sourceLineNo">164</span><a name="line.164"></a>
+<span class="sourceLineNo">165</span> createTimestampRange(1, 50, -1);<a name="line.165"></a>
+<span class="sourceLineNo">166</span> createTimestampRange(51, 100, -1);<a name="line.166"></a>
+<span class="sourceLineNo">167</span> if (USE_MANY_STORE_FILES) {<a name="line.167"></a>
+<span class="sourceLineNo">168</span> createTimestampRange(100, 500, 127);<a name="line.168"></a>
+<span class="sourceLineNo">169</span> createTimestampRange(900, 1300, -1);<a name="line.169"></a>
+<span class="sourceLineNo">170</span> createTimestampRange(1301, 2500, latestDelTS);<a name="line.170"></a>
+<span class="sourceLineNo">171</span> createTimestampRange(2502, 2598, -1);<a name="line.171"></a>
+<span class="sourceLineNo">172</span> createTimestampRange(2599, 2999, -1);<a name="line.172"></a>
+<span class="sourceLineNo">173</span> }<a name="line.173"></a>
+<span class="sourceLineNo">174</span><a name="line.174"></a>
+<span class="sourceLineNo">175</span> prepareExpectedKVs(latestDelTS);<a name="line.175"></a>
+<span class="sourceLineNo">176</span><a name="line.176"></a>
+<span class="sourceLineNo">177</span> for (int[] columnArr : COLUMN_SETS) {<a name="line.177"></a>
+<span class="sourceLineNo">178</span> for (int[] rowRange : ROW_RANGES) {<a name="line.178"></a>
+<span class="sourceLineNo">179</span> for (int maxVersions : MAX_VERSIONS_VALUES) {<a name="line.179"></a>
+<span class="sourceLineNo">180</span> for (boolean lazySeekEnabled : new boolean[] { false, true }) {<a name="line.180"></a>
+<span class="sourceLineNo">181</span> testScan(columnArr, lazySeekEnabled, rowRange[0], rowRange[1],<a name="line.181"></a>
+<span class="sourceLineNo">182</span> maxVersions);<a name="line.182"></a>
+<span class="sourceLineNo">183</span> }<a name="line.183"></a>
+<span class="sourceLineNo">184</span> }<a name="line.184"></a>
+<span class="sourceLineNo">185</span> }<a name="line.185"></a>
+<span class="sourceLineNo">186</span> }<a name="line.186"></a>
+<span class="sourceLineNo">187</span><a name="line.187"></a>
+<span class="sourceLineNo">188</span> final double seekSavings = 1 - totalSeekLazy * 1.0 / totalSeekDiligent;<a name="line.188"></a>
+<span class="sourceLineNo">189</span> System.err.println("For bloom=" + bloomType + ", compr=" + comprAlgo +<a name="line.189"></a>
+<span class="sourceLineNo">190</span> " total seeks without optimization: " + totalSeekDiligent<a name="line.190"></a>
+<span class="sourceLineNo">191</span> + ", with optimization: " + totalSeekLazy + " (" +<a name="line.191"></a>
+<span class="sourceLineNo">192</span> String.format("%.2f%%", totalSeekLazy * 100.0 / totalSeekDiligent) +<a name="line.192"></a>
+<span class="sourceLineNo">193</span> "), savings: " + String.format("%.2f%%",<a name="line.193"></a>
+<span class="sourceLineNo">194</span> 100.0 * seekSavings) + "\n");<a name="line.194"></a>
+<span class="sourceLineNo">195</span><a name="line.195"></a>
+<span class="sourceLineNo">196</span> // Test that lazy seeks are buying us something. Without the actual<a name="line.196"></a>
+<span class="sourceLineNo">197</span> // implementation of the lazy seek optimization this will be 0.<a name="line.197"></a>
+<span class="sourceLineNo">198</span> final double expectedSeekSavings = 0.0;<a name="line.198"></a>
+<span class="sourceLineNo">199</span> assertTrue("Lazy seek is only saving " +<a name="line.199"></a>
+<span class="sourceLineNo">200</span> String.format("%.2f%%", seekSavings * 100) + " seeks but should " +<a name="line.200"></a>
+<span class="sourceLineNo">201</span> "save at least " + String.format("%.2f%%", expectedSeekSavings * 100),<a name="line.201"></a>
+<span class="sourceLineNo">202</span> seekSavings >= expectedSeekSavings);<a name="line.202"></a>
+<span class="sourceLineNo">203</span> }<a name="line.203"></a>
+<span class="sourceLineNo">204</span><a name="line.204"></a>
+<span class="sourceLineNo">205</span> private void testScan(final int[] columnArr, final boolean lazySeekEnabled,<a name="line.205"></a>
+<span class="sourceLineNo">206</span> final int startRow, final int endRow, int maxVersions)<a name="line.206"></a>
+<span class="sourceLineNo">207</span> throws IOException {<a name="line.207"></a>
+<span class="sourceLineNo">208</span> StoreScanner.enableLazySeekGlobally(lazySeekEnabled);<a name="line.208"></a>
+<span class="sourceLineNo">209</span> final Scan scan = new Scan();<a name="line.209"></a>
+<span class="sourceLineNo">210</span> final Set<String> qualSet = new HashSet<>();<a name="line.210"></a>
+<span class="sourceLineNo">211</span> for (int iColumn : columnArr) {<a name="line.211"></a>
+<span class="sourceLineNo">212</span> String qualStr = getQualStr(iColumn);<a name="line.212"></a>
+<span class="sourceLineNo">213</span> scan.addColumn(FAMILY_BYTES, Bytes.toBytes(qualStr));<a name="line.213"></a>
+<span class="sourceLineNo">214</span> qualSet.add(qualStr);<a name="line.214"></a>
+<span class="sourceLineNo">215</span> }<a name="line.215"></a>
+<span class="sourceLineNo">216</span> scan.setMaxVersions(maxVersions);<a name="line.216"></a>
+<span class="sourceLineNo">217</span> scan.setStartRow(rowBytes(startRow));<a name="line.217"></a>
+<span class="sourceLineNo">218</span><a name="line.218"></a>
+<span class="sourceLineNo">219</span> // Adjust for the fact that for multi-row queries the end row is exclusive.<a name="line.219"></a>
+<span class="sourceLineNo">220</span> {<a name="line.220"></a>
+<span class="sourceLineNo">221</span> final byte[] scannerStopRow =<a name="line.221"></a>
+<span class="sourceLineNo">222</span> rowBytes(endRow + (startRow != endRow ? 1 : 0));<a name="line.222"></a>
+<span class="sourceLineNo">223</span> scan.setStopRow(scannerStopRow);<a name="line.223"></a>
+<span class="sourceLineNo">224</span> }<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span> final long initialSeekCount = StoreFileScanner.getSeekCount();<a name="line.226"></a>
+<span class="sourceLineNo">227</span> final InternalScanner scanner = region.getScanner(scan);<a name="line.227"></a>
+<span class="sourceLineNo">228</span> final List<Cell> results = new ArrayList<>();<a name="line.228"></a>
+<span class="sourceLineNo">229</span> final List<Cell> actualKVs = new ArrayList<>();<a name="line.229"></a>
+<span class="sourceLineNo">230</span><a name="line.230"></a>
+<span class="sourceLineNo">231</span> // Such a clumsy do-while loop appears to be the official way to use an<a name="line.231"></a>
+<span class="sourceLineNo">232</span> // internalScanner. scanner.next() return value refers to the _next_<a name="line.232"></a>
+<span class="sourceLineNo">233</span> // result, not to the one already returned in results.<a name="line.233"></a>
+<span class="sourceLineNo">234</span> boolean hasNext;<a name="line.234"></a>
+<span class="sourceLineNo">235</span> do {<a name="line.235"></a>
+<span class="sourceLineNo">236</span> hasNext = scanner.next(results);<a name="line.236"></a>
+<span class="sourceLineNo">237</span> actualKVs.addAll(results);<a name="line.237"></a>
+<span class="sourceLineNo">238</span> results.clear();<a name="line.238"></a>
+<span class="sourceLineNo">239</span> } while (hasNext);<a name="line.239"></a>
+<span class="sourceLineNo">240</span><a name="line.240"></a>
+<span class="sourceLineNo">241</span> List<Cell> filteredKVs = filterExpectedResults(qualSet,<a name="line.241"></a>
+<span class="sourceLineNo">242</span> rowBytes(startRow), rowBytes(endRow), maxVersions);<a name="line.242"></a>
+<span class="sourceLineNo">243</span> final String rowRestrictionStr =<a name="line.243"></a>
+<span class="sourceLineNo">244</span> (startRow == -1 && endRow == -1) ? "all rows" : (<a name="line.244"></a>
+<span class="sourceLineNo">245</span> startRow == endRow ? ("row=" + startRow) : ("startRow="<a name="line.245"></a>
+<span class="sourceLineNo">246</span> + startRow + ", " + "endRow=" + endRow));<a name="line.246"></a>
+<span class="sourceLineNo">247</span> final String columnRestrictionStr =<a name="line.247"></a>
+<span class="sourceLineNo">248</span> columnArr.length == 0 ? "all columns"<a name="line.248"></a>
+<span class="sourceLineNo">249</span> : ("columns=" + Arrays.toString(columnArr));<a name="line.249"></a>
+<span class="sourceLineNo">250</span> final String testDesc =<a name="line.250"></a>
+<span class="sourceLineNo">251</span> "Bloom=" + bloomType + ", compr=" + comprAlgo + ", "<a name="line.251"></a>
+<span class="sourceLineNo">252</span> + (scan.isGetScan() ? "Get" : "Scan") + ": "<a name="line.252"></a>
+<span class="sourceLineNo">253</span> + columnRestrictionStr + ", " + rowRestrictionStr<a name="line.253"></a>
+<span class="sourceLineNo">254</span> + ", maxVersions=" + maxVersions + ", lazySeek=" + lazySeekEnabled;<a name="line.254"></a>
+<span class="sourceLineNo">255</span> long seekCount = StoreFileScanner.getSeekCount() - initialSeekCount;<a name="line.255"></a>
+<span class="sourceLineNo">256</span> if (VERBOSE) {<a name="line.256"></a>
+<span class="sourceLineNo">257</span> System.err.println("Seek count: " + seekCount + ", KVs returned: "<a name="line.257"></a>
+<span class="sourceLineNo">258</span> + actualKVs.size() + ". " + testDesc +<a name="line.258"></a>
+<span class="sourceLineNo">259</span> (lazySeekEnabled ? "\n" : ""));<a name="line.259"></a>
+<span class="sourceLineNo">260</span> }<a name="line.260"></a>
+<span class="sourceLineNo">261</span> if (lazySeekEnabled) {<a name="line.261"></a>
+<span class="sourceLineNo">262</span> totalSeekLazy += seekCount;<a name="line.262"></a>
+<span class="sourceLineNo">263</span> } else {<a name="line.263"></a>
+<span class="sourceLineNo">264</span> totalSeekDiligent += seekCount;<a name="line.264"></a>
+<span class="sourceLineNo">265</span> }<a name="line.265"></a>
+<span class="sourceLineNo">266</span> assertKVListsEqual(testDesc, filteredKVs, actualKVs);<a name="line.266"></a>
+<span class="sourceLineNo">267</span> }<a name="line.267"></a>
+<span class="sourceLineNo">268</span><a name="line.268"></a>
+<span class="sourceLineNo">269</span> private List<Cell> filterExpectedResults(Set<String> qualSet,<a name="line.269"></a>
+<span class="sourceLineNo">270</span> byte[] startRow, byte[] endRow, int maxVersions) {<a name="line.270"></a>
+<span class="sourceLineNo">271</span> final List<Cell> filteredKVs = new ArrayList<>();<a name="line.271"></a>
+<span class="sourceLineNo">272</span> final Map<String, Integer> verCount = new HashMap<>();<a name="line.272"></a>
+<span class="sourceLineNo">273</span> for (Cell kv : expectedKVs) {<a name="line.273"></a>
+<span class="sourceLineNo">274</span> if (startRow.length > 0 &&<a name="line.274"></a>
+<span class="sourceLineNo">275</span> Bytes.compareTo(kv.getRowArray(), kv.getRowOffset(), kv.getRowLength(),<a name="line.275"></a>
+<span class="sourceLineNo">276</span> startRow, 0, startRow.length) < 0) {<a name="line.276"></a>
+<span class="sourceLineNo">277</span> continue;<a name="line.277"></a>
+<span class="sourceLineNo">278</span> }<a name="line.278"></a>
+<span class="sourceLineNo">279</span><a name="line.279"></a>
+<span class="sourceLineNo">280</span> // In this unit test the end row is always inclusive.<a name="line.280"></a>
+<span class="sourceLineNo">281</span> if (endRow.length > 0 &&<a name="line.281"></a>
+<span class="sourceLineNo">282</span> Bytes.compareTo(kv.getRowArray(), kv.getRowOffset(), kv.getRowLength(),<a name="line.282"></a>
+<span class="sourceLineNo">283</span> endRow, 0, endRow.length) > 0) {<a name="line.283"></a>
+<span class="sourceLineNo">284</span> continue;<a name="line.284"></a>
+<span class="sourceLineNo">285</span> }<a name="line.285"></a>
+<span class="sourceLineNo">286</span><a name="line.286"></a>
+<span class="sourceLineNo">287</span> if (!qualSet.isEmpty() && (!CellUtil.matchingFamily(kv, FAMILY_BYTES)<a name="line.287"></a>
+<span class="sourceLineNo">288</span> || !qualSet.contains(Bytes.toString(CellUtil.cloneQualifier(kv))))) {<a name="line.288"></a>
+<span class="sourceLineNo">289</span> continue;<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> final String rowColStr =<a name="line.292"></a>
+<span class="sourceLineNo">293</span> Bytes.toStringBinary(CellUtil.cloneRow(kv)) + "/"<a name="line.293"></a>
+<span class="sourceLineNo">294</span> + Bytes.toStringBinary(CellUtil.cloneFamily(kv)) + ":"<a name="line.294"></a>
+<span class="sourceLineNo">295</span> + Bytes.toStringBinary(CellUtil.cloneQualifier(kv));<a name="line.295"></a>
+<span class="sourceLineNo">296</span> final Integer curNumVer = verCount.get(rowColStr);<a name="line.296"></a>
+<span class="sourceLineNo">297</span> final int newNumVer = curNumVer != null ? (curNumVer + 1) : 1;<a name="line.297"></a>
+<span class="sourceLineNo">298</span> if (newNumVer <= maxVersions) {<a name="line.298"></a>
+<span class="sourceLineNo">299</span> filteredKVs.add(kv);<a name="line.299"></a>
+<span class="sourceLineNo">300</span> verCount.put(rowColStr, newNumVer);<a name="line.300"></a>
+<span class="sourceLineNo">301</span> }<a name="line.301"></a>
+<span class="sourceLineNo">302</span> }<a name="line.302"></a>
<span class="sourceLineNo">303</span><a name="line.303"></a>
-<span class="sourceLineNo">304</span> private void prepareExpectedKVs(long latestDelTS) {<a name="line.304"></a>
-<span class="sourceLineNo">305</span> final List<Cell> filteredKVs = new ArrayList<>();<a name="line.305"></a>
-<span class="sourceLineNo">306</span> for (Cell kv : expectedKVs) {<a name="line.306"></a>
-<span class="sourceLineNo">307</span> if (kv.getTimestamp() > latestDelTS || latestDelTS == -1) {<a name="line.307"></a>
-<span class="sourceLineNo">308</span> filteredKVs.add(kv);<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> expectedKVs = filteredKVs;<a name="line.311"></a>
-<span class="sourceLineNo">312</span> Collections.sort(expectedKVs, CellComparatorImpl.COMPARATOR);<a name="line.312"></a>
-<span class="sourceLineNo">313</span> }<a name="line.313"></a>
-<span class="sourceLineNo">314</span><a name="line.314"></a>
-<span class="sourceLineNo">315</span> public void put(String qual, long ts) {<a name="line.315"></a>
-<span class="sourceLineNo">316</span> if (!putTimestamps.contains(ts)) {<a name="line.316"></a>
-<span class="sourceLineNo">317</span> put.addColumn(FAMILY_BYTES, Bytes.toBytes(qual), ts, createValue(ts));<a name="line.317"></a>
-<span class="sourceLineNo">318</span> putTimestamps.add(ts);<a name="line.318"></a>
-<span class="sourceLineNo">319</span> }<a name="line.319"></a>
-<span class="sourceLineNo">320</span> if (VERBOSE) {<a name="line.320"></a>
-<span class="sourceLineNo">321</span> LOG.info("put: row " + Bytes.toStringBinary(put.getRow())<a name="line.321"></a>
-<span class="sourceLineNo">322</span> + ", cf " + FAMILY + ", qualifier " + qual + ", ts " + ts);<a name="line.322"></a>
-<span class="sourceLineNo">323</span> }<a name="line.323"></a>
-<span class="sourceLineNo">324</span> }<a name="line.324"></a>
-<span class="sourceLineNo">325</span><a name="line.325"></a>
-<span class="sourceLineNo">326</span> private byte[] createValue(long ts) {<a name="line.326"></a>
-<span class="sourceLineNo">327</span> return Bytes.toBytes("value" + ts);<a name="line.327"></a>
-<span class="sourceLineNo">328</span> }<a name="line.328"></a>
-<span class="sourceLineNo">329</span><a name="line.329"></a>
-<span class="sourceLineNo">330</span> public void delAtTimestamp(String qual, long ts) {<a name="line.330"></a>
-<span class="sourceLineNo">331</span> del.addColumn(FAMILY_BYTES, Bytes.toBytes(qual), ts);<a name="line.331"></a>
-<span class="sourceLineNo">332</span> logDelete(qual, ts, "at");<a name="line.332"></a>
-<span class="sourceLineNo">333</span> }<a name="line.333"></a>
-<span class="sourceLineNo">334</span><a name="line.334"></a>
-<span class="sourceLineNo">335</span> private void logDelete(String qual, long ts, String delType) {<a name="line.335"></a>
-<span class="sourceLineNo">336</span> if (VERBOSE) {<a name="line.336"></a>
-<span class="sourceLineNo">337</span> LOG.info("del " + delType + ": row "<a name="line.337"></a>
-<span class="sourceLineNo">338</span> + Bytes.toStringBinary(put.getRow()) + ", cf " + FAMILY<a name="line.338"></a>
-<span class="sourceLineNo">339</span> + ", qualifier " + qual + ", ts " + ts);<a name="line.339"></a>
-<span class="sourceLineNo">340</span> }<a name="line.340"></a>
-<span class="sourceLineNo">341</span> }<a name="line.341"></a>
-<span class="sourceLineNo">342</span><a name="line.342"></a>
-<span class="sourceLineNo">343</span> private void delUpToTimestamp(String qual, long upToTS) {<a name="line.343"></a>
-<span class="sourceLineNo">344</span> del.addColumns(FAMILY_BYTES, Bytes.toBytes(qual), upToTS);<a name="line.344"></a>
-<span class="sourceLineNo">345</span> logDelete(qual, upToTS, "up to and including");<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> private long randLong(long n) {<a name="line.348"></a>
-<span class="sourceLineNo">349</span> long l = rand.nextLong();<a name="line.349"></a>
-<span class="sourceLineNo">350</span> if (l == Long.MIN_VALUE)<a name="line.350"></a>
-<span class="sourceLineNo">351</span> l = Long.MAX_VALUE;<a name="line.351"></a>
-<span class="sourceLineNo">352</span> return Math.abs(l) % n;<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> private long randBetween(long a, long b) {<a name="line.355"></a>
-<span class="sourceLineNo">356</span> long x = a + randLong(b - a + 1);<a name="line.356"></a>
-<span class="sourceLineNo">357</span> assertTrue(a <= x && x <= b);<a name="line.357"></a>
-<span class="sourceLineNo">358</span> return x;<a name="line.358"></a>
-<span class="sourceLineNo">359</span> }<a name="line.359"></a>
-<span class="sourceLineNo">360</span><a name="line.360"></a>
-<span class="sourceLineNo">361</span> private final String rowStr(int i) {<a name="line.361"></a>
-<span class="sourceLineNo">362</span> return ("row" + i).intern();<a name="line.362"></a>
-<span class="sourceLineNo">363</span> }<a name="line.363"></a>
-<span class="sourceLineNo">364</span><a name="line.364"></a>
-<span class="sourceLineNo">365</span> private final byte[] rowBytes(int i) {<a name="line.365"></a>
-<span class="sourceLineNo">366</span> if (i == -1) {<a name="line.366"></a>
-<span class="sourceLineNo">367</span> return HConstants.EMPTY_BYTE_ARRAY;<a name="line.367"></a>
-<span class="sourceLineNo">368</span> }<a name="line.368"></a>
-<span class="sourceLineNo">369</span> return Bytes.toBytes(rowStr(i));<a name="line.369"></a>
-<span class="sourceLineNo">370</span> }<a name="line.370"></a>
-<span class="sourceLineNo">371</span><a name="line.371"></a>
-<span class="sourceLineNo">372</span> private final String getQualStr(int i) {<a name="line.372"></a>
-<span class="sourceLineNo">373</span> return ("qual" + i).intern();<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> public void createTimestampRange(long minTS, long maxTS,<a name="line.376"></a>
-<span class="sourceLineNo">377</span> long deleteUpToTS) throws IOException {<a name="line.377"></a>
-<span class="sourceLineNo">378</span> assertTrue(minTS < maxTS);<a name="line.378"></a>
-<span class="sourceLineNo">379</span> assertTrue(deleteUpToTS == -1<a name="line.379"></a>
-<span class="sourceLineNo">380</span> || (minTS <= deleteUpToTS && deleteUpToTS <= maxTS));<a name="line.380"></a>
-<span class="sourceLineNo">381</span><a name="line.381"></a>
-<span class="sourceLineNo">382</span> for (int iRow = 0; iRow < NUM_ROWS; ++iRow) {<a name="line.382"></a>
-<span class="sourceLineNo">383</span> final String row = rowStr(iRow);<a name="line.383"></a>
-<span class="sourceLineNo">384</span> final byte[] rowBytes = Bytes.toBytes(row);<a name="line.384"></a>
-<span class="sourceLineNo">385</span> for (int iCol = 0; iCol < NUM_COLS; ++iCol) {<a name="line.385"></a>
-<span class="sourceLineNo">386</span> final String qual = getQualStr(iCol);<a name="line.386"></a>
-<span class="sourceLineNo">387</span> final byte[] qualBytes = Bytes.toBytes(qual);<a name="line.387"></a>
-<span class="sourceLineNo">388</span> put = new Put(rowBytes);<a name="line.388"></a>
-<span class="sourceLineNo">389</span><a name="line.389"></a>
-<span class="sourceLineNo">390</span> putTimestamps.clear();<a name="line.390"></a>
-<span class="sourceLineNo">391</span> put(qual, minTS);<a name="line.391"></a>
-<span class="sourceLineNo">392</span> put(qual, maxTS);<a name="line.392"></a>
-<span class="sourceLineNo">393</span> for (int i = 0; i < PUTS_PER_ROW_COL; ++i) {<a name="line.393"></a>
-<span class="sourceLineNo">394</span> put(qual, randBetween(minTS, maxTS));<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> long[] putTimestampList = new long[putTimestamps.size()];<a name="line.397"></a>
-<span class="sourceLineNo">398</span> {<a name="line.398"></a>
-<span class="sourceLineNo">399</span> int i = 0;<a name="line.399"></a>
-<span class="sourceLineNo">400</span> for (long ts : putTimestamps) {<a name="line.400"></a>
-<span class="sourceLineNo">401</span> putTimestampList[i++] = ts;<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> // Delete a predetermined number of particular timestamps<a name="line.405"></a>
-<span class="sourceLineNo">406</span> delTimestamps.clear();<a name="line.406"></a>
-<span class="sourceLineNo">407</span> assertTrue(putTimestampList.length >= DELETES_PER_ROW_COL);<a name="line.407"></a>
-<span class="sourceLineNo">408</span> int numToDel = DELETES_PER_ROW_COL;<a name="line.408"></a>
-<span class="sourceLineNo">409</span> int tsRemaining = putTimestampList.length;<a name="line.409"></a>
-<span class="sourceLineNo">410</span> del = new Delete(rowBytes);<a name="line.410"></a>
-<span class="sourceLineNo">411</span> for (long ts : putTimestampList) {<a name="line.411"></a>
-<span class="sourceLineNo">412</span> if (rand.nextInt(tsRemaining) < numToDel) {<a name="line.412"></a>
-<span class="sourceLineNo">413</span> delAtTimestamp(qual, ts);<a name="line.413"></a>
-<span class="sourceLineNo">414</span> putTimestamps.remove(ts);<a name="line.414"></a>
-<span class="sourceLineNo">415</span> --numToDel;<a name="line.415"></a>
-<span class="sourceLineNo">416</span> }<a name="line.416"></a>
-<span class="sourceLineNo">417</span><a name="line.417"></a>
-<span class="sourceLineNo">418</span> if (--tsRemaining == 0) {<a name="line.418"></a>
-<span class="sourceLineNo">419</span> break;<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> // Another type of delete: everything up to the given timestamp.<a name="line.423"></a>
-<span class="sourceLineNo">424</span> if (deleteUpToTS != -1) {<a name="line.424"></a>
-<span class="sourceLineNo">425</span> delUpToTimestamp(qual, deleteUpToTS);<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> region.put(put);<a name="line.428"></a>
-<span class="sourceLineNo">429</span> if (!del.isEmpty()) {<a name="line.429"></a>
-<span class="sourceLineNo">430</span> region.delete(del);<a name="line.430"></a>
-<span class="sourceLineNo">431</span> }<a name="line.431"></a>
-<span class="sourceLineNo">432</span><a name="line.432"></a>
-<span class="sourceLineNo">433</span> // Add remaining timestamps (those we have not deleted) to expected<a name="line.433"></a>
-<span class="sourceLineNo">434</span> // results<a name="line.434"></a>
-<span class="sourceLineNo">435</span> for (long ts : putTimestamps) {<a name="line.435"></a>
-<span class="sourceLineNo">436</span> expectedKVs.add(new KeyValue(rowBytes, FAMILY_BYTES, qualBytes, ts,<a name="line.436"></a>
-<span class="sourceLineNo">437</span> KeyValue.Type.Put));<a name="line.437"></a>
-<span class="sourceLineNo">438</span> }<a name="line.438"></a>
-<span class="sourceLineNo">439</span> }<a name="line.439"></a>
-<span class="sourceLineNo">440</span> }<a name="line.440"></a>
-<span class="sourceLineNo">441</span><a name="line.441"></a>
-<span class="sourceLineNo">442</span> region.flush(true);<a name="line.442"></a>
-<span class="sourceLineNo">443</span> }<a name="line.443"></a>
+<span class="sourceLineNo">304</span> return filteredKVs;<a name="line.304"></a>
+<span class="sourceLineNo">305</span> }<a name="line.305"></a>
+<span class="sourceLineNo">306</span><a name="line.306"></a>
+<span class="sourceLineNo">307</span> private void prepareExpectedKVs(long latestDelTS) {<a name="line.307"></a>
+<span class="sourceLineNo">308</span> final List<Cell> filteredKVs = new ArrayList<>();<a name="line.308"></a>
+<span class="sourceLineNo">309</span> for (Cell kv : expectedKVs) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span> if (kv.getTimestamp() > latestDelTS || latestDelTS == -1) {<a name="line.310"></a>
+<span class="sourceLineNo">311</span> filteredKVs.add(kv);<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> expectedKVs = filteredKVs;<a name="line.314"></a>
+<span class="sourceLineNo">315</span> Collections.sort(expectedKVs, CellComparatorImpl.COMPARATOR);<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> public void put(String qual, long ts) {<a name="line.318"></a>
+<span class="sourceLineNo">319</span> if (!putTimestamps.contains(ts)) {<a name="line.319"></a>
+<span class="sourceLineNo">320</span> put.addColumn(FAMILY_BYTES, Bytes.toBytes(qual), ts, createValue(ts));<a name="line.320"></a>
+<span class="sourceLineNo">321</span> putTimestamps.add(ts);<a name="line.321"></a>
+<span class="sourceLineNo">322</span> }<a name="line.322"></a>
+<span class="sourceLineNo">323</span> if (VERBOSE) {<a name="line.323"></a>
+<span class="sourceLineNo">324</span> LOG.info("put: row " + Bytes.toStringBinary(put.getRow())<a name="line.324"></a>
+<span class="sourceLineNo">325</span> + ", cf " + FAMILY + ", qualifier " + qual + ", ts " + ts);<a name="line.325"></a>
+<span class="sourceLineNo">326</span> }<a name="line.326"></a>
+<span class="sourceLineNo">327</span> }<a name="line.327"></a>
+<span class="sourceLineNo">328</span><a name="line.328"></a>
+<span class="sourceLineNo">329</span> private byte[] createValue(long ts) {<a name="line.329"></a>
+<span class="sourceLineNo">330</span> return Bytes.toBytes("value" + ts);<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> public void delAtTimestamp(String qual, long ts) {<a name="line.333"></a>
+<span class="sourceLineNo">334</span> del.addColumn(FAMILY_BYTES, Bytes.toBytes(qual), ts);<a name="line.334"></a>
+<span class="sourceLineNo">335</span> logDelete(qual, ts, "at");<a name="line.335"></a>
+<span class="sourceLineNo">336</span> }<a name="line.336"></a>
+<span class="sourceLineNo">337</span><a name="line.337"></a>
+<span class="sourceLineNo">338</span> private void logDelete(String qual, long ts, String delType) {<a name="line.338"></a>
+<span class="sourceLineNo">339</span> if (VERBOSE) {<a name="line.339"></a>
+<span class="sourceLineNo">340</span> LOG.info("del " + delType + ": row "<a name="line.340"></a>
+<span class="sourceLineNo">341</span> + Bytes.toStringBinary(put.getRow()) + ", cf " + FAMILY<a name="line.341"></a>
+<span class="sourceLineNo">342</span> + ", qualifier " + qual + ", ts " + ts);<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><a name="line.345"></a>
+<span class="sourceLineNo">346</span> private void delUpToTimestamp(String qual, long upToTS) {<a name="line.346"></a>
+<span class="sourceLineNo">347</span> del.addColumns(FAMILY_BYTES, Bytes.toBytes(qual), upToTS);<a name="line.347"></a>
+<span class="sourceLineNo">348</span> logDelete(qual, upToTS, "up to and including");<a name="line.348"></a>
+<span class="sourceLineNo">349</span> }<a name="line.349"></a>
+<span class="sourceLineNo">350</span><a name="line.350"></a>
+<span class="sourceLineNo">351</span> private long randLong(long n) {<a name="line.351"></a>
+<span class="sourceLineNo">352</span> long l = rand.nextLong();<a name="line.352"></a>
+<span class="sourceLineNo">353</span> if (l == Long.MIN_VALUE)<a name="line.353"></a>
+<span class="sourceLineNo">354</span> l = Long.MAX_VALUE;<a name="line.354"></a>
+<span class="sourceLineNo">355</span> return Math.abs(l) % n;<a name="line.355"></a>
+<span class="sourceLineNo">356</span> }<a name="line.356"></a>
+<span class="sourceLineNo">357</span><a name="line.357"></a>
+<span class="sourceLineNo">358</span> private long randBetween(long a, long b) {<a name="line.358"></a>
+<span class="sourceLineNo">359</span> long x = a + randLong(b - a + 1);<a name="line.359"></a>
+<span class="sourceLineNo">360</span> assertTrue(a <= x && x <= b);<a name="line.360"></a>
+<span class="sourceLineNo">361</span> return x;<a name="line.361"></a>
+<span class="sourceLineNo">362</span> }<a name="line.362"></a>
+<span class="sourceLineNo">363</span><a name="line.363"></a>
+<span class="sourceLineNo">364</span> private final String rowStr(int i) {<a name="line.364"></a>
+<span class="sourceLineNo">365</span> return ("row" + i).intern();<a name="line.365"></a>
+<span class="sourceLineNo">366</span> }<a name="line.366"></a>
+<span class="sourceLineNo">367</span><a name="line.367"></a>
+<span class="sourceLineNo">368</span> private final byte[] rowBytes(int i) {<a name="line.368"></a>
+<span class="sourceLineNo">369</span> if (i == -1) {<a name="line.369"></a>
+<span class="sourceLineNo">370</span> return HConstants.EMPTY_BYTE_ARRAY;<a name="line.370"></a>
+<span class="sourceLineNo">371</span> }<a name="line.371"></a>
+<span class="sourceLineNo">372</span> return Bytes.toBytes(rowStr(i));<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> private final String getQualStr(int i) {<a name="line.375"></a>
+<span class="sourceLineNo">376</span> return ("qual" + i).intern();<a name="line.376"></a>
+<span class="sourceLineNo">377</span> }<a name="line.377"></a>
+<span class="sourceLineNo">378</span><a name="line.378"></a>
+<span class="sourceLineNo">379</span> public void createTimestampRange(long minTS, long maxTS,<a name="line.379"></a>
+<span class="sourceLineNo">380</span> long deleteUpToTS) throws IOException {<a name="line.380"></a>
+<span class="sourceLineNo">381</span> assertTrue(minTS < maxTS);<a name="line.381"></a>
+<span class="sourceLineNo">382</span> assertTrue(deleteUpToTS == -1<a name="line.382"></a>
+<span class="sourceLineNo">383</span> || (minTS <= deleteUpToTS && deleteUpToTS <= maxTS));<a name="line.383"></a>
+<span class="sourceLineNo">384</span><a name="line.384"></a>
+<span class="sourceLineNo">385</span> for (int iRow = 0; iRow < NUM_ROWS; ++iRow) {<a name="line.385"></a>
+<span class="sourceLineNo">386</span> final String row = rowStr(iRow);<a name="line.386"></a>
+<span class="sourceLineNo">387</span> final byte[] rowBytes = Bytes.toBytes(row);<a name="line.387"></a>
+<span class="sourceLineNo">388</span> for (int iCol = 0; iCol < NUM_COLS; ++iCol) {<a name="line.388"></a>
+<span class="sourceLineNo">389</span> final String qual = getQualStr(iCol);<a name="line.389"></a>
+<span class="sourceLineNo">390</span> final byte[] qualBytes = Bytes.toBytes(qual);<a name="line.390"></a>
+<span class="sourceLineNo">391</span> put = new Put(rowBytes);<a name="line.391"></a>
+<span class="sourceLineNo">392</span><a name="line.392"></a>
+<span class="sourceLineNo">393</span> putTimestamps.clear();<a name="line.393"></a>
+<span class="sourceLineNo">394</span> put(qual, minTS);<a name="line.394"></a>
+<span class="sourceLineNo">395</span> put(qual, maxTS);<a name="line.395"></a>
+<span class="sourceLineNo">396</span> for (int i = 0; i < PUTS_PER_ROW_COL; ++i) {<a name="line.396"></a>
+<span class="sourceLineNo">397</span> put(qual, randBetween(minTS, maxTS));<a name="line.397"></a>
+<span class="sourceLineNo">398</span> }<a name="line.398"></a>
+<span class="sourceLineNo">399</span><a name="line.399"></a>
+<span class="sourceLineNo">400</span> long[] putTimestampList = new long[putTimestamps.size()];<a name="line.400"></a>
+<span class="sourceLineNo">401</span> {<a name="line.401"></a>
+<span class="sourceLineNo">402</span> int i = 0;<a name="line.402"></a>
+<span class="sourceLineNo">403</span> for (long ts : putTimestamps) {<a name="line.403"></a>
+<span class="sourceLineNo">404</span> putTimestampList[i++] = ts;<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><a name="line.407"></a>
+<span class="sourceLineNo">408</span> // Delete a predetermined number of particular timestamps<a name="line.408"></a>
+<span class="sourceLineNo">409</span> delTimestamps.clear();<a name="line.409"></a>
+<span class="sourceLineNo">410</span> assertTrue(putTimestampList.length >= DELETES_PER_ROW_COL);<a name="line.410"></a>
+<span class="sourceLineNo">411</span> int numToDel = DELETES_PER_ROW_COL;<a name="line.411"></a>
+<span class="sourceLineNo">412</span> int tsRemaining = putTimestampList.length;<a name="line.412"></a>
+<span class="sourceLineNo">413</span> del = new Delete(rowBytes);<a name="line.413"></a>
+<span class="sourceLineNo">414</span> for (long ts : putTimestampList) {<a name="line.414"></a>
+<span class="sourceLineNo">415</span> if (rand.nextInt(tsRemaining) < numToDel) {<a name="line.415"></a>
+<span class="sourceLineNo">416</span> delAtTimestamp(qual, ts);<a name="line.416"></a>
+<span class="sourceLineNo">417</span> putTimestamps.remove(ts);<a name="line.417"></a>
+<span class="sourceLineNo">418</span> --numToDel;<a name="line.418"></a>
+<span class="sourceLineNo">419</span> }<a name="line.419"></a>
+<span class="sourceLineNo">420</span><a name="line.420"></a>
+<span class="sourceLineNo">421</span> if (--tsRemaining == 0) {<a name="line.421"></a>
+<span class="sourceLineNo">422</span> break;<a name="line.422"></a>
+<span class="sourceLineNo">423</span> }<a name="line.423"></a>
+<span class="sourceLineNo">424</span> }<a name="line.424"></a>
+<span class="sourceLineNo">425</span><a name="line.425"></a>
+<span class="sourceLineNo">426</span> // Another type of delete: everything up to the given timestamp.<a name="line.426"></a>
+<span class="sourceLineNo">427</span> if (deleteUpToTS != -1) {<a name="line.427"></a>
+<span class="sourceLineNo">428</span> delUpToTimestamp(qual, deleteUpToTS);<a name="line.428"></a>
+<span class="sourceLineNo">429</span> }<a name="line.429"></a>
+<span class="sourceLineNo">430</span><a name="line.430"></a>
+<span class="sourceLineNo">431</span> region.put(put);<a name="line.431"></a>
+<span class="sourceLineNo">432</span> if (!del.isEmpty()) {<a name="line.432"></a>
+<span class="sourceLineNo">433</span> region.delete(del);<a name="line.433"></a>
+<span class="sourceLineNo">434</span> }<a name="line.434"></a>
+<span class="sourceLineNo">435</span><a name="line.435"></a>
+<span class="sourceLineNo">436</span> // Add remaining timestamps (those we have not deleted) to expected<a name="line.436"></a>
+<span class="sourceLineNo">437</span> // results<a name="line.437"></a>
+<span class="sourceLineNo">438</span> for (long ts : putTimestamps) {<a name="line.438"></a>
+<span class="sourceLineNo">439</span> expectedKVs.add(new KeyValue(rowBytes, FAMILY_BYTES, qualBytes, ts,<a name="line.439"></a>
+<span class="sourceLineNo">440</span> KeyValue.Type.Put));<a name="line.440"></a>
+<span class="sourceLineNo">441</span> }<a name="line.441"></a>
+<span class="sourceLineNo">442</span> }<a name="line.442"></a>
+<span class="sourceLineNo">443</span> }<a name="line.443"></a>
<span class="sourceLineNo">444</span><a name="line.444"></a>
-<span class="sourceLineNo">445</span> @After<a name="line.445"></a>
-<span class="sourceLineNo">446</span> public void tearDown() throws IOException {<a name="line.446"></a>
-<span class="sourceLineNo">447</span> if (region != null) {<a name="line.447"></a>
-<span class="sourceLineNo">448</span> HBaseTestingUtility.closeRegionAndWAL(region);<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> // We have to re-set the lazy seek flag back to the default so that other<a name="line.451"></a>
-<span class="sourceLineNo">452</span> // unit tests are not affected.<a name="line.452"></a>
-<span class="sourceLineNo">453</span> StoreScanner.enableLazySeekGlobally(<a name="line.453"></a>
-<span class="sourceLineNo">454</span> StoreScanner.LAZY_SEEK_ENABLED_BY_DEFAULT);<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><a name="line.457"></a>
-<span class="sourceLineNo">458</span> public void assertKVListsEqual(String additionalMsg,<a name="line.458"></a>
-<span class="sourceLineNo">459</span> final List<? extends Cell> expected,<a name="line.459"></a>
-<span class="sourceLineNo">460</span> final List<? extends Cell> actual) {<a name="line.460"></a>
-<span class="sourceLineNo">461</span> final int eLen = expected.size();<a name="line.461"></a>
-<span class="sourceLineNo">462</span> final int aLen = actual.size();<a name="line.462"></a>
-<span class="sourceLineNo">463</span> final int minLen = Math.min(eLen, aLen);<a name="line.463"></a>
-<span class="sourceLineNo">464</span><a name="line.464"></a>
-<span class="sourceLineNo">465</span> int i;<a name="line.465"></a>
-<span class="sourceLineNo">466</span> for (i = 0; i < minLen<a name="line.466"></a>
-<span class="sourceLineNo">467</span> && PrivateCellUtil.compareKeyIgnoresMvcc(CellComparatorImpl.COMPARATOR, expected.get(i),<a name="line.467"></a>
-<span class="sourceLineNo">468</span> actual.get(i)) == 0; ++i) {<a name="line.468"></a>
-<span class="sourceLineNo">469</span> }<a name="line.469"></a>
-<span class="sourceLineNo">470</span><a name="line.470"></a>
-<span class="sourceLineNo">471</span> if (additionalMsg == null) {<a name="line.471"></a>
-<span class="sourceLineNo">472</span> additionalMsg = "";<a name="line.472"></a>
-<span class="sourceLineNo">473</span> }<a name="line.473"></a>
-<span class="sourceLineNo">474</span> if (!additionalMsg.isEmpty()) {<a name="line.474"></a>
-<span class="sourceLineNo">475</span> additionalMsg = ". " + additionalMsg;<a name="line.475"></a>
+<span class="sourceLineNo">445</span> region.flush(true);<a name="line.445"></a>
+<span class="sourceLineNo">446</span> }<a name="line.446"></a>
+<span class="sourceLineNo">447</span><a name="line.447"></a>
+<span class="sourceLineNo">448</span> @After<a name="line.448"></a>
+<span class="sourceLineNo">449</span> public void tearDown() throws IOException {<a name="line.449"></a>
+<span class="sourceLineNo">450</span> if (region != null) {<a name="line.450"></a>
+<span class="sourceLineNo">451</span> HBaseTestingUtility.closeRegionAndWAL(region);<a name="line.451"></a>
+<span class="sourceLineNo">452</span> }<a name="line.452"></a>
+<span class="sourceLineNo">453</span><a name="line.453"></a>
+<span class="sourceLineNo">454</span> // We have to re-set the lazy seek flag back to the default so that other<a name="line.454"></a>
+<span class="sourceLineNo">455</span> // unit tests are not affected.<a name="line.455"></a>
+<span class="sourceLineNo">456</span> StoreScanner.enableLazySeekGlobally(<a name="line.456"></a>
+<span class="sourceLineNo">457</span> StoreScanner.LAZY_SEEK_ENABLED_BY_DEFAULT);<a name="line.457"></a>
+<span class="sourceLineNo">458</span> }<a name="line.458"></a>
+<span class="sourceLineNo">459</span><a name="line.459"></a>
+<span class="sourceLineNo">460</span><a name="line.460"></a>
+<span class="sourceLineNo">461</span> public void assertKVListsEqual(String additionalMsg,<a name="line.461"></a>
+<span class="sourceLineNo">462</span> final List<? extends Cell> expected,<a name="line.462"></a>
+<span class="sourceLineNo">463</span> final List<? extends Cell> actual) {<a name="line.463"></a>
+<span class="sourceLineNo">464</span> final int eLen = expected.size();<a name="line.464"></a>
+<span class="sourceLineNo">465</span> final int aLen = actual.size();<a name="line.465"></a>
+<span class="sourceLineNo">466</span> final int minLen = Math.min(eLen, aLen);<a name="line.466"></a>
+<span class="sourceLineNo">467</span><a name="line.467"></a>
+<span class="sourceLineNo">468</span> int i;<a name="line.468"></a>
+<span class="sourceLineNo">469</span> for (i = 0; i < minLen<a name="line.469"></a>
+<span class="sourceLineNo">470</span> && PrivateCellUtil.compareKeyIgnoresMvcc(CellComparatorImpl.COMPARATOR, expected.get(i),<a name="line.470"></a>
+<span class="sourceLineNo">471</span> actual.get(i)) == 0; ++i) {<a name="line.471"></a>
+<span class="sourceLineNo">472</span> }<a name="line.472"></a>
+<span class="sourceLineNo">473</span><a name="line.473"></a>
+<span class="sourceLineNo">474</span> if (additionalMsg == null) {<a name="line.474"></a>
+<span class="sourceLineNo">475</span> additionalMsg = "";<a name="line.475"></a>
<span class="sourceLineNo">476</span> }<a name="line.476"></a>
-<span class="sourceLineNo">477</span><a name="line.477"></a>
-<span class="sourceLineNo">478</span> if (eLen != aLen || i != minLen) {<a name="line.478"></a>
-<span class="sourceLineNo">479</span> throw new AssertionError(<a name="line.479"></a>
-<span class="sourceLineNo">480</span> "Expected and actual KV arrays differ at position " + i + ": " +<a name="line.480"></a>
-<span class="sourceLineNo">481</span> HBaseTestingUtility.safeGetAsStr(expected, i) + " (length " + eLen +") vs. " +<a name="line.481"></a>
-<span class="sourceLineNo">482</span> HBaseTestingUtility.safeGetAsStr(actual, i) + " (length " + aLen + ")" + additionalMsg);<a name="line.482"></a>
-<span class="sourceLineNo">483</span> }<a name="line.483"></a>
-<span class="sourceLineNo">484</span> }<a name="line.484"></a>
-<span class="sourceLineNo">485</span><a name="line.485"></a>
-<span class="sourceLineNo">486</span>}<a name="line.486"></a>
-<span class="sourceLineNo">487</span><a name="line.487"></a>
+<span class="sourceLineNo">477</span> if (!additionalMsg.isEmpty()) {<a name="line.477"></a>
+<span class="sourceLineNo">478</span> additionalMsg = ". " + additionalMsg;<a name="line.478"></a>
+<span class="sourceLineNo">479</span> }<a name="line.479"></a>
+<span class="sourceLineNo">480</span><a name="line.480"></a>
+<span class="sourceLineNo">481</span> if (eLen != aLen || i != minLen) {<a name="line.481"></a>
+<span class="sourceLineNo">482</span> throw new AssertionError(<a name="line.482"></a>
+<span class="sourceLineNo">483</span> "Expected and actual KV arrays differ at position " + i + ": " +<a name="line.483"></a>
+<span class="sourceLineNo">484</span> HBaseTestingUtility.safeGetAsStr(expected, i) + " (length " + eLen +") vs. " +<a name="line.484"></a>
+<span class="sourceLineNo">485</span> HBaseTestingUtility.safeGetAsStr(actual, i) + " (length " + aLen + ")" + additionalMsg);<a name="line.485"></a>
+<span class="sourceLineNo">486</span> }<a name="line.486"></a>
+<span class="sourceLineNo">487</span> }<a name="line.487"></a>
+<span class="sourceLineNo">488</span><a name="line.488"></a>
+<span class="sourceLineNo">489</span>}<a name="line.489"></a>
+<span class="sourceLineNo">490</span><a name="line.490"></a>