http://git-wip-us.apache.org/repos/asf/hbase-site/blob/3c6f3528/devapidocs/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html
index b742702..1eb6cab 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html
@@ -105,7 +105,7 @@
 <hr>
 <br>
 <pre><a 
href="../../../../../../org/apache/hadoop/hbase/classification/InterfaceAudience.Private.html"
 title="annotation in 
org.apache.hadoop.hbase.classification">@InterfaceAudience.Private</a>
-public class <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.44">CompoundBloomFilterWriter</a>
+public class <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.45">CompoundBloomFilterWriter</a>
 extends <a 
href="../../../../../../org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterBase.html"
 title="class in org.apache.hadoop.hbase.io.hfile">CompoundBloomFilterBase</a>
 implements <a 
href="../../../../../../org/apache/hadoop/hbase/util/BloomFilterWriter.html" 
title="interface in org.apache.hadoop.hbase.util">BloomFilterWriter</a>, <a 
href="../../../../../../org/apache/hadoop/hbase/io/hfile/InlineBlockWriter.html"
 title="interface in 
org.apache.hadoop.hbase.io.hfile">InlineBlockWriter</a></pre>
 <div class="block">Adds methods required for writing a compound Bloom filter 
to the data
@@ -351,7 +351,7 @@ implements <a 
href="../../../../../../org/apache/hadoop/hbase/util/BloomFilterWr
 <ul class="blockList">
 <li class="blockList">
 <h4>LOG</h4>
-<pre>private static final&nbsp;org.apache.commons.logging.Log <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.47">LOG</a></pre>
+<pre>private static final&nbsp;org.apache.commons.logging.Log <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.48">LOG</a></pre>
 </li>
 </ul>
 <a name="chunk">
@@ -360,7 +360,7 @@ implements <a 
href="../../../../../../org/apache/hadoop/hbase/util/BloomFilterWr
 <ul class="blockList">
 <li class="blockList">
 <h4>chunk</h4>
-<pre>private&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/util/BloomFilterChunk.html" 
title="class in org.apache.hadoop.hbase.util">BloomFilterChunk</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.51">chunk</a></pre>
+<pre>private&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/util/BloomFilterChunk.html" 
title="class in org.apache.hadoop.hbase.util">BloomFilterChunk</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.52">chunk</a></pre>
 <div class="block">The current chunk being written to</div>
 </li>
 </ul>
@@ -370,7 +370,7 @@ implements <a 
href="../../../../../../org/apache/hadoop/hbase/util/BloomFilterWr
 <ul class="blockList">
 <li class="blockList">
 <h4>prevChunk</h4>
-<pre>private&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/util/BloomFilterChunk.html" 
title="class in org.apache.hadoop.hbase.util">BloomFilterChunk</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.54">prevChunk</a></pre>
+<pre>private&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/util/BloomFilterChunk.html" 
title="class in org.apache.hadoop.hbase.util">BloomFilterChunk</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.55">prevChunk</a></pre>
 <div class="block">Previous chunk, so that we can create another similar 
chunk</div>
 </li>
 </ul>
@@ -380,7 +380,7 @@ implements <a 
href="../../../../../../org/apache/hadoop/hbase/util/BloomFilterWr
 <ul class="blockList">
 <li class="blockList">
 <h4>maxFold</h4>
-<pre>private&nbsp;int <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.57">maxFold</a></pre>
+<pre>private&nbsp;int <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.58">maxFold</a></pre>
 <div class="block">Maximum fold factor</div>
 </li>
 </ul>
@@ -390,7 +390,7 @@ implements <a 
href="../../../../../../org/apache/hadoop/hbase/util/BloomFilterWr
 <ul class="blockList">
 <li class="blockList">
 <h4>chunkByteSize</h4>
-<pre>private&nbsp;int <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.60">chunkByteSize</a></pre>
+<pre>private&nbsp;int <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.61">chunkByteSize</a></pre>
 <div class="block">The size of individual Bloom filter chunks to create</div>
 </li>
 </ul>
