http://git-wip-us.apache.org/repos/asf/hbase-site/blob/33c287c2/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockCacheKey.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockCacheKey.html 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockCacheKey.html
index 1d08f0e..318b8ae 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockCacheKey.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockCacheKey.html
@@ -160,10 +160,8 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
-                    <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;buf)</code>
-<div class="block">Add block to cache (defaults to not in-memory).</div>
-</td>
+<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+                    <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;buf)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
@@ -174,8 +172,10 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
-                    <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;buf)</code>&nbsp;</td>
+<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+                    <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;buf)</code>
+<div class="block">Add block to cache (defaults to not in-memory).</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
@@ -184,35 +184,35 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable,%20boolean,%20boolean)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+<td class="colLast"><span 
class="strong">InclusiveCombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/InclusiveCombinedBlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable,%20boolean,%20boolean)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
                     <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;buf,
                     boolean&nbsp;inMemory,
-                    boolean&nbsp;cacheDataInL1)</code>
-<div class="block">Add block to cache.</div>
-</td>
+                    boolean&nbsp;cacheDataInL1)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">LruBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable,%20boolean,%20boolean)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable,%20boolean,%20boolean)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
                     <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;buf,
                     boolean&nbsp;inMemory,
-                    boolean&nbsp;cacheDataInL1)</code>
-<div class="block">Cache the block with the specified name and buffer.</div>
-</td>
+                    boolean&nbsp;cacheDataInL1)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable,%20boolean,%20boolean)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+<td class="colLast"><span class="strong">LruBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable,%20boolean,%20boolean)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
                     <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;buf,
                     boolean&nbsp;inMemory,
-                    boolean&nbsp;cacheDataInL1)</code>&nbsp;</td>
+                    boolean&nbsp;cacheDataInL1)</code>
+<div class="block">Cache the block with the specified name and buffer.</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">InclusiveCombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/InclusiveCombinedBlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable,%20boolean,%20boolean)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable,%20boolean,%20boolean)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
                     <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;buf,
                     boolean&nbsp;inMemory,
-                    boolean&nbsp;cacheDataInL1)</code>&nbsp;</td>
+                    boolean&nbsp;cacheDataInL1)</code>
+<div class="block">Add block to cache.</div>
+</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
@@ -229,9 +229,7 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#evictBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey)">evictBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey)</code>
-<div class="block">Evict block from cache.</div>
-</td>
+<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#evictBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey)">evictBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
@@ -239,7 +237,9 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#evictBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey)">evictBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey)</code>&nbsp;</td>
+<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#evictBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey)">evictBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey)</code>
+<div class="block">Evict block from cache.</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
@@ -247,35 +247,35 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
-<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20boolean,%20boolean,%20boolean)">getBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+<td class="colLast"><span 
class="strong">InclusiveCombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/InclusiveCombinedBlockCache.html#getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20boolean,%20boolean,%20boolean)">getBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
                 boolean&nbsp;caching,
                 boolean&nbsp;repeat,
-                boolean&nbsp;updateCacheMetrics)</code>
-<div class="block">Fetch block from cache.</div>
-</td>
+                boolean&nbsp;updateCacheMetrics)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
-<td class="colLast"><span class="strong">LruBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20boolean,%20boolean,%20boolean)">getBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20boolean,%20boolean,%20boolean)">getBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
                 boolean&nbsp;caching,
                 boolean&nbsp;repeat,
-                boolean&nbsp;updateCacheMetrics)</code>
-<div class="block">Get the buffer of the block with the specified name.</div>
-</td>
+                boolean&nbsp;updateCacheMetrics)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
-<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20boolean,%20boolean,%20boolean)">getBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+<td class="colLast"><span class="strong">LruBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20boolean,%20boolean,%20boolean)">getBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
                 boolean&nbsp;caching,
                 boolean&nbsp;repeat,
-                boolean&nbsp;updateCacheMetrics)</code>&nbsp;</td>
+                boolean&nbsp;updateCacheMetrics)</code>
+<div class="block">Get the buffer of the block with the specified name.</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
-<td class="colLast"><span 
class="strong">InclusiveCombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/InclusiveCombinedBlockCache.html#getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20boolean,%20boolean,%20boolean)">getBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20boolean,%20boolean,%20boolean)">getBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
                 boolean&nbsp;caching,
                 boolean&nbsp;repeat,
