http://git-wip-us.apache.org/repos/asf/hbase-site/blob/07e68d46/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestBucketCache.html
----------------------------------------------------------------------
diff --git
a/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestBucketCache.html
b/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestBucketCache.html
index 9e93548..f770d03 100644
---
a/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestBucketCache.html
+++
b/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestBucketCache.html
@@ -27,264 +27,376 @@
<span class="sourceLineNo">019</span>package
org.apache.hadoop.hbase.io.hfile.bucket;<a name="line.19"></a>
<span class="sourceLineNo">020</span><a name="line.20"></a>
<span class="sourceLineNo">021</span>import static
org.junit.Assert.assertEquals;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import static
org.junit.Assert.assertTrue;<a name="line.22"></a>
-<span class="sourceLineNo">023</span><a name="line.23"></a>
-<span class="sourceLineNo">024</span>import java.io.FileNotFoundException;<a
name="line.24"></a>
-<span class="sourceLineNo">025</span>import java.io.IOException;<a
name="line.25"></a>
-<span class="sourceLineNo">026</span>import java.util.ArrayList;<a
name="line.26"></a>
-<span class="sourceLineNo">027</span>import java.util.Arrays;<a
name="line.27"></a>
-<span class="sourceLineNo">028</span>import java.util.List;<a
name="line.28"></a>
-<span class="sourceLineNo">029</span>import java.util.Random;<a
name="line.29"></a>
-<span class="sourceLineNo">030</span>import
java.util.concurrent.locks.ReentrantReadWriteLock;<a name="line.30"></a>
-<span class="sourceLineNo">031</span><a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.fs.Path;<a
name="line.32"></a>
-<span class="sourceLineNo">033</span>import
org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import
org.apache.hadoop.hbase.io.hfile.BlockCacheKey;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import
org.apache.hadoop.hbase.io.hfile.CacheTestUtils;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import
org.apache.hadoop.hbase.io.hfile.Cacheable;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import
org.apache.hadoop.hbase.io.hfile.CacheTestUtils.HFileBlockPair;<a
name="line.37"></a>
-<span class="sourceLineNo">038</span>import
org.apache.hadoop.hbase.io.hfile.bucket.BucketAllocator.BucketSizeInfo;<a
name="line.38"></a>
-<span class="sourceLineNo">039</span>import
org.apache.hadoop.hbase.io.hfile.bucket.BucketAllocator.IndexStatistics;<a
name="line.39"></a>
-<span class="sourceLineNo">040</span>import
org.apache.hadoop.hbase.testclassification.IOTests;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import
org.apache.hadoop.hbase.testclassification.SmallTests;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.junit.After;<a
name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.junit.Before;<a
name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.junit.Test;<a
name="line.44"></a>
-<span class="sourceLineNo">045</span>import
org.junit.experimental.categories.Category;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.junit.runner.RunWith;<a
name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.junit.runners.Parameterized;<a
name="line.47"></a>
-<span class="sourceLineNo">048</span><a name="line.48"></a>
-<span class="sourceLineNo">049</span>/**<a name="line.49"></a>
-<span class="sourceLineNo">050</span> * Basic test of BucketCache.Puts and
gets.<a name="line.50"></a>
-<span class="sourceLineNo">051</span> * <p><a name="line.51"></a>
-<span class="sourceLineNo">052</span> * Tests will ensure that blocks' data
correctness under several threads concurrency<a name="line.52"></a>
-<span class="sourceLineNo">053</span> */<a name="line.53"></a>
-<span class="sourceLineNo">054</span>@RunWith(Parameterized.class)<a
name="line.54"></a>
-<span class="sourceLineNo">055</span>@Category({ IOTests.class,
SmallTests.class })<a name="line.55"></a>
-<span class="sourceLineNo">056</span>public class TestBucketCache {<a
name="line.56"></a>
-<span class="sourceLineNo">057</span><a name="line.57"></a>
-<span class="sourceLineNo">058</span> private static final Random RAND = new
Random();<a name="line.58"></a>
-<span class="sourceLineNo">059</span><a name="line.59"></a>
-<span class="sourceLineNo">060</span> @Parameterized.Parameters(name =
"{index}: blockSize={0}, bucketSizes={1}")<a name="line.60"></a>
-<span class="sourceLineNo">061</span> public static Iterable<Object[]>
data() {<a name="line.61"></a>
-<span class="sourceLineNo">062</span> return Arrays.asList(new Object[][]
{<a name="line.62"></a>
-<span class="sourceLineNo">063</span> { 8192, null }, // TODO: why is
8k the default blocksize for these tests?<a name="line.63"></a>
-<span class="sourceLineNo">064</span> {<a name="line.64"></a>
-<span class="sourceLineNo">065</span> 16 * 1024,<a
name="line.65"></a>
-<span class="sourceLineNo">066</span> new int[] { 2 * 1024 + 1024,
4 * 1024 + 1024, 8 * 1024 + 1024, 16 * 1024 + 1024,<a name="line.66"></a>
-<span class="sourceLineNo">067</span> 28 * 1024 + 1024, 32 *
1024 + 1024, 64 * 1024 + 1024, 96 * 1024 + 1024,<a name="line.67"></a>
-<span class="sourceLineNo">068</span> 128 * 1024 + 1024 } }
});<a name="line.68"></a>
-<span class="sourceLineNo">069</span> }<a name="line.69"></a>
-<span class="sourceLineNo">070</span><a name="line.70"></a>
-<span class="sourceLineNo">071</span> @Parameterized.Parameter(0)<a
name="line.71"></a>
-<span class="sourceLineNo">072</span> public int constructedBlockSize;<a
name="line.72"></a>
-<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span> @Parameterized.Parameter(1)<a
name="line.74"></a>
-<span class="sourceLineNo">075</span> public int[] constructedBlockSizes;<a
name="line.75"></a>
-<span class="sourceLineNo">076</span><a name="line.76"></a>
-<span class="sourceLineNo">077</span> BucketCache cache;<a name="line.77"></a>
-<span class="sourceLineNo">078</span> final int CACHE_SIZE = 1000000;<a
name="line.78"></a>
-<span class="sourceLineNo">079</span> final int NUM_BLOCKS = 100;<a
name="line.79"></a>
-<span class="sourceLineNo">080</span> final int BLOCK_SIZE = CACHE_SIZE /
NUM_BLOCKS;<a name="line.80"></a>
-<span class="sourceLineNo">081</span> final int NUM_THREADS = 100;<a
name="line.81"></a>
-<span class="sourceLineNo">082</span> final int NUM_QUERIES = 10000;<a
name="line.82"></a>
-<span class="sourceLineNo">083</span><a name="line.83"></a>
-<span class="sourceLineNo">084</span> final long capacitySize = 32 * 1024 *
1024;<a name="line.84"></a>
-<span class="sourceLineNo">085</span> final int writeThreads =
BucketCache.DEFAULT_WRITER_THREADS;<a name="line.85"></a>
-<span class="sourceLineNo">086</span> final int writerQLen =
BucketCache.DEFAULT_WRITER_QUEUE_ITEMS;<a name="line.86"></a>
-<span class="sourceLineNo">087</span> String ioEngineName = "heap";<a
name="line.87"></a>
-<span class="sourceLineNo">088</span> String persistencePath = null;<a
name="line.88"></a>
-<span class="sourceLineNo">089</span><a name="line.89"></a>
-<span class="sourceLineNo">090</span> private class MockedBucketCache extends
BucketCache {<a name="line.90"></a>
+<span class="sourceLineNo">022</span>import static
org.junit.Assert.assertFalse;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import static
org.junit.Assert.assertThat;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import static
org.junit.Assert.assertTrue;<a name="line.24"></a>
+<span class="sourceLineNo">025</span><a name="line.25"></a>
+<span class="sourceLineNo">026</span>import java.io.FileNotFoundException;<a
name="line.26"></a>
+<span class="sourceLineNo">027</span>import java.io.IOException;<a
name="line.27"></a>
+<span class="sourceLineNo">028</span>import java.util.ArrayList;<a
name="line.28"></a>
+<span class="sourceLineNo">029</span>import java.util.Arrays;<a
name="line.29"></a>
+<span class="sourceLineNo">030</span>import java.util.Collection;<a
name="line.30"></a>
+<span class="sourceLineNo">031</span>import java.util.List;<a
name="line.31"></a>
+<span class="sourceLineNo">032</span>import java.util.Map;<a
name="line.32"></a>
+<span class="sourceLineNo">033</span>import java.util.Random;<a
name="line.33"></a>
+<span class="sourceLineNo">034</span>import java.util.Set;<a
name="line.34"></a>
+<span class="sourceLineNo">035</span>import
java.util.concurrent.locks.ReentrantReadWriteLock;<a name="line.35"></a>
+<span class="sourceLineNo">036</span><a name="line.36"></a>
+<span class="sourceLineNo">037</span>import
com.google.common.collect.ImmutableMap;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import
org.apache.hadoop.conf.Configuration;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.fs.Path;<a
name="line.39"></a>
+<span class="sourceLineNo">040</span>import
org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import
org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import
org.apache.hadoop.hbase.io.hfile.BlockCacheKey;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import
org.apache.hadoop.hbase.io.hfile.CacheTestUtils;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import
org.apache.hadoop.hbase.io.hfile.Cacheable;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import
org.apache.hadoop.hbase.io.hfile.CacheTestUtils.HFileBlockPair;<a
name="line.45"></a>
+<span class="sourceLineNo">046</span>import
org.apache.hadoop.hbase.io.hfile.bucket.BucketAllocator.BucketSizeInfo;<a
name="line.46"></a>
+<span class="sourceLineNo">047</span>import
org.apache.hadoop.hbase.io.hfile.bucket.BucketAllocator.IndexStatistics;<a
name="line.47"></a>
+<span class="sourceLineNo">048</span>import
org.apache.hadoop.hbase.testclassification.IOTests;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import
org.apache.hadoop.hbase.testclassification.SmallTests;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.junit.After;<a
name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.junit.Before;<a
name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.junit.Test;<a
name="line.52"></a>
+<span class="sourceLineNo">053</span>import
org.junit.experimental.categories.Category;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.junit.runner.RunWith;<a
name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.junit.runners.Parameterized;<a
name="line.55"></a>
+<span class="sourceLineNo">056</span><a name="line.56"></a>
+<span class="sourceLineNo">057</span>/**<a name="line.57"></a>
+<span class="sourceLineNo">058</span> * Basic test of BucketCache.Puts and
gets.<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * <p><a name="line.59"></a>
+<span class="sourceLineNo">060</span> * Tests will ensure that blocks' data
correctness under several threads concurrency<a name="line.60"></a>
+<span class="sourceLineNo">061</span> */<a name="line.61"></a>
+<span class="sourceLineNo">062</span>@RunWith(Parameterized.class)<a
name="line.62"></a>
+<span class="sourceLineNo">063</span>@Category({ IOTests.class,
SmallTests.class })<a name="line.63"></a>
+<span class="sourceLineNo">064</span>public class TestBucketCache {<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();<a name="line.66"></a>
+<span class="sourceLineNo">067</span><a name="line.67"></a>
+<span class="sourceLineNo">068</span> @Parameterized.Parameters(name =
"{index}: blockSize={0}, bucketSizes={1}")<a name="line.68"></a>
+<span class="sourceLineNo">069</span> public static Iterable<Object[]>
data() {<a name="line.69"></a>
+<span class="sourceLineNo">070</span> return Arrays.asList(new Object[][]
{<a name="line.70"></a>
+<span class="sourceLineNo">071</span> { 8192, null }, // TODO: why is
8k the default blocksize for these tests?<a name="line.71"></a>
+<span class="sourceLineNo">072</span> {<a name="line.72"></a>
+<span class="sourceLineNo">073</span> 16 * 1024,<a
name="line.73"></a>
+<span class="sourceLineNo">074</span> new int[] { 2 * 1024 + 1024,
4 * 1024 + 1024, 8 * 1024 + 1024, 16 * 1024 + 1024,<a name="line.74"></a>
+<span class="sourceLineNo">075</span> 28 * 1024 + 1024, 32 *
1024 + 1024, 64 * 1024 + 1024, 96 * 1024 + 1024,<a name="line.75"></a>
+<span class="sourceLineNo">076</span> 128 * 1024 + 1024 } }
});<a name="line.76"></a>
+<span class="sourceLineNo">077</span> }<a name="line.77"></a>
+<span class="sourceLineNo">078</span><a name="line.78"></a>
+<span class="sourceLineNo">079</span> @Parameterized.Parameter(0)<a
name="line.79"></a>
+<span class="sourceLineNo">080</span> public int constructedBlockSize;<a
name="line.80"></a>
+<span class="sourceLineNo">081</span><a name="line.81"></a>
+<span class="sourceLineNo">082</span> @Parameterized.Parameter(1)<a
name="line.82"></a>
+<span class="sourceLineNo">083</span> public int[] constructedBlockSizes;<a
name="line.83"></a>
+<span class="sourceLineNo">084</span><a name="line.84"></a>
+<span class="sourceLineNo">085</span> BucketCache cache;<a name="line.85"></a>
+<span class="sourceLineNo">086</span> final int CACHE_SIZE = 1000000;<a
name="line.86"></a>
+<span class="sourceLineNo">087</span> final int NUM_BLOCKS = 100;<a
name="line.87"></a>
+<span class="sourceLineNo">088</span> final int BLOCK_SIZE = CACHE_SIZE /
NUM_BLOCKS;<a name="line.88"></a>
+<span class="sourceLineNo">089</span> final int NUM_THREADS = 100;<a
name="line.89"></a>
+<span class="sourceLineNo">090</span> final int NUM_QUERIES = 10000;<a
name="line.90"></a>
<span class="sourceLineNo">091</span><a name="line.91"></a>
-<span class="sourceLineNo">092</span> public MockedBucketCache(String
ioEngineName, long capacity, int blockSize, int[] bucketSizes,<a
name="line.92"></a>
-<span class="sourceLineNo">093</span> int writerThreads, int
writerQLen, String persistencePath) throws FileNotFoundException,<a
name="line.93"></a>
-<span class="sourceLineNo">094</span> IOException {<a
name="line.94"></a>
-<span class="sourceLineNo">095</span> super(ioEngineName, capacity,
blockSize, bucketSizes, writerThreads, writerQLen,<a name="line.95"></a>
-<span class="sourceLineNo">096</span> persistencePath);<a
name="line.96"></a>
-<span class="sourceLineNo">097</span> super.wait_when_cache = true;<a
name="line.97"></a>
-<span class="sourceLineNo">098</span> }<a name="line.98"></a>
+<span class="sourceLineNo">092</span> final long capacitySize = 32 * 1024 *
1024;<a name="line.92"></a>
+<span class="sourceLineNo">093</span> final int writeThreads =
BucketCache.DEFAULT_WRITER_THREADS;<a name="line.93"></a>
+<span class="sourceLineNo">094</span> final int writerQLen =
BucketCache.DEFAULT_WRITER_QUEUE_ITEMS;<a name="line.94"></a>
+<span class="sourceLineNo">095</span> String ioEngineName = "heap";<a
name="line.95"></a>
+<span class="sourceLineNo">096</span> String persistencePath = null;<a
name="line.96"></a>
+<span class="sourceLineNo">097</span><a name="line.97"></a>
+<span class="sourceLineNo">098</span> private class MockedBucketCache extends
BucketCache {<a name="line.98"></a>
<span class="sourceLineNo">099</span><a name="line.99"></a>
-<span class="sourceLineNo">100</span> @Override<a name="line.100"></a>
-<span class="sourceLineNo">101</span> public void cacheBlock(BlockCacheKey
cacheKey, Cacheable buf, boolean inMemory,<a name="line.101"></a>
-<span class="sourceLineNo">102</span> boolean cacheDataInL1) {<a
name="line.102"></a>
-<span class="sourceLineNo">103</span> if (super.getBlock(cacheKey, true,
false, true) != null) {<a name="line.103"></a>
-<span class="sourceLineNo">104</span> throw new
RuntimeException("Cached an already cached block");<a name="line.104"></a>
-<span class="sourceLineNo">105</span> }<a name="line.105"></a>
-<span class="sourceLineNo">106</span> super.cacheBlock(cacheKey, buf,
inMemory, cacheDataInL1);<a name="line.106"></a>
-<span class="sourceLineNo">107</span> }<a name="line.107"></a>
-<span class="sourceLineNo">108</span><a name="line.108"></a>
-<span class="sourceLineNo">109</span> @Override<a name="line.109"></a>
-<span class="sourceLineNo">110</span> public void cacheBlock(BlockCacheKey
cacheKey, Cacheable buf) {<a name="line.110"></a>
+<span class="sourceLineNo">100</span> public MockedBucketCache(String
ioEngineName, long capacity, int blockSize, int[] bucketSizes,<a
name="line.100"></a>
+<span class="sourceLineNo">101</span> int writerThreads, int
writerQLen, String persistencePath) throws FileNotFoundException,<a
name="line.101"></a>
+<span class="sourceLineNo">102</span> IOException {<a
name="line.102"></a>
+<span class="sourceLineNo">103</span> super(ioEngineName, capacity,
blockSize, bucketSizes, writerThreads, writerQLen,<a name="line.103"></a>
+<span class="sourceLineNo">104</span> persistencePath);<a
name="line.104"></a>
+<span class="sourceLineNo">105</span> super.wait_when_cache = true;<a
name="line.105"></a>
+<span class="sourceLineNo">106</span> }<a name="line.106"></a>
+<span class="sourceLineNo">107</span><a name="line.107"></a>
+<span class="sourceLineNo">108</span> @Override<a name="line.108"></a>
+<span class="sourceLineNo">109</span> public void cacheBlock(BlockCacheKey
cacheKey, Cacheable buf, boolean inMemory,<a name="line.109"></a>
+<span class="sourceLineNo">110</span> boolean cacheDataInL1) {<a
name="line.110"></a>
<span class="sourceLineNo">111</span> if (super.getBlock(cacheKey, true,
false, true) != null) {<a name="line.111"></a>
<span class="sourceLineNo">112</span> throw new
RuntimeException("Cached an already cached block");<a name="line.112"></a>
<span class="sourceLineNo">113</span> }<a name="line.113"></a>
-<span class="sourceLineNo">114</span> super.cacheBlock(cacheKey, buf);<a
name="line.114"></a>
+<span class="sourceLineNo">114</span> super.cacheBlock(cacheKey, buf,
inMemory, cacheDataInL1);<a name="line.114"></a>
<span class="sourceLineNo">115</span> }<a name="line.115"></a>
-<span class="sourceLineNo">116</span> }<a name="line.116"></a>
-<span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span> @Before<a name="line.118"></a>
-<span class="sourceLineNo">119</span> public void setup() throws
FileNotFoundException, IOException {<a name="line.119"></a>
-<span class="sourceLineNo">120</span> cache =<a name="line.120"></a>
-<span class="sourceLineNo">121</span> new
MockedBucketCache(ioEngineName, capacitySize, constructedBlockSize,<a
name="line.121"></a>
-<span class="sourceLineNo">122</span> constructedBlockSizes,
writeThreads, writerQLen, persistencePath);<a name="line.122"></a>
-<span class="sourceLineNo">123</span> }<a name="line.123"></a>
-<span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span> @After<a name="line.125"></a>
-<span class="sourceLineNo">126</span> public void tearDown() {<a
name="line.126"></a>
-<span class="sourceLineNo">127</span> cache.shutdown();<a
name="line.127"></a>
-<span class="sourceLineNo">128</span> }<a name="line.128"></a>
-<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span> /**<a name="line.130"></a>
-<span class="sourceLineNo">131</span> * Return a random element from {@code
a}.<a name="line.131"></a>
-<span class="sourceLineNo">132</span> */<a name="line.132"></a>
-<span class="sourceLineNo">133</span> private static <T> T
randFrom(List<T> a) {<a name="line.133"></a>
-<span class="sourceLineNo">134</span> return
a.get(RAND.nextInt(a.size()));<a name="line.134"></a>
-<span class="sourceLineNo">135</span> }<a name="line.135"></a>
-<span class="sourceLineNo">136</span><a name="line.136"></a>
-<span class="sourceLineNo">137</span> @Test<a name="line.137"></a>
-<span class="sourceLineNo">138</span> public void testBucketAllocator()
throws BucketAllocatorException {<a name="line.138"></a>
-<span class="sourceLineNo">139</span> BucketAllocator mAllocator =
cache.getAllocator();<a name="line.139"></a>
-<span class="sourceLineNo">140</span> /*<a name="line.140"></a>
-<span class="sourceLineNo">141</span> * Test the allocator first<a
name="line.141"></a>
-<span class="sourceLineNo">142</span> */<a name="line.142"></a>
-<span class="sourceLineNo">143</span> final List<Integer> BLOCKSIZES
= Arrays.asList(4 * 1024, 8 * 1024, 64 * 1024, 96 * 1024);<a
name="line.143"></a>
+<span class="sourceLineNo">116</span><a name="line.116"></a>
+<span class="sourceLineNo">117</span> @Override<a name="line.117"></a>
+<span class="sourceLineNo">118</span> public void cacheBlock(BlockCacheKey
cacheKey, Cacheable buf) {<a name="line.118"></a>
+<span class="sourceLineNo">119</span> if (super.getBlock(cacheKey, true,
false, true) != null) {<a name="line.119"></a>
+<span class="sourceLineNo">120</span> throw new
RuntimeException("Cached an already cached block");<a name="line.120"></a>
+<span class="sourceLineNo">121</span> }<a name="line.121"></a>
+<span class="sourceLineNo">122</span> super.cacheBlock(cacheKey, buf);<a
name="line.122"></a>
+<span class="sourceLineNo">123</span> }<a name="line.123"></a>
+<span class="sourceLineNo">124</span> }<a name="line.124"></a>
+<span class="sourceLineNo">125</span><a name="line.125"></a>
+<span class="sourceLineNo">126</span> @Before<a name="line.126"></a>
+<span class="sourceLineNo">127</span> public void setup() throws
FileNotFoundException, IOException {<a name="line.127"></a>
+<span class="sourceLineNo">128</span> cache =<a name="line.128"></a>
+<span class="sourceLineNo">129</span> new
MockedBucketCache(ioEngineName, capacitySize, constructedBlockSize,<a
name="line.129"></a>
+<span class="sourceLineNo">130</span> constructedBlockSizes,
writeThreads, writerQLen, persistencePath);<a name="line.130"></a>
+<span class="sourceLineNo">131</span> }<a name="line.131"></a>
+<span class="sourceLineNo">132</span><a name="line.132"></a>
+<span class="sourceLineNo">133</span> @After<a name="line.133"></a>
+<span class="sourceLineNo">134</span> public void tearDown() {<a
name="line.134"></a>
+<span class="sourceLineNo">135</span> cache.shutdown();<a
name="line.135"></a>
+<span class="sourceLineNo">136</span> }<a name="line.136"></a>
+<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">138</span> /**<a name="line.138"></a>
+<span class="sourceLineNo">139</span> * Return a random element from {@code
a}.<a name="line.139"></a>
+<span class="sourceLineNo">140</span> */<a name="line.140"></a>
+<span class="sourceLineNo">141</span> private static <T> T
randFrom(List<T> a) {<a name="line.141"></a>
+<span class="sourceLineNo">142</span> return
a.get(RAND.nextInt(a.size()));<a name="line.142"></a>
+<span class="sourceLineNo">143</span> }<a name="line.143"></a>
<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span> boolean full = false;<a
name="line.145"></a>
-<span class="sourceLineNo">146</span> ArrayList<Long> allocations =
new ArrayList<>();<a name="line.146"></a>
-<span class="sourceLineNo">147</span> // Fill the allocated extents by
choosing a random blocksize. Continues selecting blocks until<a
name="line.147"></a>
-<span class="sourceLineNo">148</span> // the cache is completely filled.<a
name="line.148"></a>
-<span class="sourceLineNo">149</span> List<Integer> tmp = new
ArrayList<>(BLOCKSIZES);<a name="line.149"></a>
-<span class="sourceLineNo">150</span> while (!full) {<a name="line.150"></a>
-<span class="sourceLineNo">151</span> Integer blockSize = null;<a
name="line.151"></a>
-<span class="sourceLineNo">152</span> try {<a name="line.152"></a>
-<span class="sourceLineNo">153</span> blockSize = randFrom(tmp);<a
name="line.153"></a>
-<span class="sourceLineNo">154</span>
allocations.add(mAllocator.allocateBlock(blockSize));<a name="line.154"></a>
-<span class="sourceLineNo">155</span> } catch (CacheFullException cfe)
{<a name="line.155"></a>
-<span class="sourceLineNo">156</span> tmp.remove(blockSize);<a
name="line.156"></a>
-<span class="sourceLineNo">157</span> if (tmp.isEmpty()) full = true;<a
name="line.157"></a>
-<span class="sourceLineNo">158</span> }<a name="line.158"></a>
-<span class="sourceLineNo">159</span> }<a name="line.159"></a>
-<span class="sourceLineNo">160</span><a name="line.160"></a>
-<span class="sourceLineNo">161</span> for (Integer blockSize : BLOCKSIZES)
{<a name="line.161"></a>
-<span class="sourceLineNo">162</span> BucketSizeInfo bucketSizeInfo =
mAllocator.roundUpToBucketSizeInfo(blockSize);<a name="line.162"></a>
-<span class="sourceLineNo">163</span> IndexStatistics indexStatistics =
bucketSizeInfo.statistics();<a name="line.163"></a>
-<span class="sourceLineNo">164</span> assertEquals("unexpected freeCount
for " + bucketSizeInfo, 0, indexStatistics.freeCount());<a name="line.164"></a>
-<span class="sourceLineNo">165</span> }<a name="line.165"></a>
-<span class="sourceLineNo">166</span><a name="line.166"></a>
-<span class="sourceLineNo">167</span> for (long offset : allocations) {<a
name="line.167"></a>
-<span class="sourceLineNo">168</span>
assertEquals(mAllocator.sizeOfAllocation(offset),
mAllocator.freeBlock(offset));<a name="line.168"></a>
-<span class="sourceLineNo">169</span> }<a name="line.169"></a>
-<span class="sourceLineNo">170</span> assertEquals(0,
mAllocator.getUsedSize());<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> @Test<a name="line.173"></a>
-<span class="sourceLineNo">174</span> public void testCacheSimple() throws
Exception {<a name="line.174"></a>
-<span class="sourceLineNo">175</span> CacheTestUtils.testCacheSimple(cache,
BLOCK_SIZE, NUM_QUERIES);<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> @Test<a name="line.178"></a>
-<span class="sourceLineNo">179</span> public void
testCacheMultiThreadedSingleKey() throws Exception {<a name="line.179"></a>
-<span class="sourceLineNo">180</span> CacheTestUtils.hammerSingleKey(cache,
BLOCK_SIZE, 2 * NUM_THREADS, 2 * NUM_QUERIES);<a name="line.180"></a>
-<span class="sourceLineNo">181</span> }<a name="line.181"></a>
-<span class="sourceLineNo">182</span><a name="line.182"></a>
-<span class="sourceLineNo">183</span> @Test<a name="line.183"></a>
-<span class="sourceLineNo">184</span> public void testHeapSizeChanges()
throws Exception {<a name="line.184"></a>
-<span class="sourceLineNo">185</span> cache.stopWriterThreads();<a
name="line.185"></a>
-<span class="sourceLineNo">186</span>
CacheTestUtils.testHeapSizeChanges(cache, BLOCK_SIZE);<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> // BucketCache.cacheBlock is async, it
first adds block to ramCache and writeQueue, then writer<a name="line.189"></a>
-<span class="sourceLineNo">190</span> // threads will flush it to the bucket
and put reference entry in backingMap.<a name="line.190"></a>
-<span class="sourceLineNo">191</span> private void
cacheAndWaitUntilFlushedToBucket(BucketCache cache, BlockCacheKey cacheKey,<a
name="line.191"></a>
-<span class="sourceLineNo">192</span> Cacheable block) throws
InterruptedException {<a name="line.192"></a>
-<span class="sourceLineNo">193</span> cache.cacheBlock(cacheKey, block);<a
name="line.193"></a>
-<span class="sourceLineNo">194</span> while
(!cache.backingMap.containsKey(cacheKey)) {<a name="line.194"></a>
-<span class="sourceLineNo">195</span> Thread.sleep(100);<a
name="line.195"></a>
-<span class="sourceLineNo">196</span> }<a name="line.196"></a>
-<span class="sourceLineNo">197</span> }<a name="line.197"></a>
-<span class="sourceLineNo">198</span><a name="line.198"></a>
-<span class="sourceLineNo">199</span> @Test<a name="line.199"></a>
-<span class="sourceLineNo">200</span> public void testMemoryLeak() throws
Exception {<a name="line.200"></a>
-<span class="sourceLineNo">201</span> final BlockCacheKey cacheKey = new
BlockCacheKey("dummy", 1L);<a name="line.201"></a>
-<span class="sourceLineNo">202</span>
cacheAndWaitUntilFlushedToBucket(cache, cacheKey, new
CacheTestUtils.ByteArrayCacheable(<a name="line.202"></a>
-<span class="sourceLineNo">203</span> new byte[10]));<a
name="line.203"></a>
-<span class="sourceLineNo">204</span> long lockId =
cache.backingMap.get(cacheKey).offset();<a name="line.204"></a>
-<span class="sourceLineNo">205</span> ReentrantReadWriteLock lock =
cache.offsetLock.getLock(lockId);<a name="line.205"></a>
-<span class="sourceLineNo">206</span> lock.writeLock().lock();<a
name="line.206"></a>
-<span class="sourceLineNo">207</span> Thread evictThread = new
Thread("evict-block") {<a name="line.207"></a>
-<span class="sourceLineNo">208</span><a name="line.208"></a>
-<span class="sourceLineNo">209</span> @Override<a name="line.209"></a>
-<span class="sourceLineNo">210</span> public void run() {<a
name="line.210"></a>
-<span class="sourceLineNo">211</span> cache.evictBlock(cacheKey);<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> };<a name="line.214"></a>
-<span class="sourceLineNo">215</span> evictThread.start();<a
name="line.215"></a>
-<span class="sourceLineNo">216</span>
cache.offsetLock.waitForWaiters(lockId, 1);<a name="line.216"></a>
-<span class="sourceLineNo">217</span> cache.blockEvicted(cacheKey,
cache.backingMap.remove(cacheKey), true);<a name="line.217"></a>
-<span class="sourceLineNo">218</span>
cacheAndWaitUntilFlushedToBucket(cache, cacheKey, new
CacheTestUtils.ByteArrayCacheable(<a name="line.218"></a>
-<span class="sourceLineNo">219</span> new byte[10]));<a
name="line.219"></a>
-<span class="sourceLineNo">220</span> lock.writeLock().unlock();<a
name="line.220"></a>
-<span class="sourceLineNo">221</span> evictThread.join();<a
name="line.221"></a>
-<span class="sourceLineNo">222</span> assertEquals(1L,
cache.getBlockCount());<a name="line.222"></a>
-<span class="sourceLineNo">223</span> assertTrue(cache.getCurrentSize()
> 0L);<a name="line.223"></a>
-<span class="sourceLineNo">224</span> assertTrue("We should have a block!",
cache.iterator().hasNext());<a name="line.224"></a>
-<span class="sourceLineNo">225</span> }<a name="line.225"></a>
-<span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span> @Test<a name="line.227"></a>
-<span class="sourceLineNo">228</span> public void testRetrieveFromFile()
throws Exception {<a name="line.228"></a>
-<span class="sourceLineNo">229</span> HBaseTestingUtility TEST_UTIL = new
HBaseTestingUtility();<a name="line.229"></a>
-<span class="sourceLineNo">230</span> Path testDir =
TEST_UTIL.getDataTestDir();<a name="line.230"></a>
-<span class="sourceLineNo">231</span>
TEST_UTIL.getTestFileSystem().mkdirs(testDir);<a name="line.231"></a>
-<span class="sourceLineNo">232</span><a name="line.232"></a>
-<span class="sourceLineNo">233</span> BucketCache bucketCache = new
BucketCache("file:" + testDir + "/bucket.cache", capacitySize,<a
name="line.233"></a>
-<span class="sourceLineNo">234</span> constructedBlockSize,
constructedBlockSizes, writeThreads, writerQLen, testDir<a name="line.234"></a>
-<span class="sourceLineNo">235</span> + "/bucket.persistence");<a
name="line.235"></a>
-<span class="sourceLineNo">236</span> long usedSize =
bucketCache.getAllocator().getUsedSize();<a name="line.236"></a>
-<span class="sourceLineNo">237</span> assertTrue(usedSize == 0);<a
name="line.237"></a>
-<span class="sourceLineNo">238</span><a name="line.238"></a>
-<span class="sourceLineNo">239</span> HFileBlockPair[] blocks =
CacheTestUtils.generateHFileBlocks(constructedBlockSize, 1);<a
name="line.239"></a>
-<span class="sourceLineNo">240</span> // Add blocks<a name="line.240"></a>
-<span class="sourceLineNo">241</span> for (HFileBlockPair block : blocks)
{<a name="line.241"></a>
-<span class="sourceLineNo">242</span>
bucketCache.cacheBlock(block.getBlockName(), block.getBlock());<a
name="line.242"></a>
-<span class="sourceLineNo">243</span> }<a name="line.243"></a>
-<span class="sourceLineNo">244</span> for (HFileBlockPair block : blocks)
{<a name="line.244"></a>
-<span class="sourceLineNo">245</span>
cacheAndWaitUntilFlushedToBucket(bucketCache, block.getBlockName(),
block.getBlock());<a name="line.245"></a>
-<span class="sourceLineNo">246</span> }<a name="line.246"></a>
-<span class="sourceLineNo">247</span> usedSize =
bucketCache.getAllocator().getUsedSize();<a name="line.247"></a>
-<span class="sourceLineNo">248</span> assertTrue(usedSize != 0);<a
name="line.248"></a>
-<span class="sourceLineNo">249</span> // persist cache to file<a
name="line.249"></a>
-<span class="sourceLineNo">250</span> bucketCache.shutdown();<a
name="line.250"></a>
-<span class="sourceLineNo">251</span><a name="line.251"></a>
-<span class="sourceLineNo">252</span> // restore cache from file<a
name="line.252"></a>
-<span class="sourceLineNo">253</span> bucketCache = new BucketCache("file:"
+ testDir + "/bucket.cache", capacitySize,<a name="line.253"></a>
-<span class="sourceLineNo">254</span> constructedBlockSize,
constructedBlockSizes, writeThreads, writerQLen, testDir<a name="line.254"></a>
-<span class="sourceLineNo">255</span> + "/bucket.persistence");<a
name="line.255"></a>
-<span class="sourceLineNo">256</span> assertEquals(usedSize,
bucketCache.getAllocator().getUsedSize());<a name="line.256"></a>
+<span class="sourceLineNo">145</span> @Test<a name="line.145"></a>
+<span class="sourceLineNo">146</span> public void testBucketAllocator()
throws BucketAllocatorException {<a name="line.146"></a>
+<span class="sourceLineNo">147</span> BucketAllocator mAllocator =
cache.getAllocator();<a name="line.147"></a>
+<span class="sourceLineNo">148</span> /*<a name="line.148"></a>
+<span class="sourceLineNo">149</span> * Test the allocator first<a
name="line.149"></a>
+<span class="sourceLineNo">150</span> */<a name="line.150"></a>
+<span class="sourceLineNo">151</span> final List<Integer> BLOCKSIZES
= Arrays.asList(4 * 1024, 8 * 1024, 64 * 1024, 96 * 1024);<a
name="line.151"></a>
+<span class="sourceLineNo">152</span><a name="line.152"></a>
+<span class="sourceLineNo">153</span> boolean full = false;<a
name="line.153"></a>
+<span class="sourceLineNo">154</span> ArrayList<Long> allocations =
new ArrayList<>();<a name="line.154"></a>
+<span class="sourceLineNo">155</span> // Fill the allocated extents by
choosing a random blocksize. Continues selecting blocks until<a
name="line.155"></a>
+<span class="sourceLineNo">156</span> // the cache is completely filled.<a
name="line.156"></a>
+<span class="sourceLineNo">157</span> List<Integer> tmp = new
ArrayList<>(BLOCKSIZES);<a name="line.157"></a>
+<span class="sourceLineNo">158</span> while (!full) {<a name="line.158"></a>
+<span class="sourceLineNo">159</span> Integer blockSize = null;<a
name="line.159"></a>
+<span class="sourceLineNo">160</span> try {<a name="line.160"></a>
+<span class="sourceLineNo">161</span> blockSize = randFrom(tmp);<a
name="line.161"></a>
+<span class="sourceLineNo">162</span>
allocations.add(mAllocator.allocateBlock(blockSize));<a name="line.162"></a>
+<span class="sourceLineNo">163</span> } catch (CacheFullException cfe)
{<a name="line.163"></a>
+<span class="sourceLineNo">164</span> tmp.remove(blockSize);<a
name="line.164"></a>
+<span class="sourceLineNo">165</span> if (tmp.isEmpty()) full = true;<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> for (Integer blockSize : BLOCKSIZES)
{<a name="line.169"></a>
+<span class="sourceLineNo">170</span> BucketSizeInfo bucketSizeInfo =
mAllocator.roundUpToBucketSizeInfo(blockSize);<a name="line.170"></a>
+<span class="sourceLineNo">171</span> IndexStatistics indexStatistics =
bucketSizeInfo.statistics();<a name="line.171"></a>
+<span class="sourceLineNo">172</span> assertEquals("unexpected freeCount
for " + bucketSizeInfo, 0, indexStatistics.freeCount());<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> for (long offset : allocations) {<a
name="line.175"></a>
+<span class="sourceLineNo">176</span>
assertEquals(mAllocator.sizeOfAllocation(offset),
mAllocator.freeBlock(offset));<a name="line.176"></a>
+<span class="sourceLineNo">177</span> }<a name="line.177"></a>
+<span class="sourceLineNo">178</span> assertEquals(0,
mAllocator.getUsedSize());<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> @Test<a name="line.181"></a>
+<span class="sourceLineNo">182</span> public void testCacheSimple() throws
Exception {<a name="line.182"></a>
+<span class="sourceLineNo">183</span> CacheTestUtils.testCacheSimple(cache,
BLOCK_SIZE, NUM_QUERIES);<a name="line.183"></a>
+<span class="sourceLineNo">184</span> }<a name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span> @Test<a name="line.186"></a>
+<span class="sourceLineNo">187</span> public void
testCacheMultiThreadedSingleKey() throws Exception {<a name="line.187"></a>
+<span class="sourceLineNo">188</span> CacheTestUtils.hammerSingleKey(cache,
BLOCK_SIZE, 2 * NUM_THREADS, 2 * NUM_QUERIES);<a name="line.188"></a>
+<span class="sourceLineNo">189</span> }<a name="line.189"></a>
+<span class="sourceLineNo">190</span><a name="line.190"></a>
+<span class="sourceLineNo">191</span> @Test<a name="line.191"></a>
+<span class="sourceLineNo">192</span> public void testHeapSizeChanges()
throws Exception {<a name="line.192"></a>
+<span class="sourceLineNo">193</span> cache.stopWriterThreads();<a
name="line.193"></a>
+<span class="sourceLineNo">194</span>
CacheTestUtils.testHeapSizeChanges(cache, BLOCK_SIZE);<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> // BucketCache.cacheBlock is async, it
first adds block to ramCache and writeQueue, then writer<a name="line.197"></a>
+<span class="sourceLineNo">198</span> // threads will flush it to the bucket
and put reference entry in backingMap.<a name="line.198"></a>
+<span class="sourceLineNo">199</span> private void
cacheAndWaitUntilFlushedToBucket(BucketCache cache, BlockCacheKey cacheKey,<a
name="line.199"></a>
+<span class="sourceLineNo">200</span> Cacheable block) throws
InterruptedException {<a name="line.200"></a>
+<span class="sourceLineNo">201</span> cache.cacheBlock(cacheKey, block);<a
name="line.201"></a>
+<span class="sourceLineNo">202</span> while
(!cache.backingMap.containsKey(cacheKey)) {<a name="line.202"></a>
+<span class="sourceLineNo">203</span> Thread.sleep(100);<a
name="line.203"></a>
+<span class="sourceLineNo">204</span> }<a name="line.204"></a>
+<span class="sourceLineNo">205</span> }<a name="line.205"></a>
+<span class="sourceLineNo">206</span><a name="line.206"></a>
+<span class="sourceLineNo">207</span> @Test<a name="line.207"></a>
+<span class="sourceLineNo">208</span> public void testMemoryLeak() throws
Exception {<a name="line.208"></a>
+<span class="sourceLineNo">209</span> final BlockCacheKey cacheKey = new
BlockCacheKey("dummy", 1L);<a name="line.209"></a>
+<span class="sourceLineNo">210</span>
cacheAndWaitUntilFlushedToBucket(cache, cacheKey, new
CacheTestUtils.ByteArrayCacheable(<a name="line.210"></a>
+<span class="sourceLineNo">211</span> new byte[10]));<a
name="line.211"></a>
+<span class="sourceLineNo">212</span> long lockId =
cache.backingMap.get(cacheKey).offset();<a name="line.212"></a>
+<span class="sourceLineNo">213</span> ReentrantReadWriteLock lock =
cache.offsetLock.getLock(lockId);<a name="line.213"></a>
+<span class="sourceLineNo">214</span> lock.writeLock().lock();<a
name="line.214"></a>
+<span class="sourceLineNo">215</span> Thread evictThread = new
Thread("evict-block") {<a name="line.215"></a>
+<span class="sourceLineNo">216</span><a name="line.216"></a>
+<span class="sourceLineNo">217</span> @Override<a name="line.217"></a>
+<span class="sourceLineNo">218</span> public void run() {<a
name="line.218"></a>
+<span class="sourceLineNo">219</span> cache.evictBlock(cacheKey);<a
name="line.219"></a>
+<span class="sourceLineNo">220</span> }<a name="line.220"></a>
+<span class="sourceLineNo">221</span><a name="line.221"></a>
+<span class="sourceLineNo">222</span> };<a name="line.222"></a>
+<span class="sourceLineNo">223</span> evictThread.start();<a
name="line.223"></a>
+<span class="sourceLineNo">224</span>
cache.offsetLock.waitForWaiters(lockId, 1);<a name="line.224"></a>
+<span class="sourceLineNo">225</span> cache.blockEvicted(cacheKey,
cache.backingMap.remove(cacheKey), true);<a name="line.225"></a>
+<span class="sourceLineNo">226</span>
cacheAndWaitUntilFlushedToBucket(cache, cacheKey, new
CacheTestUtils.ByteArrayCacheable(<a name="line.226"></a>
+<span class="sourceLineNo">227</span> new byte[10]));<a
name="line.227"></a>
+<span class="sourceLineNo">228</span> lock.writeLock().unlock();<a
name="line.228"></a>
+<span class="sourceLineNo">229</span> evictThread.join();<a
name="line.229"></a>
+<span class="sourceLineNo">230</span> assertEquals(1L,
cache.getBlockCount());<a name="line.230"></a>
+<span class="sourceLineNo">231</span> assertTrue(cache.getCurrentSize()
> 0L);<a name="line.231"></a>
+<span class="sourceLineNo">232</span> assertTrue("We should have a block!",
cache.iterator().hasNext());<a name="line.232"></a>
+<span class="sourceLineNo">233</span> }<a name="line.233"></a>
+<span class="sourceLineNo">234</span><a name="line.234"></a>
+<span class="sourceLineNo">235</span> @Test<a name="line.235"></a>
+<span class="sourceLineNo">236</span> public void testRetrieveFromFile()
throws Exception {<a name="line.236"></a>
+<span class="sourceLineNo">237</span> HBaseTestingUtility TEST_UTIL = new
HBaseTestingUtility();<a name="line.237"></a>
+<span class="sourceLineNo">238</span> Path testDir =
TEST_UTIL.getDataTestDir();<a name="line.238"></a>
+<span class="sourceLineNo">239</span>
TEST_UTIL.getTestFileSystem().mkdirs(testDir);<a name="line.239"></a>
+<span class="sourceLineNo">240</span><a name="line.240"></a>
+<span class="sourceLineNo">241</span> BucketCache bucketCache = new
BucketCache("file:" + testDir + "/bucket.cache", capacitySize,<a
name="line.241"></a>
+<span class="sourceLineNo">242</span> constructedBlockSize,
constructedBlockSizes, writeThreads, writerQLen, testDir<a name="line.242"></a>
+<span class="sourceLineNo">243</span> + "/bucket.persistence");<a
name="line.243"></a>
+<span class="sourceLineNo">244</span> long usedSize =
bucketCache.getAllocator().getUsedSize();<a name="line.244"></a>
+<span class="sourceLineNo">245</span> assertTrue(usedSize == 0);<a
name="line.245"></a>
+<span class="sourceLineNo">246</span><a name="line.246"></a>
+<span class="sourceLineNo">247</span> HFileBlockPair[] blocks =
CacheTestUtils.generateHFileBlocks(constructedBlockSize, 1);<a
name="line.247"></a>
+<span class="sourceLineNo">248</span> // Add blocks<a name="line.248"></a>
+<span class="sourceLineNo">249</span> for (HFileBlockPair block : blocks)
{<a name="line.249"></a>
+<span class="sourceLineNo">250</span>
bucketCache.cacheBlock(block.getBlockName(), block.getBlock());<a
name="line.250"></a>
+<span class="sourceLineNo">251</span> }<a name="line.251"></a>
+<span class="sourceLineNo">252</span> for (HFileBlockPair block : blocks)
{<a name="line.252"></a>
+<span class="sourceLineNo">253</span>
cacheAndWaitUntilFlushedToBucket(bucketCache, block.getBlockName(),
block.getBlock());<a name="line.253"></a>
+<span class="sourceLineNo">254</span> }<a name="line.254"></a>
+<span class="sourceLineNo">255</span> usedSize =
bucketCache.getAllocator().getUsedSize();<a name="line.255"></a>
+<span class="sourceLineNo">256</span> assertTrue(usedSize != 0);<a
name="line.256"></a>
<span class="sourceLineNo">257</span> // persist cache to file<a
name="line.257"></a>
<span class="sourceLineNo">258</span> bucketCache.shutdown();<a
name="line.258"></a>
<span class="sourceLineNo">259</span><a name="line.259"></a>
-<span class="sourceLineNo">260</span> // reconfig buckets sizes, the
biggest bucket is small than constructedBlockSize (8k or 16k)<a
name="line.260"></a>
-<span class="sourceLineNo">261</span> // so it can't restore cache from
file<a name="line.261"></a>
-<span class="sourceLineNo">262</span> int[] smallBucketSizes = new int[] {
2 * 1024 + 1024, 4 * 1024 + 1024 };<a name="line.262"></a>
-<span class="sourceLineNo">263</span> bucketCache = new BucketCache("file:"
+ testDir + "/bucket.cache", capacitySize,<a name="line.263"></a>
-<span class="sourceLineNo">264</span> constructedBlockSize,
smallBucketSizes, writeThreads,<a name="line.264"></a>
-<span class="sourceLineNo">265</span> writerQLen, testDir +
"/bucket.persistence");<a name="line.265"></a>
-<span class="sourceLineNo">266</span> assertEquals(0,
bucketCache.getAllocator().getUsedSize());<a name="line.266"></a>
-<span class="sourceLineNo">267</span> assertEquals(0,
bucketCache.backingMap.size());<a name="line.267"></a>
-<span class="sourceLineNo">268</span><a name="line.268"></a>
-<span class="sourceLineNo">269</span> TEST_UTIL.cleanupTestDir();<a
name="line.269"></a>
-<span class="sourceLineNo">270</span> }<a name="line.270"></a>
-<span class="sourceLineNo">271</span><a name="line.271"></a>
-<span class="sourceLineNo">272</span> @Test<a name="line.272"></a>
-<span class="sourceLineNo">273</span> public void
testBucketAllocatorLargeBuckets() throws BucketAllocatorException {<a
name="line.273"></a>
-<span class="sourceLineNo">274</span> long availableSpace = 20 * 1024L *
1024 * 1024;<a name="line.274"></a>
-<span class="sourceLineNo">275</span> int[] bucketSizes = new int[] { 1024,
1024 * 1024, 1024 * 1024 * 1024 };<a name="line.275"></a>
-<span class="sourceLineNo">276</span> BucketAllocator allocator = new
BucketAllocator(availableSpace, bucketSizes);<a name="line.276"></a>
-<span class="sourceLineNo">277</span>
assertTrue(allocator.getBuckets().length > 0);<a name="line.277"></a>
+<span class="sourceLineNo">260</span> // restore cache from file<a
name="line.260"></a>
+<span class="sourceLineNo">261</span> bucketCache = new BucketCache("file:"
+ testDir + "/bucket.cache", capacitySize,<a name="line.261"></a>
+<span class="sourceLineNo">262</span> constructedBlockSize,
constructedBlockSizes, writeThreads, writerQLen, testDir<a name="line.262"></a>
+<span class="sourceLineNo">263</span> + "/bucket.persistence");<a
name="line.263"></a>
+<span class="sourceLineNo">264</span> assertEquals(usedSize,
bucketCache.getAllocator().getUsedSize());<a name="line.264"></a>
+<span class="sourceLineNo">265</span> // persist cache to file<a
name="line.265"></a>
+<span class="sourceLineNo">266</span> bucketCache.shutdown();<a
name="line.266"></a>
+<span class="sourceLineNo">267</span><a name="line.267"></a>
+<span class="sourceLineNo">268</span> // reconfig buckets sizes, the
biggest bucket is small than constructedBlockSize (8k or 16k)<a
name="line.268"></a>
+<span class="sourceLineNo">269</span> // so it can't restore cache from
file<a name="line.269"></a>
+<span class="sourceLineNo">270</span> int[] smallBucketSizes = new int[] {
2 * 1024 + 1024, 4 * 1024 + 1024 };<a name="line.270"></a>
+<span class="sourceLineNo">271</span> bucketCache = new BucketCache("file:"
+ testDir + "/bucket.cache", capacitySize,<a name="line.271"></a>
+<span class="sourceLineNo">272</span> constructedBlockSize,
smallBucketSizes, writeThreads,<a name="line.272"></a>
+<span class="sourceLineNo">273</span> writerQLen, testDir +
"/bucket.persistence");<a name="line.273"></a>
+<span class="sourceLineNo">274</span> assertEquals(0,
bucketCache.getAllocator().getUsedSize());<a name="line.274"></a>
+<span class="sourceLineNo">275</span> assertEquals(0,
bucketCache.backingMap.size());<a name="line.275"></a>
+<span class="sourceLineNo">276</span><a name="line.276"></a>
+<span class="sourceLineNo">277</span> TEST_UTIL.cleanupTestDir();<a
name="line.277"></a>
<span class="sourceLineNo">278</span> }<a name="line.278"></a>
-<span class="sourceLineNo">279</span>}<a name="line.279"></a>
+<span class="sourceLineNo">279</span><a name="line.279"></a>
+<span class="sourceLineNo">280</span> @Test<a name="line.280"></a>
+<span class="sourceLineNo">281</span> public void
testBucketAllocatorLargeBuckets() throws BucketAllocatorException {<a
name="line.281"></a>
+<span class="sourceLineNo">282</span> long availableSpace = 20 * 1024L *
1024 * 1024;<a name="line.282"></a>
+<span class="sourceLineNo">283</span> int[] bucketSizes = new int[]{1024,
1024 * 1024, 1024 * 1024 * 1024};<a name="line.283"></a>
+<span class="sourceLineNo">284</span> BucketAllocator allocator = new
BucketAllocator(availableSpace, bucketSizes);<a name="line.284"></a>
+<span class="sourceLineNo">285</span>
assertTrue(allocator.getBuckets().length > 0);<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> @Test<a name="line.288"></a>
+<span class="sourceLineNo">289</span> public void testGetPartitionSize()
throws IOException {<a name="line.289"></a>
+<span class="sourceLineNo">290</span> //Test default values<a
name="line.290"></a>
+<span class="sourceLineNo">291</span> validateGetPartitionSize(cache,
BucketCache.DEFAULT_SINGLE_FACTOR, BucketCache.DEFAULT_MIN_FACTOR);<a
name="line.291"></a>
+<span class="sourceLineNo">292</span><a name="line.292"></a>
+<span class="sourceLineNo">293</span> Configuration conf =
HBaseConfiguration.create();<a name="line.293"></a>
+<span class="sourceLineNo">294</span>
conf.setFloat(BucketCache.MIN_FACTOR_CONFIG_NAME, 0.5f);<a name="line.294"></a>
+<span class="sourceLineNo">295</span>
conf.setFloat(BucketCache.SINGLE_FACTOR_CONFIG_NAME, 0.1f);<a
name="line.295"></a>
+<span class="sourceLineNo">296</span>
conf.setFloat(BucketCache.MULTI_FACTOR_CONFIG_NAME, 0.7f);<a
name="line.296"></a>
+<span class="sourceLineNo">297</span>
conf.setFloat(BucketCache.MEMORY_FACTOR_CONFIG_NAME, 0.2f);<a
name="line.297"></a>
+<span class="sourceLineNo">298</span><a name="line.298"></a>
+<span class="sourceLineNo">299</span> BucketCache cache = new
BucketCache(ioEngineName, capacitySize, constructedBlockSize,<a
name="line.299"></a>
+<span class="sourceLineNo">300</span> constructedBlockSizes,
writeThreads, writerQLen, persistencePath, 100, conf);<a name="line.300"></a>
+<span class="sourceLineNo">301</span><a name="line.301"></a>
+<span class="sourceLineNo">302</span> validateGetPartitionSize(cache, 0.1f,
0.5f);<a name="line.302"></a>
+<span class="sourceLineNo">303</span> validateGetPartitionSize(cache, 0.7f,
0.5f);<a name="line.303"></a>
+<span class="sourceLineNo">304</span> validateGetPartitionSize(cache, 0.2f,
0.5f);<a name="line.304"></a>
+<span class="sourceLineNo">305</span> }<a name="line.305"></a>
+<span class="sourceLineNo">306</span><a name="line.306"></a>
+<span class="sourceLineNo">307</span> @Test<a name="line.307"></a>
+<span class="sourceLineNo">308</span> public void
testValidBucketCacheConfigs() throws IOException {<a name="line.308"></a>
+<span class="sourceLineNo">309</span> Configuration conf =
HBaseConfiguration.create();<a name="line.309"></a>
+<span class="sourceLineNo">310</span>
conf.setFloat(BucketCache.ACCEPT_FACTOR_CONFIG_NAME, 0.9f);<a
name="line.310"></a>
+<span class="sourceLineNo">311</span>
conf.setFloat(BucketCache.MIN_FACTOR_CONFIG_NAME, 0.5f);<a name="line.311"></a>
+<span class="sourceLineNo">312</span>
conf.setFloat(BucketCache.EXTRA_FREE_FACTOR_CONFIG_NAME, 0.5f);<a
name="line.312"></a>
+<span class="sourceLineNo">313</span>
conf.setFloat(BucketCache.SINGLE_FACTOR_CONFIG_NAME, 0.1f);<a
name="line.313"></a>
+<span class="sourceLineNo">314</span>
conf.setFloat(BucketCache.MULTI_FACTOR_CONFIG_NAME, 0.7f);<a
name="line.314"></a>
+<span class="sourceLineNo">315</span>
conf.setFloat(BucketCache.MEMORY_FACTOR_CONFIG_NAME, 0.2f);<a
name="line.315"></a>
+<span class="sourceLineNo">316</span><a name="line.316"></a>
+<span class="sourceLineNo">317</span> BucketCache cache = new
BucketCache(ioEngineName, capacitySize, constructedBlockSize,<a
name="line.317"></a>
+<span class="sourceLineNo">318</span> constructedBlockSizes,
writeThreads, writerQLen, persistencePath, 100, conf);<a name="line.318"></a>
+<span class="sourceLineNo">319</span><a name="line.319"></a>
+<span class="sourceLineNo">320</span>
assertEquals(BucketCache.ACCEPT_FACTOR_CONFIG_NAME + " failed to propagate.",
cache.getAcceptableFactor(), 0.9f, 0);<a name="line.320"></a>
+<span class="sourceLineNo">321</span>
assertEquals(BucketCache.MIN_FACTOR_CONFIG_NAME + " failed to propagate.",
cache.getMinFactor(), 0.5f, 0);<a name="line.321"></a>
+<span class="sourceLineNo">322</span>
assertEquals(BucketCache.EXTRA_FREE_FACTOR_CONFIG_NAME + " failed to
propagate.", cache.getExtraFreeFactor(), 0.5f, 0);<a name="line.322"></a>
+<span class="sourceLineNo">323</span>
assertEquals(BucketCache.SINGLE_FACTOR_CONFIG_NAME + " failed to propagate.",
cache.getSingleFactor(), 0.1f, 0);<a name="line.323"></a>
+<span class="sourceLineNo">324</span>
assertEquals(BucketCache.MULTI_FACTOR_CONFIG_NAME + " failed to propagate.",
cache.getMultiFactor(), 0.7f, 0);<a name="line.324"></a>
+<span class="sourceLineNo">325</span>
assertEquals(BucketCache.MEMORY_FACTOR_CONFIG_NAME + " failed to propagate.",
cache.getMemoryFactor(), 0.2f, 0);<a name="line.325"></a>
+<span class="sourceLineNo">326</span> }<a name="line.326"></a>
+<span class="sourceLineNo">327</span><a name="line.327"></a>
+<span class="sourceLineNo">328</span> @Test<a name="line.328"></a>
+<span class="sourceLineNo">329</span> public void
testInvalidAcceptFactorConfig() throws IOException {<a name="line.329"></a>
+<span class="sourceLineNo">330</span> float[] configValues = {-1f, 0.2f,
0.86f, 1.05f};<a name="line.330"></a>
+<span class="sourceLineNo">331</span> boolean[] expectedOutcomes = {false,
false, true, false};<a name="line.331"></a>
+<span class="sourceLineNo">332</span> Map<String, float[]>
configMappings = ImmutableMap.of(BucketCache.ACCEPT_FACTOR_CONFIG_NAME,
configValues);<a name="line.332"></a>
+<span class="sourceLineNo">333</span> Configuration conf =
HBaseConfiguration.create();<a name="line.333"></a>
+<span class="sourceLineNo">334</span> checkConfigValues(conf,
configMappings, expectedOutcomes);<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> @Test<a name="line.337"></a>
+<span class="sourceLineNo">338</span> public void
testInvalidMinFactorConfig() throws IOException {<a name="line.338"></a>
+<span class="sourceLineNo">339</span> float[] configValues = {-1f, 0f,
0.96f, 1.05f};<a name="line.339"></a>
+<span class="sourceLineNo">340</span> //throws due to <0, in expected
range, minFactor > acceptableFactor, > 1.0<a name="line.340"></a>
+<span class="sourceLineNo">341</span> boolean[] expectedOutcomes = {false,
true, false, false};<a name="line.341"></a>
+<span class="sourceLineNo">342</span> Map<String, float[]>
configMappings = ImmutableMap.of(BucketCache.MIN_FACTOR_CONFIG_NAME,
configValues);<a name="line.342"></a>
+<span class="sourceLineNo">343</span> Configuration conf =
HBaseConfiguration.create();<a name="line.343"></a>
+<span class="sourceLineNo">344</span> checkConfigValues(conf,
configMappings, expectedOutcomes);<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> @Test<a name="line.347"></a>
+<span class="sourceLineNo">348</span> public void
testInvalidExtraFreeFactorConfig() throws IOException {<a name="line.348"></a>
+<span class="sourceLineNo">349</span> float[] configValues = {-1f, 0f,
0.2f, 1.05f};<a name="line.349"></a>
+<span class="sourceLineNo">350</span> //throws due to <0, in expected
range, in expected range, config can be > 1.0<a name="line.350"></a>
+<span class="sourceLineNo">351</span> boolean[] expectedOutcomes = {false,
true, true, true};<a name="line.351"></a>
+<span class="sourceLineNo">352</span> Map<String, float[]>
configMappings = ImmutableMap.of(BucketCache.EXTRA_FREE_FACTOR_CONFIG_NAME,
configValues);<a name="line.352"></a>
+<span class="sourceLineNo">353</span> Configuration conf =
HBaseConfiguration.create();<a name="line.353"></a>
+<span class="sourceLineNo">354</span> checkConfigValues(conf,
configMappings, expectedOutcomes);<a name="line.354"></a>
+<span class="sourceLineNo">355</span> }<a name="line.355"></a>
+<span class="sourceLineNo">356</span><a name="line.356"></a>
+<span class="sourceLineNo">357</span> @Test<a name="line.357"></a>
+<span class="sourceLineNo">358</span> public void
testInvalidCacheSplitFactorConfig() throws IOException {<a name="line.358"></a>
+<span class="sourceLineNo">359</span> float[] singleFactorConfigValues =
{0.2f, 0f, -0.2f, 1f};<a name="line.359"></a>
+<span class="sourceLineNo">360</span> float[] multiFactorConfigValues =
{0.4f, 0f, 1f, .05f};<a name="line.360"></a>
+<span class="sourceLineNo">361</span> float[] memoryFactorConfigValues =
{0.4f, 0f, 0.2f, .5f};<a name="line.361"></a>
+<span class="sourceLineNo">362</span> // All configs add up to 1.0 and are
between 0 and 1.0, configs don't add to 1.0, configs can't be negative, configs
don't add to 1.0<a name="line.362"></a>
+<span class="sourceLineNo">363</span> boolean[] expectedOutcomes = {true,
false, false, false};<a name="line.363"></a>
+<span class="sourceLineNo">364</span> Map<String, float[]>
configMappings = ImmutableMap.of(BucketCache.SINGLE_FACTOR_CONFIG_NAME,<a
name="line.364"></a>
+<span class="sourceLineNo">365</span> singleFactorConfigValues,
BucketCache.MULTI_FACTOR_CONFIG_NAME, multiFactorConfigValues,<a
name="line.365"></a>
+<span class="sourceLineNo">366</span>
BucketCache.MEMORY_FACTOR_CONFIG_NAME, memoryFactorConfigValues);<a
name="line.366"></a>
+<span class="sourceLineNo">367</span> Configuration conf =
HBaseConfiguration.create();<a name="line.367"></a>
+<span class="sourceLineNo">368</span> checkConfigValues(conf,
configMappings, expectedOutcomes);<a name="line.368"></a>
+<span class="sourceLineNo">369</span> }<a name="line.369"></a>
+<span class="sourceLineNo">370</span><a name="line.370"></a>
+<span class="sourceLineNo">371</span> private void
checkConfigValues(Configuration conf, Map<String, float[]> configMap,
boolean[] expectSuccess) throws IOException {<a name="line.371"></a>
+<span class="sourceLineNo">372</span> Set<String> configNames =
configMap.keySet();<a name="line.372"></a>
+<span class="sourceLineNo">373</span> for (int i = 0; i <
expectSuccess.length; i++) {<a name="line.373"></a>
+<span class="sourceLineNo">374</span> try {<a name="line.374"></a>
+<span class="sourceLineNo">375</span> for (String configName :
configNames) {<a name="line.375"></a>
+<span class="sourceLineNo">376</span> conf.setFloat(configName,
configMap.get(configName)[i]);<a name="line.376"></a>
+<span class="sourceLineNo">377</span> }<a name="line.377"></a>
+<span class="sourceLineNo">378</span> BucketCache cache = new
BucketCache(ioEngineName, capacitySize, constructedBlockSize,<a
name="line.378"></a>
+<span class="sourceLineNo">379</span> constructedBlockSizes,
writeThreads, writerQLen, persistencePath, 100, conf);<a name="line.379"></a>
+<span class="sourceLineNo">380</span> assertTrue("Created BucketCache
and expected it to succeed: " + expectSuccess[i] + ", but it actually was: " +
!expectSuccess[i], expectSuccess[i]);<a name="line.380"></a>
+<span class="sourceLineNo">381</span> } catch (IllegalArgumentException
e) {<a name="line.381"></a>
+<span class="sourceLineNo">382</span> assertFalse("Created BucketCache
and expected it to succeed: " + expectSuccess[i] + ", but it actually was: " +
!expectSuccess[i], expectSuccess[i]);<a name="line.382"></a>
+<span class="sourceLineNo">383</span> }<a name="line.383"></a>
+<span class="sourceLineNo">384</span> }<a name="line.384"></a>
+<span class="sourceLineNo">385</span> }<a name="line.385"></a>
+<span class="sourceLineNo">386</span><a name="line.386"></a>
+<span class="sourceLineNo">387</span> private void
validateGetPartitionSize(BucketCache bucketCache, float partitionFactor, float
minFactor) {<a name="line.387"></a>
+<span class="sourceLineNo">388</span> long expectedOutput = (long)
Math.floor(bucketCache.getAllocator().getTotalSize() * partitionFactor *
minFactor);<a name="line.388"></a>
+<span class="sourceLineNo">389</span> assertEquals(expectedOutput,
bucketCache.getPartitionSize(partitionFactor));<a name="line.389"></a>
+<span class="sourceLineNo">390</span> }<a name="line.390"></a>
+<span class="sourceLineNo">391</span>}<a name="line.391"></a>