http://git-wip-us.apache.org/repos/asf/hbase-site/blob/bbe517ae/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html index 68397c8..5282059 100644 --- a/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html +++ b/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html @@ -141,8 +141,8 @@ <ul> <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>) <ul> -<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/FaultyFSLog.FailureType.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">FaultyFSLog.FailureType</span></a></li> <li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/IOTestProvider.AllowedOperations.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">IOTestProvider.AllowedOperations</span></a></li> +<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/FaultyFSLog.FailureType.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">FaultyFSLog.FailureType</span></a></li> <li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">TestWALSplit.Corruptions</span></a></li> </ul> </li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/bbe517ae/testdevapidocs/overview-tree.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/overview-tree.html b/testdevapidocs/overview-tree.html index cc67041..a990b7a 100644 --- a/testdevapidocs/overview-tree.html +++ b/testdevapidocs/overview-tree.html @@ -3451,6 +3451,7 @@ <li type="circle">org.apache.hadoop.hbase.mapred.<a href="org/apache/hadoop/hbase/mapred/TestRowCounter.html" title="class in org.apache.hadoop.hbase.mapred"><span class="typeNameLink">TestRowCounter</span></a></li> <li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="org/apache/hadoop/hbase/mapreduce/TestRowCounter.html" title="class in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">TestRowCounter</span></a></li> <li type="circle">org.apache.hadoop.hbase.mapred.<a href="org/apache/hadoop/hbase/mapred/TestRowCounter.OutputReader.html" title="class in org.apache.hadoop.hbase.mapred"><span class="typeNameLink">TestRowCounter.OutputReader</span></a></li> +<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="org/apache/hadoop/hbase/regionserver/TestRowPrefixBloomFilter.html" title="class in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestRowPrefixBloomFilter</span></a></li> <li type="circle">org.apache.hadoop.hbase.coprocessor.<a href="org/apache/hadoop/hbase/coprocessor/TestRowProcessorEndpoint.html" title="class in org.apache.hadoop.hbase.coprocessor"><span class="typeNameLink">TestRowProcessorEndpoint</span></a></li> <li type="circle">org.apache.hadoop.hbase.coprocessor.<a href="org/apache/hadoop/hbase/coprocessor/TestRowProcessorEndpoint.IncrementRunner.html" title="class in org.apache.hadoop.hbase.coprocessor"><span class="typeNameLink">TestRowProcessorEndpoint.IncrementRunner</span></a> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable.html?is-external=true" title="class or interface in java.lang">Runnable</a>)</li> <li type="circle">org.apache.hadoop.hbase.coprocessor.<a href="org/apache/hadoop/hbase/coprocessor/TestRowProcessorEndpoint.SwapRowsRunner.html" title="class in org.apache.hadoop.hbase.coprocessor"><span class="typeNameLink">TestRowProcessorEndpoint.SwapRowsRunner</span></a> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable.html?is-external=true" title="class or interface in java.lang">Runnable</a>)</li> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/bbe517ae/testdevapidocs/src-html/org/apache/hadoop/hbase/chaos/actions/ChangeBloomFilterAction.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/chaos/actions/ChangeBloomFilterAction.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/chaos/actions/ChangeBloomFilterAction.html index 85e4d6a..0b8afc8 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/chaos/actions/ChangeBloomFilterAction.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/chaos/actions/ChangeBloomFilterAction.html @@ -30,42 +30,48 @@ <span class="sourceLineNo">022</span><a name="line.22"></a> <span class="sourceLineNo">023</span>import org.apache.hadoop.hbase.TableName;<a name="line.23"></a> <span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.regionserver.BloomType;<a name="line.24"></a> -<span class="sourceLineNo">025</span><a name="line.25"></a> -<span class="sourceLineNo">026</span>/**<a name="line.26"></a> -<span class="sourceLineNo">027</span> * Action that tries to adjust the bloom filter setting on all the columns of a<a name="line.27"></a> -<span class="sourceLineNo">028</span> * table<a name="line.28"></a> -<span class="sourceLineNo">029</span> */<a name="line.29"></a> -<span class="sourceLineNo">030</span>public class ChangeBloomFilterAction extends Action {<a name="line.30"></a> -<span class="sourceLineNo">031</span> private final long sleepTime;<a name="line.31"></a> -<span class="sourceLineNo">032</span> private final TableName tableName;<a name="line.32"></a> -<span class="sourceLineNo">033</span><a name="line.33"></a> -<span class="sourceLineNo">034</span> public ChangeBloomFilterAction(TableName tableName) {<a name="line.34"></a> -<span class="sourceLineNo">035</span> this(-1, tableName);<a name="line.35"></a> -<span class="sourceLineNo">036</span> }<a name="line.36"></a> -<span class="sourceLineNo">037</span><a name="line.37"></a> -<span class="sourceLineNo">038</span> public ChangeBloomFilterAction(int sleepTime, TableName tableName) {<a name="line.38"></a> -<span class="sourceLineNo">039</span> this.sleepTime = sleepTime;<a name="line.39"></a> -<span class="sourceLineNo">040</span> this.tableName = tableName;<a name="line.40"></a> -<span class="sourceLineNo">041</span> }<a name="line.41"></a> -<span class="sourceLineNo">042</span><a name="line.42"></a> -<span class="sourceLineNo">043</span> @Override<a name="line.43"></a> -<span class="sourceLineNo">044</span> public void perform() throws Exception {<a name="line.44"></a> -<span class="sourceLineNo">045</span> final Random random = new Random();<a name="line.45"></a> -<span class="sourceLineNo">046</span> final BloomType[] bloomArray = BloomType.values();<a name="line.46"></a> -<span class="sourceLineNo">047</span> final int bloomArraySize = bloomArray.length;<a name="line.47"></a> -<span class="sourceLineNo">048</span><a name="line.48"></a> -<span class="sourceLineNo">049</span> LOG.info("Performing action: Change bloom filter on all columns of table " + tableName);<a name="line.49"></a> -<span class="sourceLineNo">050</span><a name="line.50"></a> -<span class="sourceLineNo">051</span> modifyAllTableColumns(tableName, (columnName, columnBuilder) -> {<a name="line.51"></a> -<span class="sourceLineNo">052</span> BloomType bloomType = bloomArray[random.nextInt(bloomArraySize)];<a name="line.52"></a> -<span class="sourceLineNo">053</span> LOG.debug("Performing action: About to set bloom filter type to "<a name="line.53"></a> -<span class="sourceLineNo">054</span> + bloomType + " on column " + columnName + " of table " + tableName);<a name="line.54"></a> -<span class="sourceLineNo">055</span> columnBuilder.setBloomFilterType(bloomType);<a name="line.55"></a> -<span class="sourceLineNo">056</span> });<a name="line.56"></a> -<span class="sourceLineNo">057</span><a name="line.57"></a> -<span class="sourceLineNo">058</span> LOG.debug("Performing action: Just set bloom filter types on table " + tableName);<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">025</span>import org.apache.hadoop.hbase.util.BloomFilterUtil;<a name="line.25"></a> +<span class="sourceLineNo">026</span><a name="line.26"></a> +<span class="sourceLineNo">027</span>/**<a name="line.27"></a> +<span class="sourceLineNo">028</span> * Action that tries to adjust the bloom filter setting on all the columns of a<a name="line.28"></a> +<span class="sourceLineNo">029</span> * table<a name="line.29"></a> +<span class="sourceLineNo">030</span> */<a name="line.30"></a> +<span class="sourceLineNo">031</span>public class ChangeBloomFilterAction extends Action {<a name="line.31"></a> +<span class="sourceLineNo">032</span> private final long sleepTime;<a name="line.32"></a> +<span class="sourceLineNo">033</span> private final TableName tableName;<a name="line.33"></a> +<span class="sourceLineNo">034</span><a name="line.34"></a> +<span class="sourceLineNo">035</span> public ChangeBloomFilterAction(TableName tableName) {<a name="line.35"></a> +<span class="sourceLineNo">036</span> this(-1, tableName);<a name="line.36"></a> +<span class="sourceLineNo">037</span> }<a name="line.37"></a> +<span class="sourceLineNo">038</span><a name="line.38"></a> +<span class="sourceLineNo">039</span> public ChangeBloomFilterAction(int sleepTime, TableName tableName) {<a name="line.39"></a> +<span class="sourceLineNo">040</span> this.sleepTime = sleepTime;<a name="line.40"></a> +<span class="sourceLineNo">041</span> this.tableName = tableName;<a name="line.41"></a> +<span class="sourceLineNo">042</span> }<a name="line.42"></a> +<span class="sourceLineNo">043</span><a name="line.43"></a> +<span class="sourceLineNo">044</span> @Override<a name="line.44"></a> +<span class="sourceLineNo">045</span> public void perform() throws Exception {<a name="line.45"></a> +<span class="sourceLineNo">046</span> final Random random = new Random();<a name="line.46"></a> +<span class="sourceLineNo">047</span> final BloomType[] bloomArray = BloomType.values();<a name="line.47"></a> +<span class="sourceLineNo">048</span> final int bloomArraySize = bloomArray.length;<a name="line.48"></a> +<span class="sourceLineNo">049</span><a name="line.49"></a> +<span class="sourceLineNo">050</span> LOG.info("Performing action: Change bloom filter on all columns of table " + tableName);<a name="line.50"></a> +<span class="sourceLineNo">051</span><a name="line.51"></a> +<span class="sourceLineNo">052</span> modifyAllTableColumns(tableName, (columnName, columnBuilder) -> {<a name="line.52"></a> +<span class="sourceLineNo">053</span> BloomType bloomType = bloomArray[random.nextInt(bloomArraySize)];<a name="line.53"></a> +<span class="sourceLineNo">054</span> LOG.debug("Performing action: About to set bloom filter type to "<a name="line.54"></a> +<span class="sourceLineNo">055</span> + bloomType + " on column " + columnName + " of table " + tableName);<a name="line.55"></a> +<span class="sourceLineNo">056</span> columnBuilder.setBloomFilterType(bloomType);<a name="line.56"></a> +<span class="sourceLineNo">057</span> if (bloomType == BloomType.ROWPREFIX_FIXED_LENGTH) {<a name="line.57"></a> +<span class="sourceLineNo">058</span> columnBuilder.setConfiguration(BloomFilterUtil.PREFIX_LENGTH_KEY, "10");<a name="line.58"></a> +<span class="sourceLineNo">059</span> } else if (bloomType == BloomType.ROWPREFIX_DELIMITED) {<a name="line.59"></a> +<span class="sourceLineNo">060</span> columnBuilder.setConfiguration(BloomFilterUtil.DELIMITER_KEY, "#");<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><a name="line.63"></a> +<span class="sourceLineNo">064</span> LOG.debug("Performing action: Just set bloom filter types on table " + tableName);<a name="line.64"></a> +<span class="sourceLineNo">065</span> }<a name="line.65"></a> +<span class="sourceLineNo">066</span>}<a name="line.66"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/bbe517ae/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/TestSeekBeforeWithInlineBlocks.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/TestSeekBeforeWithInlineBlocks.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/TestSeekBeforeWithInlineBlocks.html index a221583..1a12cc9 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/TestSeekBeforeWithInlineBlocks.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/TestSeekBeforeWithInlineBlocks.html @@ -45,159 +45,164 @@ <span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.testclassification.IOTests;<a name="line.37"></a> <span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.38"></a> <span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.util.BloomFilterFactory;<a name="line.39"></a> -<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.40"></a> -<span class="sourceLineNo">041</span>import org.junit.ClassRule;<a name="line.41"></a> -<span class="sourceLineNo">042</span>import org.junit.Test;<a name="line.42"></a> -<span class="sourceLineNo">043</span>import org.junit.experimental.categories.Category;<a name="line.43"></a> -<span class="sourceLineNo">044</span>import org.slf4j.Logger;<a name="line.44"></a> -<span class="sourceLineNo">045</span>import org.slf4j.LoggerFactory;<a name="line.45"></a> -<span class="sourceLineNo">046</span><a name="line.46"></a> -<span class="sourceLineNo">047</span>@Category({IOTests.class, MediumTests.class})<a name="line.47"></a> -<span class="sourceLineNo">048</span>public class TestSeekBeforeWithInlineBlocks {<a name="line.48"></a> -<span class="sourceLineNo">049</span><a name="line.49"></a> -<span class="sourceLineNo">050</span> @ClassRule<a name="line.50"></a> -<span class="sourceLineNo">051</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.51"></a> -<span class="sourceLineNo">052</span> HBaseClassTestRule.forClass(TestSeekBeforeWithInlineBlocks.class);<a name="line.52"></a> -<span class="sourceLineNo">053</span><a name="line.53"></a> -<span class="sourceLineNo">054</span> private static final Logger LOG = LoggerFactory.getLogger(TestSeekBeforeWithInlineBlocks.class);<a name="line.54"></a> -<span class="sourceLineNo">055</span><a name="line.55"></a> -<span class="sourceLineNo">056</span> private static final HBaseTestingUtility TEST_UTIL =<a name="line.56"></a> -<span class="sourceLineNo">057</span> new HBaseTestingUtility();<a name="line.57"></a> -<span class="sourceLineNo">058</span><a name="line.58"></a> -<span class="sourceLineNo">059</span> private static final int NUM_KV = 10000;<a name="line.59"></a> -<span class="sourceLineNo">060</span><a name="line.60"></a> -<span class="sourceLineNo">061</span> private static final int DATA_BLOCK_SIZE = 4096;<a name="line.61"></a> -<span class="sourceLineNo">062</span> private static final int BLOOM_BLOCK_SIZE = 1024;<a name="line.62"></a> -<span class="sourceLineNo">063</span> private static final int[] INDEX_CHUNK_SIZES = { 65536, 4096, 1024 };<a name="line.63"></a> -<span class="sourceLineNo">064</span> private static final int[] EXPECTED_NUM_LEVELS = { 1, 2, 3 };<a name="line.64"></a> -<span class="sourceLineNo">065</span><a name="line.65"></a> -<span class="sourceLineNo">066</span> private static final Random RAND = new Random(192537);<a name="line.66"></a> -<span class="sourceLineNo">067</span> private static final byte[] FAM = Bytes.toBytes("family");<a name="line.67"></a> -<span class="sourceLineNo">068</span><a name="line.68"></a> -<span class="sourceLineNo">069</span> private FileSystem fs;<a name="line.69"></a> -<span class="sourceLineNo">070</span> private Configuration conf;<a name="line.70"></a> -<span class="sourceLineNo">071</span><a name="line.71"></a> -<span class="sourceLineNo">072</span> /**<a name="line.72"></a> -<span class="sourceLineNo">073</span> * Scanner.seekBefore() could fail because when seeking to a previous HFile data block, it needs<a name="line.73"></a> -<span class="sourceLineNo">074</span> * to know the size of that data block, which it calculates using current data block offset and<a name="line.74"></a> -<span class="sourceLineNo">075</span> * the previous data block offset. This fails to work when there are leaf-level index blocks in<a name="line.75"></a> -<span class="sourceLineNo">076</span> * the scannable section of the HFile, i.e. starting in HFileV2. This test will try seekBefore()<a name="line.76"></a> -<span class="sourceLineNo">077</span> * on a flat (single-level) and multi-level (2,3) HFile and confirm this bug is now fixed. This<a name="line.77"></a> -<span class="sourceLineNo">078</span> * bug also happens for inline Bloom blocks for the same reasons.<a name="line.78"></a> -<span class="sourceLineNo">079</span> */<a name="line.79"></a> -<span class="sourceLineNo">080</span> @Test<a name="line.80"></a> -<span class="sourceLineNo">081</span> public void testMultiIndexLevelRandomHFileWithBlooms() throws IOException {<a name="line.81"></a> -<span class="sourceLineNo">082</span> conf = TEST_UTIL.getConfiguration();<a name="line.82"></a> -<span class="sourceLineNo">083</span><a name="line.83"></a> -<span class="sourceLineNo">084</span> // Try out different HFile versions to ensure reverse scan works on each version<a name="line.84"></a> -<span class="sourceLineNo">085</span> for (int hfileVersion = HFile.MIN_FORMAT_VERSION_WITH_TAGS;<a name="line.85"></a> -<span class="sourceLineNo">086</span> hfileVersion <= HFile.MAX_FORMAT_VERSION; hfileVersion++) {<a name="line.86"></a> -<span class="sourceLineNo">087</span><a name="line.87"></a> -<span class="sourceLineNo">088</span> conf.setInt(HFile.FORMAT_VERSION_KEY, hfileVersion);<a name="line.88"></a> -<span class="sourceLineNo">089</span> fs = HFileSystem.get(conf);<a name="line.89"></a> +<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.util.BloomFilterUtil;<a name="line.40"></a> +<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.41"></a> +<span class="sourceLineNo">042</span>import org.junit.ClassRule;<a name="line.42"></a> +<span class="sourceLineNo">043</span>import org.junit.Test;<a name="line.43"></a> +<span class="sourceLineNo">044</span>import org.junit.experimental.categories.Category;<a name="line.44"></a> +<span class="sourceLineNo">045</span>import org.slf4j.Logger;<a name="line.45"></a> +<span class="sourceLineNo">046</span>import org.slf4j.LoggerFactory;<a name="line.46"></a> +<span class="sourceLineNo">047</span><a name="line.47"></a> +<span class="sourceLineNo">048</span>@Category({IOTests.class, MediumTests.class})<a name="line.48"></a> +<span class="sourceLineNo">049</span>public class TestSeekBeforeWithInlineBlocks {<a name="line.49"></a> +<span class="sourceLineNo">050</span><a name="line.50"></a> +<span class="sourceLineNo">051</span> @ClassRule<a name="line.51"></a> +<span class="sourceLineNo">052</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.52"></a> +<span class="sourceLineNo">053</span> HBaseClassTestRule.forClass(TestSeekBeforeWithInlineBlocks.class);<a name="line.53"></a> +<span class="sourceLineNo">054</span><a name="line.54"></a> +<span class="sourceLineNo">055</span> private static final Logger LOG = LoggerFactory.getLogger(TestSeekBeforeWithInlineBlocks.class);<a name="line.55"></a> +<span class="sourceLineNo">056</span><a name="line.56"></a> +<span class="sourceLineNo">057</span> private static final HBaseTestingUtility TEST_UTIL =<a name="line.57"></a> +<span class="sourceLineNo">058</span> new HBaseTestingUtility();<a name="line.58"></a> +<span class="sourceLineNo">059</span><a name="line.59"></a> +<span class="sourceLineNo">060</span> private static final int NUM_KV = 10000;<a name="line.60"></a> +<span class="sourceLineNo">061</span><a name="line.61"></a> +<span class="sourceLineNo">062</span> private static final int DATA_BLOCK_SIZE = 4096;<a name="line.62"></a> +<span class="sourceLineNo">063</span> private static final int BLOOM_BLOCK_SIZE = 1024;<a name="line.63"></a> +<span class="sourceLineNo">064</span> private static final int[] INDEX_CHUNK_SIZES = { 65536, 4096, 1024 };<a name="line.64"></a> +<span class="sourceLineNo">065</span> private static final int[] EXPECTED_NUM_LEVELS = { 1, 2, 3 };<a name="line.65"></a> +<span class="sourceLineNo">066</span><a name="line.66"></a> +<span class="sourceLineNo">067</span> private static final Random RAND = new Random(192537);<a name="line.67"></a> +<span class="sourceLineNo">068</span> private static final byte[] FAM = Bytes.toBytes("family");<a name="line.68"></a> +<span class="sourceLineNo">069</span><a name="line.69"></a> +<span class="sourceLineNo">070</span> private FileSystem fs;<a name="line.70"></a> +<span class="sourceLineNo">071</span> private Configuration conf;<a name="line.71"></a> +<span class="sourceLineNo">072</span><a name="line.72"></a> +<span class="sourceLineNo">073</span> /**<a name="line.73"></a> +<span class="sourceLineNo">074</span> * Scanner.seekBefore() could fail because when seeking to a previous HFile data block, it needs<a name="line.74"></a> +<span class="sourceLineNo">075</span> * to know the size of that data block, which it calculates using current data block offset and<a name="line.75"></a> +<span class="sourceLineNo">076</span> * the previous data block offset. This fails to work when there are leaf-level index blocks in<a name="line.76"></a> +<span class="sourceLineNo">077</span> * the scannable section of the HFile, i.e. starting in HFileV2. This test will try seekBefore()<a name="line.77"></a> +<span class="sourceLineNo">078</span> * on a flat (single-level) and multi-level (2,3) HFile and confirm this bug is now fixed. This<a name="line.78"></a> +<span class="sourceLineNo">079</span> * bug also happens for inline Bloom blocks for the same reasons.<a name="line.79"></a> +<span class="sourceLineNo">080</span> */<a name="line.80"></a> +<span class="sourceLineNo">081</span> @Test<a name="line.81"></a> +<span class="sourceLineNo">082</span> public void testMultiIndexLevelRandomHFileWithBlooms() throws IOException {<a name="line.82"></a> +<span class="sourceLineNo">083</span> conf = TEST_UTIL.getConfiguration();<a name="line.83"></a> +<span class="sourceLineNo">084</span> TEST_UTIL.getConfiguration().setInt(BloomFilterUtil.PREFIX_LENGTH_KEY, 10);<a name="line.84"></a> +<span class="sourceLineNo">085</span> TEST_UTIL.getConfiguration().set(BloomFilterUtil.DELIMITER_KEY, "#");<a name="line.85"></a> +<span class="sourceLineNo">086</span><a name="line.86"></a> +<span class="sourceLineNo">087</span> // Try out different HFile versions to ensure reverse scan works on each version<a name="line.87"></a> +<span class="sourceLineNo">088</span> for (int hfileVersion = HFile.MIN_FORMAT_VERSION_WITH_TAGS;<a name="line.88"></a> +<span class="sourceLineNo">089</span> hfileVersion <= HFile.MAX_FORMAT_VERSION; hfileVersion++) {<a name="line.89"></a> <span class="sourceLineNo">090</span><a name="line.90"></a> -<span class="sourceLineNo">091</span> // Try out different bloom types because inline Bloom blocks break seekBefore()<a name="line.91"></a> -<span class="sourceLineNo">092</span> for (BloomType bloomType : BloomType.values()) {<a name="line.92"></a> +<span class="sourceLineNo">091</span> conf.setInt(HFile.FORMAT_VERSION_KEY, hfileVersion);<a name="line.91"></a> +<span class="sourceLineNo">092</span> fs = HFileSystem.get(conf);<a name="line.92"></a> <span class="sourceLineNo">093</span><a name="line.93"></a> -<span class="sourceLineNo">094</span> // Test out HFile block indices of various sizes/levels<a name="line.94"></a> -<span class="sourceLineNo">095</span> for (int testI = 0; testI < INDEX_CHUNK_SIZES.length; testI++) {<a name="line.95"></a> -<span class="sourceLineNo">096</span> int indexBlockSize = INDEX_CHUNK_SIZES[testI];<a name="line.96"></a> -<span class="sourceLineNo">097</span> int expectedNumLevels = EXPECTED_NUM_LEVELS[testI];<a name="line.97"></a> -<span class="sourceLineNo">098</span><a name="line.98"></a> -<span class="sourceLineNo">099</span> LOG.info(String.format("Testing HFileVersion: %s, BloomType: %s, Index Levels: %s",<a name="line.99"></a> -<span class="sourceLineNo">100</span> hfileVersion, bloomType, expectedNumLevels));<a name="line.100"></a> +<span class="sourceLineNo">094</span> // Try out different bloom types because inline Bloom blocks break seekBefore()<a name="line.94"></a> +<span class="sourceLineNo">095</span> for (BloomType bloomType : BloomType.values()) {<a name="line.95"></a> +<span class="sourceLineNo">096</span><a name="line.96"></a> +<span class="sourceLineNo">097</span> // Test out HFile block indices of various sizes/levels<a name="line.97"></a> +<span class="sourceLineNo">098</span> for (int testI = 0; testI < INDEX_CHUNK_SIZES.length; testI++) {<a name="line.98"></a> +<span class="sourceLineNo">099</span> int indexBlockSize = INDEX_CHUNK_SIZES[testI];<a name="line.99"></a> +<span class="sourceLineNo">100</span> int expectedNumLevels = EXPECTED_NUM_LEVELS[testI];<a name="line.100"></a> <span class="sourceLineNo">101</span><a name="line.101"></a> -<span class="sourceLineNo">102</span> conf.setInt(HFileBlockIndex.MAX_CHUNK_SIZE_KEY, indexBlockSize);<a name="line.102"></a> -<span class="sourceLineNo">103</span> conf.setInt(BloomFilterFactory.IO_STOREFILE_BLOOM_BLOCK_SIZE, BLOOM_BLOCK_SIZE);<a name="line.103"></a> +<span class="sourceLineNo">102</span> LOG.info(String.format("Testing HFileVersion: %s, BloomType: %s, Index Levels: %s",<a name="line.102"></a> +<span class="sourceLineNo">103</span> hfileVersion, bloomType, expectedNumLevels));<a name="line.103"></a> <span class="sourceLineNo">104</span><a name="line.104"></a> -<span class="sourceLineNo">105</span> Cell[] cells = new Cell[NUM_KV];<a name="line.105"></a> -<span class="sourceLineNo">106</span><a name="line.106"></a> -<span class="sourceLineNo">107</span> Path hfilePath = new Path(TEST_UTIL.getDataTestDir(),<a name="line.107"></a> -<span class="sourceLineNo">108</span> String.format("testMultiIndexLevelRandomHFileWithBlooms-%s-%s-%s",<a name="line.108"></a> -<span class="sourceLineNo">109</span> hfileVersion, bloomType, testI));<a name="line.109"></a> -<span class="sourceLineNo">110</span><a name="line.110"></a> -<span class="sourceLineNo">111</span> // Disable caching to prevent it from hiding any bugs in block seeks/reads<a name="line.111"></a> -<span class="sourceLineNo">112</span> conf.setFloat(HConstants.HFILE_BLOCK_CACHE_SIZE_KEY, 0.0f);<a name="line.112"></a> -<span class="sourceLineNo">113</span> CacheConfig cacheConf = new CacheConfig(conf);<a name="line.113"></a> -<span class="sourceLineNo">114</span><a name="line.114"></a> -<span class="sourceLineNo">115</span> // Write the HFile<a name="line.115"></a> -<span class="sourceLineNo">116</span> {<a name="line.116"></a> -<span class="sourceLineNo">117</span> HFileContext meta = new HFileContextBuilder()<a name="line.117"></a> -<span class="sourceLineNo">118</span> .withBlockSize(DATA_BLOCK_SIZE)<a name="line.118"></a> -<span class="sourceLineNo">119</span> .build();<a name="line.119"></a> -<span class="sourceLineNo">120</span><a name="line.120"></a> -<span class="sourceLineNo">121</span> StoreFileWriter storeFileWriter =<a name="line.121"></a> -<span class="sourceLineNo">122</span> new StoreFileWriter.Builder(conf, cacheConf, fs)<a name="line.122"></a> -<span class="sourceLineNo">123</span> .withFilePath(hfilePath)<a name="line.123"></a> -<span class="sourceLineNo">124</span> .withFileContext(meta)<a name="line.124"></a> -<span class="sourceLineNo">125</span> .withBloomType(bloomType)<a name="line.125"></a> -<span class="sourceLineNo">126</span> .build();<a name="line.126"></a> -<span class="sourceLineNo">127</span><a name="line.127"></a> -<span class="sourceLineNo">128</span> for (int i = 0; i < NUM_KV; i++) {<a name="line.128"></a> -<span class="sourceLineNo">129</span> byte[] row = RandomKeyValueUtil.randomOrderedKey(RAND, i);<a name="line.129"></a> -<span class="sourceLineNo">130</span> byte[] qual = RandomKeyValueUtil.randomRowOrQualifier(RAND);<a name="line.130"></a> -<span class="sourceLineNo">131</span> byte[] value = RandomKeyValueUtil.randomValue(RAND);<a name="line.131"></a> -<span class="sourceLineNo">132</span> KeyValue kv = new KeyValue(row, FAM, qual, value);<a name="line.132"></a> -<span class="sourceLineNo">133</span><a name="line.133"></a> -<span class="sourceLineNo">134</span> storeFileWriter.append(kv);<a name="line.134"></a> -<span class="sourceLineNo">135</span> cells[i] = kv;<a name="line.135"></a> -<span class="sourceLineNo">136</span> }<a name="line.136"></a> -<span class="sourceLineNo">137</span><a name="line.137"></a> -<span class="sourceLineNo">138</span> storeFileWriter.close();<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> // Read the HFile<a name="line.141"></a> -<span class="sourceLineNo">142</span> HFile.Reader reader = HFile.createReader(fs, hfilePath, cacheConf, true, conf);<a name="line.142"></a> -<span class="sourceLineNo">143</span><a name="line.143"></a> -<span class="sourceLineNo">144</span> // Sanity check the HFile index level<a name="line.144"></a> -<span class="sourceLineNo">145</span> assertEquals(expectedNumLevels, reader.getTrailer().getNumDataIndexLevels());<a name="line.145"></a> -<span class="sourceLineNo">146</span><a name="line.146"></a> -<span class="sourceLineNo">147</span> // Check that we can seekBefore in either direction and with both pread<a name="line.147"></a> -<span class="sourceLineNo">148</span> // enabled and disabled<a name="line.148"></a> -<span class="sourceLineNo">149</span> for (boolean pread : new boolean[] { false, true }) {<a name="line.149"></a> -<span class="sourceLineNo">150</span> HFileScanner scanner = reader.getScanner(true, pread);<a name="line.150"></a> -<span class="sourceLineNo">151</span> checkNoSeekBefore(cells, scanner, 0);<a name="line.151"></a> -<span class="sourceLineNo">152</span> for (int i = 1; i < NUM_KV; i++) {<a name="line.152"></a> -<span class="sourceLineNo">153</span> checkSeekBefore(cells, scanner, i);<a name="line.153"></a> -<span class="sourceLineNo">154</span> checkCell(cells[i-1], scanner.getCell());<a name="line.154"></a> -<span class="sourceLineNo">155</span> }<a name="line.155"></a> -<span class="sourceLineNo">156</span> assertTrue(scanner.seekTo());<a name="line.156"></a> -<span class="sourceLineNo">157</span> for (int i = NUM_KV - 1; i >= 1; i--) {<a name="line.157"></a> +<span class="sourceLineNo">105</span> conf.setInt(HFileBlockIndex.MAX_CHUNK_SIZE_KEY, indexBlockSize);<a name="line.105"></a> +<span class="sourceLineNo">106</span> conf.setInt(BloomFilterFactory.IO_STOREFILE_BLOOM_BLOCK_SIZE, BLOOM_BLOCK_SIZE);<a name="line.106"></a> +<span class="sourceLineNo">107</span> conf.setInt(BloomFilterUtil.PREFIX_LENGTH_KEY, 10);<a name="line.107"></a> +<span class="sourceLineNo">108</span> conf.set(BloomFilterUtil.DELIMITER_KEY, "#");<a name="line.108"></a> +<span class="sourceLineNo">109</span><a name="line.109"></a> +<span class="sourceLineNo">110</span> Cell[] cells = new Cell[NUM_KV];<a name="line.110"></a> +<span class="sourceLineNo">111</span><a name="line.111"></a> +<span class="sourceLineNo">112</span> Path hfilePath = new Path(TEST_UTIL.getDataTestDir(),<a name="line.112"></a> +<span class="sourceLineNo">113</span> String.format("testMultiIndexLevelRandomHFileWithBlooms-%s-%s-%s",<a name="line.113"></a> +<span class="sourceLineNo">114</span> hfileVersion, bloomType, testI));<a name="line.114"></a> +<span class="sourceLineNo">115</span><a name="line.115"></a> +<span class="sourceLineNo">116</span> // Disable caching to prevent it from hiding any bugs in block seeks/reads<a name="line.116"></a> +<span class="sourceLineNo">117</span> conf.setFloat(HConstants.HFILE_BLOCK_CACHE_SIZE_KEY, 0.0f);<a name="line.117"></a> +<span class="sourceLineNo">118</span> CacheConfig cacheConf = new CacheConfig(conf);<a name="line.118"></a> +<span class="sourceLineNo">119</span><a name="line.119"></a> +<span class="sourceLineNo">120</span> // Write the HFile<a name="line.120"></a> +<span class="sourceLineNo">121</span> {<a name="line.121"></a> +<span class="sourceLineNo">122</span> HFileContext meta = new HFileContextBuilder()<a name="line.122"></a> +<span class="sourceLineNo">123</span> .withBlockSize(DATA_BLOCK_SIZE)<a name="line.123"></a> +<span class="sourceLineNo">124</span> .build();<a name="line.124"></a> +<span class="sourceLineNo">125</span><a name="line.125"></a> +<span class="sourceLineNo">126</span> StoreFileWriter storeFileWriter =<a name="line.126"></a> +<span class="sourceLineNo">127</span> new StoreFileWriter.Builder(conf, cacheConf, fs)<a name="line.127"></a> +<span class="sourceLineNo">128</span> .withFilePath(hfilePath)<a name="line.128"></a> +<span class="sourceLineNo">129</span> .withFileContext(meta)<a name="line.129"></a> +<span class="sourceLineNo">130</span> .withBloomType(bloomType)<a name="line.130"></a> +<span class="sourceLineNo">131</span> .build();<a name="line.131"></a> +<span class="sourceLineNo">132</span><a name="line.132"></a> +<span class="sourceLineNo">133</span> for (int i = 0; i < NUM_KV; i++) {<a name="line.133"></a> +<span class="sourceLineNo">134</span> byte[] row = RandomKeyValueUtil.randomOrderedKey(RAND, i);<a name="line.134"></a> +<span class="sourceLineNo">135</span> byte[] qual = RandomKeyValueUtil.randomRowOrQualifier(RAND);<a name="line.135"></a> +<span class="sourceLineNo">136</span> byte[] value = RandomKeyValueUtil.randomValue(RAND);<a name="line.136"></a> +<span class="sourceLineNo">137</span> KeyValue kv = new KeyValue(row, FAM, qual, value);<a name="line.137"></a> +<span class="sourceLineNo">138</span><a name="line.138"></a> +<span class="sourceLineNo">139</span> storeFileWriter.append(kv);<a name="line.139"></a> +<span class="sourceLineNo">140</span> cells[i] = kv;<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> storeFileWriter.close();<a name="line.143"></a> +<span class="sourceLineNo">144</span> }<a name="line.144"></a> +<span class="sourceLineNo">145</span><a name="line.145"></a> +<span class="sourceLineNo">146</span> // Read the HFile<a name="line.146"></a> +<span class="sourceLineNo">147</span> HFile.Reader reader = HFile.createReader(fs, hfilePath, cacheConf, true, conf);<a name="line.147"></a> +<span class="sourceLineNo">148</span><a name="line.148"></a> +<span class="sourceLineNo">149</span> // Sanity check the HFile index level<a name="line.149"></a> +<span class="sourceLineNo">150</span> assertEquals(expectedNumLevels, reader.getTrailer().getNumDataIndexLevels());<a name="line.150"></a> +<span class="sourceLineNo">151</span><a name="line.151"></a> +<span class="sourceLineNo">152</span> // Check that we can seekBefore in either direction and with both pread<a name="line.152"></a> +<span class="sourceLineNo">153</span> // enabled and disabled<a name="line.153"></a> +<span class="sourceLineNo">154</span> for (boolean pread : new boolean[] { false, true }) {<a name="line.154"></a> +<span class="sourceLineNo">155</span> HFileScanner scanner = reader.getScanner(true, pread);<a name="line.155"></a> +<span class="sourceLineNo">156</span> checkNoSeekBefore(cells, scanner, 0);<a name="line.156"></a> +<span class="sourceLineNo">157</span> for (int i = 1; i < NUM_KV; i++) {<a name="line.157"></a> <span class="sourceLineNo">158</span> checkSeekBefore(cells, scanner, i);<a name="line.158"></a> <span class="sourceLineNo">159</span> checkCell(cells[i-1], scanner.getCell());<a name="line.159"></a> <span class="sourceLineNo">160</span> }<a name="line.160"></a> -<span class="sourceLineNo">161</span> checkNoSeekBefore(cells, scanner, 0);<a name="line.161"></a> -<span class="sourceLineNo">162</span> scanner.close();<a name="line.162"></a> -<span class="sourceLineNo">163</span> }<a name="line.163"></a> -<span class="sourceLineNo">164</span><a name="line.164"></a> -<span class="sourceLineNo">165</span> reader.close();<a name="line.165"></a> -<span class="sourceLineNo">166</span> }<a name="line.166"></a> -<span class="sourceLineNo">167</span> }<a name="line.167"></a> -<span class="sourceLineNo">168</span> }<a name="line.168"></a> -<span class="sourceLineNo">169</span> }<a name="line.169"></a> -<span class="sourceLineNo">170</span><a name="line.170"></a> -<span class="sourceLineNo">171</span> private void checkSeekBefore(Cell[] cells, HFileScanner scanner, int i)<a name="line.171"></a> -<span class="sourceLineNo">172</span> throws IOException {<a name="line.172"></a> -<span class="sourceLineNo">173</span> assertEquals("Failed to seek to the key before #" + i + " ("<a name="line.173"></a> -<span class="sourceLineNo">174</span> + CellUtil.getCellKeyAsString(cells[i]) + ")", true,<a name="line.174"></a> -<span class="sourceLineNo">175</span> scanner.seekBefore(cells[i]));<a name="line.175"></a> -<span class="sourceLineNo">176</span> }<a name="line.176"></a> -<span class="sourceLineNo">177</span><a name="line.177"></a> -<span class="sourceLineNo">178</span> private void checkNoSeekBefore(Cell[] cells, HFileScanner scanner, int i)<a name="line.178"></a> -<span class="sourceLineNo">179</span> throws IOException {<a name="line.179"></a> -<span class="sourceLineNo">180</span> assertEquals("Incorrectly succeeded in seeking to before first key ("<a name="line.180"></a> -<span class="sourceLineNo">181</span> + CellUtil.getCellKeyAsString(cells[i]) + ")", false,<a name="line.181"></a> -<span class="sourceLineNo">182</span> scanner.seekBefore(cells[i]));<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> /** Check a key/value pair after it was read by the reader */<a name="line.185"></a> -<span class="sourceLineNo">186</span> private void checkCell(Cell expected, Cell actual) {<a name="line.186"></a> -<span class="sourceLineNo">187</span> assertTrue(String.format("Expected key %s, but was %s",<a name="line.187"></a> -<span class="sourceLineNo">188</span> CellUtil.getCellKeyAsString(expected), CellUtil.getCellKeyAsString(actual)),<a name="line.188"></a> -<span class="sourceLineNo">189</span> CellUtil.equals(expected, actual));<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><a name="line.192"></a> +<span class="sourceLineNo">161</span> assertTrue(scanner.seekTo());<a name="line.161"></a> +<span class="sourceLineNo">162</span> for (int i = NUM_KV - 1; i >= 1; i--) {<a name="line.162"></a> +<span class="sourceLineNo">163</span> checkSeekBefore(cells, scanner, i);<a name="line.163"></a> +<span class="sourceLineNo">164</span> checkCell(cells[i-1], scanner.getCell());<a name="line.164"></a> +<span class="sourceLineNo">165</span> }<a name="line.165"></a> +<span class="sourceLineNo">166</span> checkNoSeekBefore(cells, scanner, 0);<a name="line.166"></a> +<span class="sourceLineNo">167</span> scanner.close();<a name="line.167"></a> +<span class="sourceLineNo">168</span> }<a name="line.168"></a> +<span class="sourceLineNo">169</span><a name="line.169"></a> +<span class="sourceLineNo">170</span> reader.close();<a name="line.170"></a> +<span class="sourceLineNo">171</span> }<a name="line.171"></a> +<span class="sourceLineNo">172</span> }<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><a name="line.175"></a> +<span class="sourceLineNo">176</span> private void checkSeekBefore(Cell[] cells, HFileScanner scanner, int i)<a name="line.176"></a> +<span class="sourceLineNo">177</span> throws IOException {<a name="line.177"></a> +<span class="sourceLineNo">178</span> assertEquals("Failed to seek to the key before #" + i + " ("<a name="line.178"></a> +<span class="sourceLineNo">179</span> + CellUtil.getCellKeyAsString(cells[i]) + ")", true,<a name="line.179"></a> +<span class="sourceLineNo">180</span> scanner.seekBefore(cells[i]));<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> private void checkNoSeekBefore(Cell[] cells, HFileScanner scanner, int i)<a name="line.183"></a> +<span class="sourceLineNo">184</span> throws IOException {<a name="line.184"></a> +<span class="sourceLineNo">185</span> assertEquals("Incorrectly succeeded in seeking to before first key ("<a name="line.185"></a> +<span class="sourceLineNo">186</span> + CellUtil.getCellKeyAsString(cells[i]) + ")", false,<a name="line.186"></a> +<span class="sourceLineNo">187</span> scanner.seekBefore(cells[i]));<a name="line.187"></a> +<span class="sourceLineNo">188</span> }<a name="line.188"></a> +<span class="sourceLineNo">189</span><a name="line.189"></a> +<span class="sourceLineNo">190</span> /** Check a key/value pair after it was read by the reader */<a name="line.190"></a> +<span class="sourceLineNo">191</span> private void checkCell(Cell expected, Cell actual) {<a name="line.191"></a> +<span class="sourceLineNo">192</span> assertTrue(String.format("Expected key %s, but was %s",<a name="line.192"></a> +<span class="sourceLineNo">193</span> CellUtil.getCellKeyAsString(expected), CellUtil.getCellKeyAsString(actual)),<a name="line.193"></a> +<span class="sourceLineNo">194</span> CellUtil.equals(expected, actual));<a name="line.194"></a> +<span class="sourceLineNo">195</span> }<a name="line.195"></a> +<span class="sourceLineNo">196</span>}<a name="line.196"></a> +<span class="sourceLineNo">197</span><a name="line.197"></a>
