You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mi...@apache.org on 2016/07/07 17:58:12 UTC

[13/52] [partial] hbase-site git commit: Published site at c137bafe51a9212f0c2bb2aa4cde4614b4e537be.

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/16d2a5b1/devapidocs/org/apache/hadoop/hbase/io/encoding/class-use/HFileBlockDecodingContext.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/io/encoding/class-use/HFileBlockDecodingContext.html b/devapidocs/org/apache/hadoop/hbase/io/encoding/class-use/HFileBlockDecodingContext.html
index 335d5c4..a24194b 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/encoding/class-use/HFileBlockDecodingContext.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/encoding/class-use/HFileBlockDecodingContext.html
@@ -205,30 +205,30 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/DataBlockEncoder.EncodedSeeker.html" title="interface in org.apache.hadoop.hbase.io.encoding">DataBlockEncoder.EncodedSeeker</a></code></td>
-<td class="colLast"><span class="strong">DiffKeyDeltaEncoder.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/DiffKeyDeltaEncoder.html#createSeeker(org.apache.hadoop.hbase.CellComparator,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDecodingContext)">createSeeker</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/CellComparator.html" title="class in org.apache.hadoop.hbase">CellComparator</a>&nbsp;comparator,
+<td class="colLast"><span class="strong">CopyKeyDataBlockEncoder.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/CopyKeyDataBlockEncoder.html#createSeeker(org.apache.hadoop.hbase.CellComparator,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDecodingContext)">createSeeker</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/CellComparator.html" title="class in org.apache.hadoop.hbase">CellComparator</a>&nbsp;comparator,
                         <a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDecodingContext.html" title="interface in org.apache.hadoop.hbase.io.encoding">HFileBlockDecodingContext</a>&nbsp;decodingCtx)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/DataBlockEncoder.EncodedSeeker.html" title="interface in org.apache.hadoop.hbase.io.encoding">DataBlockEncoder.EncodedSeeker</a></code></td>
-<td class="colLast"><span class="strong">PrefixKeyDeltaEncoder.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/PrefixKeyDeltaEncoder.html#createSeeker(org.apache.hadoop.hbase.CellComparator,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDecodingContext)">createSeeker</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/CellComparator.html" title="class in org.apache.hadoop.hbase">CellComparator</a>&nbsp;comparator,
-                        <a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDecodingContext.html" title="interface in org.apache.hadoop.hbase.io.encoding">HFileBlockDecodingContext</a>&nbsp;decodingCtx)</code>&nbsp;</td>
+<td class="colLast"><span class="strong">DataBlockEncoder.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/DataBlockEncoder.html#createSeeker(org.apache.hadoop.hbase.CellComparator,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDecodingContext)">createSeeker</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/CellComparator.html" title="class in org.apache.hadoop.hbase">CellComparator</a>&nbsp;comparator,
+                        <a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDecodingContext.html" title="interface in org.apache.hadoop.hbase.io.encoding">HFileBlockDecodingContext</a>&nbsp;decodingCtx)</code>
+<div class="block">Create a HFileBlock seeker which find KeyValues within a block.</div>
+</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/DataBlockEncoder.EncodedSeeker.html" title="interface in org.apache.hadoop.hbase.io.encoding">DataBlockEncoder.EncodedSeeker</a></code></td>
-<td class="colLast"><span class="strong">CopyKeyDataBlockEncoder.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/CopyKeyDataBlockEncoder.html#createSeeker(org.apache.hadoop.hbase.CellComparator,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDecodingContext)">createSeeker</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/CellComparator.html" title="class in org.apache.hadoop.hbase">CellComparator</a>&nbsp;comparator,
+<td class="colLast"><span class="strong">FastDiffDeltaEncoder.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/FastDiffDeltaEncoder.html#createSeeker(org.apache.hadoop.hbase.CellComparator,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDecodingContext)">createSeeker</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/CellComparator.html" title="class in org.apache.hadoop.hbase">CellComparator</a>&nbsp;comparator,
                         <a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDecodingContext.html" title="interface in org.apache.hadoop.hbase.io.encoding">HFileBlockDecodingContext</a>&nbsp;decodingCtx)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/DataBlockEncoder.EncodedSeeker.html" title="interface in org.apache.hadoop.hbase.io.encoding">DataBlockEncoder.EncodedSeeker</a></code></td>
