http://git-wip-us.apache.org/repos/asf/hbase-site/blob/58f51408/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/TestHFileBackedByBucketCache.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/TestHFileBackedByBucketCache.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/TestHFileBackedByBucketCache.html
index ad16b5c..8296871 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/TestHFileBackedByBucketCache.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/TestHFileBackedByBucketCache.html
@@ -50,7 +50,7 @@
 <span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.io.hfile.bucket.BucketAllocator;<a name="line.42"></a>
 <span class="sourceLineNo">043</span>import 
org.apache.hadoop.hbase.io.hfile.bucket.BucketCache;<a name="line.43"></a>
 <span class="sourceLineNo">044</span>import 
org.apache.hadoop.hbase.testclassification.IOTests;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.testclassification.SmallTests;<a name="line.45"></a>
+<span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.45"></a>
 <span class="sourceLineNo">046</span>import org.junit.Before;<a 
name="line.46"></a>
 <span class="sourceLineNo">047</span>import org.junit.Rule;<a 
name="line.47"></a>
 <span class="sourceLineNo">048</span>import org.junit.Test;<a 
name="line.48"></a>
@@ -61,182 +61,188 @@
 <span class="sourceLineNo">053</span>/**<a name="line.53"></a>
 <span class="sourceLineNo">054</span> * Test for file-backed BucketCache.<a 
name="line.54"></a>
 <span class="sourceLineNo">055</span> */<a name="line.55"></a>