@@ -400,7 +400,7 @@ implements <a 
href="../../../../../../org/apache/hadoop/hbase/util/BloomFilterWr
 <ul class="blockList">
 <li class="blockList">
 <h4>readyChunks</h4>
-<pre>private&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/Queue.html?is-external=true";
 title="class or interface in java.util">Queue</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.ReadyChunk.html"
 title="class in 
org.apache.hadoop.hbase.io.hfile">CompoundBloomFilterWriter.ReadyChunk</a>&gt; 
<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.69">readyChunks</a></pre>
+<pre>private&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/Queue.html?is-external=true";
 title="class or interface in java.util">Queue</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.ReadyChunk.html"
 title="class in 
org.apache.hadoop.hbase.io.hfile">CompoundBloomFilterWriter.ReadyChunk</a>&gt; 
<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.70">readyChunks</a></pre>
 </li>
 </ul>
 <a name="firstKeyInChunk">
@@ -409,7 +409,7 @@ implements <a 
href="../../../../../../org/apache/hadoop/hbase/util/BloomFilterWr
 <ul class="blockList">
 <li class="blockList">
 <h4>firstKeyInChunk</h4>
-<pre>private&nbsp;byte[] <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.72">firstKeyInChunk</a></pre>
+<pre>private&nbsp;byte[] <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.73">firstKeyInChunk</a></pre>
 <div class="block">The first key in the current Bloom filter chunk.</div>
 </li>
 </ul>
@@ -419,7 +419,7 @@ implements <a 
href="../../../../../../org/apache/hadoop/hbase/util/BloomFilterWr
 <ul class="blockList">
 <li class="blockList">
 <h4>bloomBlockIndexWriter</h4>
-<pre>private&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.BlockIndexWriter.html"
 title="class in 
org.apache.hadoop.hbase.io.hfile">HFileBlockIndex.BlockIndexWriter</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.74">bloomBlockIndexWriter</a></pre>
+<pre>private&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.BlockIndexWriter.html"
 title="class in 
org.apache.hadoop.hbase.io.hfile">HFileBlockIndex.BlockIndexWriter</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.75">bloomBlockIndexWriter</a></pre>
 </li>
 </ul>
 <a name="cacheOnWrite">
@@ -428,7 +428,7 @@ implements <a 
href="../../../../../../org/apache/hadoop/hbase/util/BloomFilterWr
 <ul class="blockListLast">
 <li class="blockList">
 <h4>cacheOnWrite</h4>
-<pre>private&nbsp;boolean <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.78">cacheOnWrite</a></pre>
+<pre>private&nbsp;boolean <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.79">cacheOnWrite</a></pre>
 <div class="block">Whether to cache-on-write compound Bloom filter chunks</div>
 </li>
 </ul>
@@ -446,7 +446,7 @@ implements <a 
href="../../../../../../org/apache/hadoop/hbase/util/BloomFilterWr
 <ul class="blockListLast">
 <li class="blockList">
 <h4>CompoundBloomFilterWriter</h4>
-<pre>public&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.91">CompoundBloomFilterWriter</a>(int&nbsp;chunkByteSizeHint,
+<pre>public&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.92">CompoundBloomFilterWriter</a>(int&nbsp;chunkByteSizeHint,
                          float&nbsp;errorRate,
                          int&nbsp;hashType,
                          int&nbsp;maxFold,
@@ -470,7 +470,7 @@ implements <a 
href="../../../../../../org/apache/hadoop/hbase/util/BloomFilterWr
 <ul class="blockList">
 <li class="blockList">
 <h4>shouldWriteBlock</h4>
-<pre>public&nbsp;boolean&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.105">shouldWriteBlock</a>(boolean&nbsp;closing)</pre>
+<pre>public&nbsp;boolean&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.106">shouldWriteBlock</a>(boolean&nbsp;closing)</pre>
 <div class="block"><strong>Description copied from interface:&nbsp;<code><a 