-                boolean&nbsp;updateCacheMetrics)</code>&nbsp;</td>
+                boolean&nbsp;updateCacheMetrics)</code>
+<div class="block">Fetch block from cache.</div>
+</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
@@ -302,11 +302,8 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#returnBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable)">returnBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
-                      <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;block)</code>
-<div class="block">Called when the scanner using the block decides to return 
the block once its usage
- is over.</div>
-</td>
+<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#returnBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable)">returnBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+                      <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;block)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
@@ -315,8 +312,11 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#returnBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable)">returnBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
-                      <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;block)</code>&nbsp;</td>
+<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#returnBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable)">returnBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+                      <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;block)</code>
+<div class="block">Called when the scanner using the block decides to return 
the block once its usage
+ is over.</div>
+</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
@@ -501,14 +501,14 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">BucketCache.BucketEntryGroup.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.BucketEntryGroup.html#add(java.util.Map.Entry)">add</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.Entry.html?is-external=true";
 title="class or interface in java.util">Map.Entry</a>&lt;<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>,<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.BucketEntry.html"
 title="class in 
org.apache.hadoop.hbase.io.hfile.bucket">BucketCache.BucketEntry</a>&gt;&nbsp;block)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
 <td class="colLast"><span 
class="strong">CachedEntryQueue.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/CachedEntryQueue.html#add(java.util.Map.Entry)">add</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.Entry.html?is-external=true";
 title="class or interface in java.util">Map.Entry</a>&lt;<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>,<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.BucketEntry.html"
 title="class in 
org.apache.hadoop.hbase.io.hfile.bucket">BucketCache.BucketEntry</a>&gt;&nbsp;entry)</code>
 <div class="block">Attempt to add the specified entry to this queue.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span 
class="strong">BucketCache.BucketEntryGroup.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.BucketEntryGroup.html#add(java.util.Map.Entry)">add</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.Entry.html?is-external=true";
 title="class or interface in java.util">Map.Entry</a>&lt;<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>,<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.BucketEntry.html"
 title="class in 
org.apache.hadoop.hbase.io.hfile.bucket">BucketCache.BucketEntry</a>&gt;&nbsp;block)</code>&nbsp;</td>
+</tr>
 </tbody>
 </table>
 <table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing 
constructors, and an explanation">

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/33c287c2/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockType.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockType.html 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockType.html
index 4bc6e8f..ab3d56f 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockType.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockType.html
@@ -120,11 +120,11 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a></code></td>
-<td class="colLast"><span 
class="strong">HFileBlockEncodingContext.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockEncodingContext.html#getBlockType()">getBlockType</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">HFileBlockDefaultEncodingContext.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultEncodingContext.html#getBlockType()">getBlockType</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a></code></td>
-<td class="colLast"><span 
class="strong">HFileBlockDefaultEncodingContext.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultEncodingContext.html#getBlockType()">getBlockType</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">HFileBlockEncodingContext.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockEncodingContext.html#getBlockType()">getBlockType</a></strong>()</code>&nbsp;</td>
 </tr>
 </tbody>
 </table>