-<td class="colLast"><span class="strong">FastDiffDeltaEncoder.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/FastDiffDeltaEncoder.html#createSeeker(org.apache.hadoop.hbase.CellComparator,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDecodingContext)">createSeeker</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/CellComparator.html" title="class in org.apache.hadoop.hbase">CellComparator</a>&nbsp;comparator,
+<td class="colLast"><span class="strong">PrefixKeyDeltaEncoder.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/PrefixKeyDeltaEncoder.html#createSeeker(org.apache.hadoop.hbase.CellComparator,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDecodingContext)">createSeeker</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/CellComparator.html" title="class in org.apache.hadoop.hbase">CellComparator</a>&nbsp;comparator,
                         <a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDecodingContext.html" title="interface in org.apache.hadoop.hbase.io.encoding">HFileBlockDecodingContext</a>&nbsp;decodingCtx)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/DataBlockEncoder.EncodedSeeker.html" title="interface in org.apache.hadoop.hbase.io.encoding">DataBlockEncoder.EncodedSeeker</a></code></td>
-<td class="colLast"><span class="strong">DataBlockEncoder.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/DataBlockEncoder.html#createSeeker(org.apache.hadoop.hbase.CellComparator,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDecodingContext)">createSeeker</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/CellComparator.html" title="class in org.apache.hadoop.hbase">CellComparator</a>&nbsp;comparator,
-                        <a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDecodingContext.html" title="interface in org.apache.hadoop.hbase.io.encoding">HFileBlockDecodingContext</a>&nbsp;decodingCtx)</code>
-<div class="block">Create a HFileBlock seeker which find KeyValues within a block.</div>
-</td>
+<td class="colLast"><span class="strong">DiffKeyDeltaEncoder.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/DiffKeyDeltaEncoder.html#createSeeker(org.apache.hadoop.hbase.CellComparator,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDecodingContext)">createSeeker</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/CellComparator.html" title="class in org.apache.hadoop.hbase">CellComparator</a>&nbsp;comparator,
+                        <a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDecodingContext.html" title="interface in org.apache.hadoop.hbase.io.encoding">HFileBlockDecodingContext</a>&nbsp;decodingCtx)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a></code></td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/16d2a5b1/devapidocs/org/apache/hadoop/hbase/io/encoding/class-use/HFileBlockDefaultDecodingContext.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/io/encoding/class-use/HFileBlockDefaultDecodingContext.html b/devapidocs/org/apache/hadoop/hbase/io/encoding/class-use/HFileBlockDefaultDecodingContext.html
index d8e55a5..6841665 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/encoding/class-use/HFileBlockDefaultDecodingContext.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/encoding/class-use/HFileBlockDefaultDecodingContext.html
@@ -109,35 +109,35 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a></code></td>
-<td class="colLast"><span class="strong">DiffKeyDeltaEncoder.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/DiffKeyDeltaEncoder.html#internalDecodeKeyValues(java.io.DataInputStream,%20int,%20int,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultDecodingContext)">internalDecodeKeyValues</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/DataInputStream.html?is-external=true" title="class or interface in java.io">DataInputStream</a>&nbsp;source,
+<td class="colLast"><span class="strong">CopyKeyDataBlockEncoder.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/CopyKeyDataBlockEncoder.html#internalDecodeKeyValues(java.io.DataInputStream,%20int,%20int,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultDecodingContext)">internalDecodeKeyValues</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/DataInputStream.html?is-external=true" title="class or interface in java.io">DataInputStream</a>&nbsp;source,
                                               int&nbsp;allocateHeaderLength,
                                               int&nbsp;skipLastBytes,
                                               <a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultDecodingContext.html" title="class in org.apache.hadoop.hbase.io.encoding">HFileBlockDefaultDecodingContext</a>&nbsp;decodingCtx)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a></code></td>
-<td class="colLast"><span class="strong">PrefixKeyDeltaEncoder.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/PrefixKeyDeltaEncoder.html#internalDecodeKeyValues(java.io.DataInputStream,%20int,%20int,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultDecodingContext)">internalDecodeKeyValues</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/DataInputStream.html?is-external=true" title="class or interface in java.io">DataInputStream</a>&nbsp;source,
+<td class="colFirst"><code>protected abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a></code></td>
+<td class="colLast"><span class="strong">BufferedDataBlockEncoder.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/BufferedDataBlockEncoder.html#internalDecodeKeyValues(java.io.DataInputStream,%20int,%20int,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultDecodingContext)">internalDecodeKeyValues</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/DataInputStream.html?is-external=true" title="class or interface in java.io">DataInputStream</a>&nbsp;source,
                                               int&nbsp;allocateHeaderLength,
                                               int&nbsp;skipLastBytes,
                                               <a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultDecodingContext.html" title="class in org.apache.hadoop.hbase.io.encoding">HFileBlockDefaultDecodingContext</a>&nbsp;decodingCtx)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>protected abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a></code></td>