-<span class="sourceLineNo">056</span>@Category({IOTests.class, 
SmallTests.class})<a name="line.56"></a>
-<span class="sourceLineNo">057</span>public class TestHFileBackedByBucketCache 
{<a name="line.57"></a>
-<span class="sourceLineNo">058</span>  private static final Log LOG = 
LogFactory.getLog(TestHFileBackedByBucketCache.class);<a name="line.58"></a>
-<span class="sourceLineNo">059</span>  @Rule public TestName name = new 
TestName();<a name="line.59"></a>
-<span class="sourceLineNo">060</span>  @Rule public final TestRule timeout = 
CategoryBasedTimeout.builder().withTimeout(this.getClass()).<a 
name="line.60"></a>
-<span class="sourceLineNo">061</span>      
withLookingForStuckThread(true).build();<a name="line.61"></a>
-<span class="sourceLineNo">062</span>  private static final 
HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.62"></a>
-<span class="sourceLineNo">063</span>  private static final int ROW_LENGTH = 
4;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>  private Configuration conf;<a 
name="line.64"></a>
-<span class="sourceLineNo">065</span>  private FileSystem fs;<a 
name="line.65"></a>
-<span class="sourceLineNo">066</span><a name="line.66"></a>
-<span class="sourceLineNo">067</span>  // MATH! SIZING FOR THE TEST!<a 
name="line.67"></a>
-<span class="sourceLineNo">068</span>  // Set bucketcache to be smallest size 
possible which is 1MB. We do that in the test<a name="line.68"></a>
-<span class="sourceLineNo">069</span>  // @Before 
&lt;code&gt;before&lt;/code&gt; method. Into out 1MB cache, have it so only one 
bucket. If<a name="line.69"></a>
-<span class="sourceLineNo">070</span>  // bucketsize is set to 125kb in size, 
we will have one bucket in our 1MB bucketcache. It is<a name="line.70"></a>
-<span class="sourceLineNo">071</span>  // cryptic how this comes about but 
basically comes down to<a name="line.71"></a>
-<span class="sourceLineNo">072</span>  // {@link 
BucketAllocator#FEWEST_ITEMS_IN_BUCKET} being '4'... so 4 * 125 = just over 
500k or so<a name="line.72"></a>
-<span class="sourceLineNo">073</span>  // which makes for one bucket only in 
1M which you can see from TRACE logging:<a name="line.73"></a>
-<span class="sourceLineNo">074</span>  //<a name="line.74"></a>
-<span class="sourceLineNo">075</span>  // Cache totalSize=532480, buckets=1, 
bucket capacity=<a name="line.75"></a>
-<span class="sourceLineNo">076</span>  //   
532480=(4*133120)=(FEWEST_ITEMS_IN_BUCKET*(largest configured bucketcache 
size))<a name="line.76"></a>
+<span class="sourceLineNo">056</span>// This is marked a LargeTest so it runs 
in its own JVM. We do this because we are making use of<a name="line.56"></a>
+<span class="sourceLineNo">057</span>// the cache and the cache is global. We 
don't want any other concurrent test polluting ours which<a name="line.57"></a>
+<span class="sourceLineNo">058</span>// can happen if more than one test in a 
single JVM which can happen when tests are small.<a name="line.58"></a>
+<span class="sourceLineNo">059</span>@Category({IOTests.class, 
LargeTests.class})<a name="line.59"></a>
+<span class="sourceLineNo">060</span>public class TestHFileBackedByBucketCache 
{<a name="line.60"></a>
+<span class="sourceLineNo">061</span>  private static final Log LOG = 
LogFactory.getLog(TestHFileBackedByBucketCache.class);<a name="line.61"></a>
+<span class="sourceLineNo">062</span>  @Rule public TestName name = new 
TestName();<a name="line.62"></a>
+<span class="sourceLineNo">063</span>  @Rule public final TestRule timeout = 
CategoryBasedTimeout.builder().withTimeout(this.getClass()).<a 
name="line.63"></a>
+<span class="sourceLineNo">064</span>      
withLookingForStuckThread(true).build();<a name="line.64"></a>
+<span class="sourceLineNo">065</span>  private static final 
HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.65"></a>
+<span class="sourceLineNo">066</span>  private static final int ROW_LENGTH = 
4;<a name="line.66"></a>
+<span class="sourceLineNo">067</span>  private Configuration conf;<a 
name="line.67"></a>
+<span class="sourceLineNo">068</span>  private FileSystem fs;<a 
name="line.68"></a>
+<span class="sourceLineNo">069</span><a name="line.69"></a>
+<span class="sourceLineNo">070</span>  // MATH! SIZING FOR THE TEST!<a 
name="line.70"></a>
+<span class="sourceLineNo">071</span>  // Set bucketcache to be smallest size 
possible which is 1MB. We do that in the test<a name="line.71"></a>
+<span class="sourceLineNo">072</span>  // @Before 
&lt;code&gt;before&lt;/code&gt; method. Into out 1MB cache, have it so only one 
bucket. If<a name="line.72"></a>
+<span class="sourceLineNo">073</span>  // bucketsize is set to 125kb in size, 
we will have one bucket in our 1MB bucketcache. It is<a name="line.73"></a>
+<span class="sourceLineNo">074</span>  // cryptic how this comes about but 
basically comes down to<a name="line.74"></a>
+<span class="sourceLineNo">075</span>  // {@link 
BucketAllocator#FEWEST_ITEMS_IN_BUCKET} being '4'... so 4 * 125 = just over 
500k or so<a name="line.75"></a>
+<span class="sourceLineNo">076</span>  // which makes for one bucket only in 
1M which you can see from TRACE logging:<a name="line.76"></a>
 <span class="sourceLineNo">077</span>  //<a name="line.77"></a>
-<span class="sourceLineNo">078</span>  // Now into this one big bucket, we 
write hfileblocks....Each hfileblock has two keys because<a name="line.78"></a>
-<span class="sourceLineNo">079</span>  // first is under the BLOCKSIZE of 64k 
and then the second puts us over the 64k...<a name="line.79"></a>
-<span class="sourceLineNo">080</span>  // so two Cells per block...<a 
name="line.80"></a>
-<span class="sourceLineNo">081</span>  /**<a name="line.81"></a>
-<span class="sourceLineNo">082</span>   * Default size.<a name="line.82"></a>
-<span class="sourceLineNo">083</span>   */<a name="line.83"></a>
-<span class="sourceLineNo">084</span>  private static final int BLOCKSIZE = 64 
* 1024;<a name="line.84"></a>
-<span class="sourceLineNo">085</span><a name="line.85"></a>
-<span class="sourceLineNo">086</span>  /**<a name="line.86"></a>
-<span class="sourceLineNo">087</span>   * Bucket sizes get multiplied by 4 for 
actual bucket size.<a name="line.87"></a>
-<span class="sourceLineNo">088</span>   * See {@link 
BucketAllocator#FEWEST_ITEMS_IN_BUCKET}.<a name="line.88"></a>
-<span class="sourceLineNo">089</span>   */<a name="line.89"></a>
-<span class="sourceLineNo">090</span>  private static final int BUCKETSIZE = 
125 * 1024;<a name="line.90"></a>
-<span class="sourceLineNo">091</span><a name="line.91"></a>
-<span class="sourceLineNo">092</span>  /**<a name="line.92"></a>
-<span class="sourceLineNo">093</span>   * Make it so one Cell is just under a 
BLOCKSIZE. The second Cell puts us over the BLOCKSIZE<a name="line.93"></a>
-<span class="sourceLineNo">094</span>   * so we have two Cells per 
HFilBlock.<a name="line.94"></a>
-<span class="sourceLineNo">095</span>   */<a name="line.95"></a>
-<span class="sourceLineNo">096</span>  private static final int VALUE_SIZE = 
33 * 1024;<a name="line.96"></a>
-<span class="sourceLineNo">097</span><a name="line.97"></a>
-<span class="sourceLineNo">098</span>  @Before<a name="line.98"></a>
-<span class="sourceLineNo">099</span>  public void before() throws IOException 
{<a name="line.99"></a>
-<span class="sourceLineNo">100</span>    // Do setup of a bucketcache that has 
one bucket only. Enable trace-level logging for<a name="line.100"></a>
-<span class="sourceLineNo">101</span>    // key classes.<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    this.conf = 
TEST_UTIL.getConfiguration();<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    this.fs = FileSystem.get(conf);<a 
name="line.103"></a>
-<span class="sourceLineNo">104</span><a name="line.104"></a>
-<span class="sourceLineNo">105</span>    // Set BucketCache and HFileBlock to 
log at trace level.<a name="line.105"></a>
-<span class="sourceLineNo">106</span>    setTraceLevel(BucketCache.class);<a 
name="line.106"></a>
-<span class="sourceLineNo">107</span>    setTraceLevel(HFileBlock.class);<a 
name="line.107"></a>
-<span class="sourceLineNo">108</span>    
setTraceLevel(HFileReaderImpl.class);<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    
setTraceLevel(BucketAllocator.class);<a name="line.109"></a>
-<span class="sourceLineNo">110</span>  }<a name="line.110"></a>
-<span class="sourceLineNo">111</span><a name="line.111"></a>
-<span class="sourceLineNo">112</span>  //  Assumes log4j logging.<a 
name="line.112"></a>
-<span class="sourceLineNo">113</span>  private static void setTraceLevel(final 
Class&lt;?&gt; clazz) {<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    Log testlog = 
LogFactory.getLog(clazz.getName());<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    
((org.apache.commons.logging.impl.Log4JLogger)testlog).getLogger().<a 
name="line.115"></a>
-<span class="sourceLineNo">116</span>      
setLevel(org.apache.log4j.Level.TRACE);<a name="line.116"></a>
-<span class="sourceLineNo">117</span>  }<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
-<span class="sourceLineNo">119</span>  /**<a name="line.119"></a>
-<span class="sourceLineNo">120</span>   * Test that bucketcache is caching and 
that the persist of in-memory map works<a name="line.120"></a>
-<span class="sourceLineNo">121</span>   * @throws IOException<a 
name="line.121"></a>
-<span class="sourceLineNo">122</span>   */<a name="line.122"></a>
-<span class="sourceLineNo">123</span>  @Test<a name="line.123"></a>
-<span class="sourceLineNo">124</span>  public void 
testBucketCacheCachesAndPersists() throws IOException {<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    // Set up a bucket cache. Set up one 
that will persist by passing a<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    // hbase.bucketcache.persistent.path 
value to store the in-memory map of what is out in<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    // the file-backed bucketcache. Set 
bucketcache to have one size only, BUCKETSIZE.<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    // See "MATH! SIZING FOR THE TEST!" 
note above around declaration of BUCKETSIZE<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    String bucketCacheDataFile =<a 
name="line.129"></a>
-<span class="sourceLineNo">130</span>      (new 
Path(TEST_UTIL.getDataTestDir(), "bucketcache.data")).toString();<a 
name="line.130"></a>
-<span class="sourceLineNo">131</span>    (new 
File(bucketCacheDataFile)).getParentFile().mkdirs();<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    
this.conf.set("hbase.bucketcache.ioengine", "file:" + bucketCacheDataFile);<a 
name="line.132"></a>
-<span class="sourceLineNo">133</span>    
this.conf.set("hbase.bucketcache.persistent.path", bucketCacheDataFile + 
".map");<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    
this.conf.setStrings("hbase.bucketcache.bucket.sizes", 
Integer.toString(BUCKETSIZE));<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    // This is minimum bucketcache 
size.... 1MB.<a name="line.135"></a>
-<span class="sourceLineNo">136</span>    
this.conf.setInt("hbase.bucketcache.size", 1);<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    CacheConfig cacheConfig = new 
CacheConfig(conf);<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    Path hfilePath = new 
Path(TEST_UTIL.getDataTestDir(), this.name.getMethodName());<a 
name="line.138"></a>
-<span class="sourceLineNo">139</span>    // Write 8 entries which should make 
for four hfileBlocks.<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    final int count = 8;<a 
name="line.140"></a>
-<span class="sourceLineNo">141</span>    final int hfileBlockCount = 4;<a 
name="line.141"></a>
-<span class="sourceLineNo">142</span>    List&lt;Cell&gt; writtenCells = 
writeFile(hfilePath, Compression.Algorithm.NONE, cacheConfig, count);<a 
name="line.142"></a>
-<span class="sourceLineNo">143</span>    CacheStats stats = 
cacheConfig.getBlockCache().getStats();<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    List&lt;Cell&gt; readCells = 
readFile(hfilePath, cacheConfig);<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    
assertTrue(!writtenCells.isEmpty());<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    assertEquals(writtenCells.size(), 
readCells.size());<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    assertEquals(hfileBlockCount, 
stats.getMissCount());<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    assertEquals(1, stats.getHitCount()); 
// readFile will read first block is from cache.<a name="line.148"></a>
-<span class="sourceLineNo">149</span><a name="line.149"></a>
-<span class="sourceLineNo">150</span>    // Now, close out the cache and then 
reopen and verify that cache still has our blocks.<a name="line.150"></a>
-<span class="sourceLineNo">151</span>    // Assert that persistence works.<a 
name="line.151"></a>
-<span class="sourceLineNo">152</span>    
cacheConfig.getBlockCache().shutdown();<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    // Need to clear the global cache 
else the new CacheConfig won't create a bucketcache but<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    // just reuse the old one.<a 
name="line.154"></a>
-<span class="sourceLineNo">155</span>    
CacheConfig.GLOBAL_BLOCK_CACHE_INSTANCE = null;<a name="line.155"></a>
-<span class="sourceLineNo">156</span>    cacheConfig = new 
CacheConfig(conf);<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    stats = 
cacheConfig.getBlockCache().getStats();<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    assertEquals(0, 
stats.getHitCachingCount());<a name="line.158"></a>
-<span class="sourceLineNo">159</span>    readCells = readFile(hfilePath, 
cacheConfig);<a name="line.159"></a>
-<span class="sourceLineNo">160</span>    // readFile will read all hfileblocs 
in the file, hfileBlockCount, and then one more, so + 1.<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    assertEquals(hfileBlockCount + 1, 
stats.getHitCachingCount());<a name="line.161"></a>
-<span class="sourceLineNo">162</span>  }<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>   * Write a file with 
&lt;code&gt;count&lt;/code&gt; entries.<a name="line.165"></a>
-<span class="sourceLineNo">166</span>   * @return The Cells written to the 
file.<a name="line.166"></a>
-<span class="sourceLineNo">167</span>   * @throws IOException<a 
name="line.167"></a>
-<span class="sourceLineNo">168</span>   */<a name="line.168"></a>
-<span class="sourceLineNo">169</span>  private List&lt;Cell&gt; 
writeFile(final Path hfilePath, final Compression.Algorithm compressAlgo,<a 
name="line.169"></a>
-<span class="sourceLineNo">170</span>      final CacheConfig cacheConfig, 
final int count)<a name="line.170"></a>
-<span class="sourceLineNo">171</span>  throws IOException {<a 
name="line.171"></a>
-<span class="sourceLineNo">172</span>    List&lt;Cell&gt; cells = new 
ArrayList&lt;Cell&gt;(count);<a name="line.172"></a>
-<span class="sourceLineNo">173</span>    HFileContext context =<a 
name="line.173"></a>
-<span class="sourceLineNo">174</span>        new 
HFileContextBuilder().withBlockSize(BLOCKSIZE).withCompression(compressAlgo).build();<a
 name="line.174"></a>
-<span class="sourceLineNo">175</span>    try (HFile.Writer writer = new 
HFile.WriterFactory(conf, cacheConfig).<a name="line.175"></a>
-<span class="sourceLineNo">176</span>        withPath(fs, hfilePath).<a 
name="line.176"></a>
-<span class="sourceLineNo">177</span>        withFileContext(context).<a 
name="line.177"></a>
-<span class="sourceLineNo">178</span>        
withComparator(CellComparator.COMPARATOR).<a name="line.178"></a>
-<span class="sourceLineNo">179</span>        create()) {<a name="line.179"></a>
-<span class="sourceLineNo">180</span>      byte [] valueBytes = new byte 
[VALUE_SIZE];<a name="line.180"></a>
-<span class="sourceLineNo">181</span>      for (int i = 0; i &lt; 
valueBytes.length; i++) valueBytes[i] = '0';<a name="line.181"></a>
-<span class="sourceLineNo">182</span>      for (int i = 0; i &lt; count; ++i) 
{<a name="line.182"></a>
-<span class="sourceLineNo">183</span>        byte[] keyBytes = format(i);<a 
name="line.183"></a>
-<span class="sourceLineNo">184</span>        KeyValue keyValue = new 
KeyValue(keyBytes, HConstants.CATALOG_FAMILY, keyBytes,<a name="line.184"></a>
-<span class="sourceLineNo">185</span>            HConstants.LATEST_TIMESTAMP, 
valueBytes);<a name="line.185"></a>
-<span class="sourceLineNo">186</span>        writer.append(keyValue);<a 
name="line.186"></a>
-<span class="sourceLineNo">187</span>        cells.add(keyValue);<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>    return cells;<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">193</span>  /**<a name="line.193"></a>
-<span class="sourceLineNo">194</span>   * Read the whole file, then read the 
first block so we get something from cache for sure.<a name="line.194"></a>
-<span class="sourceLineNo">195</span>   * So... there are TOTAL_BLOCKS_IN_FILE 
read + 1. See math at head of this class.<a name="line.195"></a>
-<span class="sourceLineNo">196</span>   * @return The Cells read from the 
file.<a name="line.196"></a>
-<span class="sourceLineNo">197</span>   */<a name="line.197"></a>
-<span class="sourceLineNo">198</span>  private List&lt;Cell&gt; readFile(final 
Path hfilePath, final CacheConfig cacheConfig)<a name="line.198"></a>
-<span class="sourceLineNo">199</span>  throws IOException {<a 
name="line.199"></a>
-<span class="sourceLineNo">200</span>    List&lt;Cell&gt; cells = new 
ArrayList&lt;Cell&gt;();<a name="line.200"></a>
-<span class="sourceLineNo">201</span>    try (HFile.Reader reader = 
HFile.createReader(this.fs, hfilePath, cacheConfig, this.conf);<a 
name="line.201"></a>
-<span class="sourceLineNo">202</span>        HFileScanner scanner = 
reader.getScanner(true, true)) {<a name="line.202"></a>
-<span class="sourceLineNo">203</span>      scanner.seekTo();<a 
name="line.203"></a>
-<span class="sourceLineNo">204</span>      do {<a name="line.204"></a>
-<span class="sourceLineNo">205</span>        cells.add(scanner.getCell());<a 
name="line.205"></a>
-<span class="sourceLineNo">206</span>        LOG.info(scanner.getKey());<a 
name="line.206"></a>
-<span class="sourceLineNo">207</span>      } while (scanner.next());<a 
name="line.207"></a>
-<span class="sourceLineNo">208</span>      // Do a random seek just so we see 
a block coming from cache.<a name="line.208"></a>
-<span class="sourceLineNo">209</span>      
scanner.seekTo(reader.getFirstKey());<a name="line.209"></a>
-<span class="sourceLineNo">210</span>      scanner.next();<a 
name="line.210"></a>
-<span class="sourceLineNo">211</span>      LOG.info(scanner.getCell());<a 
name="line.211"></a>
-<span class="sourceLineNo">212</span>    }<a name="line.212"></a>
-<span class="sourceLineNo">213</span>    return cells;<a name="line.213"></a>
-<span class="sourceLineNo">214</span>  }<a name="line.214"></a>
-<span class="sourceLineNo">215</span><a name="line.215"></a>
-<span class="sourceLineNo">216</span>  /*<a name="line.216"></a>
-<span class="sourceLineNo">217</span>   * Format passed integer.<a 
name="line.217"></a>
-<span class="sourceLineNo">218</span>   * @param number<a name="line.218"></a>
-<span class="sourceLineNo">219</span>   * @return Returns zero-prefixed 
ROW_LENGTH-byte wide decimal version of passed<a name="line.219"></a>
-<span class="sourceLineNo">220</span>   * number (Does absolute in case number 
is negative).<a name="line.220"></a>
-<span class="sourceLineNo">221</span>   */<a name="line.221"></a>
-<span class="sourceLineNo">222</span>  private static byte [] format(final int 
number) {<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    byte [] b = new byte[ROW_LENGTH];<a 
name="line.223"></a>
-<span class="sourceLineNo">224</span>    int d = Math.abs(number);<a 
name="line.224"></a>
-<span class="sourceLineNo">225</span>    for (int i = b.length - 1; i &gt;= 0; 
i--) {<a name="line.225"></a>
-<span class="sourceLineNo">226</span>      b[i] = (byte)((d % 10) + '0');<a 
name="line.226"></a>
-<span class="sourceLineNo">227</span>      d /= 10;<a name="line.227"></a>
-<span class="sourceLineNo">228</span>    }<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    return b;<a name="line.229"></a>
-<span class="sourceLineNo">230</span>  }<a name="line.230"></a>
-<span class="sourceLineNo">231</span>}<a name="line.231"></a>
+<span class="sourceLineNo">078</span>  // Cache totalSize=532480, buckets=1, 
bucket capacity=<a name="line.78"></a>
+<span class="sourceLineNo">079</span>  //   
532480=(4*133120)=(FEWEST_ITEMS_IN_BUCKET*(largest configured bucketcache 
size))<a name="line.79"></a>
+<span class="sourceLineNo">080</span>  //<a name="line.80"></a>
+<span class="sourceLineNo">081</span>  // Now into this one big bucket, we 
write hfileblocks....Each hfileblock has two keys because<a name="line.81"></a>
+<span class="sourceLineNo">082</span>  // first is under the BLOCKSIZE of 64k 
and then the second puts us over the 64k...<a name="line.82"></a>
+<span class="sourceLineNo">083</span>  // so two Cells per block...<a 
name="line.83"></a>
+<span class="sourceLineNo">084</span>  /**<a name="line.84"></a>
+<span class="sourceLineNo">085</span>   * Default size.<a name="line.85"></a>
+<span class="sourceLineNo">086</span>   */<a name="line.86"></a>
+<span class="sourceLineNo">087</span>  private static final int BLOCKSIZE = 64 
* 1024;<a name="line.87"></a>
+<span class="sourceLineNo">088</span><a name="line.88"></a>
+<span class="sourceLineNo">089</span>  /**<a name="line.89"></a>
+<span class="sourceLineNo">090</span>   * Bucket sizes get multiplied by 4 for 
actual bucket size.<a name="line.90"></a>
+<span class="sourceLineNo">091</span>   * See {@link 
BucketAllocator#FEWEST_ITEMS_IN_BUCKET}.<a name="line.91"></a>
+<span class="sourceLineNo">092</span>   */<a name="line.92"></a>
+<span class="sourceLineNo">093</span>  private static final int BUCKETSIZE = 
125 * 1024;<a name="line.93"></a>
+<span class="sourceLineNo">094</span><a name="line.94"></a>
+<span class="sourceLineNo">095</span>  /**<a name="line.95"></a>
+<span class="sourceLineNo">096</span>   * Make it so one Cell is just under a 
BLOCKSIZE. The second Cell puts us over the BLOCKSIZE<a name="line.96"></a>
+<span class="sourceLineNo">097</span>   * so we have two Cells per 
HFilBlock.<a name="line.97"></a>
+<span class="sourceLineNo">098</span>   */<a name="line.98"></a>
+<span class="sourceLineNo">099</span>  private static final int VALUE_SIZE = 
33 * 1024;<a name="line.99"></a>
+<span class="sourceLineNo">100</span><a name="line.100"></a>
+<span class="sourceLineNo">101</span>  @Before<a name="line.101"></a>
+<span class="sourceLineNo">102</span>  public void before() throws IOException 
{<a name="line.102"></a>
+<span class="sourceLineNo">103</span>    // Do setup of a bucketcache that has 
one bucket only. Enable trace-level logging for<a name="line.103"></a>
+<span class="sourceLineNo">104</span>    // key classes.<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    this.conf = 
TEST_UTIL.getConfiguration();<a name="line.105"></a>
+<span class="sourceLineNo">106</span>    this.fs = FileSystem.get(conf);<a 
name="line.106"></a>
+<span class="sourceLineNo">107</span><a name="line.107"></a>
+<span class="sourceLineNo">108</span>    // Set BucketCache and HFileBlock to 
log at trace level.<a name="line.108"></a>
+<span class="sourceLineNo">109</span>    setTraceLevel(BucketCache.class);<a 
name="line.109"></a>
+<span class="sourceLineNo">110</span>    setTraceLevel(HFileBlock.class);<a 
name="line.110"></a>
+<span class="sourceLineNo">111</span>    
setTraceLevel(HFileReaderImpl.class);<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    
setTraceLevel(BucketAllocator.class);<a name="line.112"></a>
+<span class="sourceLineNo">113</span>  }<a name="line.113"></a>
+<span class="sourceLineNo">114</span><a name="line.114"></a>
+<span class="sourceLineNo">115</span>  //  Assumes log4j logging.<a 
name="line.115"></a>
+<span class="sourceLineNo">116</span>  private static void setTraceLevel(final 
Class&lt;?&gt; clazz) {<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    Log testlog = 
LogFactory.getLog(clazz.getName());<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    
((org.apache.commons.logging.impl.Log4JLogger)testlog).getLogger().<a 
name="line.118"></a>
+<span class="sourceLineNo">119</span>      
setLevel(org.apache.log4j.Level.TRACE);<a name="line.119"></a>
+<span class="sourceLineNo">120</span>  }<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span>  /**<a name="line.122"></a>
+<span class="sourceLineNo">123</span>   * Test that bucketcache is caching and 
that the persist of in-memory map works<a name="line.123"></a>
+<span class="sourceLineNo">124</span>   * @throws IOException<a 
name="line.124"></a>
+<span class="sourceLineNo">125</span>   */<a name="line.125"></a>
+<span class="sourceLineNo">126</span>  @Test<a name="line.126"></a>
+<span class="sourceLineNo">127</span>  public void 
testBucketCacheCachesAndPersists() throws IOException {<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    // Set up a bucket cache. Set up one 
that will persist by passing a<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    // hbase.bucketcache.persistent.path 
value to store the in-memory map of what is out in<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    // the file-backed bucketcache. Set 
bucketcache to have one size only, BUCKETSIZE.<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    // See "MATH! SIZING FOR THE TEST!" 
note above around declaration of BUCKETSIZE<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    String bucketCacheDataFile =<a 
name="line.132"></a>
+<span class="sourceLineNo">133</span>      (new 
Path(TEST_UTIL.getDataTestDir(), "bucketcache.data")).toString();<a 
name="line.133"></a>
+<span class="sourceLineNo">134</span>    (new 
File(bucketCacheDataFile)).getParentFile().mkdirs();<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    
this.conf.set("hbase.bucketcache.ioengine", "file:" + bucketCacheDataFile);<a 
name="line.135"></a>
+<span class="sourceLineNo">136</span>    
this.conf.set("hbase.bucketcache.persistent.path", bucketCacheDataFile + 
".map");<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    
this.conf.setStrings("hbase.bucketcache.bucket.sizes", 
Integer.toString(BUCKETSIZE));<a name="line.137"></a>
+<span class="sourceLineNo">138</span>    // This is minimum bucketcache 
size.... 1MB.<a name="line.138"></a>
+<span class="sourceLineNo">139</span>    
this.conf.setInt("hbase.bucketcache.size", 1);<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    // Write 8 entries which should make 
for four hfileBlocks.<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    final int count = 8;<a 
name="line.141"></a>
+<span class="sourceLineNo">142</span>    final int hfileBlockCount = 4;<a 
name="line.142"></a>
+<span class="sourceLineNo">143</span>    Path hfilePath = new 
Path(TEST_UTIL.getDataTestDir(), this.name.getMethodName());<a 
name="line.143"></a>
+<span class="sourceLineNo">144</span>    // Clear out any existing global 
cache instance. Will pollute our tests below. Any concurrent<a 
name="line.144"></a>
+<span class="sourceLineNo">145</span>    // running test will pollute our 
results below.<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    
CacheConfig.GLOBAL_BLOCK_CACHE_INSTANCE = null;<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    CacheConfig cacheConfig = new 
CacheConfig(conf);<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    List&lt;Cell&gt; writtenCells = 
writeFile(hfilePath, Compression.Algorithm.NONE, cacheConfig, count);<a 
name="line.148"></a>
+<span class="sourceLineNo">149</span>    CacheStats stats = 
cacheConfig.getBlockCache().getStats();<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    List&lt;Cell&gt; readCells = 
readFile(hfilePath, cacheConfig);<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    
assertTrue(!writtenCells.isEmpty());<a name="line.151"></a>
+<span class="sourceLineNo">152</span>    assertEquals(writtenCells.size(), 
readCells.size());<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    assertEquals(hfileBlockCount, 
stats.getMissCount());<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    assertEquals(1, stats.getHitCount()); 
// readFile will read first block is from cache.<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span>    // Now, close out the cache and then 
reopen and verify that cache still has our blocks.<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    // Assert that persistence works.<a 
name="line.157"></a>
+<span class="sourceLineNo">158</span>    
cacheConfig.getBlockCache().shutdown();<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    // Need to clear the global cache 
else the new CacheConfig won't create a bucketcache but<a name="line.159"></a>
+<span class="sourceLineNo">160</span>    // just reuse the old one.<a 
name="line.160"></a>
+<span class="sourceLineNo">161</span>    
CacheConfig.GLOBAL_BLOCK_CACHE_INSTANCE = null;<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    cacheConfig = new 
CacheConfig(conf);<a name="line.162"></a>
+<span class="sourceLineNo">163</span>    stats = 
cacheConfig.getBlockCache().getStats();<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    assertEquals(0, 
stats.getHitCachingCount());<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    readCells = readFile(hfilePath, 
cacheConfig);<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    // readFile will read all hfileblocs 
in the file, hfileBlockCount, and then one more, so + 1.<a name="line.166"></a>
+<span class="sourceLineNo">167</span>    assertEquals(hfileBlockCount + 1, 
stats.getHitCachingCount());<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>   * Write a file with 
&lt;code&gt;count&lt;/code&gt; entries.<a name="line.171"></a>
+<span class="sourceLineNo">172</span>   * @return The Cells written to the 
file.<a name="line.172"></a>
+<span class="sourceLineNo">173</span>   * @throws IOException<a 
name="line.173"></a>
+<span class="sourceLineNo">174</span>   */<a name="line.174"></a>
+<span class="sourceLineNo">175</span>  private List&lt;Cell&gt; 
writeFile(final Path hfilePath, final Compression.Algorithm compressAlgo,<a 
name="line.175"></a>
+<span class="sourceLineNo">176</span>      final CacheConfig cacheConfig, 
final int count)<a name="line.176"></a>
+<span class="sourceLineNo">177</span>  throws IOException {<a 
name="line.177"></a>
+<span class="sourceLineNo">178</span>    List&lt;Cell&gt; cells = new 
ArrayList&lt;Cell&gt;(count);<a name="line.178"></a>
+<span class="sourceLineNo">179</span>    HFileContext context =<a 
name="line.179"></a>
+<span class="sourceLineNo">180</span>        new 
HFileContextBuilder().withBlockSize(BLOCKSIZE).withCompression(compressAlgo).build();<a
 name="line.180"></a>
+<span class="sourceLineNo">181</span>    try (HFile.Writer writer = new 
HFile.WriterFactory(conf, cacheConfig).<a name="line.181"></a>
+<span class="sourceLineNo">182</span>        withPath(fs, hfilePath).<a 
name="line.182"></a>
+<span class="sourceLineNo">183</span>        withFileContext(context).<a 
name="line.183"></a>
+<span class="sourceLineNo">184</span>        
withComparator(CellComparator.COMPARATOR).<a name="line.184"></a>
+<span class="sourceLineNo">185</span>        create()) {<a name="line.185"></a>
+<span class="sourceLineNo">186</span>      byte [] valueBytes = new byte 
[VALUE_SIZE];<a name="line.186"></a>
+<span class="sourceLineNo">187</span>      for (int i = 0; i &lt; 
valueBytes.length; i++) valueBytes[i] = '0';<a name="line.187"></a>
+<span class="sourceLineNo">188</span>      for (int i = 0; i &lt; count; ++i) 
{<a name="line.188"></a>
+<span class="sourceLineNo">189</span>        byte[] keyBytes = format(i);<a 
name="line.189"></a>
+<span class="sourceLineNo">190</span>        KeyValue keyValue = new 
KeyValue(keyBytes, HConstants.CATALOG_FAMILY, keyBytes,<a name="line.190"></a>
+<span class="sourceLineNo">191</span>            HConstants.LATEST_TIMESTAMP, 
valueBytes);<a name="line.191"></a>
+<span class="sourceLineNo">192</span>        writer.append(keyValue);<a 
name="line.192"></a>
+<span class="sourceLineNo">193</span>        cells.add(keyValue);<a 
name="line.193"></a>
+<span class="sourceLineNo">194</span>      }<a name="line.194"></a>
+<span class="sourceLineNo">195</span>    }<a name="line.195"></a>
+<span class="sourceLineNo">196</span>    return cells;<a name="line.196"></a>
+<span class="sourceLineNo">197</span>  }<a name="line.197"></a>
+<span class="sourceLineNo">198</span><a name="line.198"></a>
+<span class="sourceLineNo">199</span>  /**<a name="line.199"></a>
+<span class="sourceLineNo">200</span>   * Read the whole file, then read the 
first block so we get something from cache for sure.<a name="line.200"></a>
+<span class="sourceLineNo">201</span>   * So... there are TOTAL_BLOCKS_IN_FILE 
read + 1. See math at head of this class.<a name="line.201"></a>
+<span class="sourceLineNo">202</span>   * @return The Cells read from the 
file.<a name="line.202"></a>
+<span class="sourceLineNo">203</span>   */<a name="line.203"></a>
+<span class="sourceLineNo">204</span>  private List&lt;Cell&gt; readFile(final 
Path hfilePath, final CacheConfig cacheConfig)<a name="line.204"></a>
+<span class="sourceLineNo">205</span>  throws IOException {<a 
name="line.205"></a>
+<span class="sourceLineNo">206</span>    List&lt;Cell&gt; cells = new 
ArrayList&lt;Cell&gt;();<a name="line.206"></a>
+<span class="sourceLineNo">207</span>    try (HFile.Reader reader = 
HFile.createReader(this.fs, hfilePath, cacheConfig, this.conf);<a 
name="line.207"></a>
+<span class="sourceLineNo">208</span>        HFileScanner scanner = 
reader.getScanner(true, true)) {<a name="line.208"></a>
+<span class="sourceLineNo">209</span>      scanner.seekTo();<a 
name="line.209"></a>
+<span class="sourceLineNo">210</span>      do {<a name="line.210"></a>
+<span class="sourceLineNo">211</span>        cells.add(scanner.getCell());<a 
name="line.211"></a>
+<span class="sourceLineNo">212</span>        LOG.info(scanner.getKey());<a 
name="line.212"></a>
+<span class="sourceLineNo">213</span>      } while (scanner.next());<a 
name="line.213"></a>
+<span class="sourceLineNo">214</span>      // Do a random seek just so we see 
a block coming from cache.<a name="line.214"></a>
+<span class="sourceLineNo">215</span>      
scanner.seekTo(reader.getFirstKey());<a name="line.215"></a>
+<span class="sourceLineNo">216</span>      scanner.next();<a 
name="line.216"></a>
+<span class="sourceLineNo">217</span>      LOG.info(scanner.getCell());<a 
name="line.217"></a>
+<span class="sourceLineNo">218</span>    }<a name="line.218"></a>
+<span class="sourceLineNo">219</span>    return cells;<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>   * Format passed integer.<a 
name="line.223"></a>
+<span class="sourceLineNo">224</span>   * @param number<a name="line.224"></a>
+<span class="sourceLineNo">225</span>   * @return Returns zero-prefixed 
ROW_LENGTH-byte wide decimal version of passed<a name="line.225"></a>
+<span class="sourceLineNo">226</span>   * number (Does absolute in case number 
is negative).<a name="line.226"></a>
+<span class="sourceLineNo">227</span>   */<a name="line.227"></a>
+<span class="sourceLineNo">228</span>  private static byte [] format(final int 
number) {<a name="line.228"></a>
+<span class="sourceLineNo">229</span>    byte [] b = new byte[ROW_LENGTH];<a 
name="line.229"></a>
+<span class="sourceLineNo">230</span>    int d = Math.abs(number);<a 
name="line.230"></a>
+<span class="sourceLineNo">231</span>    for (int i = b.length - 1; i &gt;= 0; 
i--) {<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      b[i] = (byte)((d % 10) + '0');<a 
name="line.232"></a>
+<span class="sourceLineNo">233</span>      d /= 10;<a name="line.233"></a>
+<span class="sourceLineNo">234</span>    }<a name="line.234"></a>
+<span class="sourceLineNo">235</span>    return b;<a name="line.235"></a>
+<span class="sourceLineNo">236</span>  }<a name="line.236"></a>
+<span class="sourceLineNo">237</span>}<a name="line.237"></a>
 
 
 

Reply via email to