@@ -137,13 +137,13 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">HFileBlockEncodingContext.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockEncodingContext.html#postEncoding(org.apache.hadoop.hbase.io.hfile.BlockType)">postEncoding</a></strong>(<a
 href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in 
org.apache.hadoop.hbase.io.hfile">BlockType</a>&nbsp;blockType)</code>
-<div class="block">Do any action that needs to be performed after the 
encoding.</div>
-</td>
+<td class="colLast"><span 
class="strong">HFileBlockDefaultEncodingContext.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultEncodingContext.html#postEncoding(org.apache.hadoop.hbase.io.hfile.BlockType)">postEncoding</a></strong>(<a
 href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in 
org.apache.hadoop.hbase.io.hfile">BlockType</a>&nbsp;blockType)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">HFileBlockDefaultEncodingContext.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultEncodingContext.html#postEncoding(org.apache.hadoop.hbase.io.hfile.BlockType)">postEncoding</a></strong>(<a
 href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in 
org.apache.hadoop.hbase.io.hfile">BlockType</a>&nbsp;blockType)</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">HFileBlockEncodingContext.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockEncodingContext.html#postEncoding(org.apache.hadoop.hbase.io.hfile.BlockType)">postEncoding</a></strong>(<a
 href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in 
org.apache.hadoop.hbase.io.hfile">BlockType</a>&nbsp;blockType)</code>
+<div class="block">Do any action that needs to be performed after the 
encoding.</div>
+</td>
 </tr>
 </tbody>
 </table>
@@ -186,7 +186,7 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a></code></td>
-<td class="colLast"><span class="strong">CachedBlock.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CachedBlock.html#getBlockType()">getBlockType</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">Cacheable.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html#getBlockType()">getBlockType</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a></code></td>
@@ -194,25 +194,25 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a></code></td>
-<td class="colLast"><span class="strong">Cacheable.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html#getBlockType()">getBlockType</a></strong>()</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a></code></td>
 <td class="colLast"><span class="strong">HFileBlock.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.html#getBlockType()">getBlockType</a></strong>()</code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a></code></td>
 <td class="colLast"><span 
class="strong">HFileBlock.BlockWritable.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.BlockWritable.html#getBlockType()">getBlockType</a></strong>()</code>
 <div class="block">The type of block this data should use.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a></code></td>
+<td class="colLast"><span class="strong">CachedBlock.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CachedBlock.html#getBlockType()">getBlockType</a></strong>()</code>&nbsp;</td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a></code></td>
-<td class="colLast"><span 
class="strong">HFileBlockIndex.BlockIndexWriter.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.BlockIndexWriter.html#getInlineBlockType()">getInlineBlockType</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">CompoundBloomFilterWriter.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#getInlineBlockType()">getInlineBlockType</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a></code></td>
-<td class="colLast"><span 
class="strong">CompoundBloomFilterWriter.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#getInlineBlockType()">getInlineBlockType</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">HFileBlockIndex.BlockIndexWriter.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.BlockIndexWriter.html#getInlineBlockType()">getInlineBlockType</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a></code></td>
@@ -276,14 +276,14 @@ the order they are declared.</div>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">HFileDataBlockEncoderImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileDataBlockEncoderImpl.html#endBlockEncoding(org.apache.hadoop.hbase.io.encoding.HFileBlockEncodingContext,%20java.io.DataOutputStream,%20byte[],%20org.apache.hadoop.hbase.io.hfile.BlockType)">endBlockEncoding</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockEncodingContext.html"
 title="interface in 
org.apache.hadoop.hbase.io.encoding">HFileBlockEncodingContext</a>&nbsp;encodingCtx,
+<td class="colLast"><span 
class="strong">NoOpDataBlockEncoder.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/NoOpDataBlockEncoder.html#endBlockEncoding(org.apache.hadoop.hbase.io.encoding.HFileBlockEncodingContext,%20java.io.DataOutputStream,%20byte[],%20org.apache.hadoop.hbase.io.hfile.BlockType)">endBlockEncoding</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockEncodingContext.html"
 title="interface in 
org.apache.hadoop.hbase.io.encoding">HFileBlockEncodingContext</a>&nbsp;encodingCtx,
                                 <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/DataOutputStream.html?is-external=true";
 title="class or interface in java.io">DataOutputStream</a>&nbsp;out,
                                 byte[]&nbsp;uncompressedBytesWithHeader,
                                 <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in 
org.apache.hadoop.hbase.io.hfile">BlockType</a>&nbsp;blockType)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">NoOpDataBlockEncoder.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/NoOpDataBlockEncoder.html#endBlockEncoding(org.apache.hadoop.hbase.io.encoding.HFileBlockEncodingContext,%20java.io.DataOutputStream,%20byte[],%20org.apache.hadoop.hbase.io.hfile.BlockType)">endBlockEncoding</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockEncodingContext.html"
 title="interface in 
org.apache.hadoop.hbase.io.encoding">HFileBlockEncodingContext</a>&nbsp;encodingCtx,
+<td class="colLast"><span 
class="strong">HFileDataBlockEncoderImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileDataBlockEncoderImpl.html#endBlockEncoding(org.apache.hadoop.hbase.io.encoding.HFileBlockEncodingContext,%20java.io.DataOutputStream,%20byte[],%20org.apache.hadoop.hbase.io.hfile.BlockType)">endBlockEncoding</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockEncodingContext.html"
 title="interface in 
org.apache.hadoop.hbase.io.encoding">HFileBlockEncodingContext</a>&nbsp;encodingCtx,
                                 <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/DataOutputStream.html?is-external=true";
 title="class or interface in java.io">DataOutputStream</a>&nbsp;out,
                                 byte[]&nbsp;uncompressedBytesWithHeader,
                                 <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in 
org.apache.hadoop.hbase.io.hfile">BlockType</a>&nbsp;blockType)</code>&nbsp;</td>
@@ -347,27 +347,27 @@ the order they are declared.</div>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.html" 
title="class in org.apache.hadoop.hbase.io.hfile">HFileBlock</a></code></td>
-<td class="colLast"><span 
class="strong">HFileReaderImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.html#readBlock(long,%20long,%20boolean,%20boolean,%20boolean,%20boolean,%20org.apache.hadoop.hbase.io.hfile.BlockType,%20org.apache.hadoop.hbase.io.encoding.DataBlockEncoding)">readBlock</a></strong>(long&nbsp;dataBlockOffset,
+<td class="colLast"><span 
class="strong">HFile.CachingBlockReader.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.CachingBlockReader.html#readBlock(long,%20long,%20boolean,%20boolean,%20boolean,%20boolean,%20org.apache.hadoop.hbase.io.hfile.BlockType,%20org.apache.hadoop.hbase.io.encoding.DataBlockEncoding)">readBlock</a></strong>(long&nbsp;offset,
                   long&nbsp;onDiskBlockSize,
                   boolean&nbsp;cacheBlock,
                   boolean&nbsp;pread,
                   boolean&nbsp;isCompaction,
                   boolean&nbsp;updateCacheMetrics,
                   <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in 
org.apache.hadoop.hbase.io.hfile">BlockType</a>&nbsp;expectedBlockType,
-                  <a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/DataBlockEncoding.html"
 title="enum in 
org.apache.hadoop.hbase.io.encoding">DataBlockEncoding</a>&nbsp;expectedDataBlockEncoding)</code>&nbsp;</td>
+                  <a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/DataBlockEncoding.html"
 title="enum in 
org.apache.hadoop.hbase.io.encoding">DataBlockEncoding</a>&nbsp;expectedDataBlockEncoding)</code>
+<div class="block">Read in a file block.</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.html" 
title="class in org.apache.hadoop.hbase.io.hfile">HFileBlock</a></code></td>
-<td class="colLast"><span 
class="strong">HFile.CachingBlockReader.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.CachingBlockReader.html#readBlock(long,%20long,%20boolean,%20boolean,%20boolean,%20boolean,%20org.apache.hadoop.hbase.io.hfile.BlockType,%20org.apache.hadoop.hbase.io.encoding.DataBlockEncoding)">readBlock</a></strong>(long&nbsp;offset,
+<td class="colLast"><span 
class="strong">HFileReaderImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.html#readBlock(long,%20long,%20boolean,%20boolean,%20boolean,%20boolean,%20org.apache.hadoop.hbase.io.hfile.BlockType,%20org.apache.hadoop.hbase.io.encoding.DataBlockEncoding)">readBlock</a></strong>(long&nbsp;dataBlockOffset,
                   long&nbsp;onDiskBlockSize,
                   boolean&nbsp;cacheBlock,
                   boolean&nbsp;pread,
                   boolean&nbsp;isCompaction,
                   boolean&nbsp;updateCacheMetrics,
                   <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in 
org.apache.hadoop.hbase.io.hfile">BlockType</a>&nbsp;expectedBlockType,
-                  <a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/DataBlockEncoding.html"
 title="enum in 
org.apache.hadoop.hbase.io.encoding">DataBlockEncoding</a>&nbsp;expectedDataBlockEncoding)</code>
-<div class="block">Read in a file block.</div>
-</td>
+                  <a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/DataBlockEncoding.html"
 title="enum in 
org.apache.hadoop.hbase.io.encoding">DataBlockEncoding</a>&nbsp;expectedDataBlockEncoding)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>private void</code></td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/33c287c2/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheConfig.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheConfig.html 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheConfig.html
index 58f8c31..7eb55a8 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheConfig.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheConfig.html
@@ -231,17 +231,15 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
-<td class="colLast"><span 
class="strong">HFileReaderImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.html#cacheConf">cacheConf</a></strong></code>
-<div class="block">Block cache configuration.</div>
-</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><code>protected <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
 <td class="colLast"><span 
class="strong">HFileWriterImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileWriterImpl.html#cacheConf">cacheConf</a></strong></code>
 <div class="block">Cache configuration for caching data on write.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>protected <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
+<td class="colLast"><span 
class="strong">HFile.WriterFactory.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.WriterFactory.html#cacheConf">cacheConf</a></strong></code>&nbsp;</td>
+</tr>
 <tr class="altColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
 <td class="colLast"><span 
class="strong">HFileBlockIndex.BlockIndexWriter.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.BlockIndexWriter.html#cacheConf">cacheConf</a></strong></code>
@@ -249,8 +247,10 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>protected <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
-<td class="colLast"><span 
class="strong">HFile.WriterFactory.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.WriterFactory.html#cacheConf">cacheConf</a></strong></code>&nbsp;</td>
+<td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
+<td class="colLast"><span 
class="strong">HFileReaderImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.html#cacheConf">cacheConf</a></strong></code>
+<div class="block">Block cache configuration.</div>
+</td>
 </tr>
 </tbody>
 </table>
@@ -405,6 +405,13 @@
 </td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code>static <a 
href="../../../../../../../org/apache/hadoop/hbase/mob/CachedMobFile.html" 
title="class in org.apache.hadoop.hbase.mob">CachedMobFile</a></code></td>
+<td class="colLast"><span class="strong">CachedMobFile.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/mob/CachedMobFile.html#create(org.apache.hadoop.fs.FileSystem,%20org.apache.hadoop.fs.Path,%20org.apache.hadoop.conf.Configuration,%20org.apache.hadoop.hbase.io.hfile.CacheConfig)">create</a></strong>(org.apache.hadoop.fs.FileSystem&nbsp;fs,
+            org.apache.hadoop.fs.Path&nbsp;path,
+            org.apache.hadoop.conf.Configuration&nbsp;conf,
+            <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">CacheConfig</a>&nbsp;cacheConf)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>static <a 
href="../../../../../../../org/apache/hadoop/hbase/mob/MobFile.html" 
title="class in org.apache.hadoop.hbase.mob">MobFile</a></code></td>
 <td class="colLast"><span class="strong">MobFile.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/mob/MobFile.html#create(org.apache.hadoop.fs.FileSystem,%20org.apache.hadoop.fs.Path,%20org.apache.hadoop.conf.Configuration,%20org.apache.hadoop.hbase.io.hfile.CacheConfig)">create</a></strong>(org.apache.hadoop.fs.FileSystem&nbsp;fs,
             org.apache.hadoop.fs.Path&nbsp;path,
@@ -413,13 +420,6 @@
 <div class="block">Creates an instance of the MobFile.</div>
 </td>
 </tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static <a 
href="../../../../../../../org/apache/hadoop/hbase/mob/CachedMobFile.html" 
title="class in org.apache.hadoop.hbase.mob">CachedMobFile</a></code></td>
-<td class="colLast"><span class="strong">CachedMobFile.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/mob/CachedMobFile.html#create(org.apache.hadoop.fs.FileSystem,%20org.apache.hadoop.fs.Path,%20org.apache.hadoop.conf.Configuration,%20org.apache.hadoop.hbase.io.hfile.CacheConfig)">create</a></strong>(org.apache.hadoop.fs.FileSystem&nbsp;fs,
-            org.apache.hadoop.fs.Path&nbsp;path,
-            org.apache.hadoop.conf.Configuration&nbsp;conf,
-            <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">CacheConfig</a>&nbsp;cacheConf)</code>&nbsp;</td>
-</tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/StoreFileWriter.html"
 title="class in 
org.apache.hadoop.hbase.regionserver">StoreFileWriter</a></code></td>
 <td class="colLast"><span class="strong">MobUtils.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/mob/MobUtils.html#createDelFileWriter(org.apache.hadoop.conf.Configuration,%20org.apache.hadoop.fs.FileSystem,%20org.apache.hadoop.hbase.HColumnDescriptor,%20java.lang.String,%20org.apache.hadoop.fs.Path,%20long,%20org.apache.hadoop.hbase.io.compress.Compression.Algorithm,%20byte[],%20org.apache.hadoop.hbase.io.hfile.CacheConfig,%20org.apache.hadoop.hbase.io.crypto.Encryption.Context)">createDelFileWriter</a></strong>(org.apache.hadoop.conf.Configuration&nbsp;conf,
@@ -534,15 +534,15 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
-<td class="colLast"><span class="strong">SweepJob.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/mob/mapreduce/SweepJob.html#cacheConfig">cacheConfig</a></strong></code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">MemStoreWrapper.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/mob/mapreduce/MemStoreWrapper.html#cacheConfig">cacheConfig</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
-<td class="colLast"><span class="strong">SweepReducer.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/mob/mapreduce/SweepReducer.html#cacheConfig">cacheConfig</a></strong></code>&nbsp;</td>
+<td class="colLast"><span class="strong">SweepJob.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/mob/mapreduce/SweepJob.html#cacheConfig">cacheConfig</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
-<td class="colLast"><span 
class="strong">MemStoreWrapper.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/mob/mapreduce/MemStoreWrapper.html#cacheConfig">cacheConfig</a></strong></code>&nbsp;</td>
+<td class="colLast"><span class="strong">SweepReducer.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/mob/mapreduce/SweepReducer.html#cacheConfig">cacheConfig</a></strong></code>&nbsp;</td>
 </tr>
 </tbody>
 </table>
@@ -575,16 +575,16 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><code>protected <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
-<td class="colLast"><span class="strong">HStore.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/HStore.html#cacheConf">cacheConf</a></strong></code>&nbsp;</td>
+<td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
+<td class="colLast"><span 
class="strong">StoreFileWriter.Builder.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/StoreFileWriter.Builder.html#cacheConf">cacheConf</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
 <td class="colLast"><span class="strong">StoreFile.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/StoreFile.html#cacheConf">cacheConf</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
-<td class="colLast"><span 
class="strong">StoreFileWriter.Builder.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/StoreFileWriter.Builder.html#cacheConf">cacheConf</a></strong></code>&nbsp;</td>
+<td class="colFirst"><code>protected <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
+<td class="colLast"><span class="strong">HStore.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/HStore.html#cacheConf">cacheConf</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>protected <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
@@ -605,7 +605,7 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
-<td class="colLast"><span class="strong">HStore.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/HStore.html#getCacheConfig()">getCacheConfig</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">HRegionServer.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html#getCacheConfig()">getCacheConfig</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
@@ -615,7 +615,7 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
-<td class="colLast"><span class="strong">HRegionServer.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html#getCacheConfig()">getCacheConfig</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">HStore.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/HStore.html#getCacheConfig()">getCacheConfig</a></strong>()</code>&nbsp;</td>
 </tr>
 </tbody>
 </table>
@@ -727,11 +727,11 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
-<td class="colLast"><span 
class="strong">BlockCacheTmplImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmplImpl.html#cacheConfig">cacheConfig</a></strong></code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">BlockCacheViewTmplImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheViewTmplImpl.html#cacheConfig">cacheConfig</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
-<td class="colLast"><span 
class="strong">BlockCacheViewTmplImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheViewTmplImpl.html#cacheConfig">cacheConfig</a></strong></code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">BlockCacheTmplImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmplImpl.html#cacheConfig">cacheConfig</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/33c287c2/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheStats.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheStats.html 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheStats.html
index 7dfafa9..dc61c71 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheStats.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheStats.html
@@ -150,9 +150,7 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheStats.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheStats</a></code></td>
-<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#getStats()">getStats</a></strong>()</code>
-<div class="block">Get the statistics for this block cache.</div>
-</td>
+<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#getStats()">getStats</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheStats.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheStats</a></code></td>
@@ -162,7 +160,9 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheStats.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheStats</a></code></td>
-<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#getStats()">getStats</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#getStats()">getStats</a></strong>()</code>
+<div class="block">Get the statistics for this block cache.</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheStats.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheStats</a></code></td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/33c287c2/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/Cacheable.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/Cacheable.html 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/Cacheable.html
index 42b48f5..62df01b 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/Cacheable.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/Cacheable.html
@@ -168,35 +168,35 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
-<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20boolean,%20boolean,%20boolean)">getBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+<td class="colLast"><span 
class="strong">InclusiveCombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/InclusiveCombinedBlockCache.html#getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20boolean,%20boolean,%20boolean)">getBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
                 boolean&nbsp;caching,
                 boolean&nbsp;repeat,
