You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2016/07/19 15:46:47 UTC
[03/52] [partial] hbase-site git commit: Published site at
9454daf25bcc704d8403a403282c9bf0090b1101.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f94f7f0f/devapidocs/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.CellBasedKeyBlockIndexReader.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.CellBasedKeyBlockIndexReader.html b/devapidocs/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.CellBasedKeyBlockIndexReader.html
index ea38681..d012318 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.CellBasedKeyBlockIndexReader.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.CellBasedKeyBlockIndexReader.html
@@ -390,7 +390,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlockIn
<ul class="blockList">
<li class="blockList">
<h4>loadDataBlockWithScanInfo</h4>
-<pre>public <a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockWithScanInfo.html" title="class in org.apache.hadoop.hbase.io.hfile">BlockWithScanInfo</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.CellBasedKeyBlockIndexReader.html#line.274">loadDataBlockWithScanInfo</a>(<a href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a> key,
+<pre>public <a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockWithScanInfo.html" title="class in org.apache.hadoop.hbase.io.hfile">BlockWithScanInfo</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.CellBasedKeyBlockIndexReader.html#line.275">loadDataBlockWithScanInfo</a>(<a href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a> key,
<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.html" title="class in org.apache.hadoop.hbase.io.hfile">HFileBlock</a> currentBlock,
boolean cacheBlocks,
boolean pread,
@@ -419,7 +419,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlockIn
<ul class="blockList">
<li class="blockList">
<h4>midkey</h4>
-<pre>public <a href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.CellBasedKeyBlockIndexReader.html#line.391">midkey</a>()
+<pre>public <a href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.CellBasedKeyBlockIndexReader.html#line.392">midkey</a>()
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 class: <code><a href="../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.BlockIndexReader.html#midkey()">HFileBlockIndex.BlockIndexReader</a></code></strong></div>
<div class="block">An approximation to the <a href="../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.html" title="class in org.apache.hadoop.hbase.io.hfile"><code>HFile</code></a>'s mid-key. Operates on block
@@ -439,7 +439,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlockIn
<ul class="blockList">
<li class="blockList">
<h4>initialize</h4>
-<pre>protected void <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.CellBasedKeyBlockIndexReader.html#line.432">initialize</a>(int numEntries)</pre>
+<pre>protected void <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.CellBasedKeyBlockIndexReader.html#line.433">initialize</a>(int numEntries)</pre>
<dl>
<dt><strong>Specified by:</strong></dt>
<dd><code><a href="../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.BlockIndexReader.html#initialize(int)">initialize</a></code> in class <code><a href="../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.BlockIndexReader.html" title="class in org.apache.hadoop.hbase.io.hfile">HFileBlockIndex.BlockIndexReader</a></code></dd>
@@ -452,7 +452,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlockIn
<ul class="blockList">
<li class="blockList">
<h4>add</h4>
-<pre>protected void <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.CellBasedKeyBlockIndexReader.html#line.443">add</a>(byte[] key,
+<pre>protected void <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.CellBasedKeyBlockIndexReader.html#line.444">add</a>(byte[] key,
long offset,
int dataSize)</pre>
<div class="block">Adds a new entry in the root block index. Only used when reading.</div>
@@ -468,7 +468,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlockIn
<ul class="blockList">
<li class="blockList">
<h4>rootBlockContainingKey</h4>
-<pre>public int <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.CellBasedKeyBlockIndexReader.html#line.452">rootBlockContainingKey</a>(byte[] key,
+<pre>public int <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.CellBasedKeyBlockIndexReader.html#line.453">rootBlockContainingKey</a>(byte[] key,
int offset,
int length,
<a href="../../../../../../org/apache/hadoop/hbase/CellComparator.html" title="class in org.apache.hadoop.hbase">CellComparator</a> comp)</pre>
@@ -489,7 +489,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlockIn
<ul class="blockList">
<li class="blockList">
<h4>rootBlockContainingKey</h4>
-<pre>public int <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.CellBasedKeyBlockIndexReader.html#line.460">rootBlockContainingKey</a>(<a href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a> key)</pre>
+<pre>public int <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.CellBasedKeyBlockIndexReader.html#line.461">rootBlockContainingKey</a>(<a href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a> key)</pre>
<div class="block"><strong>Description copied from class: <code><a href="../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.BlockIndexReader.html#rootBlockContainingKey(org.apache.hadoop.hbase.Cell)">HFileBlockIndex.BlockIndexReader</a></code></strong></div>
<div class="block">Finds the root-level index block containing the given key.</div>
<dl>
@@ -504,7 +504,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlockIn
<ul class="blockListLast">
<li class="blockList">
<h4>toString</h4>
-<pre>public <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> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.CellBasedKeyBlockIndexReader.html#line.483">toString</a>()</pre>
+<pre>public <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> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.CellBasedKeyBlockIndexReader.html#line.484">toString</a>()</pre>
<dl>
<dt><strong>Overrides:</strong></dt>
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#toString()" title="class or interface in java.lang">toString</a></code> in class <code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></dd>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f94f7f0f/devapidocs/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.html b/devapidocs/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.html
index 29fd28a..04fa004 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.html
@@ -367,7 +367,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockListLast">
<li class="blockList">
<h4>getMaxChunkSize</h4>
-<pre>public static int <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.html#line.1646">getMaxChunkSize</a>(org.apache.hadoop.conf.Configuration conf)</pre>
+<pre>public static int <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.html#line.1647">getMaxChunkSize</a>(org.apache.hadoop.conf.Configuration conf)</pre>
</li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f94f7f0f/devapidocs/org/apache/hadoop/hbase/io/hfile/bucket/class-use/BucketCache.BucketEntry.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/bucket/class-use/BucketCache.BucketEntry.html b/devapidocs/org/apache/hadoop/hbase/io/hfile/bucket/class-use/BucketCache.BucketEntry.html
index 3d85d2f..7f983f5 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/bucket/class-use/BucketCache.BucketEntry.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/bucket/class-use/BucketCache.BucketEntry.html
@@ -168,13 +168,13 @@
<tbody>
<tr class="altColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">CachedEntryQueue.</span><code><strong><a href="../../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/CachedEntryQueue.html#add(java.util.Map.Entry)">add</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.Entry.html?is-external=true" title="class or interface in java.util">Map.Entry</a><<a href="../../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" title="class in org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>,<a href="../../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.BucketEntry.html" title="class in org.apache.hadoop.hbase.io.hfile.bucket">BucketCache.BucketEntry</a>> entry)</code>
-<div class="block">Attempt to add the specified entry to this queue.</div>
-</td>
+<td class="colLast"><span class="strong">BucketCache.BucketEntryGroup.</span><code><strong><a href="../../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.BucketEntryGroup.html#add(java.util.Map.Entry)">add</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.Entry.html?is-external=true" title="class or interface in java.util">Map.Entry</a><<a href="../../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" title="class in org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>,<a href="../../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.BucketEntry.html" title="class in org.apache.hadoop.hbase.io.hfile.bucket">BucketCache.BucketEntry</a>> block)</code> </td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">BucketCache.BucketEntryGroup.</span><code><strong><a href="../../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.BucketEntryGroup.html#add(java.util.Map.Entry)">add</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.Entry.html?is-external=true" title="class or interface in java.util">Map.Entry</a><<a href="../../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" title="class in org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>,<a href="../../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.BucketEntry.html" title="class in org.apache.hadoop.hbase.io.hfile.bucket">BucketCache.BucketEntry</a>> block)</code> </td>
+<td class="colLast"><span class="strong">CachedEntryQueue.</span><code><strong><a href="../../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/CachedEntryQueue.html#add(java.util.Map.Entry)">add</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.Entry.html?is-external=true" title="class or interface in java.util">Map.Entry</a><<a href="../../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" title="class in org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>,<a href="../../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.BucketEntry.html" title="class in org.apache.hadoop.hbase.io.hfile.bucket">BucketCache.BucketEntry</a>> entry)</code>
+<div class="block">Attempt to add the specified entry to this queue.</div>
+</td>
</tr>
</tbody>
</table>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f94f7f0f/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 fc8fa85..e3a17a7 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">BlockCache.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#getBlockCaches()">getBlockCaches</a></strong>()</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> </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">LruBlockCache.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#getBlockCaches()">getBlockCaches</a></strong>()</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> </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> </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> </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/f94f7f0f/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 95f8c3d..c4aa0bb 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> cacheKey,
+ <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a> buf)</code> </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> cacheKey,
<a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a> buf)</code>
<div class="block">Add block to cache (defaults to not in-memory).</div>
</td>
</tr>
-<tr class="rowColor">
+<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> cacheKey,
<a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a> buf)</code>
<div class="block">Cache the block with the specified name and buffer.</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> cacheKey,
- <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a> buf)</code> </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> cacheKey,
@@ -184,7 +184,7 @@
</tr>
<tr class="altColor">
<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> 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> cacheKey,
<a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a> buf,
boolean inMemory,
boolean cacheDataInL1)</code> </td>
@@ -200,19 +200,19 @@
</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> 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> cacheKey,
<a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a> buf,
boolean inMemory,
- boolean cacheDataInL1)</code>
-<div class="block">Cache the block with the specified name and buffer.</div>
-</td>
+ boolean cacheDataInL1)</code> </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,%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> 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> cacheKey,
<a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a> buf,
boolean inMemory,
- boolean cacheDataInL1)</code> </td>
+ boolean cacheDataInL1)</code>
+<div class="block">Cache the block with the specified name and buffer.</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">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> cacheKey)</code>
-<div class="block">Evict block from cache.</div>
-</td>
+<td class="colLast"><span class="strong">CombinedBlockCache.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#evictBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey)">evictBlock</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" title="class in org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a> cacheKey)</code> </td>
</tr>
<tr class="rowColor">
<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> cacheKey)</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> cacheKey)</code>
+<div class="block">Evict block from cache.</div>
+</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> cacheKey)</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> cacheKey)</code> </td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>boolean</code></td>
@@ -247,7 +247,7 @@
</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">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> 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> cacheKey,
boolean caching,
boolean repeat,
boolean updateCacheMetrics)</code> </td>
@@ -263,19 +263,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">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> 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> cacheKey,
boolean caching,
boolean repeat,
- boolean updateCacheMetrics)</code>
-<div class="block">Get the buffer of the block with the specified name.</div>
-</td>
+ boolean updateCacheMetrics)</code> </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">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> 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> cacheKey,
boolean caching,
boolean repeat,
- boolean updateCacheMetrics)</code> </td>
+ boolean updateCacheMetrics)</code>
+<div class="block">Get the buffer of the block with the specified name.</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,20 +302,20 @@
</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> cacheKey,
+ <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a> block)</code> </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> cacheKey,
<a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a> 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">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> cacheKey,
- <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a> block)</code> </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> cacheKey,
+<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> cacheKey,
<a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a> block)</code> </td>
</tr>
<tr class="altColor">
@@ -501,13 +501,13 @@
<tbody>
<tr class="altColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">CachedEntryQueue.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/CachedEntryQueue.html#add(java.util.Map.Entry)">add</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.Entry.html?is-external=true" title="class or interface in java.util">Map.Entry</a><<a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" title="class in org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>,<a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.BucketEntry.html" title="class in org.apache.hadoop.hbase.io.hfile.bucket">BucketCache.BucketEntry</a>> entry)</code>
-<div class="block">Attempt to add the specified entry to this queue.</div>
-</td>
+<td class="colLast"><span class="strong">BucketCache.BucketEntryGroup.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.BucketEntryGroup.html#add(java.util.Map.Entry)">add</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.Entry.html?is-external=true" title="class or interface in java.util">Map.Entry</a><<a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" title="class in org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>,<a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.BucketEntry.html" title="class in org.apache.hadoop.hbase.io.hfile.bucket">BucketCache.BucketEntry</a>> block)</code> </td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">BucketCache.BucketEntryGroup.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.BucketEntryGroup.html#add(java.util.Map.Entry)">add</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.Entry.html?is-external=true" title="class or interface in java.util">Map.Entry</a><<a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" title="class in org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>,<a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.BucketEntry.html" title="class in org.apache.hadoop.hbase.io.hfile.bucket">BucketCache.BucketEntry</a>> block)</code> </td>
+<td class="colLast"><span class="strong">CachedEntryQueue.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/CachedEntryQueue.html#add(java.util.Map.Entry)">add</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.Entry.html?is-external=true" title="class or interface in java.util">Map.Entry</a><<a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" title="class in org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>,<a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.BucketEntry.html" title="class in org.apache.hadoop.hbase.io.hfile.bucket">BucketCache.BucketEntry</a>> entry)</code>
+<div class="block">Attempt to add the specified entry to this queue.</div>
+</td>
</tr>
</tbody>
</table>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f94f7f0f/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 a5c8648..5d5ce89 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
@@ -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">Cacheable.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html#getBlockType()">getBlockType</a></strong>()</code> </td>
+<td class="colLast"><span class="strong">CachedBlock.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CachedBlock.html#getBlockType()">getBlockType</a></strong>()</code> </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">CachedBlock.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CachedBlock.html#getBlockType()">getBlockType</a></strong>()</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> </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,14 +208,14 @@
</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> </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>
</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">HFileBlockIndex.BlockIndexWriter.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.BlockIndexWriter.html#getInlineBlockType()">getInlineBlockType</a></strong>()</code> </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> </td>
@@ -276,7 +276,7 @@ the order they are declared.</div>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">HFileDataBlockEncoderImpl.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileDataBlockEncoderImpl.html#endBlockEncoding(org.apache.hadoop.hbase.io.encoding.HFileBlockEncodingContext,%20java.io.DataOutputStream,%20byte[],%20org.apache.hadoop.hbase.io.hfile.BlockType)">endBlockEncoding</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockEncodingContext.html" title="interface in org.apache.hadoop.hbase.io.encoding">HFileBlockEncodingContext</a> 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> 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> out,
byte[] uncompressedBytesWithHeader,
<a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a> blockType)</code> </td>
@@ -292,7 +292,7 @@ the order they are declared.</div>
</tr>
<tr class="rowColor">
<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> encodingCtx,
+<td class="colLast"><span class="strong">HFileDataBlockEncoderImpl.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileDataBlockEncoderImpl.html#endBlockEncoding(org.apache.hadoop.hbase.io.encoding.HFileBlockEncodingContext,%20java.io.DataOutputStream,%20byte[],%20org.apache.hadoop.hbase.io.hfile.BlockType)">endBlockEncoding</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockEncodingContext.html" title="interface in org.apache.hadoop.hbase.io.encoding">HFileBlockEncodingContext</a> 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> out,
byte[] uncompressedBytesWithHeader,
<a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a> blockType)</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 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 offset,
long onDiskBlockSize,
boolean cacheBlock,
boolean pread,
boolean isCompaction,
boolean updateCacheMetrics,
<a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a> expectedBlockType,
- <a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/DataBlockEncoding.html" title="enum in org.apache.hadoop.hbase.io.encoding">DataBlockEncoding</a> expectedDataBlockEncoding)</code> </td>
+ <a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/DataBlockEncoding.html" title="enum in org.apache.hadoop.hbase.io.encoding">DataBlockEncoding</a> 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 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 dataBlockOffset,
long onDiskBlockSize,
boolean cacheBlock,
boolean pread,
boolean isCompaction,
boolean updateCacheMetrics,
<a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a> expectedBlockType,
- <a href="../../../../../../../org/apache/hadoop/hbase/io/encoding/DataBlockEncoding.html" title="enum in org.apache.hadoop.hbase.io.encoding">DataBlockEncoding</a> 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> expectedDataBlockEncoding)</code> </td>
</tr>
<tr class="altColor">
<td class="colFirst"><code>private void</code></td>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f94f7f0f/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 b0ee771..540b3a6 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
@@ -137,51 +137,51 @@
<tbody>
<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../../../org/apache/hadoop/hbase/regionserver/StoreFileReader.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFileReader</a></code></td>
-<td class="colLast"><span class="strong">RegionObserver.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/coprocessor/RegionObserver.html#postStoreFileReaderOpen(org.apache.hadoop.hbase.coprocessor.ObserverContext,%20org.apache.hadoop.fs.FileSystem,%20org.apache.hadoop.fs.Path,%20org.apache.hadoop.hbase.io.FSDataInputStreamWrapper,%20long,%20org.apache.hadoop.hbase.io.hfile.CacheConfig,%20org.apache.hadoop.hbase.io.Reference,%20org.apache.hadoop.hbase.regionserver.StoreFileReader)">postStoreFileReaderOpen</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/coprocessor/ObserverContext.html" title="class in org.apache.hadoop.hbase.coprocessor">ObserverContext</a><<a href="../../../../../../../org/apache/hadoop/hbase/coprocessor/RegionCoprocessorEnvironment.html" title="interface in org.apache.hadoop.hbase.coprocessor">RegionCoprocessorEnvironment</a>> ctx,
+<td class="colLast"><span class="strong">BaseRegionObserver.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/coprocessor/BaseRegionObserver.html#postStoreFileReaderOpen(org.apache.hadoop.hbase.coprocessor.ObserverContext,%20org.apache.hadoop.fs.FileSystem,%20org.apache.hadoop.fs.Path,%20org.apache.hadoop.hbase.io.FSDataInputStreamWrapper,%20long,%20org.apache.hadoop.hbase.io.hfile.CacheConfig,%20org.apache.hadoop.hbase.io.Reference,%20org.apache.hadoop.hbase.regionserver.StoreFileReader)">postStoreFileReaderOpen</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/coprocessor/ObserverContext.html" title="class in org.apache.hadoop.hbase.coprocessor">ObserverContext</a><<a href="../../../../../../../org/apache/hadoop/hbase/coprocessor/RegionCoprocessorEnvironment.html" title="interface in org.apache.hadoop.hbase.coprocessor">RegionCoprocessorEnvironment</a>> ctx,
org.apache.hadoop.fs.FileSystem fs,
org.apache.hadoop.fs.Path p,
<a href="../../../../../../../org/apache/hadoop/hbase/io/FSDataInputStreamWrapper.html" title="class in org.apache.hadoop.hbase.io">FSDataInputStreamWrapper</a> in,
long size,
<a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a> cacheConf,
<a href="../../../../../../../org/apache/hadoop/hbase/io/Reference.html" title="class in org.apache.hadoop.hbase.io">Reference</a> r,
- <a href="../../../../../../../org/apache/hadoop/hbase/regionserver/StoreFileReader.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFileReader</a> reader)</code>
-<div class="block">Called after the creation of Reader for a store file.</div>
-</td>
+ <a href="../../../../../../../org/apache/hadoop/hbase/regionserver/StoreFileReader.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFileReader</a> reader)</code> </td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code><a href="../../../../../../../org/apache/hadoop/hbase/regionserver/StoreFileReader.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFileReader</a></code></td>
-<td class="colLast"><span class="strong">BaseRegionObserver.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/coprocessor/BaseRegionObserver.html#postStoreFileReaderOpen(org.apache.hadoop.hbase.coprocessor.ObserverContext,%20org.apache.hadoop.fs.FileSystem,%20org.apache.hadoop.fs.Path,%20org.apache.hadoop.hbase.io.FSDataInputStreamWrapper,%20long,%20org.apache.hadoop.hbase.io.hfile.CacheConfig,%20org.apache.hadoop.hbase.io.Reference,%20org.apache.hadoop.hbase.regionserver.StoreFileReader)">postStoreFileReaderOpen</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/coprocessor/ObserverContext.html" title="class in org.apache.hadoop.hbase.coprocessor">ObserverContext</a><<a href="../../../../../../../org/apache/hadoop/hbase/coprocessor/RegionCoprocessorEnvironment.html" title="interface in org.apache.hadoop.hbase.coprocessor">RegionCoprocessorEnvironment</a>> ctx,
+<td class="colLast"><span class="strong">RegionObserver.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/coprocessor/RegionObserver.html#postStoreFileReaderOpen(org.apache.hadoop.hbase.coprocessor.ObserverContext,%20org.apache.hadoop.fs.FileSystem,%20org.apache.hadoop.fs.Path,%20org.apache.hadoop.hbase.io.FSDataInputStreamWrapper,%20long,%20org.apache.hadoop.hbase.io.hfile.CacheConfig,%20org.apache.hadoop.hbase.io.Reference,%20org.apache.hadoop.hbase.regionserver.StoreFileReader)">postStoreFileReaderOpen</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/coprocessor/ObserverContext.html" title="class in org.apache.hadoop.hbase.coprocessor">ObserverContext</a><<a href="../../../../../../../org/apache/hadoop/hbase/coprocessor/RegionCoprocessorEnvironment.html" title="interface in org.apache.hadoop.hbase.coprocessor">RegionCoprocessorEnvironment</a>> ctx,
org.apache.hadoop.fs.FileSystem fs,
org.apache.hadoop.fs.Path p,
<a href="../../../../../../../org/apache/hadoop/hbase/io/FSDataInputStreamWrapper.html" title="class in org.apache.hadoop.hbase.io">FSDataInputStreamWrapper</a> in,
long size,
<a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a> cacheConf,
<a href="../../../../../../../org/apache/hadoop/hbase/io/Reference.html" title="class in org.apache.hadoop.hbase.io">Reference</a> r,
- <a href="../../../../../../../org/apache/hadoop/hbase/regionserver/StoreFileReader.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFileReader</a> reader)</code> </td>
+ <a href="../../../../../../../org/apache/hadoop/hbase/regionserver/StoreFileReader.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFileReader</a> reader)</code>
+<div class="block">Called after the creation of Reader for a store file.</div>
+</td>
</tr>
<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../../../org/apache/hadoop/hbase/regionserver/StoreFileReader.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFileReader</a></code></td>
-<td class="colLast"><span class="strong">RegionObserver.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/coprocessor/RegionObserver.html#preStoreFileReaderOpen(org.apache.hadoop.hbase.coprocessor.ObserverContext,%20org.apache.hadoop.fs.FileSystem,%20org.apache.hadoop.fs.Path,%20org.apache.hadoop.hbase.io.FSDataInputStreamWrapper,%20long,%20org.apache.hadoop.hbase.io.hfile.CacheConfig,%20org.apache.hadoop.hbase.io.Reference,%20org.apache.hadoop.hbase.regionserver.StoreFileReader)">preStoreFileReaderOpen</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/coprocessor/ObserverContext.html" title="class in org.apache.hadoop.hbase.coprocessor">ObserverContext</a><<a href="../../../../../../../org/apache/hadoop/hbase/coprocessor/RegionCoprocessorEnvironment.html" title="interface in org.apache.hadoop.hbase.coprocessor">RegionCoprocessorEnvironment</a>> ctx,
+<td class="colLast"><span class="strong">BaseRegionObserver.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/coprocessor/BaseRegionObserver.html#preStoreFileReaderOpen(org.apache.hadoop.hbase.coprocessor.ObserverContext,%20org.apache.hadoop.fs.FileSystem,%20org.apache.hadoop.fs.Path,%20org.apache.hadoop.hbase.io.FSDataInputStreamWrapper,%20long,%20org.apache.hadoop.hbase.io.hfile.CacheConfig,%20org.apache.hadoop.hbase.io.Reference,%20org.apache.hadoop.hbase.regionserver.StoreFileReader)">preStoreFileReaderOpen</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/coprocessor/ObserverContext.html" title="class in org.apache.hadoop.hbase.coprocessor">ObserverContext</a><<a href="../../../../../../../org/apache/hadoop/hbase/coprocessor/RegionCoprocessorEnvironment.html" title="interface in org.apache.hadoop.hbase.coprocessor">RegionCoprocessorEnvironment</a>> ctx,
org.apache.hadoop.fs.FileSystem fs,
org.apache.hadoop.fs.Path p,
<a href="../../../../../../../org/apache/hadoop/hbase/io/FSDataInputStreamWrapper.html" title="class in org.apache.hadoop.hbase.io">FSDataInputStreamWrapper</a> in,
long size,
<a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a> cacheConf,
<a href="../../../../../../../org/apache/hadoop/hbase/io/Reference.html" title="class in org.apache.hadoop.hbase.io">Reference</a> r,
- <a href="../../../../../../../org/apache/hadoop/hbase/regionserver/StoreFileReader.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFileReader</a> reader)</code>
-<div class="block">Called before creation of Reader for a store file.</div>
-</td>
+ <a href="../../../../../../../org/apache/hadoop/hbase/regionserver/StoreFileReader.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFileReader</a> reader)</code> </td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code><a href="../../../../../../../org/apache/hadoop/hbase/regionserver/StoreFileReader.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFileReader</a></code></td>
-<td class="colLast"><span class="strong">BaseRegionObserver.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/coprocessor/BaseRegionObserver.html#preStoreFileReaderOpen(org.apache.hadoop.hbase.coprocessor.ObserverContext,%20org.apache.hadoop.fs.FileSystem,%20org.apache.hadoop.fs.Path,%20org.apache.hadoop.hbase.io.FSDataInputStreamWrapper,%20long,%20org.apache.hadoop.hbase.io.hfile.CacheConfig,%20org.apache.hadoop.hbase.io.Reference,%20org.apache.hadoop.hbase.regionserver.StoreFileReader)">preStoreFileReaderOpen</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/coprocessor/ObserverContext.html" title="class in org.apache.hadoop.hbase.coprocessor">ObserverContext</a><<a href="../../../../../../../org/apache/hadoop/hbase/coprocessor/RegionCoprocessorEnvironment.html" title="interface in org.apache.hadoop.hbase.coprocessor">RegionCoprocessorEnvironment</a>> ctx,
+<td class="colLast"><span class="strong">RegionObserver.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/coprocessor/RegionObserver.html#preStoreFileReaderOpen(org.apache.hadoop.hbase.coprocessor.ObserverContext,%20org.apache.hadoop.fs.FileSystem,%20org.apache.hadoop.fs.Path,%20org.apache.hadoop.hbase.io.FSDataInputStreamWrapper,%20long,%20org.apache.hadoop.hbase.io.hfile.CacheConfig,%20org.apache.hadoop.hbase.io.Reference,%20org.apache.hadoop.hbase.regionserver.StoreFileReader)">preStoreFileReaderOpen</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/coprocessor/ObserverContext.html" title="class in org.apache.hadoop.hbase.coprocessor">ObserverContext</a><<a href="../../../../../../../org/apache/hadoop/hbase/coprocessor/RegionCoprocessorEnvironment.html" title="interface in org.apache.hadoop.hbase.coprocessor">RegionCoprocessorEnvironment</a>> ctx,
org.apache.hadoop.fs.FileSystem fs,
org.apache.hadoop.fs.Path p,
<a href="../../../../../../../org/apache/hadoop/hbase/io/FSDataInputStreamWrapper.html" title="class in org.apache.hadoop.hbase.io">FSDataInputStreamWrapper</a> in,
long size,
<a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a> cacheConf,
<a href="../../../../../../../org/apache/hadoop/hbase/io/Reference.html" title="class in org.apache.hadoop.hbase.io">Reference</a> r,
- <a href="../../../../../../../org/apache/hadoop/hbase/regionserver/StoreFileReader.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFileReader</a> reader)</code> </td>
+ <a href="../../../../../../../org/apache/hadoop/hbase/regionserver/StoreFileReader.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFileReader</a> reader)</code>
+<div class="block">Called before creation of Reader for a store file.</div>
+</td>
</tr>
</tbody>
</table>
@@ -231,10 +231,8 @@
</tr>
<tbody>
<tr class="altColor">
-<td class="colFirst"><code>private <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
-<td class="colLast"><span class="strong">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>
+<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> </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>
@@ -249,8 +247,10 @@
</td>
</tr>
<tr class="rowColor">
-<td class="colFirst"><code>protected <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
-<td class="colLast"><span class="strong">HFile.WriterFactory.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.WriterFactory.html#cacheConf">cacheConf</a></strong></code> </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">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>
</tbody>
</table>
@@ -405,13 +405,6 @@
</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 fs,
- org.apache.hadoop.fs.Path path,
- org.apache.hadoop.conf.Configuration conf,
- <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a> cacheConf)</code> </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 fs,
org.apache.hadoop.fs.Path path,
@@ -420,6 +413,13 @@
<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 fs,
+ org.apache.hadoop.fs.Path path,
+ org.apache.hadoop.conf.Configuration conf,
+ <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a> cacheConf)</code> </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 conf,
@@ -534,7 +534,7 @@
<tbody>
<tr class="altColor">
<td class="colFirst"><code>private <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
-<td class="colLast"><span class="strong">SweepJob.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/mob/mapreduce/SweepJob.html#cacheConfig">cacheConfig</a></strong></code> </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> </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>
@@ -542,7 +542,7 @@
</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">SweepReducer.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/mob/mapreduce/SweepReducer.html#cacheConfig">cacheConfig</a></strong></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> </td>
</tr>
</tbody>
</table>
@@ -576,11 +576,11 @@
<tbody>
<tr class="altColor">
<td class="colFirst"><code>private <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
-<td class="colLast"><span class="strong">StoreFileWriter.Builder.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/regionserver/StoreFileWriter.Builder.html#cacheConf">cacheConf</a></strong></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> </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> </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> </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>
@@ -605,9 +605,7 @@
</tr>
<tr class="rowColor">
<td class="colFirst"><code><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
-<td class="colLast"><span class="strong">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>
+<td class="colLast"><span class="strong">HStore.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/regionserver/HStore.html#getCacheConfig()">getCacheConfig</a></strong>()</code> </td>
</tr>
<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
@@ -615,7 +613,9 @@
</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> </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>
</tbody>
</table>
@@ -749,11 +749,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">BlockCacheViewTmpl.ImplData.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheViewTmpl.ImplData.html#m_cacheConfig">m_cacheConfig</a></strong></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> </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">BlockCacheTmpl.ImplData.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.ImplData.html#m_cacheConfig">m_cacheConfig</a></strong></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> </td>
</tr>
</tbody>
</table>
@@ -766,11 +766,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">BlockCacheViewTmpl.ImplData.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheViewTmpl.ImplData.html#getCacheConfig()">getCacheConfig</a></strong>()</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> </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">BlockCacheTmpl.ImplData.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.ImplData.html#getCacheConfig()">getCacheConfig</a></strong>()</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> </td>
</tr>
</tbody>
</table>
@@ -840,11 +840,11 @@
</tr>
<tr class="rowColor">
<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> cacheConfig)</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> cacheConfig)</code> </td>
</tr>
<tr class="altColor">
<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> cacheConfig)</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> cacheConfig)</code> </td>
</tr>
</tbody>
</table>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f94f7f0f/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheStats.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheStats.html b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheStats.html
index 7dfafa9..4143193 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> </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">BlockCache.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#getStats()">getStats</a></strong>()</code>
<div class="block">Get the statistics for this block cache.</div>
</td>
</tr>
-<tr class="rowColor">
+<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">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="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> </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> </td>