http://git-wip-us.apache.org/repos/asf/hbase-site/blob/bbe517ae/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.html
----------------------------------------------------------------------
diff --git
a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.html
b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.html
index 42cb56c..0f8e743 100644
---
a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.html
+++
b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.html
@@ -57,300 +57,303 @@
<span class="sourceLineNo">049</span>import
org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;<a name="line.49"></a>
<span class="sourceLineNo">050</span>import
org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.50"></a>
<span class="sourceLineNo">051</span>import
org.apache.hadoop.hbase.testclassification.RegionServerTests;<a
name="line.51"></a>
-<span class="sourceLineNo">052</span>import
org.apache.hadoop.hbase.util.Bytes;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import org.junit.ClassRule;<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.runner.RunWith;<a
name="line.56"></a>
-<span class="sourceLineNo">057</span>import org.junit.runners.Parameterized;<a
name="line.57"></a>
-<span class="sourceLineNo">058</span>import
org.junit.runners.Parameterized.Parameters;<a name="line.58"></a>
-<span class="sourceLineNo">059</span>import org.slf4j.Logger;<a
name="line.59"></a>
-<span class="sourceLineNo">060</span>import org.slf4j.LoggerFactory;<a
name="line.60"></a>
-<span class="sourceLineNo">061</span><a name="line.61"></a>
-<span class="sourceLineNo">062</span>/**<a name="line.62"></a>
-<span class="sourceLineNo">063</span> * Tests optimized scanning of multiple
columns.<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 TestMultiColumnScanner {<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(TestMultiColumnScanner.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 =
LoggerFactory.getLogger(TestMultiColumnScanner.class);<a name="line.73"></a>
-<span class="sourceLineNo">074</span><a name="line.74"></a>
-<span class="sourceLineNo">075</span> private static final String TABLE_NAME
=<a name="line.75"></a>
-<span class="sourceLineNo">076</span>
TestMultiColumnScanner.class.getSimpleName();<a name="line.76"></a>
-<span class="sourceLineNo">077</span><a name="line.77"></a>
-<span class="sourceLineNo">078</span> static final int MAX_VERSIONS = 50;<a
name="line.78"></a>
-<span class="sourceLineNo">079</span><a name="line.79"></a>
-<span class="sourceLineNo">080</span> private static final String FAMILY =
"CF";<a name="line.80"></a>
-<span class="sourceLineNo">081</span> private static final byte[]
FAMILY_BYTES = Bytes.toBytes(FAMILY);<a name="line.81"></a>
-<span class="sourceLineNo">082</span><a name="line.82"></a>
-<span class="sourceLineNo">083</span> /**<a name="line.83"></a>
-<span class="sourceLineNo">084</span> * The size of the column qualifier set
used. Increasing this parameter<a name="line.84"></a>
-<span class="sourceLineNo">085</span> * exponentially increases test time.<a
name="line.85"></a>
-<span class="sourceLineNo">086</span> */<a name="line.86"></a>
-<span class="sourceLineNo">087</span> private static final int NUM_COLUMNS =
8;<a name="line.87"></a>
-<span class="sourceLineNo">088</span><a name="line.88"></a>
-<span class="sourceLineNo">089</span> private static final int
MAX_COLUMN_BIT_MASK = 1 << NUM_COLUMNS - 1;<a name="line.89"></a>
-<span class="sourceLineNo">090</span> private static final int NUM_FLUSHES =
10;<a name="line.90"></a>
-<span class="sourceLineNo">091</span> private static final int NUM_ROWS =
20;<a name="line.91"></a>
-<span class="sourceLineNo">092</span><a name="line.92"></a>
-<span class="sourceLineNo">093</span> /** A large value of type long for use
as a timestamp */<a name="line.93"></a>
-<span class="sourceLineNo">094</span> private static final long BIG_LONG =
9111222333444555666L;<a name="line.94"></a>
-<span class="sourceLineNo">095</span><a name="line.95"></a>
-<span class="sourceLineNo">096</span> /**<a name="line.96"></a>
-<span class="sourceLineNo">097</span> * Timestamps to test with. Cannot use
{@link Long#MAX_VALUE} here, because<a name="line.97"></a>
-<span class="sourceLineNo">098</span> * it will be replaced by an timestamp
auto-generated based on the time.<a name="line.98"></a>
-<span class="sourceLineNo">099</span> */<a name="line.99"></a>
-<span class="sourceLineNo">100</span> private static final long[] TIMESTAMPS
= new long[] { 1, 3, 5,<a name="line.100"></a>
-<span class="sourceLineNo">101</span> Integer.MAX_VALUE, BIG_LONG,
Long.MAX_VALUE - 1 };<a name="line.101"></a>
-<span class="sourceLineNo">102</span><a name="line.102"></a>
-<span class="sourceLineNo">103</span> /** The probability that a column is
skipped in a store file. */<a name="line.103"></a>
-<span class="sourceLineNo">104</span> private static final double
COLUMN_SKIP_IN_STORE_FILE_PROB = 0.7;<a name="line.104"></a>
-<span class="sourceLineNo">105</span><a name="line.105"></a>
-<span class="sourceLineNo">106</span> /** The probability of skipping a
column in a single row */<a name="line.106"></a>
-<span class="sourceLineNo">107</span> private static final double
COLUMN_SKIP_IN_ROW_PROB = 0.1;<a name="line.107"></a>
-<span class="sourceLineNo">108</span><a name="line.108"></a>
-<span class="sourceLineNo">109</span> /** The probability of skipping a
column everywhere */<a name="line.109"></a>
-<span class="sourceLineNo">110</span> private static final double
COLUMN_SKIP_EVERYWHERE_PROB = 0.1;<a name="line.110"></a>
-<span class="sourceLineNo">111</span><a name="line.111"></a>
-<span class="sourceLineNo">112</span> /** The probability to delete a
row/column pair */<a name="line.112"></a>
-<span class="sourceLineNo">113</span> private static final double
DELETE_PROBABILITY = 0.02;<a name="line.113"></a>
-<span class="sourceLineNo">114</span><a name="line.114"></a>
-<span class="sourceLineNo">115</span> private final static
HBaseTestingUtility TEST_UTIL = HBaseTestingUtility.createLocalHTU();<a
name="line.115"></a>
-<span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span> private final Compression.Algorithm
comprAlgo;<a name="line.117"></a>
-<span class="sourceLineNo">118</span> private final BloomType bloomType;<a
name="line.118"></a>
-<span class="sourceLineNo">119</span> private final DataBlockEncoding
dataBlockEncoding;<a name="line.119"></a>
-<span class="sourceLineNo">120</span><a name="line.120"></a>
-<span class="sourceLineNo">121</span> // Some static sanity-checking.<a
name="line.121"></a>
-<span class="sourceLineNo">122</span> static {<a name="line.122"></a>
-<span class="sourceLineNo">123</span> assertTrue(BIG_LONG > 0.9 *
Long.MAX_VALUE); // Guard against typos.<a name="line.123"></a>
-<span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span> // Ensure TIMESTAMPS are sorted.<a
name="line.125"></a>
-<span class="sourceLineNo">126</span> for (int i = 0; i <
TIMESTAMPS.length - 1; ++i)<a name="line.126"></a>
-<span class="sourceLineNo">127</span> assertTrue(TIMESTAMPS[i] <
TIMESTAMPS[i + 1]);<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> @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> List<Object[]> parameters = new
ArrayList<>();<a name="line.132"></a>
-<span class="sourceLineNo">133</span> for (Object[]
bloomAndCompressionParams :<a name="line.133"></a>
-<span class="sourceLineNo">134</span>
HBaseTestingUtility.BLOOM_AND_COMPRESSION_COMBINATIONS) {<a name="line.134"></a>
-<span class="sourceLineNo">135</span> for (boolean useDataBlockEncoding :
new boolean[]{false, true}) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span>
parameters.add(ArrayUtils.add(bloomAndCompressionParams,<a name="line.136"></a>
-<span class="sourceLineNo">137</span> useDataBlockEncoding));<a
name="line.137"></a>
-<span class="sourceLineNo">138</span> }<a name="line.138"></a>
-<span class="sourceLineNo">139</span> }<a name="line.139"></a>
-<span class="sourceLineNo">140</span> return parameters;<a
name="line.140"></a>
-<span class="sourceLineNo">141</span> }<a name="line.141"></a>
-<span class="sourceLineNo">142</span><a name="line.142"></a>
-<span class="sourceLineNo">143</span> public
TestMultiColumnScanner(Compression.Algorithm comprAlgo,<a name="line.143"></a>
-<span class="sourceLineNo">144</span> BloomType bloomType, boolean
useDataBlockEncoding) {<a name="line.144"></a>
-<span class="sourceLineNo">145</span> this.comprAlgo = comprAlgo;<a
name="line.145"></a>
-<span class="sourceLineNo">146</span> this.bloomType = bloomType;<a
name="line.146"></a>
-<span class="sourceLineNo">147</span> this.dataBlockEncoding =
useDataBlockEncoding ? DataBlockEncoding.PREFIX :<a name="line.147"></a>
-<span class="sourceLineNo">148</span> DataBlockEncoding.NONE;<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> @Test<a name="line.151"></a>
-<span class="sourceLineNo">152</span> public void testMultiColumnScanner()
throws IOException {<a name="line.152"></a>
-<span class="sourceLineNo">153</span> HRegion region =
TEST_UTIL.createTestRegion(TABLE_NAME,<a name="line.153"></a>
-<span class="sourceLineNo">154</span> new HColumnDescriptor(FAMILY)<a
name="line.154"></a>
-<span class="sourceLineNo">155</span>
.setCompressionType(comprAlgo)<a name="line.155"></a>
-<span class="sourceLineNo">156</span>
.setBloomFilterType(bloomType)<a name="line.156"></a>
-<span class="sourceLineNo">157</span>
.setMaxVersions(MAX_VERSIONS)<a name="line.157"></a>
-<span class="sourceLineNo">158</span>
.setDataBlockEncoding(dataBlockEncoding)<a name="line.158"></a>
-<span class="sourceLineNo">159</span> );<a name="line.159"></a>
-<span class="sourceLineNo">160</span> List<String> rows =
sequentialStrings("row", NUM_ROWS);<a name="line.160"></a>
-<span class="sourceLineNo">161</span> List<String> qualifiers =
sequentialStrings("qual", NUM_COLUMNS);<a name="line.161"></a>
-<span class="sourceLineNo">162</span> List<KeyValue> kvs = new
ArrayList<>();<a name="line.162"></a>
-<span class="sourceLineNo">163</span> Set<String> keySet = new
HashSet<>();<a name="line.163"></a>
-<span class="sourceLineNo">164</span><a name="line.164"></a>
-<span class="sourceLineNo">165</span> // A map from
<row>_<qualifier> to the most recent delete timestamp for<a
name="line.165"></a>
-<span class="sourceLineNo">166</span> // that column.<a name="line.166"></a>
-<span class="sourceLineNo">167</span> Map<String, Long>
lastDelTimeMap = new HashMap<>();<a name="line.167"></a>
-<span class="sourceLineNo">168</span><a name="line.168"></a>
-<span class="sourceLineNo">169</span> Random rand = new
Random(29372937L);<a name="line.169"></a>
-<span class="sourceLineNo">170</span> Set<String> rowQualSkip = new
HashSet<>();<a name="line.170"></a>
+<span class="sourceLineNo">052</span>import
org.apache.hadoop.hbase.util.BloomFilterUtil;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import
org.apache.hadoop.hbase.util.Bytes;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.junit.ClassRule;<a
name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.junit.Test;<a
name="line.55"></a>
+<span class="sourceLineNo">056</span>import
org.junit.experimental.categories.Category;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.junit.runner.RunWith;<a
name="line.57"></a>
+<span class="sourceLineNo">058</span>import org.junit.runners.Parameterized;<a
name="line.58"></a>
+<span class="sourceLineNo">059</span>import
org.junit.runners.Parameterized.Parameters;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>import org.slf4j.Logger;<a
name="line.60"></a>
+<span class="sourceLineNo">061</span>import org.slf4j.LoggerFactory;<a
name="line.61"></a>
+<span class="sourceLineNo">062</span><a name="line.62"></a>
+<span class="sourceLineNo">063</span>/**<a name="line.63"></a>
+<span class="sourceLineNo">064</span> * Tests optimized scanning of multiple
columns.<a name="line.64"></a>
+<span class="sourceLineNo">065</span> */<a name="line.65"></a>
+<span class="sourceLineNo">066</span>@RunWith(Parameterized.class)<a
name="line.66"></a>
+<span class="sourceLineNo">067</span>@Category({RegionServerTests.class,
MediumTests.class})<a name="line.67"></a>
+<span class="sourceLineNo">068</span>public class TestMultiColumnScanner {<a
name="line.68"></a>
+<span class="sourceLineNo">069</span><a name="line.69"></a>
+<span class="sourceLineNo">070</span> @ClassRule<a name="line.70"></a>
+<span class="sourceLineNo">071</span> public static final HBaseClassTestRule
CLASS_RULE =<a name="line.71"></a>
+<span class="sourceLineNo">072</span>
HBaseClassTestRule.forClass(TestMultiColumnScanner.class);<a name="line.72"></a>
+<span class="sourceLineNo">073</span><a name="line.73"></a>
+<span class="sourceLineNo">074</span> private static final Logger LOG =
LoggerFactory.getLogger(TestMultiColumnScanner.class);<a name="line.74"></a>
+<span class="sourceLineNo">075</span><a name="line.75"></a>
+<span class="sourceLineNo">076</span> private static final String TABLE_NAME
=<a name="line.76"></a>
+<span class="sourceLineNo">077</span>
TestMultiColumnScanner.class.getSimpleName();<a name="line.77"></a>
+<span class="sourceLineNo">078</span><a name="line.78"></a>
+<span class="sourceLineNo">079</span> static final int MAX_VERSIONS = 50;<a
name="line.79"></a>
+<span class="sourceLineNo">080</span><a name="line.80"></a>
+<span class="sourceLineNo">081</span> private static final String FAMILY =
"CF";<a name="line.81"></a>
+<span class="sourceLineNo">082</span> private static final byte[]
FAMILY_BYTES = Bytes.toBytes(FAMILY);<a name="line.82"></a>
+<span class="sourceLineNo">083</span><a name="line.83"></a>
+<span class="sourceLineNo">084</span> /**<a name="line.84"></a>
+<span class="sourceLineNo">085</span> * The size of the column qualifier set
used. Increasing this parameter<a name="line.85"></a>
+<span class="sourceLineNo">086</span> * exponentially increases test time.<a
name="line.86"></a>
+<span class="sourceLineNo">087</span> */<a name="line.87"></a>
+<span class="sourceLineNo">088</span> private static final int NUM_COLUMNS =
8;<a name="line.88"></a>
+<span class="sourceLineNo">089</span><a name="line.89"></a>
+<span class="sourceLineNo">090</span> private static final int
MAX_COLUMN_BIT_MASK = 1 << NUM_COLUMNS - 1;<a name="line.90"></a>
+<span class="sourceLineNo">091</span> private static final int NUM_FLUSHES =
10;<a name="line.91"></a>
+<span class="sourceLineNo">092</span> private static final int NUM_ROWS =
20;<a name="line.92"></a>
+<span class="sourceLineNo">093</span><a name="line.93"></a>
+<span class="sourceLineNo">094</span> /** A large value of type long for use
as a timestamp */<a name="line.94"></a>
+<span class="sourceLineNo">095</span> private static final long BIG_LONG =
9111222333444555666L;<a name="line.95"></a>
+<span class="sourceLineNo">096</span><a name="line.96"></a>
+<span class="sourceLineNo">097</span> /**<a name="line.97"></a>
+<span class="sourceLineNo">098</span> * Timestamps to test with. Cannot use
{@link Long#MAX_VALUE} here, because<a name="line.98"></a>
+<span class="sourceLineNo">099</span> * it will be replaced by an timestamp
auto-generated based on the time.<a name="line.99"></a>
+<span class="sourceLineNo">100</span> */<a name="line.100"></a>
+<span class="sourceLineNo">101</span> private static final long[] TIMESTAMPS
= new long[] { 1, 3, 5,<a name="line.101"></a>
+<span class="sourceLineNo">102</span> Integer.MAX_VALUE, BIG_LONG,
Long.MAX_VALUE - 1 };<a name="line.102"></a>
+<span class="sourceLineNo">103</span><a name="line.103"></a>
+<span class="sourceLineNo">104</span> /** The probability that a column is
skipped in a store file. */<a name="line.104"></a>
+<span class="sourceLineNo">105</span> private static final double
COLUMN_SKIP_IN_STORE_FILE_PROB = 0.7;<a name="line.105"></a>
+<span class="sourceLineNo">106</span><a name="line.106"></a>
+<span class="sourceLineNo">107</span> /** The probability of skipping a
column in a single row */<a name="line.107"></a>
+<span class="sourceLineNo">108</span> private static final double
COLUMN_SKIP_IN_ROW_PROB = 0.1;<a name="line.108"></a>
+<span class="sourceLineNo">109</span><a name="line.109"></a>
+<span class="sourceLineNo">110</span> /** The probability of skipping a
column everywhere */<a name="line.110"></a>
+<span class="sourceLineNo">111</span> private static final double
COLUMN_SKIP_EVERYWHERE_PROB = 0.1;<a name="line.111"></a>
+<span class="sourceLineNo">112</span><a name="line.112"></a>
+<span class="sourceLineNo">113</span> /** The probability to delete a
row/column pair */<a name="line.113"></a>
+<span class="sourceLineNo">114</span> private static final double
DELETE_PROBABILITY = 0.02;<a name="line.114"></a>
+<span class="sourceLineNo">115</span><a name="line.115"></a>
+<span class="sourceLineNo">116</span> private final static
HBaseTestingUtility TEST_UTIL = HBaseTestingUtility.createLocalHTU();<a
name="line.116"></a>
+<span class="sourceLineNo">117</span><a name="line.117"></a>
+<span class="sourceLineNo">118</span> private final Compression.Algorithm
comprAlgo;<a name="line.118"></a>
+<span class="sourceLineNo">119</span> private final BloomType bloomType;<a
name="line.119"></a>
+<span class="sourceLineNo">120</span> private final DataBlockEncoding
dataBlockEncoding;<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span> // Some static sanity-checking.<a
name="line.122"></a>
+<span class="sourceLineNo">123</span> static {<a name="line.123"></a>
+<span class="sourceLineNo">124</span> assertTrue(BIG_LONG > 0.9 *
Long.MAX_VALUE); // Guard against typos.<a name="line.124"></a>
+<span class="sourceLineNo">125</span><a name="line.125"></a>
+<span class="sourceLineNo">126</span> // Ensure TIMESTAMPS are sorted.<a
name="line.126"></a>
+<span class="sourceLineNo">127</span> for (int i = 0; i <
TIMESTAMPS.length - 1; ++i)<a name="line.127"></a>
+<span class="sourceLineNo">128</span> assertTrue(TIMESTAMPS[i] <
TIMESTAMPS[i + 1]);<a name="line.128"></a>
+<span class="sourceLineNo">129</span> }<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> List<Object[]> parameters = new
ArrayList<>();<a name="line.133"></a>
+<span class="sourceLineNo">134</span> for (Object[]
bloomAndCompressionParams :<a name="line.134"></a>
+<span class="sourceLineNo">135</span>
HBaseTestingUtility.BLOOM_AND_COMPRESSION_COMBINATIONS) {<a name="line.135"></a>
+<span class="sourceLineNo">136</span> for (boolean useDataBlockEncoding :
new boolean[]{false, true}) {<a name="line.136"></a>
+<span class="sourceLineNo">137</span>
parameters.add(ArrayUtils.add(bloomAndCompressionParams,<a name="line.137"></a>
+<span class="sourceLineNo">138</span> useDataBlockEncoding));<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> return parameters;<a
name="line.141"></a>
+<span class="sourceLineNo">142</span> }<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span> public
TestMultiColumnScanner(Compression.Algorithm comprAlgo,<a name="line.144"></a>
+<span class="sourceLineNo">145</span> BloomType bloomType, boolean
useDataBlockEncoding) {<a name="line.145"></a>
+<span class="sourceLineNo">146</span> this.comprAlgo = comprAlgo;<a
name="line.146"></a>
+<span class="sourceLineNo">147</span> this.bloomType = bloomType;<a
name="line.147"></a>
+<span class="sourceLineNo">148</span> this.dataBlockEncoding =
useDataBlockEncoding ? DataBlockEncoding.PREFIX :<a name="line.148"></a>
+<span class="sourceLineNo">149</span> DataBlockEncoding.NONE;<a
name="line.149"></a>
+<span class="sourceLineNo">150</span> }<a name="line.150"></a>
+<span class="sourceLineNo">151</span><a name="line.151"></a>
+<span class="sourceLineNo">152</span> @Test<a name="line.152"></a>
+<span class="sourceLineNo">153</span> public void testMultiColumnScanner()
throws IOException {<a name="line.153"></a>
+<span class="sourceLineNo">154</span>
TEST_UTIL.getConfiguration().setInt(BloomFilterUtil.PREFIX_LENGTH_KEY, 10);<a
name="line.154"></a>
+<span class="sourceLineNo">155</span>
TEST_UTIL.getConfiguration().set(BloomFilterUtil.DELIMITER_KEY, "#");<a
name="line.155"></a>
+<span class="sourceLineNo">156</span> HRegion region =
TEST_UTIL.createTestRegion(TABLE_NAME,<a name="line.156"></a>
+<span class="sourceLineNo">157</span> new HColumnDescriptor(FAMILY)<a
name="line.157"></a>
+<span class="sourceLineNo">158</span>
.setCompressionType(comprAlgo)<a name="line.158"></a>
+<span class="sourceLineNo">159</span>
.setBloomFilterType(bloomType)<a name="line.159"></a>
+<span class="sourceLineNo">160</span>
.setMaxVersions(MAX_VERSIONS)<a name="line.160"></a>
+<span class="sourceLineNo">161</span>
.setDataBlockEncoding(dataBlockEncoding)<a name="line.161"></a>
+<span class="sourceLineNo">162</span> );<a name="line.162"></a>
+<span class="sourceLineNo">163</span> List<String> rows =
sequentialStrings("row", NUM_ROWS);<a name="line.163"></a>
+<span class="sourceLineNo">164</span> List<String> qualifiers =
sequentialStrings("qual", NUM_COLUMNS);<a name="line.164"></a>
+<span class="sourceLineNo">165</span> List<KeyValue> kvs = new
ArrayList<>();<a name="line.165"></a>
+<span class="sourceLineNo">166</span> Set<String> keySet = new
HashSet<>();<a name="line.166"></a>
+<span class="sourceLineNo">167</span><a name="line.167"></a>
+<span class="sourceLineNo">168</span> // A map from
<row>_<qualifier> to the most recent delete timestamp for<a
name="line.168"></a>
+<span class="sourceLineNo">169</span> // that column.<a name="line.169"></a>
+<span class="sourceLineNo">170</span> Map<String, Long>
lastDelTimeMap = new HashMap<>();<a name="line.170"></a>
<span class="sourceLineNo">171</span><a name="line.171"></a>
-<span class="sourceLineNo">172</span> // Skip some columns in some rows. We
need to test scanning over a set<a name="line.172"></a>
-<span class="sourceLineNo">173</span> // of columns when some of the
columns are not there.<a name="line.173"></a>
-<span class="sourceLineNo">174</span> for (String row : rows)<a
name="line.174"></a>
-<span class="sourceLineNo">175</span> for (String qual : qualifiers)<a
name="line.175"></a>
-<span class="sourceLineNo">176</span> if (rand.nextDouble() <
COLUMN_SKIP_IN_ROW_PROB) {<a name="line.176"></a>
-<span class="sourceLineNo">177</span> LOG.info("Skipping " + qual + "
in row " + row);<a name="line.177"></a>
-<span class="sourceLineNo">178</span> rowQualSkip.add(rowQualKey(row,
qual));<a name="line.178"></a>
-<span class="sourceLineNo">179</span> }<a name="line.179"></a>
-<span class="sourceLineNo">180</span><a name="line.180"></a>
-<span class="sourceLineNo">181</span> // Also skip some columns in all
rows.<a name="line.181"></a>
-<span class="sourceLineNo">182</span> for (String qual : qualifiers)<a
name="line.182"></a>
-<span class="sourceLineNo">183</span> if (rand.nextDouble() <
COLUMN_SKIP_EVERYWHERE_PROB) {<a name="line.183"></a>
-<span class="sourceLineNo">184</span> LOG.info("Skipping " + qual + "
in all rows");<a name="line.184"></a>
-<span class="sourceLineNo">185</span> for (String row : rows)<a
name="line.185"></a>
-<span class="sourceLineNo">186</span> rowQualSkip.add(rowQualKey(row,
qual));<a name="line.186"></a>
-<span class="sourceLineNo">187</span> }<a name="line.187"></a>
-<span class="sourceLineNo">188</span><a name="line.188"></a>
-<span class="sourceLineNo">189</span> for (int iFlush = 0; iFlush <
NUM_FLUSHES; ++iFlush) {<a name="line.189"></a>
-<span class="sourceLineNo">190</span> for (String qual : qualifiers) {<a
name="line.190"></a>
-<span class="sourceLineNo">191</span> // This is where we decide to
include or not include this column into<a name="line.191"></a>
-<span class="sourceLineNo">192</span> // this store file, regardless of
row and timestamp.<a name="line.192"></a>
-<span class="sourceLineNo">193</span> if (rand.nextDouble() <
COLUMN_SKIP_IN_STORE_FILE_PROB)<a name="line.193"></a>
-<span class="sourceLineNo">194</span> continue;<a name="line.194"></a>
-<span class="sourceLineNo">195</span><a name="line.195"></a>
-<span class="sourceLineNo">196</span> byte[] qualBytes =
Bytes.toBytes(qual);<a name="line.196"></a>
-<span class="sourceLineNo">197</span> for (String row : rows) {<a
name="line.197"></a>
-<span class="sourceLineNo">198</span> Put p = new
Put(Bytes.toBytes(row));<a name="line.198"></a>
-<span class="sourceLineNo">199</span> for (long ts : TIMESTAMPS) {<a
name="line.199"></a>
-<span class="sourceLineNo">200</span> String value =
createValue(row, qual, ts);<a name="line.200"></a>
-<span class="sourceLineNo">201</span> KeyValue kv =
KeyValueTestUtil.create(row, FAMILY, qual, ts,<a name="line.201"></a>
-<span class="sourceLineNo">202</span> value);<a
name="line.202"></a>
-<span class="sourceLineNo">203</span>
assertEquals(kv.getTimestamp(), ts);<a name="line.203"></a>
-<span class="sourceLineNo">204</span> p.add(kv);<a
name="line.204"></a>
-<span class="sourceLineNo">205</span> String keyAsString =
kv.toString();<a name="line.205"></a>
-<span class="sourceLineNo">206</span> if
(!keySet.contains(keyAsString)) {<a name="line.206"></a>
-<span class="sourceLineNo">207</span> keySet.add(keyAsString);<a
name="line.207"></a>
-<span class="sourceLineNo">208</span> kvs.add(kv);<a
name="line.208"></a>
-<span class="sourceLineNo">209</span> }<a name="line.209"></a>
-<span class="sourceLineNo">210</span> }<a name="line.210"></a>
-<span class="sourceLineNo">211</span> region.put(p);<a
name="line.211"></a>
-<span class="sourceLineNo">212</span><a name="line.212"></a>
-<span class="sourceLineNo">213</span> Delete d = new
Delete(Bytes.toBytes(row));<a name="line.213"></a>
-<span class="sourceLineNo">214</span> boolean deletedSomething =
false;<a name="line.214"></a>
-<span class="sourceLineNo">215</span> for (long ts : TIMESTAMPS)<a
name="line.215"></a>
-<span class="sourceLineNo">216</span> if (rand.nextDouble() <
DELETE_PROBABILITY) {<a name="line.216"></a>
-<span class="sourceLineNo">217</span> d.addColumns(FAMILY_BYTES,
qualBytes, ts);<a name="line.217"></a>
-<span class="sourceLineNo">218</span> String rowAndQual = row +
"_" + qual;<a name="line.218"></a>
-<span class="sourceLineNo">219</span> Long whenDeleted =
lastDelTimeMap.get(rowAndQual);<a name="line.219"></a>
-<span class="sourceLineNo">220</span>
lastDelTimeMap.put(rowAndQual, whenDeleted == null ? ts<a name="line.220"></a>
-<span class="sourceLineNo">221</span> : Math.max(ts,
whenDeleted));<a name="line.221"></a>
-<span class="sourceLineNo">222</span> deletedSomething = true;<a
name="line.222"></a>
-<span class="sourceLineNo">223</span> }<a name="line.223"></a>
-<span class="sourceLineNo">224</span> if (deletedSomething)<a
name="line.224"></a>
-<span class="sourceLineNo">225</span> region.delete(d);<a
name="line.225"></a>
-<span class="sourceLineNo">226</span> }<a name="line.226"></a>
-<span class="sourceLineNo">227</span> }<a name="line.227"></a>
-<span class="sourceLineNo">228</span> region.flush(true);<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> Collections.sort(kvs,
CellComparatorImpl.COMPARATOR);<a name="line.231"></a>
-<span class="sourceLineNo">232</span> for (int maxVersions = 1; maxVersions
<= TIMESTAMPS.length; ++maxVersions) {<a name="line.232"></a>
-<span class="sourceLineNo">233</span> for (int columnBitMask = 1;
columnBitMask <= MAX_COLUMN_BIT_MASK; ++columnBitMask) {<a
name="line.233"></a>
-<span class="sourceLineNo">234</span> Scan scan = new Scan();<a
name="line.234"></a>
-<span class="sourceLineNo">235</span>
scan.setMaxVersions(maxVersions);<a name="line.235"></a>
-<span class="sourceLineNo">236</span> Set<String> qualSet = new
TreeSet<>();<a name="line.236"></a>
-<span class="sourceLineNo">237</span> {<a name="line.237"></a>
-<span class="sourceLineNo">238</span> int columnMaskTmp =
columnBitMask;<a name="line.238"></a>
-<span class="sourceLineNo">239</span> for (String qual : qualifiers)
{<a name="line.239"></a>
-<span class="sourceLineNo">240</span> if ((columnMaskTmp & 1)
!= 0) {<a name="line.240"></a>
-<span class="sourceLineNo">241</span>
scan.addColumn(FAMILY_BYTES, Bytes.toBytes(qual));<a name="line.241"></a>
-<span class="sourceLineNo">242</span> qualSet.add(qual);<a
name="line.242"></a>
-<span class="sourceLineNo">243</span> }<a name="line.243"></a>
-<span class="sourceLineNo">244</span> columnMaskTmp >>= 1;<a
name="line.244"></a>
-<span class="sourceLineNo">245</span> }<a name="line.245"></a>
-<span class="sourceLineNo">246</span> assertEquals(0,
columnMaskTmp);<a name="line.246"></a>
-<span class="sourceLineNo">247</span> }<a name="line.247"></a>
-<span class="sourceLineNo">248</span><a name="line.248"></a>
-<span class="sourceLineNo">249</span> InternalScanner scanner =
region.getScanner(scan);<a name="line.249"></a>
-<span class="sourceLineNo">250</span> List<Cell> results = new
ArrayList<>();<a name="line.250"></a>
+<span class="sourceLineNo">172</span> Random rand = new
Random(29372937L);<a name="line.172"></a>
+<span class="sourceLineNo">173</span> Set<String> rowQualSkip = new
HashSet<>();<a name="line.173"></a>
+<span class="sourceLineNo">174</span><a name="line.174"></a>
+<span class="sourceLineNo">175</span> // Skip some columns in some rows. We
need to test scanning over a set<a name="line.175"></a>
+<span class="sourceLineNo">176</span> // of columns when some of the
columns are not there.<a name="line.176"></a>
+<span class="sourceLineNo">177</span> for (String row : rows)<a
name="line.177"></a>
+<span class="sourceLineNo">178</span> for (String qual : qualifiers)<a
name="line.178"></a>
+<span class="sourceLineNo">179</span> if (rand.nextDouble() <
COLUMN_SKIP_IN_ROW_PROB) {<a name="line.179"></a>
+<span class="sourceLineNo">180</span> LOG.info("Skipping " + qual + "
in row " + row);<a name="line.180"></a>
+<span class="sourceLineNo">181</span> rowQualSkip.add(rowQualKey(row,
qual));<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> // Also skip some columns in all
rows.<a name="line.184"></a>
+<span class="sourceLineNo">185</span> for (String qual : qualifiers)<a
name="line.185"></a>
+<span class="sourceLineNo">186</span> if (rand.nextDouble() <
COLUMN_SKIP_EVERYWHERE_PROB) {<a name="line.186"></a>
+<span class="sourceLineNo">187</span> LOG.info("Skipping " + qual + "
in all rows");<a name="line.187"></a>
+<span class="sourceLineNo">188</span> for (String row : rows)<a
name="line.188"></a>
+<span class="sourceLineNo">189</span> rowQualSkip.add(rowQualKey(row,
qual));<a name="line.189"></a>
+<span class="sourceLineNo">190</span> }<a name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span> for (int iFlush = 0; iFlush <
NUM_FLUSHES; ++iFlush) {<a name="line.192"></a>
+<span class="sourceLineNo">193</span> for (String qual : qualifiers) {<a
name="line.193"></a>
+<span class="sourceLineNo">194</span> // This is where we decide to
include or not include this column into<a name="line.194"></a>
+<span class="sourceLineNo">195</span> // this store file, regardless of
row and timestamp.<a name="line.195"></a>
+<span class="sourceLineNo">196</span> if (rand.nextDouble() <
COLUMN_SKIP_IN_STORE_FILE_PROB)<a name="line.196"></a>
+<span class="sourceLineNo">197</span> continue;<a name="line.197"></a>
+<span class="sourceLineNo">198</span><a name="line.198"></a>
+<span class="sourceLineNo">199</span> byte[] qualBytes =
Bytes.toBytes(qual);<a name="line.199"></a>
+<span class="sourceLineNo">200</span> for (String row : rows) {<a
name="line.200"></a>
+<span class="sourceLineNo">201</span> Put p = new
Put(Bytes.toBytes(row));<a name="line.201"></a>
+<span class="sourceLineNo">202</span> for (long ts : TIMESTAMPS) {<a
name="line.202"></a>
+<span class="sourceLineNo">203</span> String value =
createValue(row, qual, ts);<a name="line.203"></a>
+<span class="sourceLineNo">204</span> KeyValue kv =
KeyValueTestUtil.create(row, FAMILY, qual, ts,<a name="line.204"></a>
+<span class="sourceLineNo">205</span> value);<a
name="line.205"></a>
+<span class="sourceLineNo">206</span>
assertEquals(kv.getTimestamp(), ts);<a name="line.206"></a>
+<span class="sourceLineNo">207</span> p.add(kv);<a
name="line.207"></a>
+<span class="sourceLineNo">208</span> String keyAsString =
kv.toString();<a name="line.208"></a>
+<span class="sourceLineNo">209</span> if
(!keySet.contains(keyAsString)) {<a name="line.209"></a>
+<span class="sourceLineNo">210</span> keySet.add(keyAsString);<a
name="line.210"></a>
+<span class="sourceLineNo">211</span> kvs.add(kv);<a
name="line.211"></a>
+<span class="sourceLineNo">212</span> }<a name="line.212"></a>
+<span class="sourceLineNo">213</span> }<a name="line.213"></a>
+<span class="sourceLineNo">214</span> region.put(p);<a
name="line.214"></a>
+<span class="sourceLineNo">215</span><a name="line.215"></a>
+<span class="sourceLineNo">216</span> Delete d = new
Delete(Bytes.toBytes(row));<a name="line.216"></a>
+<span class="sourceLineNo">217</span> boolean deletedSomething =
false;<a name="line.217"></a>
+<span class="sourceLineNo">218</span> for (long ts : TIMESTAMPS)<a
name="line.218"></a>
+<span class="sourceLineNo">219</span> if (rand.nextDouble() <
DELETE_PROBABILITY) {<a name="line.219"></a>
+<span class="sourceLineNo">220</span> d.addColumns(FAMILY_BYTES,
qualBytes, ts);<a name="line.220"></a>
+<span class="sourceLineNo">221</span> String rowAndQual = row +
"_" + qual;<a name="line.221"></a>
+<span class="sourceLineNo">222</span> Long whenDeleted =
lastDelTimeMap.get(rowAndQual);<a name="line.222"></a>
+<span class="sourceLineNo">223</span>
lastDelTimeMap.put(rowAndQual, whenDeleted == null ? ts<a name="line.223"></a>
+<span class="sourceLineNo">224</span> : Math.max(ts,
whenDeleted));<a name="line.224"></a>
+<span class="sourceLineNo">225</span> deletedSomething = true;<a
name="line.225"></a>
+<span class="sourceLineNo">226</span> }<a name="line.226"></a>
+<span class="sourceLineNo">227</span> if (deletedSomething)<a
name="line.227"></a>
+<span class="sourceLineNo">228</span> region.delete(d);<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> region.flush(true);<a
name="line.231"></a>
+<span class="sourceLineNo">232</span> }<a name="line.232"></a>
+<span class="sourceLineNo">233</span><a name="line.233"></a>
+<span class="sourceLineNo">234</span> Collections.sort(kvs,
CellComparatorImpl.COMPARATOR);<a name="line.234"></a>
+<span class="sourceLineNo">235</span> for (int maxVersions = 1; maxVersions
<= TIMESTAMPS.length; ++maxVersions) {<a name="line.235"></a>
+<span class="sourceLineNo">236</span> for (int columnBitMask = 1;
columnBitMask <= MAX_COLUMN_BIT_MASK; ++columnBitMask) {<a
name="line.236"></a>
+<span class="sourceLineNo">237</span> Scan scan = new Scan();<a
name="line.237"></a>
+<span class="sourceLineNo">238</span>
scan.setMaxVersions(maxVersions);<a name="line.238"></a>
+<span class="sourceLineNo">239</span> Set<String> qualSet = new
TreeSet<>();<a name="line.239"></a>
+<span class="sourceLineNo">240</span> {<a name="line.240"></a>
+<span class="sourceLineNo">241</span> int columnMaskTmp =
columnBitMask;<a name="line.241"></a>
+<span class="sourceLineNo">242</span> for (String qual : qualifiers)
{<a name="line.242"></a>
+<span class="sourceLineNo">243</span> if ((columnMaskTmp & 1)
!= 0) {<a name="line.243"></a>
+<span class="sourceLineNo">244</span>
scan.addColumn(FAMILY_BYTES, Bytes.toBytes(qual));<a name="line.244"></a>
+<span class="sourceLineNo">245</span> qualSet.add(qual);<a
name="line.245"></a>
+<span class="sourceLineNo">246</span> }<a name="line.246"></a>
+<span class="sourceLineNo">247</span> columnMaskTmp >>= 1;<a
name="line.247"></a>
+<span class="sourceLineNo">248</span> }<a name="line.248"></a>
+<span class="sourceLineNo">249</span> assertEquals(0,
columnMaskTmp);<a name="line.249"></a>
+<span class="sourceLineNo">250</span> }<a name="line.250"></a>
<span class="sourceLineNo">251</span><a name="line.251"></a>
-<span class="sourceLineNo">252</span> int kvPos = 0;<a
name="line.252"></a>
-<span class="sourceLineNo">253</span> int numResults = 0;<a
name="line.253"></a>
-<span class="sourceLineNo">254</span> String queryInfo = "columns
queried: " + qualSet + " (columnBitMask="<a name="line.254"></a>
-<span class="sourceLineNo">255</span> + columnBitMask + "),
maxVersions=" + maxVersions;<a name="line.255"></a>
-<span class="sourceLineNo">256</span><a name="line.256"></a>
-<span class="sourceLineNo">257</span> while (scanner.next(results) ||
results.size() > 0) {<a name="line.257"></a>
-<span class="sourceLineNo">258</span> for (Cell kv : results) {<a
name="line.258"></a>
-<span class="sourceLineNo">259</span> while (kvPos <
kvs.size()<a name="line.259"></a>
-<span class="sourceLineNo">260</span> &&
!matchesQuery(kvs.get(kvPos), qualSet, maxVersions,<a name="line.260"></a>
-<span class="sourceLineNo">261</span> lastDelTimeMap)) {<a
name="line.261"></a>
-<span class="sourceLineNo">262</span> ++kvPos;<a
name="line.262"></a>
-<span class="sourceLineNo">263</span> }<a name="line.263"></a>
-<span class="sourceLineNo">264</span> String rowQual =
getRowQualStr(kv);<a name="line.264"></a>
-<span class="sourceLineNo">265</span> String deleteInfo = "";<a
name="line.265"></a>
-<span class="sourceLineNo">266</span> Long lastDelTS =
lastDelTimeMap.get(rowQual);<a name="line.266"></a>
-<span class="sourceLineNo">267</span> if (lastDelTS != null) {<a
name="line.267"></a>
-<span class="sourceLineNo">268</span> deleteInfo = "; last
timestamp when row/column " + rowQual<a name="line.268"></a>
-<span class="sourceLineNo">269</span> + " was deleted: " +
lastDelTS;<a name="line.269"></a>
-<span class="sourceLineNo">270</span> }<a name="line.270"></a>
-<span class="sourceLineNo">271</span> assertTrue("Scanner returned
additional key/value: " + kv + ", "<a name="line.271"></a>
-<span class="sourceLineNo">272</span> + queryInfo + deleteInfo
+ ";", kvPos < kvs.size());<a name="line.272"></a>
-<span class="sourceLineNo">273</span> assertTrue("Scanner returned
wrong key/value; " + queryInfo + deleteInfo + ";",<a name="line.273"></a>
-<span class="sourceLineNo">274</span>
PrivateCellUtil.equalsIgnoreMvccVersion(kvs.get(kvPos), (kv)));<a
name="line.274"></a>
-<span class="sourceLineNo">275</span> ++kvPos;<a
name="line.275"></a>
-<span class="sourceLineNo">276</span> ++numResults;<a
name="line.276"></a>
-<span class="sourceLineNo">277</span> }<a name="line.277"></a>
-<span class="sourceLineNo">278</span> results.clear();<a
name="line.278"></a>
-<span class="sourceLineNo">279</span> }<a name="line.279"></a>
-<span class="sourceLineNo">280</span> for (; kvPos < kvs.size();
++kvPos) {<a name="line.280"></a>
-<span class="sourceLineNo">281</span> KeyValue remainingKV =
kvs.get(kvPos);<a name="line.281"></a>
-<span class="sourceLineNo">282</span> assertFalse("Matching column
not returned by scanner: "<a name="line.282"></a>
-<span class="sourceLineNo">283</span> + remainingKV + ", " +
queryInfo + ", results returned: "<a name="line.283"></a>
-<span class="sourceLineNo">284</span> + numResults,
matchesQuery(remainingKV, qualSet, maxVersions,<a name="line.284"></a>
-<span class="sourceLineNo">285</span> lastDelTimeMap));<a
name="line.285"></a>
-<span class="sourceLineNo">286</span> }<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> assertTrue("This test is supposed to
delete at least some row/column " +<a name="line.289"></a>
-<span class="sourceLineNo">290</span> "pairs", lastDelTimeMap.size()
> 0);<a name="line.290"></a>
-<span class="sourceLineNo">291</span> LOG.info("Number of row/col pairs
deleted at least once: " +<a name="line.291"></a>
-<span class="sourceLineNo">292</span> lastDelTimeMap.size());<a
name="line.292"></a>
-<span class="sourceLineNo">293</span>
HBaseTestingUtility.closeRegionAndWAL(region);<a name="line.293"></a>
-<span class="sourceLineNo">294</span> }<a name="line.294"></a>
-<span class="sourceLineNo">295</span><a name="line.295"></a>
-<span class="sourceLineNo">296</span> private static String
getRowQualStr(Cell kv) {<a name="line.296"></a>
-<span class="sourceLineNo">297</span> String rowStr =
Bytes.toString(CellUtil.cloneRow(kv));<a name="line.297"></a>
-<span class="sourceLineNo">298</span> String qualStr =
Bytes.toString(CellUtil.cloneQualifier(kv));<a name="line.298"></a>
-<span class="sourceLineNo">299</span> return rowStr + "_" + qualStr;<a
name="line.299"></a>
-<span class="sourceLineNo">300</span> }<a name="line.300"></a>
-<span class="sourceLineNo">301</span><a name="line.301"></a>
-<span class="sourceLineNo">302</span> private static boolean
matchesQuery(KeyValue kv, Set<String> qualSet,<a name="line.302"></a>
-<span class="sourceLineNo">303</span> int maxVersions, Map<String,
Long> lastDelTimeMap) {<a name="line.303"></a>
-<span class="sourceLineNo">304</span> Long lastDelTS =
lastDelTimeMap.get(getRowQualStr(kv));<a name="line.304"></a>
-<span class="sourceLineNo">305</span> long ts = kv.getTimestamp();<a
name="line.305"></a>
-<span class="sourceLineNo">306</span> return
qualSet.contains(qualStr(kv))<a name="line.306"></a>
-<span class="sourceLineNo">307</span> && ts >=
TIMESTAMPS[TIMESTAMPS.length - maxVersions]<a name="line.307"></a>
-<span class="sourceLineNo">308</span> && (lastDelTS == null ||
ts > lastDelTS);<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> private static String qualStr(KeyValue
kv) {<a name="line.311"></a>
-<span class="sourceLineNo">312</span> return
Bytes.toString(kv.getQualifierArray(), kv.getQualifierOffset(),<a
name="line.312"></a>
-<span class="sourceLineNo">313</span> kv.getQualifierLength());<a
name="line.313"></a>
-<span class="sourceLineNo">314</span> }<a name="line.314"></a>
-<span class="sourceLineNo">315</span><a name="line.315"></a>
-<span class="sourceLineNo">316</span> private static String rowQualKey(String
row, String qual) {<a name="line.316"></a>
-<span class="sourceLineNo">317</span> return row + "_" + qual;<a
name="line.317"></a>
-<span class="sourceLineNo">318</span> }<a name="line.318"></a>
-<span class="sourceLineNo">319</span><a name="line.319"></a>
-<span class="sourceLineNo">320</span> static String createValue(String row,
String qual, long ts) {<a name="line.320"></a>
-<span class="sourceLineNo">321</span> return "value_for_" + row + "_" +
qual + "_" + ts;<a name="line.321"></a>
-<span class="sourceLineNo">322</span> }<a name="line.322"></a>
-<span class="sourceLineNo">323</span><a name="line.323"></a>
-<span class="sourceLineNo">324</span> private static List<String>
sequentialStrings(String prefix, int n) {<a name="line.324"></a>
-<span class="sourceLineNo">325</span> List<String> lst = new
ArrayList<>();<a name="line.325"></a>
-<span class="sourceLineNo">326</span> for (int i = 0; i < n; ++i) {<a
name="line.326"></a>
-<span class="sourceLineNo">327</span> StringBuilder sb = new
StringBuilder();<a name="line.327"></a>
-<span class="sourceLineNo">328</span> sb.append(prefix + i);<a
name="line.328"></a>
-<span class="sourceLineNo">329</span><a name="line.329"></a>
-<span class="sourceLineNo">330</span> // Make column length depend on
i.<a name="line.330"></a>
-<span class="sourceLineNo">331</span> int iBitShifted = i;<a
name="line.331"></a>
-<span class="sourceLineNo">332</span> while (iBitShifted != 0) {<a
name="line.332"></a>
-<span class="sourceLineNo">333</span> sb.append((iBitShifted & 1)
== 0 ? 'a' : 'b');<a name="line.333"></a>
-<span class="sourceLineNo">334</span> iBitShifted >>= 1;<a
name="line.334"></a>
-<span class="sourceLineNo">335</span> }<a name="line.335"></a>
-<span class="sourceLineNo">336</span><a name="line.336"></a>
-<span class="sourceLineNo">337</span> lst.add(sb.toString());<a
name="line.337"></a>
-<span class="sourceLineNo">338</span> }<a name="line.338"></a>
+<span class="sourceLineNo">252</span> InternalScanner scanner =
region.getScanner(scan);<a name="line.252"></a>
+<span class="sourceLineNo">253</span> List<Cell> results = new
ArrayList<>();<a name="line.253"></a>
+<span class="sourceLineNo">254</span><a name="line.254"></a>
+<span class="sourceLineNo">255</span> int kvPos = 0;<a
name="line.255"></a>
+<span class="sourceLineNo">256</span> int numResults = 0;<a
name="line.256"></a>
+<span class="sourceLineNo">257</span> String queryInfo = "columns
queried: " + qualSet + " (columnBitMask="<a name="line.257"></a>
+<span class="sourceLineNo">258</span> + columnBitMask + "),
maxVersions=" + maxVersions;<a name="line.258"></a>
+<span class="sourceLineNo">259</span><a name="line.259"></a>
+<span class="sourceLineNo">260</span> while (scanner.next(results) ||
results.size() > 0) {<a name="line.260"></a>
+<span class="sourceLineNo">261</span> for (Cell kv : results) {<a
name="line.261"></a>
+<span class="sourceLineNo">262</span> while (kvPos <
kvs.size()<a name="line.262"></a>
+<span class="sourceLineNo">263</span> &&
!matchesQuery(kvs.get(kvPos), qualSet, maxVersions,<a name="line.263"></a>
+<span class="sourceLineNo">264</span> lastDelTimeMap)) {<a
name="line.264"></a>
+<span class="sourceLineNo">265</span> ++kvPos;<a
name="line.265"></a>
+<span class="sourceLineNo">266</span> }<a name="line.266"></a>
+<span class="sourceLineNo">267</span> String rowQual =
getRowQualStr(kv);<a name="line.267"></a>
+<span class="sourceLineNo">268</span> String deleteInfo = "";<a
name="line.268"></a>
+<span class="sourceLineNo">269</span> Long lastDelTS =
lastDelTimeMap.get(rowQual);<a name="line.269"></a>
+<span class="sourceLineNo">270</span> if (lastDelTS != null) {<a
name="line.270"></a>
+<span class="sourceLineNo">271</span> deleteInfo = "; last
timestamp when row/column " + rowQual<a name="line.271"></a>
+<span class="sourceLineNo">272</span> + " was deleted: " +
lastDelTS;<a name="line.272"></a>
+<span class="sourceLineNo">273</span> }<a name="line.273"></a>
+<span class="sourceLineNo">274</span> assertTrue("Scanner returned
additional key/value: " + kv + ", "<a name="line.274"></a>
+<span class="sourceLineNo">275</span> + queryInfo + deleteInfo
+ ";", kvPos < kvs.size());<a name="line.275"></a>
+<span class="sourceLineNo">276</span> assertTrue("Scanner returned
wrong key/value; " + queryInfo + deleteInfo + ";",<a name="line.276"></a>
+<span class="sourceLineNo">277</span>
PrivateCellUtil.equalsIgnoreMvccVersion(kvs.get(kvPos), (kv)));<a
name="line.277"></a>
+<span class="sourceLineNo">278</span> ++kvPos;<a
name="line.278"></a>
+<span class="sourceLineNo">279</span> ++numResults;<a
name="line.279"></a>
+<span class="sourceLineNo">280</span> }<a name="line.280"></a>
+<span class="sourceLineNo">281</span> results.clear();<a
name="line.281"></a>
+<span class="sourceLineNo">282</span> }<a name="line.282"></a>
+<span class="sourceLineNo">283</span> for (; kvPos < kvs.size();
++kvPos) {<a name="line.283"></a>
+<span class="sourceLineNo">284</span> KeyValue remainingKV =
kvs.get(kvPos);<a name="line.284"></a>
+<span class="sourceLineNo">285</span> assertFalse("Matching column
not returned by scanner: "<a name="line.285"></a>
+<span class="sourceLineNo">286</span> + remainingKV + ", " +
queryInfo + ", results returned: "<a name="line.286"></a>
+<span class="sourceLineNo">287</span> + numResults,
matchesQuery(remainingKV, qualSet, maxVersions,<a name="line.287"></a>
+<span class="sourceLineNo">288</span> lastDelTimeMap));<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> assertTrue("This test is supposed to
delete at least some row/column " +<a name="line.292"></a>
+<span class="sourceLineNo">293</span> "pairs", lastDelTimeMap.size()
> 0);<a name="line.293"></a>
+<span class="sourceLineNo">294</span> LOG.info("Number of row/col pairs
deleted at least once: " +<a name="line.294"></a>
+<span class="sourceLineNo">295</span> lastDelTimeMap.size());<a
name="line.295"></a>
+<span class="sourceLineNo">296</span>
HBaseTestingUtility.closeRegionAndWAL(region);<a name="line.296"></a>
+<span class="sourceLineNo">297</span> }<a name="line.297"></a>
+<span class="sourceLineNo">298</span><a name="line.298"></a>
+<span class="sourceLineNo">299</span> private static String
getRowQualStr(Cell kv) {<a name="line.299"></a>
+<span class="sourceLineNo">300</span> String rowStr =
Bytes.toString(CellUtil.cloneRow(kv));<a name="line.300"></a>
+<span class="sourceLineNo">301</span> String qualStr =
Bytes.toString(CellUtil.cloneQualifier(kv));<a name="line.301"></a>
+<span class="sourceLineNo">302</span> return rowStr + "_" + qualStr;<a
name="line.302"></a>
+<span class="sourceLineNo">303</span> }<a name="line.303"></a>
+<span class="sourceLineNo">304</span><a name="line.304"></a>
+<span class="sourceLineNo">305</span> private static boolean
matchesQuery(KeyValue kv, Set<String> qualSet,<a name="line.305"></a>
+<span class="sourceLineNo">306</span> int maxVersions, Map<String,
Long> lastDelTimeMap) {<a name="line.306"></a>
+<span class="sourceLineNo">307</span> Long lastDelTS =
lastDelTimeMap.get(getRowQualStr(kv));<a name="line.307"></a>
+<span class="sourceLineNo">308</span> long ts = kv.getTimestamp();<a
name="line.308"></a>
+<span class="sourceLineNo">309</span> return
qualSet.contains(qualStr(kv))<a name="line.309"></a>
+<span class="sourceLineNo">310</span> && ts >=
TIMESTAMPS[TIMESTAMPS.length - maxVersions]<a name="line.310"></a>
+<span class="sourceLineNo">311</span> && (lastDelTS == null ||
ts > lastDelTS);<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> private static String qualStr(KeyValue
kv) {<a name="line.314"></a>
+<span class="sourceLineNo">315</span> return
Bytes.toString(kv.getQualifierArray(), kv.getQualifierOffset(),<a
name="line.315"></a>
+<span class="sourceLineNo">316</span> kv.getQualifierLength());<a
name="line.316"></a>
+<span class="sourceLineNo">317</span> }<a name="line.317"></a>
+<span class="sourceLineNo">318</span><a name="line.318"></a>
+<span class="sourceLineNo">319</span> private static String rowQualKey(String
row, String qual) {<a name="line.319"></a>
+<span class="sourceLineNo">320</span> return row + "_" + qual;<a
name="line.320"></a>
+<span class="sourceLineNo">321</span> }<a name="line.321"></a>
+<span class="sourceLineNo">322</span><a name="line.322"></a>
+<span class="sourceLineNo">323</span> static String createValue(String row,
String qual, long ts) {<a name="line.323"></a>
+<span class="sourceLineNo">324</span> return "value_for_" + row + "_" +
qual + "_" + ts;<a name="line.324"></a>
+<span class="sourceLineNo">325</span> }<a name="line.325"></a>
+<span class="sourceLineNo">326</span><a name="line.326"></a>
+<span class="sourceLineNo">327</span> private static List<String>
sequentialStrings(String prefix, int n) {<a name="line.327"></a>
+<span class="sourceLineNo">328</span> List<String> lst = new
ArrayList<>();<a name="line.328"></a>
+<span class="sourceLineNo">329</span> for (int i = 0; i < n; ++i) {<a
name="line.329"></a>
+<span class="sourceLineNo">330</span> StringBuilder sb = new
StringBuilder();<a name="line.330"></a>
+<span class="sourceLineNo">331</span> sb.append(prefix + i);<a
name="line.331"></a>
+<span class="sourceLineNo">332</span><a name="line.332"></a>
+<span class="sourceLineNo">333</span> // Make column length depend on
i.<a name="line.333"></a>
+<span class="sourceLineNo">334</span> int iBitShifted = i;<a
name="line.334"></a>
+<span class="sourceLineNo">335</span> while (iBitShifted != 0) {<a
name="line.335"></a>
+<span class="sourceLineNo">336</span> sb.append((iBitShifted & 1)
== 0 ? 'a' : 'b');<a name="line.336"></a>
+<span class="sourceLineNo">337</span> iBitShifted >>= 1;<a
name="line.337"></a>
+<span class="sourceLineNo">338</span> }<a name="line.338"></a>
<span class="sourceLineNo">339</span><a name="line.339"></a>
-<span class="sourceLineNo">340</span> return lst;<a name="line.340"></a>
-<span class="sourceLineNo">341</span> }<a name="line.341"></a>
+<span class="sourceLineNo">340</span> lst.add(sb.toString());<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><a name="line.343"></a>
-<span class="sourceLineNo">344</span>}<a name="line.344"></a>
+<span class="sourceLineNo">343</span> return lst;<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><a name="line.346"></a>
+<span class="sourceLineNo">347</span>}<a name="line.347"></a>
+<span class="sourceLineNo">348</span><a name="line.348"></a>