href="../../../../../../org/apache/hadoop/hbase/io/hfile/InlineBlockWriter.html#shouldWriteBlock(boolean)">InlineBlockWriter</a></code></strong></div>
 <div class="block">Determines whether there is a new block to be written 
out.</div>
 <dl>
@@ -486,7 +486,7 @@ implements <a 
href="../../../../../../org/apache/hadoop/hbase/util/BloomFilterWr
 <ul class="blockList">
 <li class="blockList">
 <h4>enqueueReadyChunk</h4>
-<pre>private&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.116">enqueueReadyChunk</a>(boolean&nbsp;closing)</pre>
+<pre>private&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.117">enqueueReadyChunk</a>(boolean&nbsp;closing)</pre>
 <div class="block">Enqueue the current chunk if it is ready to be written 
out.</div>
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>closing</code> - 
true if we are closing the file, so we do not expect new
         keys to show up</dd></dl>
@@ -498,13 +498,13 @@ implements <a 
href="../../../../../../org/apache/hadoop/hbase/util/BloomFilterWr
 <ul class="blockList">
 <li class="blockList">
 <h4>add</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.162">add</a>(byte[]&nbsp;bloomKey,
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.163">add</a>(byte[]&nbsp;bloomKey,
        int&nbsp;keyOffset,
        int&nbsp;keyLength)</pre>
 <div class="block">Adds a Bloom filter key. This key must be greater than the 
previous key,
  as defined by the comparator this compound Bloom filter is configured
  with. For efficiency, key monotonicity is not checked here. See
- <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/StoreFile.Writer.html#append(org.apache.hadoop.hbase.Cell)"><code>StoreFile.Writer.append(
+ <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/StoreFileWriter.html#append(org.apache.hadoop.hbase.Cell)"><code>StoreFileWriter.append(
  org.apache.hadoop.hbase.Cell)</code></a> for the details of 
deduplication.</div>
 <dl>
 <dt><strong>Specified by:</strong></dt>
@@ -518,7 +518,7 @@ implements <a 
href="../../../../../../org/apache/hadoop/hbase/util/BloomFilterWr
 <ul class="blockList">
 <li class="blockList">
 <h4>writeInlineBlock</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.200">writeInlineBlock</a>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/io/DataOutput.html?is-external=true";
 title="class or interface in java.io">DataOutput</a>&nbsp;out)
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.201">writeInlineBlock</a>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/io/DataOutput.html?is-external=true";
 title="class or interface in java.io">DataOutput</a>&nbsp;out)
                       throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
 <div class="block"><strong>Description copied from interface:&nbsp;<code><a 
href="../../../../../../org/apache/hadoop/hbase/io/hfile/InlineBlockWriter.html#writeInlineBlock(java.io.DataOutput)">InlineBlockWriter</a></code></strong></div>
 <div class="block">Writes the block to the provided stream. Must not write any 
magic records.
@@ -537,7 +537,7 @@ implements <a 
href="../../../../../../org/apache/hadoop/hbase/util/BloomFilterWr
 <ul class="blockList">
 <li class="blockList">
 <h4>blockWritten</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.210">blockWritten</a>(long&nbsp;offset,
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.211">blockWritten</a>(long&nbsp;offset,
                 int&nbsp;onDiskSize,
                 int&nbsp;uncompressedSize)</pre>
 <div class="block"><strong>Description copied from interface:&nbsp;<code><a 
href="../../../../../../org/apache/hadoop/hbase/io/hfile/InlineBlockWriter.html#blockWritten(long,%20int,%20int)">InlineBlockWriter</a></code></strong></div>
@@ -557,7 +557,7 @@ implements <a 
href="../../../../../../org/apache/hadoop/hbase/util/BloomFilterWr
 <ul class="blockList">
 <li class="blockList">
 <h4>getInlineBlockType</h4>