-<td class="colLast"><span class="strong">BufferedDataBlockEncoder.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/BufferedDataBlockEncoder.html#internalDecodeKeyValues(java.io.DataInputStream,%20int,%20int,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultDecodingContext)">internalDecodeKeyValues</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/DataInputStream.html?is-external=true" title="class or interface in java.io">DataInputStream</a>&nbsp;source,
+<td class="colFirst"><code>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a></code></td>
+<td class="colLast"><span class="strong">FastDiffDeltaEncoder.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/FastDiffDeltaEncoder.html#internalDecodeKeyValues(java.io.DataInputStream,%20int,%20int,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultDecodingContext)">internalDecodeKeyValues</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/DataInputStream.html?is-external=true" title="class or interface in java.io">DataInputStream</a>&nbsp;source,
                                               int&nbsp;allocateHeaderLength,
                                               int&nbsp;skipLastBytes,
                                               <a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultDecodingContext.html" title="class in org.apache.hadoop.hbase.io.encoding">HFileBlockDefaultDecodingContext</a>&nbsp;decodingCtx)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a></code></td>
-<td class="colLast"><span class="strong">CopyKeyDataBlockEncoder.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/CopyKeyDataBlockEncoder.html#internalDecodeKeyValues(java.io.DataInputStream,%20int,%20int,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultDecodingContext)">internalDecodeKeyValues</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/DataInputStream.html?is-external=true" title="class or interface in java.io">DataInputStream</a>&nbsp;source,
+<td class="colLast"><span class="strong">PrefixKeyDeltaEncoder.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/PrefixKeyDeltaEncoder.html#internalDecodeKeyValues(java.io.DataInputStream,%20int,%20int,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultDecodingContext)">internalDecodeKeyValues</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/DataInputStream.html?is-external=true" title="class or interface in java.io">DataInputStream</a>&nbsp;source,
                                               int&nbsp;allocateHeaderLength,
                                               int&nbsp;skipLastBytes,
                                               <a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultDecodingContext.html" title="class in org.apache.hadoop.hbase.io.encoding">HFileBlockDefaultDecodingContext</a>&nbsp;decodingCtx)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a></code></td>
-<td class="colLast"><span class="strong">FastDiffDeltaEncoder.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/FastDiffDeltaEncoder.html#internalDecodeKeyValues(java.io.DataInputStream,%20int,%20int,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultDecodingContext)">internalDecodeKeyValues</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/DataInputStream.html?is-external=true" title="class or interface in java.io">DataInputStream</a>&nbsp;source,
+<td class="colLast"><span class="strong">DiffKeyDeltaEncoder.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/DiffKeyDeltaEncoder.html#internalDecodeKeyValues(java.io.DataInputStream,%20int,%20int,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultDecodingContext)">internalDecodeKeyValues</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/DataInputStream.html?is-external=true" title="class or interface in java.io">DataInputStream</a>&nbsp;source,
                                               int&nbsp;allocateHeaderLength,
                                               int&nbsp;skipLastBytes,
                                               <a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultDecodingContext.html" title="class in org.apache.hadoop.hbase.io.encoding">HFileBlockDefaultDecodingContext</a>&nbsp;decodingCtx)</code>&nbsp;</td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/16d2a5b1/devapidocs/org/apache/hadoop/hbase/io/encoding/class-use/HFileBlockDefaultEncodingContext.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/io/encoding/class-use/HFileBlockDefaultEncodingContext.html b/devapidocs/org/apache/hadoop/hbase/io/encoding/class-use/HFileBlockDefaultEncodingContext.html
index 55fbd64..344c9be 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/encoding/class-use/HFileBlockDefaultEncodingContext.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/encoding/class-use/HFileBlockDefaultEncodingContext.html
@@ -109,31 +109,31 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>int</code></td>
-<td class="colLast"><span class="strong">DiffKeyDeltaEncoder.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/DiffKeyDeltaEncoder.html#internalEncode(org.apache.hadoop.hbase.Cell,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultEncodingContext,%20java.io.DataOutputStream)">internalEncode</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;cell,
+<td class="colLast"><span class="strong">CopyKeyDataBlockEncoder.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/CopyKeyDataBlockEncoder.html#internalEncode(org.apache.hadoop.hbase.Cell,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultEncodingContext,%20java.io.DataOutputStream)">internalEncode</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;cell,
                             <a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultEncodingContext.html" title="class in org.apache.hadoop.hbase.io.encoding">HFileBlockDefaultEncodingContext</a>&nbsp;encodingContext,
                             <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)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>int</code></td>