-                boolean&nbsp;updateCacheMetrics)</code>
-<div class="block">Fetch block from cache.</div>
-</td>
+                boolean&nbsp;updateCacheMetrics)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
-<td class="colLast"><span class="strong">LruBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20boolean,%20boolean,%20boolean)">getBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20boolean,%20boolean,%20boolean)">getBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
                 boolean&nbsp;caching,
                 boolean&nbsp;repeat,
-                boolean&nbsp;updateCacheMetrics)</code>
-<div class="block">Get the buffer of the block with the specified name.</div>
-</td>
+                boolean&nbsp;updateCacheMetrics)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
-<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20boolean,%20boolean,%20boolean)">getBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+<td class="colLast"><span class="strong">LruBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20boolean,%20boolean,%20boolean)">getBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
                 boolean&nbsp;caching,
                 boolean&nbsp;repeat,
-                boolean&nbsp;updateCacheMetrics)</code>&nbsp;</td>
+                boolean&nbsp;updateCacheMetrics)</code>
+<div class="block">Get the buffer of the block with the specified name.</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
-<td class="colLast"><span 
class="strong">InclusiveCombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/InclusiveCombinedBlockCache.html#getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20boolean,%20boolean,%20boolean)">getBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20boolean,%20boolean,%20boolean)">getBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
                 boolean&nbsp;caching,
                 boolean&nbsp;repeat,