-<pre>public&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a>&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.216">getInlineBlockType</a>()</pre>
+<pre>public&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a>&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.217">getInlineBlockType</a>()</pre>
 <div class="block"><strong>Description copied from interface:&nbsp;<code><a 
href="../../../../../../org/apache/hadoop/hbase/io/hfile/InlineBlockWriter.html#getInlineBlockType()">InlineBlockWriter</a></code></strong></div>
 <div class="block">The type of blocks this block writer produces.</div>
 <dl>
@@ -572,7 +572,7 @@ implements <a 
href="../../../../../../org/apache/hadoop/hbase/util/BloomFilterWr
 <ul class="blockList">
 <li class="blockList">
 <h4>compactBloom</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.260">compactBloom</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.261">compactBloom</a>()</pre>
 <div class="block"><strong>Description copied from interface:&nbsp;<code><a 
href="../../../../../../org/apache/hadoop/hbase/util/BloomFilterWriter.html#compactBloom()">BloomFilterWriter</a></code></strong></div>
 <div class="block">Compact the Bloom filter before writing metadata &amp; data 
to disk.</div>
 <dl>
@@ -587,7 +587,7 @@ implements <a 
href="../../../../../../org/apache/hadoop/hbase/util/BloomFilterWr
 <ul class="blockList">
 <li class="blockList">
 <h4>getMetaWriter</h4>
-<pre>public&nbsp;org.apache.hadoop.io.Writable&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.264">getMetaWriter</a>()</pre>
+<pre>public&nbsp;org.apache.hadoop.io.Writable&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.265">getMetaWriter</a>()</pre>
 <div class="block"><strong>Description copied from interface:&nbsp;<code><a 
href="../../../../../../org/apache/hadoop/hbase/util/BloomFilterWriter.html#getMetaWriter()">BloomFilterWriter</a></code></strong></div>
 <div class="block">Get a writable interface into bloom filter meta data.</div>
 <dl>
@@ -602,7 +602,7 @@ implements <a 
href="../../../../../../org/apache/hadoop/hbase/util/BloomFilterWr
 <ul class="blockList">
 <li class="blockList">
 <h4>getDataWriter</h4>
-<pre>public&nbsp;org.apache.hadoop.io.Writable&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.269">getDataWriter</a>()</pre>
+<pre>public&nbsp;org.apache.hadoop.io.Writable&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.270">getDataWriter</a>()</pre>
 <div class="block"><strong>Description copied from interface:&nbsp;<code><a 
href="../../../../../../org/apache/hadoop/hbase/util/BloomFilterWriter.html#getDataWriter()">BloomFilterWriter</a></code></strong></div>
 <div class="block">Get a writable interface into bloom filter data (the actual 
Bloom bits).
  Not used for compound Bloom filters.</div>
@@ -618,7 +618,7 @@ implements <a 
href="../../../../../../org/apache/hadoop/hbase/util/BloomFilterWr
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getCacheOnWrite</h4>
-<pre>public&nbsp;boolean&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.274">getCacheOnWrite</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#line.275">getCacheOnWrite</a>()</pre>
 <dl>
 <dt><strong>Specified by:</strong></dt>
 <dd><code><a 
href="../../../../../../org/apache/hadoop/hbase/io/hfile/InlineBlockWriter.html#getCacheOnWrite()">getCacheOnWrite</a></code>&nbsp;in
 interface&nbsp;<code><a 
href="../../../../../../org/apache/hadoop/hbase/io/hfile/InlineBlockWriter.html"
 title="interface in 