-<td class="colLast"><span class="strong">PrefixKeyDeltaEncoder.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/PrefixKeyDeltaEncoder.html#internalEncode(org.apache.hadoop.hbase.Cell,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultEncodingContext,%20java.io.DataOutputStream)">internalEncode</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;cell,
-                            <a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultEncodingContext.html" title="class in org.apache.hadoop.hbase.io.encoding">HFileBlockDefaultEncodingContext</a>&nbsp;encodingContext,
-                            <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)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><code>abstract int</code></td>
 <td class="colLast"><span class="strong">BufferedDataBlockEncoder.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/BufferedDataBlockEncoder.html#internalEncode(org.apache.hadoop.hbase.Cell,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultEncodingContext,%20java.io.DataOutputStream)">internalEncode</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;cell,
                             <a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultEncodingContext.html" title="class in org.apache.hadoop.hbase.io.encoding">HFileBlockDefaultEncodingContext</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)</code>&nbsp;</td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><span class="strong">FastDiffDeltaEncoder.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/FastDiffDeltaEncoder.html#internalEncode(org.apache.hadoop.hbase.Cell,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultEncodingContext,%20java.io.DataOutputStream)">internalEncode</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;cell,
+                            <a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultEncodingContext.html" title="class in org.apache.hadoop.hbase.io.encoding">HFileBlockDefaultEncodingContext</a>&nbsp;encodingContext,
+                            <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)</code>&nbsp;</td>
+</tr>
 <tr class="altColor">
 <td class="colFirst"><code>int</code></td>
-<td class="colLast"><span class="strong">CopyKeyDataBlockEncoder.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/CopyKeyDataBlockEncoder.html#internalEncode(org.apache.hadoop.hbase.Cell,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultEncodingContext,%20java.io.DataOutputStream)">internalEncode</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;cell,
+<td class="colLast"><span class="strong">PrefixKeyDeltaEncoder.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/PrefixKeyDeltaEncoder.html#internalEncode(org.apache.hadoop.hbase.Cell,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultEncodingContext,%20java.io.DataOutputStream)">internalEncode</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;cell,
                             <a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultEncodingContext.html" title="class in org.apache.hadoop.hbase.io.encoding">HFileBlockDefaultEncodingContext</a>&nbsp;encodingContext,
                             <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)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>int</code></td>
-<td class="colLast"><span class="strong">FastDiffDeltaEncoder.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/FastDiffDeltaEncoder.html#internalEncode(org.apache.hadoop.hbase.Cell,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultEncodingContext,%20java.io.DataOutputStream)">internalEncode</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;cell,
+<td class="colLast"><span class="strong">DiffKeyDeltaEncoder.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/DiffKeyDeltaEncoder.html#internalEncode(org.apache.hadoop.hbase.Cell,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultEncodingContext,%20java.io.DataOutputStream)">internalEncode</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;cell,
                             <a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultEncodingContext.html" title="class in org.apache.hadoop.hbase.io.encoding">HFileBlockDefaultEncodingContext</a>&nbsp;encodingContext,
                             <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)</code>&nbsp;</td>
 </tr>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/16d2a5b1/devapidocs/org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html b/devapidocs/org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html
index 91d7c70..89d1c16 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html
@@ -226,7 +226,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>values</h4>
-<pre>public static&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html" title="enum in org.apache.hadoop.hbase.io.hfile">Cacheable.MemoryType</a>[]&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html#line.78">values</a>()</pre>
+<pre>public static&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html" title="enum in org.apache.hadoop.hbase.io.hfile">Cacheable.MemoryType</a>[]&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html#line.36">values</a>()</pre>
 <div class="block">Returns an array containing the constants of this enum type, in
 the order they are declared.  This method may be used to iterate
 over the constants as follows:
@@ -243,7 +243,7 @@ for (Cacheable.MemoryType c : Cacheable.MemoryType.values())
 <ul class="blockListLast">
 <li class="blockList">
 <h4>valueOf</h4>