-                boolean&nbsp;updateCacheMetrics)</code>&nbsp;</td>
+                boolean&nbsp;updateCacheMetrics)</code>
+<div class="block">Fetch block from cache.</div>
+</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
@@ -245,10 +245,8 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
-                    <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;buf)</code>
-<div class="block">Add block to cache (defaults to not in-memory).</div>
-</td>
+<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+                    <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;buf)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
@@ -259,8 +257,10 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
-                    <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;buf)</code>&nbsp;</td>
+<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+                    <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;buf)</code>
+<div class="block">Add block to cache (defaults to not in-memory).</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
@@ -269,35 +269,35 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable,%20boolean,%20boolean)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+<td class="colLast"><span 
class="strong">InclusiveCombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/InclusiveCombinedBlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable,%20boolean,%20boolean)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
                     <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;buf,
                     boolean&nbsp;inMemory,
-                    boolean&nbsp;cacheDataInL1)</code>
-<div class="block">Add block to cache.</div>
-</td>
+                    boolean&nbsp;cacheDataInL1)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">LruBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable,%20boolean,%20boolean)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable,%20boolean,%20boolean)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
                     <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;buf,
                     boolean&nbsp;inMemory,
-                    boolean&nbsp;cacheDataInL1)</code>
-<div class="block">Cache the block with the specified name and buffer.</div>
-</td>
+                    boolean&nbsp;cacheDataInL1)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable,%20boolean,%20boolean)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+<td class="colLast"><span class="strong">LruBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable,%20boolean,%20boolean)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
                     <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;buf,
                     boolean&nbsp;inMemory,