org.apache.hadoop.hbase.io.hfile">InlineBlockWriter</a></code></dd>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/3c6f3528/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockCache.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockCache.html 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockCache.html
index e3a17a7..54091a4 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockCache.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockCache.html
@@ -219,11 +219,11 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">BlockCache</a>[]</code></td>
-<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#getBlockCaches()">getBlockCaches</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#getBlockCaches()">getBlockCaches</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">BlockCache</a>[]</code></td>
-<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#getBlockCaches()">getBlockCaches</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#getBlockCaches()">getBlockCaches</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">BlockCache</a>[]</code></td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/3c6f3528/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 090b827..c7550c3 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,16 +160,16 @@
 <tbody>
 <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>
-</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#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>
+<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="altColor">
 <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)">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,
@@ -184,19 +184,19 @@
 </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">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="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#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">Add block to cache.</div>
-</td>
+                    boolean&nbsp;cacheDataInL1)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
@@ -229,14 +229,14 @@
 </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>
-</tr>
-<tr class="rowColor">
-<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>
 </tr>
+<tr class="rowColor">
+<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>
+</tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><span class="strong">LruBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.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>
@@ -247,19 +247,19 @@
 </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">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="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">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">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">Fetch block from cache.</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>
@@ -302,17 +302,17 @@
 </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>
-</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>
 </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>
+</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#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,

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/3c6f3528/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 a83a9f9..100213f 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
@@ -161,20 +161,20 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>private <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">BlockCacheKey.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html#blockType">blockType</a></strong></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>private <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#blockType">blockType</a></strong></code>
 <div class="block">Type of block.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>private <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.Writer.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.Writer.html#blockType">blockType</a></strong></code>
 <div class="block">Current block type.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>private <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">BlockCacheKey.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html#blockType">blockType</a></strong></code>&nbsp;</td>
+</tr>
 </tbody>
 </table>
 <table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing 
methods, and an explanation">
@@ -186,11 +186,13 @@
 <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">BlockCacheKey.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html#getBlockType()">getBlockType</a></strong>()</code>&nbsp;</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="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">Cacheable.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html#getBlockType()">getBlockType</a></strong>()</code>&nbsp;</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>
@@ -198,27 +200,25 @@
 </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>
+<td class="colLast"><span class="strong">BlockCacheKey.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html#getBlockType()">getBlockType</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">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>
+<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">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="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">InlineBlockWriter.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/InlineBlockWriter.html#getInlineBlockType()">getInlineBlockType</a></strong>()</code>
-<div class="block">The type of blocks this block writer produces.</div>
-</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="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">InlineBlockWriter.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/InlineBlockWriter.html#getInlineBlockType()">getInlineBlockType</a></strong>()</code>
+<div class="block">The type of blocks this block writer produces.</div>
+</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a></code></td>
@@ -276,19 +276,19 @@ the order they are declared.</div>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">HFileDataBlockEncoder.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileDataBlockEncoder.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>
-<div class="block">Ends encoding for a block of KeyValues.</div>
-</td>
+                                <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">HFileDataBlockEncoder.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileDataBlockEncoder.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>
+                                <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">Ends encoding for a block of KeyValues.</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></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>
@@ -444,12 +444,12 @@ the order they are declared.</div>
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><code>private void</code></td>
-<td class="colLast"><span 
class="strong">StoreFile.Reader.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/StoreFile.Reader.html#loadBloomfilter(org.apache.hadoop.hbase.io.hfile.BlockType)">loadBloomfilter</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="colFirst"><code>void</code></td>
+<td class="colLast"><span 
class="strong">StoreFileReader.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/StoreFileReader.html#loadBloomfilter(org.apache.hadoop.hbase.io.hfile.BlockType)">loadBloomfilter</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>private void</code></td>
-<td class="colLast"><span 
class="strong">StoreFile.Reader.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/StoreFile.Reader.html#setBloomFilterFaulty(org.apache.hadoop.hbase.io.hfile.BlockType)">setBloomFilterFaulty</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">StoreFileReader.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/StoreFileReader.html#setBloomFilterFaulty(org.apache.hadoop.hbase.io.hfile.BlockType)">setBloomFilterFaulty</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>
 </tbody>
 </table>

Reply via email to