-<pre>public static&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html" title="enum in org.apache.hadoop.hbase.io.hfile">Cacheable.MemoryType</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html#line.78">valueOf</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
+<pre>public static&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html" title="enum in org.apache.hadoop.hbase.io.hfile">Cacheable.MemoryType</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html#line.36">valueOf</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
 <div class="block">Returns the enum constant of this type with the specified name.
 The string must match <i>exactly</i> an identifier used to declare an
 enum constant in this type.  (Extraneous whitespace characters are 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/16d2a5b1/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 d1a7e03..068c871 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,15 +219,15 @@
 </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">LruBlockCache.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.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="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">LruBlockCache.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.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>
-<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>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/16d2a5b1/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 fdd0f4a..d3d6c11 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,23 +160,23 @@
 <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">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,
                     <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">Cache the block with the specified name and buffer.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<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>
 </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>
-</tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="strong">MemcachedBlockCache.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/MemcachedBlockCache.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,35 +184,35 @@
 </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,%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">Cache the block with the specified name and buffer.</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">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>
-<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,17 +229,17 @@
 </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>
+<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>
+<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>
 </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">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">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">Get the buffer of the block with the specified name.</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">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>
-<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,22 +302,22 @@
 </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,
+<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">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,
+                      <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">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>
-<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">MemcachedBlockCache.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/MemcachedBlockCache.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/16d2a5b1/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 75780a4..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,11 +186,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">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">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">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">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>
@@ -208,9 +208,7 @@
 </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">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="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>
@@ -218,7 +216,9 @@
 </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">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>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/16d2a5b1/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 ce7bde4..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
@@ -232,26 +232,26 @@
 <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">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="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">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="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">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>
 <div class="block">CacheConfig, or null if cache-on-write is disabled</div>
 </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">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>
 <table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
@@ -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,
@@ -538,11 +538,11 @@
 </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">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">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,18 +605,18 @@
 </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>
-</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>
 <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="rowColor">
+<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>
 <td class="colLast"><span class="strong">Store.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getCacheConfig()">getCacheConfig</a></strong>()</code>
 <div class="block">Used for tests.</div>
 </td>
 </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>
+</tr>
 </tbody>
 </table>
 <table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
@@ -735,11 +735,11 @@
 </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">BlockCacheTmpl.ImplData.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.ImplData.html#m_cacheConfig">m_cacheConfig</a></strong></code>&nbsp;</td>
+<td class="colLast"><span class="strong">BlockCacheViewTmpl.ImplData.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheViewTmpl.ImplData.html#m_cacheConfig">m_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">BlockCacheViewTmpl.ImplData.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheViewTmpl.ImplData.html#m_cacheConfig">m_cacheConfig</a></strong></code>&nbsp;</td>
+<td class="colLast"><span class="strong">BlockCacheTmpl.ImplData.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.ImplData.html#m_cacheConfig">m_cacheConfig</a></strong></code>&nbsp;</td>
 </tr>
 </tbody>
 </table>
@@ -752,11 +752,11 @@
 <tbody>
 <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>
-<td class="colLast"><span class="strong">BlockCacheTmpl.ImplData.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.ImplData.html#getCacheConfig()">getCacheConfig</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">BlockCacheViewTmpl.ImplData.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheViewTmpl.ImplData.html#getCacheConfig()">getCacheConfig</a></strong>()</code>&nbsp;</td>
 </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">BlockCacheViewTmpl.ImplData.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheViewTmpl.ImplData.html#getCacheConfig()">getCacheConfig</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">BlockCacheTmpl.ImplData.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.ImplData.html#getCacheConfig()">getCacheConfig</a></strong>()</code>&nbsp;</td>
 </tr>
 </tbody>
 </table>
@@ -826,11 +826,11 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">BlockCacheTmpl.ImplData.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.ImplData.html#setCacheConfig(org.apache.hadoop.hbase.io.hfile.CacheConfig)">setCacheConfig</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a>&nbsp;cacheConfig)</code>&nbsp;</td>
+<td class="colLast"><span class="strong">BlockCacheViewTmpl.ImplData.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheViewTmpl.ImplData.html#setCacheConfig(org.apache.hadoop.hbase.io.hfile.CacheConfig)">setCacheConfig</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a>&nbsp;cacheConfig)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">BlockCacheViewTmpl.ImplData.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheViewTmpl.ImplData.html#setCacheConfig(org.apache.hadoop.hbase.io.hfile.CacheConfig)">setCacheConfig</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a>&nbsp;cacheConfig)</code>&nbsp;</td>
+<td class="colLast"><span class="strong">BlockCacheTmpl.ImplData.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.ImplData.html#setCacheConfig(org.apache.hadoop.hbase.io.hfile.CacheConfig)">setCacheConfig</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a>&nbsp;cacheConfig)</code>&nbsp;</td>
 </tr>
 </tbody>
 </table>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/16d2a5b1/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 839b31f..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,20 +150,20 @@
 <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">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>
 <td class="colLast"><span class="strong">LruBlockCache.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#getStats()">getStats</a></strong>()</code>
 <div class="block">Get counter statistics for this cache.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<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>
 </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>
-</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>
 <td class="colLast"><span class="strong">MemcachedBlockCache.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/MemcachedBlockCache.html#getStats()">getStats</a></strong>()</code>&nbsp;</td>