-                    boolean&nbsp;cacheDataInL1)</code>&nbsp;</td>
+                    boolean&nbsp;cacheDataInL1)</code>
+<div class="block">Cache the block with the specified name and buffer.</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">InclusiveCombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/InclusiveCombinedBlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable,%20boolean,%20boolean)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable,%20boolean,%20boolean)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
                     <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;buf,
                     boolean&nbsp;inMemory,
-                    boolean&nbsp;cacheDataInL1)</code>&nbsp;</td>
+                    boolean&nbsp;cacheDataInL1)</code>
+<div class="block">Add block to cache.</div>
+</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
@@ -313,11 +313,8 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#returnBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable)">returnBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
-                      <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;block)</code>
-<div class="block">Called when the scanner using the block decides to return 
the block once its usage
- is over.</div>
-</td>
+<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#returnBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable)">returnBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+                      <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;block)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
@@ -326,8 +323,11 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#returnBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable)">returnBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
-                      <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;block)</code>&nbsp;</td>
+<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#returnBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable)">returnBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+                      <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;block)</code>
+<div class="block">Called when the scanner using the block decides to return 
the block once its usage
+ is over.</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
@@ -411,23 +411,23 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
-<td class="colLast"><span 
class="strong">FileMmapEngine.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileMmapEngine.html#read(long,%20int,%20org.apache.hadoop.hbase.io.hfile.CacheableDeserializer)">read</a></strong>(long&nbsp;offset,
+<td class="colLast"><span 
class="strong">ByteBufferIOEngine.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/ByteBufferIOEngine.html#read(long,%20int,%20org.apache.hadoop.hbase.io.hfile.CacheableDeserializer)">read</a></strong>(long&nbsp;offset,
         int&nbsp;length,
         <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheableDeserializer.html"
 title="interface in 
org.apache.hadoop.hbase.io.hfile">CacheableDeserializer</a>&lt;<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&gt;&nbsp;deserializer)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
-<td class="colLast"><span class="strong">FileIOEngine.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#read(long,%20int,%20org.apache.hadoop.hbase.io.hfile.CacheableDeserializer)">read</a></strong>(long&nbsp;offset,
+<td class="colLast"><span 
class="strong">FileMmapEngine.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileMmapEngine.html#read(long,%20int,%20org.apache.hadoop.hbase.io.hfile.CacheableDeserializer)">read</a></strong>(long&nbsp;offset,
         int&nbsp;length,
-        <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheableDeserializer.html"
 title="interface in 
org.apache.hadoop.hbase.io.hfile">CacheableDeserializer</a>&lt;<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&gt;&nbsp;deserializer)</code>
-<div class="block">Transfers data from file to the given byte buffer</div>
-</td>
+        <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheableDeserializer.html"
 title="interface in 
org.apache.hadoop.hbase.io.hfile">CacheableDeserializer</a>&lt;<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&gt;&nbsp;deserializer)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
-<td class="colLast"><span 
class="strong">ByteBufferIOEngine.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/ByteBufferIOEngine.html#read(long,%20int,%20org.apache.hadoop.hbase.io.hfile.CacheableDeserializer)">read</a></strong>(long&nbsp;offset,
+<td class="colLast"><span class="strong">FileIOEngine.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#read(long,%20int,%20org.apache.hadoop.hbase.io.hfile.CacheableDeserializer)">read</a></strong>(long&nbsp;offset,
         int&nbsp;length,
-        <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheableDeserializer.html"
 title="interface in 
org.apache.hadoop.hbase.io.hfile">CacheableDeserializer</a>&lt;<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&gt;&nbsp;deserializer)</code>&nbsp;</td>
+        <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheableDeserializer.html"
 title="interface in 
org.apache.hadoop.hbase.io.hfile">CacheableDeserializer</a>&lt;<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&gt;&nbsp;deserializer)</code>
+<div class="block">Transfers data from file to the given byte buffer</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
@@ -500,23 +500,23 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
-<td class="colLast"><span 
class="strong">FileMmapEngine.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileMmapEngine.html#read(long,%20int,%20org.apache.hadoop.hbase.io.hfile.CacheableDeserializer)">read</a></strong>(long&nbsp;offset,
+<td class="colLast"><span 
class="strong">ByteBufferIOEngine.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/ByteBufferIOEngine.html#read(long,%20int,%20org.apache.hadoop.hbase.io.hfile.CacheableDeserializer)">read</a></strong>(long&nbsp;offset,
         int&nbsp;length,
         <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheableDeserializer.html"
 title="interface in 
org.apache.hadoop.hbase.io.hfile">CacheableDeserializer</a>&lt;<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&gt;&nbsp;deserializer)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
-<td class="colLast"><span class="strong">FileIOEngine.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#read(long,%20int,%20org.apache.hadoop.hbase.io.hfile.CacheableDeserializer)">read</a></strong>(long&nbsp;offset,
+<td class="colLast"><span 
class="strong">FileMmapEngine.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileMmapEngine.html#read(long,%20int,%20org.apache.hadoop.hbase.io.hfile.CacheableDeserializer)">read</a></strong>(long&nbsp;offset,
         int&nbsp;length,
-        <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheableDeserializer.html"
 title="interface in 
org.apache.hadoop.hbase.io.hfile">CacheableDeserializer</a>&lt;<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&gt;&nbsp;deserializer)</code>
-<div class="block">Transfers data from file to the given byte buffer</div>
-</td>
+        <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheableDeserializer.html"
 title="interface in 
org.apache.hadoop.hbase.io.hfile">CacheableDeserializer</a>&lt;<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&gt;&nbsp;deserializer)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
-<td class="colLast"><span 
class="strong">ByteBufferIOEngine.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/ByteBufferIOEngine.html#read(long,%20int,%20org.apache.hadoop.hbase.io.hfile.CacheableDeserializer)">read</a></strong>(long&nbsp;offset,
+<td class="colLast"><span class="strong">FileIOEngine.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#read(long,%20int,%20org.apache.hadoop.hbase.io.hfile.CacheableDeserializer)">read</a></strong>(long&nbsp;offset,
         int&nbsp;length,
-        <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheableDeserializer.html"
 title="interface in 
org.apache.hadoop.hbase.io.hfile">CacheableDeserializer</a>&lt;<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&gt;&nbsp;deserializer)</code>&nbsp;</td>
+        <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheableDeserializer.html"
 title="interface in 
org.apache.hadoop.hbase.io.hfile">CacheableDeserializer</a>&lt;<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&gt;&nbsp;deserializer)</code>
+<div class="block">Transfers data from file to the given byte buffer</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/33c287c2/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheableDeserializer.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheableDeserializer.html
 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheableDeserializer.html
index d71e022..8490881 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheableDeserializer.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheableDeserializer.html
@@ -193,23 +193,23 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
-<td class="colLast"><span 
class="strong">FileMmapEngine.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileMmapEngine.html#read(long,%20int,%20org.apache.hadoop.hbase.io.hfile.CacheableDeserializer)">read</a></strong>(long&nbsp;offset,
+<td class="colLast"><span 
class="strong">ByteBufferIOEngine.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/ByteBufferIOEngine.html#read(long,%20int,%20org.apache.hadoop.hbase.io.hfile.CacheableDeserializer)">read</a></strong>(long&nbsp;offset,
         int&nbsp;length,
         <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheableDeserializer.html"
 title="interface in 
org.apache.hadoop.hbase.io.hfile">CacheableDeserializer</a>&lt;<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&gt;&nbsp;deserializer)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
-<td class="colLast"><span class="strong">FileIOEngine.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#read(long,%20int,%20org.apache.hadoop.hbase.io.hfile.CacheableDeserializer)">read</a></strong>(long&nbsp;offset,
+<td class="colLast"><span 
class="strong">FileMmapEngine.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileMmapEngine.html#read(long,%20int,%20org.apache.hadoop.hbase.io.hfile.CacheableDeserializer)">read</a></strong>(long&nbsp;offset,
         int&nbsp;length,
-        <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheableDeserializer.html"
 title="interface in 
org.apache.hadoop.hbase.io.hfile">CacheableDeserializer</a>&lt;<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&gt;&nbsp;deserializer)</code>
-<div class="block">Transfers data from file to the given byte buffer</div>
-</td>
+        <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheableDeserializer.html"
 title="interface in 
org.apache.hadoop.hbase.io.hfile">CacheableDeserializer</a>&lt;<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&gt;&nbsp;deserializer)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
-<td class="colLast"><span 
class="strong">ByteBufferIOEngine.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/ByteBufferIOEngine.html#read(long,%20int,%20org.apache.hadoop.hbase.io.hfile.CacheableDeserializer)">read</a></strong>(long&nbsp;offset,
+<td class="colLast"><span class="strong">FileIOEngine.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#read(long,%20int,%20org.apache.hadoop.hbase.io.hfile.CacheableDeserializer)">read</a></strong>(long&nbsp;offset,
         int&nbsp;length,
-        <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheableDeserializer.html"
 title="interface in 
org.apache.hadoop.hbase.io.hfile">CacheableDeserializer</a>&lt;<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&gt;&nbsp;deserializer)</code>&nbsp;</td>
+        <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheableDeserializer.html"
 title="interface in 
org.apache.hadoop.hbase.io.hfile">CacheableDeserializer</a>&lt;<a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&gt;&nbsp;deserializer)</code>
+<div class="block">Transfers data from file to the given byte buffer</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>

Reply via email to